[hybrisadaptor] Fix building rotation vector adaptors with old Androi…

…d versions. JB#47730
sailfishos · Sep 4, 2020 · ab21877 · ab21877
1 parent e65aa54
commit ab21877
Show file tree

Hide file tree

Showing 3 changed files with 97 additions and 99 deletions.
diff --git a/adaptors/hybrisstepcounteradaptor/hybrisstepcounteradaptor.cpp b/adaptors/hybrisstepcounteradaptor/hybrisstepcounteradaptor.cpp
@@ -26,12 +26,8 @@
 #include "datatypes/utils.h"
 #include "config.h"
 
-#ifndef SENSOR_TYPE_STEP_COUNTER
-#define SENSOR_TYPE_STEP_COUNTER (19)
-/* If hardware/sensors.h does not define SENSOR_TYPE_STEP_COUNTER, assume
- * a) the event structure is missing u64 union too, and b) u64.step_counter
- * would be located at the same address as non-u64 data array. */
-#define NO_SENSORS_EVENT_U64
+#ifndef USE_BINDER
+#include <android-version.h>
 #endif
 
 HybrisStepCounterAdaptor::HybrisStepCounterAdaptor(const QString& id) :
@@ -83,7 +79,10 @@ void HybrisStepCounterAdaptor::processSample(const sensors_event_t& data)
 #ifdef USE_BINDER
     d->value_ = data.u.stepCount;
 #else
-#ifdef NO_SENSORS_EVENT_U64
+#if ANDROID_VERSION_MAJOR == 4 && ANDROID_VERSION_MINOR < 4
+/* In Android versions 4.3 and older hardware/sensors.h does not
+ * contain u64 union and values are located at the same
+ * address as non-u64 data array. */
     uint64_t value = 0;
     memcpy(&value, data.data, sizeof value);
     d->value_ = value;

diff --git a/core/hybrisadaptor.cpp b/core/hybrisadaptor.cpp
@@ -35,98 +35,6 @@
 #include <time.h>
 #include <signal.h>
 
-
-/* Older devices probably have old android hal and thus do
- * not define sensor all sensor types that have been added
- * later on -> In order to both use symbolic names and
- * compile for all devices we need to fill in holes that
- * android hal for some particular device might have.
- */
-#ifndef SENSOR_TYPE_META_DATA
-#define SENSOR_TYPE_META_DATA                        (0)
-#endif
-#ifndef SENSOR_TYPE_ACCELEROMETER
-#define SENSOR_TYPE_ACCELEROMETER                    (1)
-#endif
-#ifndef SENSOR_TYPE_GEOMAGNETIC_FIELD
-#define SENSOR_TYPE_GEOMAGNETIC_FIELD                (2) // alias for SENSOR_TYPE_MAGNETIC_FIELD
-#endif
-#ifndef SENSOR_TYPE_MAGNETIC_FIELD
-#define SENSOR_TYPE_MAGNETIC_FIELD                   (2) // alias for SENSOR_TYPE_GEOMAGNETIC_FIELD
-#endif
-#ifndef SENSOR_TYPE_ORIENTATION
-#define SENSOR_TYPE_ORIENTATION                      (3)
-#endif
-#ifndef SENSOR_TYPE_GYROSCOPE
-#define SENSOR_TYPE_GYROSCOPE                        (4)
-#endif
-#ifndef SENSOR_TYPE_LIGHT
-#define SENSOR_TYPE_LIGHT                            (5)
-#endif
-#ifndef SENSOR_TYPE_PRESSURE
-#define SENSOR_TYPE_PRESSURE                         (6)
-#endif
-#ifndef SENSOR_TYPE_TEMPERATURE
-#define SENSOR_TYPE_TEMPERATURE                      (7)
-#endif
-#ifndef SENSOR_TYPE_PROXIMITY
-#define SENSOR_TYPE_PROXIMITY                        (8)
-#endif
-#ifndef SENSOR_TYPE_GRAVITY
-#define SENSOR_TYPE_GRAVITY                          (9)
-#endif
-#ifndef SENSOR_TYPE_LINEAR_ACCELERATION
-#define SENSOR_TYPE_LINEAR_ACCELERATION             (10)
-#endif
-#ifndef SENSOR_TYPE_ROTATION_VECTOR
-#define SENSOR_TYPE_ROTATION_VECTOR                 (11)
-#endif
-#ifndef SENSOR_TYPE_RELATIVE_HUMIDITY
-#define SENSOR_TYPE_RELATIVE_HUMIDITY               (12)
-#endif
-#ifndef SENSOR_TYPE_AMBIENT_TEMPERATURE
-#define SENSOR_TYPE_AMBIENT_TEMPERATURE             (13)
-#endif
-#ifndef SENSOR_TYPE_MAGNETIC_FIELD_UNCALIBRATED
-#define SENSOR_TYPE_MAGNETIC_FIELD_UNCALIBRATED     (14)
-#endif
-#ifndef SENSOR_TYPE_GAME_ROTATION_VECTOR
-#define SENSOR_TYPE_GAME_ROTATION_VECTOR            (15)
-#endif
-#ifndef SENSOR_TYPE_GYROSCOPE_UNCALIBRATED
-#define SENSOR_TYPE_GYROSCOPE_UNCALIBRATED          (16)
-#endif
-#ifndef SENSOR_TYPE_SIGNIFICANT_MOTION
-#define SENSOR_TYPE_SIGNIFICANT_MOTION              (17)
-#endif
-#ifndef SENSOR_TYPE_STEP_DETECTOR
-#define SENSOR_TYPE_STEP_DETECTOR                   (18)
-#endif
-#ifndef SENSOR_TYPE_STEP_COUNTER
-#define SENSOR_TYPE_STEP_COUNTER                    (19)
-#endif
-#ifndef SENSOR_TYPE_GEOMAGNETIC_ROTATION_VECTOR
-#define SENSOR_TYPE_GEOMAGNETIC_ROTATION_VECTOR     (20)
-#endif
-#ifndef SENSOR_TYPE_HEART_RATE
-#define SENSOR_TYPE_HEART_RATE                      (21)
-#endif
-#ifndef SENSOR_TYPE_TILT_DETECTOR
-#define SENSOR_TYPE_TILT_DETECTOR                   (22)
-#endif
-#ifndef SENSOR_TYPE_WAKE_GESTURE
-#define SENSOR_TYPE_WAKE_GESTURE                    (23)
-#endif
-#ifndef SENSOR_TYPE_GLANCE_GESTURE
-#define SENSOR_TYPE_GLANCE_GESTURE                  (24)
-#endif
-#ifndef SENSOR_TYPE_PICK_UP_GESTURE
-#define SENSOR_TYPE_PICK_UP_GESTURE                 (25)
-#endif
-#ifndef SENSOR_TYPE_WRIST_TILT_GESTURE
-#define SENSOR_TYPE_WRIST_TILT_GESTURE              (26)
-#endif
-
 #ifdef USE_BINDER
 #define SENSOR_BINDER_SERVICE_DEVICE "/dev/hwbinder"
 #define SENSOR_BINDER_SERVICE_IFACE "android.hardware.sensors@1.0::ISensors"

diff --git a/core/hybrisadaptor.h b/core/hybrisadaptor.h
@@ -36,6 +36,97 @@
 #include <pthread.h>
 #endif
 
+/* Older devices probably have old android hal and thus do
+ * not define sensor all sensor types that have been added
+ * later on -> In order to both use symbolic names and
+ * compile for all devices we need to fill in holes that
+ * android hal for some particular device might have.
+ */
+#ifndef SENSOR_TYPE_META_DATA
+#define SENSOR_TYPE_META_DATA                        (0)
+#endif
+#ifndef SENSOR_TYPE_ACCELEROMETER
+#define SENSOR_TYPE_ACCELEROMETER                    (1)
+#endif
+#ifndef SENSOR_TYPE_GEOMAGNETIC_FIELD
+#define SENSOR_TYPE_GEOMAGNETIC_FIELD                (2) // alias for SENSOR_TYPE_MAGNETIC_FIELD
+#endif
+#ifndef SENSOR_TYPE_MAGNETIC_FIELD
+#define SENSOR_TYPE_MAGNETIC_FIELD                   (2) // alias for SENSOR_TYPE_GEOMAGNETIC_FIELD
+#endif
+#ifndef SENSOR_TYPE_ORIENTATION
+#define SENSOR_TYPE_ORIENTATION                      (3)
+#endif
+#ifndef SENSOR_TYPE_GYROSCOPE
+#define SENSOR_TYPE_GYROSCOPE                        (4)
+#endif
+#ifndef SENSOR_TYPE_LIGHT
+#define SENSOR_TYPE_LIGHT                            (5)
+#endif
+#ifndef SENSOR_TYPE_PRESSURE
+#define SENSOR_TYPE_PRESSURE                         (6)
+#endif
+#ifndef SENSOR_TYPE_TEMPERATURE
+#define SENSOR_TYPE_TEMPERATURE                      (7)
+#endif
+#ifndef SENSOR_TYPE_PROXIMITY
+#define SENSOR_TYPE_PROXIMITY                        (8)
+#endif
+#ifndef SENSOR_TYPE_GRAVITY
+#define SENSOR_TYPE_GRAVITY                          (9)
+#endif
+#ifndef SENSOR_TYPE_LINEAR_ACCELERATION
+#define SENSOR_TYPE_LINEAR_ACCELERATION             (10)
+#endif
+#ifndef SENSOR_TYPE_ROTATION_VECTOR
+#define SENSOR_TYPE_ROTATION_VECTOR                 (11)
+#endif
+#ifndef SENSOR_TYPE_RELATIVE_HUMIDITY
+#define SENSOR_TYPE_RELATIVE_HUMIDITY               (12)
+#endif
+#ifndef SENSOR_TYPE_AMBIENT_TEMPERATURE
+#define SENSOR_TYPE_AMBIENT_TEMPERATURE             (13)
+#endif
+#ifndef SENSOR_TYPE_MAGNETIC_FIELD_UNCALIBRATED
+#define SENSOR_TYPE_MAGNETIC_FIELD_UNCALIBRATED     (14)
+#endif
+#ifndef SENSOR_TYPE_GAME_ROTATION_VECTOR
+#define SENSOR_TYPE_GAME_ROTATION_VECTOR            (15)
+#endif
+#ifndef SENSOR_TYPE_GYROSCOPE_UNCALIBRATED
+#define SENSOR_TYPE_GYROSCOPE_UNCALIBRATED          (16)
+#endif
+#ifndef SENSOR_TYPE_SIGNIFICANT_MOTION
+#define SENSOR_TYPE_SIGNIFICANT_MOTION              (17)
+#endif
+#ifndef SENSOR_TYPE_STEP_DETECTOR
+#define SENSOR_TYPE_STEP_DETECTOR                   (18)
+#endif
+#ifndef SENSOR_TYPE_STEP_COUNTER
+#define SENSOR_TYPE_STEP_COUNTER                    (19)
+#endif
+#ifndef SENSOR_TYPE_GEOMAGNETIC_ROTATION_VECTOR
+#define SENSOR_TYPE_GEOMAGNETIC_ROTATION_VECTOR     (20)
+#endif
+#ifndef SENSOR_TYPE_HEART_RATE
+#define SENSOR_TYPE_HEART_RATE                      (21)
+#endif
+#ifndef SENSOR_TYPE_TILT_DETECTOR
+#define SENSOR_TYPE_TILT_DETECTOR                   (22)
+#endif
+#ifndef SENSOR_TYPE_WAKE_GESTURE
+#define SENSOR_TYPE_WAKE_GESTURE                    (23)
+#endif
+#ifndef SENSOR_TYPE_GLANCE_GESTURE
+#define SENSOR_TYPE_GLANCE_GESTURE                  (24)
+#endif
+#ifndef SENSOR_TYPE_PICK_UP_GESTURE
+#define SENSOR_TYPE_PICK_UP_GESTURE                 (25)
+#endif
+#ifndef SENSOR_TYPE_WRIST_TILT_GESTURE
+#define SENSOR_TYPE_WRIST_TILT_GESTURE              (26)
+#endif
+
 #define SENSORFW_MCE_WATCHER
 
 class HybrisAdaptor;