sensord: move deprecated event types to sensor_deprecated.h

- clean up sensor_types.h

Change-Id: I41225fcb478d00fd780aa46cda2ff94c18ede5c9
Signed-off-by: kibak.yoon <kibak.yoon@samsung.com>

diff --git a/src/shared/sensor_deprecated.h b/src/shared/sensor_deprecated.h
index a9481a5..41a4092 100644 (file)
--- a/src/shared/sensor_deprecated.h
+++ b/src/shared/sensor_deprecated.h
@@ -25,6 +25,79 @@ extern "C"
 {
 #endif
 
+// Sensor Event Types
+enum event_types_t {
+       ACCELEROMETER_RAW_DATA_EVENT                                                                                            = (ACCELEROMETER_SENSOR << 16) | 0x0001,
+       ACCELEROMETER_UNPROCESSED_DATA_EVENT                                              = (ACCELEROMETER_SENSOR << 16) | 0x0002,
+
+       GYROSCOPE_RAW_DATA_EVENT                  = (GYROSCOPE_SENSOR << 16) | 0x0001,
+       GYROSCOPE_UNPROCESSED_DATA_EVENT                  = (GYROSCOPE_SENSOR << 16) | 0x0002,
+
+       GEOMAGNETIC_RAW_DATA_EVENT              = (GEOMAGNETIC_SENSOR << 16) | 0x0001,
+       GEOMAGNETIC_UNPROCESSED_DATA_EVENT              = (GEOMAGNETIC_SENSOR << 16) | 0x0002,
+
+       PROXIMITY_CHANGE_STATE_EVENT     = (PROXIMITY_SENSOR << 16) | 0x0001,
+       PROXIMITY_STATE_EVENT   = (PROXIMITY_SENSOR << 16) | 0x0002,
+       PROXIMITY_DISTANCE_DATA_EVENT   = (PROXIMITY_SENSOR << 16) | 0x0003,
+
+       PRESSURE_RAW_DATA_EVENT                 = (PRESSURE_SENSOR << 16) | 0x0001,
+
+       TEMPERATURE_RAW_DATA_EVENT              = (TEMPERATURE_SENSOR << 16) | 0x0001,
+
+       LIGHT_LUX_DATA_EVENT     = (LIGHT_SENSOR << 16) | 0x0001,
+       LIGHT_LEVEL_DATA_EVENT  = (LIGHT_SENSOR << 16) | 0x0002,
+       LIGHT_CHANGE_LEVEL_EVENT                  = (LIGHT_SENSOR << 16) | 0x0003,
+
+       ROTATION_VECTOR_RAW_DATA_EVENT  = (ROTATION_VECTOR_SENSOR << 16) | 0x0001,
+
+       RV_RAW_RAW_DATA_EVENT   = (RV_RAW_SENSOR << 16) | 0x0001,
+
+       ULTRAVIOLET_RAW_DATA_EVENT              = (ULTRAVIOLET_SENSOR << 16) | 0x0001,
+
+       AUTO_ROTATION_CHANGE_STATE_EVENT = (AUTO_ROTATION_SENSOR << 16) | 0x0001,
+
+       BIO_LED_RED_RAW_DATA_EVENT              = (BIO_LED_RED_SENSOR << 16) | 0x0001,
+
+       GAMING_RV_RAW_DATA_EVENT                  = (GYROSCOPE_RV_SENSOR << 16) | 0x0001,
+
+       GEOMAGNETIC_RV_RAW_DATA_EVENT   = (GEOMAGNETIC_RV_SENSOR << 16) | 0x0001,
+
+       GRAVITY_RAW_DATA_EVENT  = (GRAVITY_SENSOR << 16) | 0x0001,
+
+       LINEAR_ACCEL_RAW_DATA_EVENT       = (LINEAR_ACCEL_SENSOR << 16) | 0x0001,
+
+       MOTION_ENGINE_EVENT_SNAP                                                                                  = (MOTION_SENSOR << 16) | 0x0001,
+       MOTION_ENGINE_EVENT_SHAKE                                                                                = (MOTION_SENSOR << 16) | 0x0002,
+       MOTION_ENGINE_EVENT_DOUBLETAP                                            = (MOTION_SENSOR << 16) | 0x0004,
+       MOTION_ENGINE_EVENT_PANNING                                                                       = (MOTION_SENSOR << 16) | 0x0008,
+       MOTION_ENGINE_EVENT_TOP_TO_BOTTOM                                       = (MOTION_SENSOR << 16) | 0x0010,
+       MOTION_ENGINE_EVENT_DIRECT_CALL                                   = (MOTION_SENSOR << 16) | 0x0020,
+       MOTION_ENGINE_EVENT_TILT_TO_UNLOCK                                = (MOTION_SENSOR << 16) | 0x0040,
+       MOTION_ENGINE_EVENT_LOCK_EXECUTE_CAMERA = (MOTION_SENSOR << 16) | 0x0080,
+       MOTION_ENGINE_EVENT_SMART_ALERT                                   = (MOTION_SENSOR << 16) | 0x0100,
+       MOTION_ENGINE_EVENT_TILT                                                                                  = (MOTION_SENSOR << 16) | 0x0200,
+       MOTION_ENGINE_EVENT_PANNING_BROWSE                                = (MOTION_SENSOR << 16) | 0x0400,
+       MOTION_ENGINE_EVENT_NO_MOVE                                                                       = (MOTION_SENSOR << 16) | 0x0800,
+       MOTION_ENGINE_EVENT_SHAKE_ALWAYS_ON       = (MOTION_SENSOR << 16) | 0x1000,
+       MOTION_ENGINE_EVENT_SMART_RELAY                 = (MOTION_SENSOR << 16) | 0x2000,
+
+       ORIENTATION_RAW_DATA_EVENT              = (ORIENTATION_SENSOR << 16) | 0x0001,
+
+       TILT_RAW_DATA_EVENT       = (TILT_SENSOR << 16) | 0x0001,
+
+       GYROSCOPE_UNCAL_RAW_DATA_EVENT  = (GYROSCOPE_UNCAL_SENSOR << 16) | 0x0001,
+
+       FUSION_EVENT = (FUSION_SENSOR << 16) | 0x0001,
+       FUSION_GYROSCOPE_UNCAL_EVENT = (FUSION_SENSOR << 16) | 0x0002,
+       FUSION_CALIBRATION_NEEDED_EVENT = (FUSION_SENSOR << 16) | 0x0003,
+       FUSION_ORIENTATION_ENABLED = (FUSION_SENSOR << 16) | 0x0004,
+       FUSION_ROTATION_VECTOR_ENABLED = (FUSION_SENSOR << 16) | 0x0005,
+       FUSION_GAMING_ROTATION_VECTOR_ENABLED = (FUSION_SENSOR << 16) | 0x0006,
+       FUSION_GEOMAGNETIC_ROTATION_VECTOR_ENABLED = (FUSION_SENSOR << 16) | 0x0007,
+       FUSION_TILT_ENABLED = (FUSION_SENSOR << 16) | 0x0008,
+       FUSION_GYROSCOPE_UNCAL_ENABLED = (FUSION_SENSOR << 16) | 0x0009,
+};
+
 #define CALIBRATION_EVENT(sensor_type) (((sensor_type) << 16) | 0x2)
 
 #define ACCELEROMETER_EVENT_ROTATION_CHECK ((ACCELEROMETER_SENSOR << 16) | 0x0100)
@@ -100,6 +173,86 @@ enum accelerometer_rotate_state {
        ROTATION_EVENT_270 = 4,
 };
 
+enum motion_snap_event {
+       MOTION_ENGIEN_SNAP_NONE                 = 0,
+       MOTION_ENGIEN_NEGATIVE_SNAP_X   = 1,
+       MOTION_ENGIEN_POSITIVE_SNAP_X   = 2,
+       MOTION_ENGIEN_NEGATIVE_SNAP_Y   = 3,
+       MOTION_ENGIEN_POSITIVE_SNAP_Y   = 4,
+       MOTION_ENGIEN_NEGATIVE_SNAP_Z   = 5,
+       MOTION_ENGIEN_POSITIVE_SNAP_Z   = 6,
+       MOTION_ENGIEN_SNAP_LEFT                 = MOTION_ENGIEN_NEGATIVE_SNAP_X,
+       MOTION_ENGIEN_SNAP_RIGHT                = MOTION_ENGIEN_POSITIVE_SNAP_X,
+       MOTION_ENGINE_SNAP_NONE                 = 0,
+       MOTION_ENGINE_NEGATIVE_SNAP_X   = 1,
+       MOTION_ENGINE_POSITIVE_SNAP_X   = 2,
+       MOTION_ENGINE_NEGATIVE_SNAP_Y   = 3,
+       MOTION_ENGINE_POSITIVE_SNAP_Y   = 4,
+       MOTION_ENGINE_NEGATIVE_SNAP_Z   = 5,
+       MOTION_ENGINE_POSITIVE_SNAP_Z   = 6,
+       MOTION_ENGINE_SNAP_LEFT                 = MOTION_ENGINE_NEGATIVE_SNAP_X,
+       MOTION_ENGINE_SNAP_RIGHT                = MOTION_ENGINE_POSITIVE_SNAP_X,
+};
+
+enum motion_shake_event {
+       MOTION_ENGIEN_SHAKE_NONE                = 0,
+       MOTION_ENGIEN_SHAKE_DETECTION   = 1,
+       MOTION_ENGIEN_SHAKE_CONTINUING  = 2,
+       MOTION_ENGIEN_SHAKE_FINISH              = 3,
+       MOTION_ENGINE_SHAKE_BREAK               = 4,
+       MOTION_ENGINE_SHAKE_NONE                = 0,
+       MOTION_ENGINE_SHAKE_DETECTION   = 1,
+       MOTION_ENGINE_SHAKE_CONTINUING  = 2,
+       MOTION_ENGINE_SHAKE_FINISH              = 3,
+};
+
+enum motion_doubletap_event {
+       MOTION_ENGIEN_DOUBLTAP_NONE                     = 0,
+       MOTION_ENGIEN_DOUBLTAP_DETECTION        = 1,
+       MOTION_ENGINE_DOUBLTAP_NONE                     = 0,
+       MOTION_ENGINE_DOUBLTAP_DETECTION        = 1,
+};
+
+enum motion_top_to_bottom_event {
+       MOTION_ENGIEN_TOP_TO_BOTTOM_NONE                = 0,
+       MOTION_ENGIEN_TOP_TO_BOTTOM_WAIT                = 1,
+       MOTION_ENGIEN_TOP_TO_BOTTOM_DETECTION   = 2,
+       MOTION_ENGINE_TOP_TO_BOTTOM_NONE                = 0,
+       MOTION_ENGINE_TOP_TO_BOTTOM_WAIT                = 1,
+       MOTION_ENGINE_TOP_TO_BOTTOM_DETECTION   = 2,
+};
+
+enum motion_direct_call_event_t {
+       MOTION_ENGINE_DIRECT_CALL_NONE,
+       MOTION_ENGINE_DIRECT_CALL_DETECTION,
+};
+
+enum motion_smart_relay_event_t {
+       MOTION_ENGINE_SMART_RELAY_NONE,
+       MOTION_ENGINE_SMART_RELAY_DETECTION,
+};
+
+enum motion_tilt_to_unlock_event_t {
+       MOTION_ENGINE_TILT_TO_UNLOCK_NONE,
+       MOTION_ENGINE_TILT_TO_UNLOCK_DETECTION,
+};
+
+enum motion_lock_execute_camera_event_t {
+       MOTION_ENGINE_LOCK_EXECUTE_CAMERA_NONE,
+       MOTION_ENGINE_LOCK_EXECUTE_CAMERA_L_DETECTION,
+       MOTION_ENGINE_LOCK_EXECUTE_CAMERA_R_DETECTION,
+};
+
+enum motion_smart_alert_t {
+       MOTION_ENGINE_SMART_ALERT_NONE,
+       MOTION_ENGINE_SMART_ALERT_DETECTION,
+};
+
+enum motion_no_move_t {
+       MOTION_ENGINE_NO_MOVE_NONE,
+       MOTION_ENGINE_NO_MOVE_DETECTION,
+};
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/src/shared/sensor_types.h b/src/shared/sensor_types.h
index 6667684..cb8e65e 100644 (file)
--- a/src/shared/sensor_types.h
+++ b/src/shared/sensor_types.h
@@ -91,79 +91,6 @@ extern "C"
 
 DECLARE_SENSOR_ENUM(sensor_type_t, SENSOR_TYPE)
 
-// Sensor Event Types
-enum event_types_t {
-       ACCELEROMETER_RAW_DATA_EVENT                                    = (ACCELEROMETER_SENSOR << 16) | 0x0001,
-       ACCELEROMETER_UNPROCESSED_DATA_EVENT                    = (ACCELEROMETER_SENSOR << 16) | 0x0002,
-
-       GYROSCOPE_RAW_DATA_EVENT        = (GYROSCOPE_SENSOR << 16) | 0x0001,
-       GYROSCOPE_UNPROCESSED_DATA_EVENT        = (GYROSCOPE_SENSOR << 16) | 0x0002,
-
-       GEOMAGNETIC_RAW_DATA_EVENT      = (GEOMAGNETIC_SENSOR << 16) | 0x0001,
-       GEOMAGNETIC_UNPROCESSED_DATA_EVENT      = (GEOMAGNETIC_SENSOR << 16) | 0x0002,
-
-       PROXIMITY_CHANGE_STATE_EVENT    = (PROXIMITY_SENSOR << 16) | 0x0001,
-       PROXIMITY_STATE_EVENT   = (PROXIMITY_SENSOR << 16) | 0x0002,
-       PROXIMITY_DISTANCE_DATA_EVENT   = (PROXIMITY_SENSOR << 16) | 0x0003,
-
-       PRESSURE_RAW_DATA_EVENT         = (PRESSURE_SENSOR << 16) | 0x0001,
-
-       TEMPERATURE_RAW_DATA_EVENT      = (TEMPERATURE_SENSOR << 16) | 0x0001,
-
-       LIGHT_LUX_DATA_EVENT    = (LIGHT_SENSOR << 16) | 0x0001,
-       LIGHT_LEVEL_DATA_EVENT  = (LIGHT_SENSOR << 16) | 0x0002,
-       LIGHT_CHANGE_LEVEL_EVENT        = (LIGHT_SENSOR << 16) | 0x0003,
-
-       ROTATION_VECTOR_RAW_DATA_EVENT  = (ROTATION_VECTOR_SENSOR << 16) | 0x0001,
-
-       RV_RAW_RAW_DATA_EVENT   = (RV_RAW_SENSOR << 16) | 0x0001,
-
-       ULTRAVIOLET_RAW_DATA_EVENT      = (ULTRAVIOLET_SENSOR << 16) | 0x0001,
-
-       AUTO_ROTATION_CHANGE_STATE_EVENT = (AUTO_ROTATION_SENSOR << 16) | 0x0001,
-
-       BIO_LED_RED_RAW_DATA_EVENT      = (BIO_LED_RED_SENSOR << 16) | 0x0001,
-
-       GAMING_RV_RAW_DATA_EVENT        = (GYROSCOPE_RV_SENSOR << 16) | 0x0001,
-
-       GEOMAGNETIC_RV_RAW_DATA_EVENT   = (GEOMAGNETIC_RV_SENSOR << 16) | 0x0001,
-
-       GRAVITY_RAW_DATA_EVENT  = (GRAVITY_SENSOR << 16) | 0x0001,
-
-       LINEAR_ACCEL_RAW_DATA_EVENT     = (LINEAR_ACCEL_SENSOR << 16) | 0x0001,
-
-       MOTION_ENGINE_EVENT_SNAP                                = (MOTION_SENSOR << 16) | 0x0001,
-       MOTION_ENGINE_EVENT_SHAKE                               = (MOTION_SENSOR << 16) | 0x0002,
-       MOTION_ENGINE_EVENT_DOUBLETAP                   = (MOTION_SENSOR << 16) | 0x0004,
-       MOTION_ENGINE_EVENT_PANNING                             = (MOTION_SENSOR << 16) | 0x0008,
-       MOTION_ENGINE_EVENT_TOP_TO_BOTTOM               = (MOTION_SENSOR << 16) | 0x0010,
-       MOTION_ENGINE_EVENT_DIRECT_CALL                 = (MOTION_SENSOR << 16) | 0x0020,
-       MOTION_ENGINE_EVENT_TILT_TO_UNLOCK              = (MOTION_SENSOR << 16) | 0x0040,
-       MOTION_ENGINE_EVENT_LOCK_EXECUTE_CAMERA = (MOTION_SENSOR << 16) | 0x0080,
-       MOTION_ENGINE_EVENT_SMART_ALERT                 = (MOTION_SENSOR << 16) | 0x0100,
-       MOTION_ENGINE_EVENT_TILT                                = (MOTION_SENSOR << 16) | 0x0200,
-       MOTION_ENGINE_EVENT_PANNING_BROWSE              = (MOTION_SENSOR << 16) | 0x0400,
-       MOTION_ENGINE_EVENT_NO_MOVE                             = (MOTION_SENSOR << 16) | 0x0800,
-       MOTION_ENGINE_EVENT_SHAKE_ALWAYS_ON     = (MOTION_SENSOR << 16) | 0x1000,
-       MOTION_ENGINE_EVENT_SMART_RELAY         = (MOTION_SENSOR << 16) | 0x2000,
-
-       ORIENTATION_RAW_DATA_EVENT      = (ORIENTATION_SENSOR << 16) | 0x0001,
-
-       TILT_RAW_DATA_EVENT     = (TILT_SENSOR << 16) | 0x0001,
-
-       GYROSCOPE_UNCAL_RAW_DATA_EVENT  = (GYROSCOPE_UNCAL_SENSOR << 16) | 0x0001,
-
-       FUSION_EVENT = (FUSION_SENSOR << 16) | 0x0001,
-       FUSION_GYROSCOPE_UNCAL_EVENT = (FUSION_SENSOR << 16) | 0x0002,
-       FUSION_CALIBRATION_NEEDED_EVENT = (FUSION_SENSOR << 16) | 0x0003,
-       FUSION_ORIENTATION_ENABLED = (FUSION_SENSOR << 16) | 0x0004,
-       FUSION_ROTATION_VECTOR_ENABLED = (FUSION_SENSOR << 16) | 0x0005,
-       FUSION_GAMING_ROTATION_VECTOR_ENABLED = (FUSION_SENSOR << 16) | 0x0006,
-       FUSION_GEOMAGNETIC_ROTATION_VECTOR_ENABLED = (FUSION_SENSOR << 16) | 0x0007,
-       FUSION_TILT_ENABLED = (FUSION_SENSOR << 16) | 0x0008,
-       FUSION_GYROSCOPE_UNCAL_ENABLED = (FUSION_SENSOR << 16) | 0x0009,
-};
-
 enum proxi_change_state {
        PROXIMITY_STATE_NEAR    = 0,
        PROXIMITY_STATE_FAR     = 1,
@@ -177,99 +104,6 @@ enum auto_rotation_state {
        AUTO_ROTATION_DEGREE_270,
 };
 
-enum motion_snap_event {
-       MOTION_ENGIEN_SNAP_NONE                 = 0,
-       MOTION_ENGIEN_NEGATIVE_SNAP_X   = 1,
-       MOTION_ENGIEN_POSITIVE_SNAP_X   = 2,
-       MOTION_ENGIEN_NEGATIVE_SNAP_Y   = 3,
-       MOTION_ENGIEN_POSITIVE_SNAP_Y   = 4,
-       MOTION_ENGIEN_NEGATIVE_SNAP_Z   = 5,
-       MOTION_ENGIEN_POSITIVE_SNAP_Z   = 6,
-       MOTION_ENGIEN_SNAP_LEFT                 = MOTION_ENGIEN_NEGATIVE_SNAP_X,
-       MOTION_ENGIEN_SNAP_RIGHT                = MOTION_ENGIEN_POSITIVE_SNAP_X,
-       MOTION_ENGINE_SNAP_NONE                 = 0,
-       MOTION_ENGINE_NEGATIVE_SNAP_X   = 1,
-       MOTION_ENGINE_POSITIVE_SNAP_X   = 2,
-       MOTION_ENGINE_NEGATIVE_SNAP_Y   = 3,
-       MOTION_ENGINE_POSITIVE_SNAP_Y   = 4,
-       MOTION_ENGINE_NEGATIVE_SNAP_Z   = 5,
-       MOTION_ENGINE_POSITIVE_SNAP_Z   = 6,
-       MOTION_ENGINE_SNAP_LEFT                 = MOTION_ENGINE_NEGATIVE_SNAP_X,
-       MOTION_ENGINE_SNAP_RIGHT                = MOTION_ENGINE_POSITIVE_SNAP_X,
-};
-
-enum motion_shake_event {
-       MOTION_ENGIEN_SHAKE_NONE                = 0,
-       MOTION_ENGIEN_SHAKE_DETECTION   = 1,
-       MOTION_ENGIEN_SHAKE_CONTINUING  = 2,
-       MOTION_ENGIEN_SHAKE_FINISH              = 3,
-       MOTION_ENGINE_SHAKE_BREAK               = 4,
-       MOTION_ENGINE_SHAKE_NONE                = 0,
-       MOTION_ENGINE_SHAKE_DETECTION   = 1,
-       MOTION_ENGINE_SHAKE_CONTINUING  = 2,
-       MOTION_ENGINE_SHAKE_FINISH              = 3,
-};
-
-enum motion_doubletap_event {
-       MOTION_ENGIEN_DOUBLTAP_NONE                     = 0,
-       MOTION_ENGIEN_DOUBLTAP_DETECTION        = 1,
-       MOTION_ENGINE_DOUBLTAP_NONE                     = 0,
-       MOTION_ENGINE_DOUBLTAP_DETECTION        = 1,
-};
-
-enum motion_top_to_bottom_event {
-       MOTION_ENGIEN_TOP_TO_BOTTOM_NONE                = 0,
-       MOTION_ENGIEN_TOP_TO_BOTTOM_WAIT                = 1,
-       MOTION_ENGIEN_TOP_TO_BOTTOM_DETECTION   = 2,
-       MOTION_ENGINE_TOP_TO_BOTTOM_NONE                = 0,
-       MOTION_ENGINE_TOP_TO_BOTTOM_WAIT                = 1,
-       MOTION_ENGINE_TOP_TO_BOTTOM_DETECTION   = 2,
-};
-
-enum motion_direct_call_event_t {
-       MOTION_ENGINE_DIRECT_CALL_NONE,
-       MOTION_ENGINE_DIRECT_CALL_DETECTION,
-};
-
-enum motion_smart_relay_event_t {
-       MOTION_ENGINE_SMART_RELAY_NONE,
-       MOTION_ENGINE_SMART_RELAY_DETECTION,
-};
-
-enum motion_tilt_to_unlock_event_t {
-       MOTION_ENGINE_TILT_TO_UNLOCK_NONE,
-       MOTION_ENGINE_TILT_TO_UNLOCK_DETECTION,
-};
-
-enum motion_lock_execute_camera_event_t {
-       MOTION_ENGINE_LOCK_EXECUTE_CAMERA_NONE,
-       MOTION_ENGINE_LOCK_EXECUTE_CAMERA_L_DETECTION,
-       MOTION_ENGINE_LOCK_EXECUTE_CAMERA_R_DETECTION,
-};
-
-enum motion_smart_alert_t {
-       MOTION_ENGINE_SMART_ALERT_NONE,
-       MOTION_ENGINE_SMART_ALERT_DETECTION,
-};
-
-enum motion_no_move_t {
-       MOTION_ENGINE_NO_MOVE_NONE,
-    MOTION_ENGINE_NO_MOVE_DETECTION,
-};
-
-enum motion_property_id {
-       MOTION_PROPERTY_UNKNOWN = 0,
-       MOTION_PROPERTY_CHECK_ACCEL_SENSOR,
-       MOTION_PROPERTY_CHECK_GYRO_SENSOR,
-       MOTION_PROPERTY_CHECK_GEO_SENSOR,
-       MOTION_PROPERTY_CHECK_PRIXI_SENSOR,
-       MOTION_PROPERTY_CHECK_LIGHT_SENSOR,
-       MOTION_PROPERTY_CHECK_BARO_SENSOR,
-       MOTION_PROPERTY_LCD_TOUCH_ON,
-       MOTION_PROPERTY_LCD_TOUCH_OFF,
-       MOTION_PROPERTY_CHECK_GYRO_CAL_STATUS,
-};
-
 #ifdef __cplusplus
 }
 #endif