Removing redundant event representations for context sensor

Removed redundant context sensor events CONTEXT_BASE_DATA_SET and CONTEXT_EVENT_REPORT which were the same.
These have been moved to the sensor_deprecated folder.
Since both these represent the same context sensor event, DATA_SET type has been removed. CONTEXT_EVENT_REPORT has been renamed to CONTEXT_REPORT_EVENT to make it simpler.

Change-Id: Iaca58e1b48e19adabf5edc1d6a001933cd4ec910

diff --git a/src/libsensord/client_common.cpp b/src/libsensord/client_common.cpp
index cda167c..d1f132f 100755 (executable)
--- a/src/libsensord/client_common.cpp
+++ b/src/libsensord/client_common.cpp
@@ -49,7 +49,7 @@ log_element g_log_elements[] = {
        FILL_LOG_ELEMENT(LOG_ID_EVENT, LIGHT_CHANGE_LEVEL_EVENT, 0, 1),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, PROXIMITY_STATE_EVENT, 0, 10),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, PROXIMITY_DISTANCE_DATA_EVENT, 0, 10),
-       FILL_LOG_ELEMENT(LOG_ID_EVENT, CONTEXT_EVENT_REPORT, 0, 1),
+       FILL_LOG_ELEMENT(LOG_ID_EVENT, CONTEXT_REPORT_EVENT, 0, 1),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, AUTO_ROTATION_CHANGE_STATE_EVENT, 0, 1),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, ACCELEROMETER_RAW_DATA_EVENT, 0, 10),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, GYROSCOPE_RAW_DATA_EVENT, 0, 10),
@@ -65,8 +65,6 @@ log_element g_log_elements[] = {
        FILL_LOG_ELEMENT(LOG_ID_EVENT, ROTATION_VECTOR_EVENT_RAW_DATA_REPORT_ON_TIME, 0, 10),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, GEOMAGNETIC_RV_RAW_DATA_EVENT, 0, 10),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, GAMING_RV_RAW_DATA_EVENT, 0, 10),
-
-       FILL_LOG_ELEMENT(LOG_ID_DATA, CONTEXT_BASE_DATA_SET, 0, 25),
 };
 
 typedef unordered_map<unsigned int, log_attr* > log_map;

diff --git a/src/libsensord/sensor_context.h b/src/libsensord/sensor_context.h
index c821596..d35f941 100755 (executable)
--- a/src/libsensord/sensor_context.h
+++ b/src/libsensord/sensor_context.h
@@ -36,12 +36,8 @@ extern "C"
  * @{
  */
 
-enum context_data_id {
-       CONTEXT_BASE_DATA_SET   = (CONTEXT_SENSOR << 16) | 0x0001,
-};
-
 enum context_event_type {
-       CONTEXT_EVENT_REPORT    = (CONTEXT_SENSOR << 16) | 0x0001,
+       CONTEXT_REPORT_EVENT    = (CONTEXT_SENSOR << 16) | 0x0001,
 };
 
 enum context_property_id {

diff --git a/src/libsensord/sensor_deprecated.h b/src/libsensord/sensor_deprecated.h
index 011d12b..bb80e6c 100644 (file)
--- a/src/libsensord/sensor_deprecated.h
+++ b/src/libsensord/sensor_deprecated.h
@@ -83,6 +83,9 @@ extern "C"
 #define LINEAR_ACCEL_BASE_DATA_SET LINEAR_ACCEL_RAW_DATA_EVENT
 #define LINEAR_ACCEL_EVENT_RAW_DATA_REPORT_ON_TIME LINEAR_ACCEL_RAW_DATA_EVENT
 
+#define CONTEXT_BASE_DATA_SET CONTEXT_REPORT_EVENT
+#define CONTEXT_EVENT_REPORT CONTEXT_REPORT_EVENT
+
 enum accelerometer_rotate_state {
        ROTATION_UNKNOWN = 0,
        ROTATION_LANDSCAPE_LEFT = 1,