From 13e0b7b261fd2b46f918a651761d51233bf8616e Mon Sep 17 00:00:00 2001 From: Vibhor Gaur Date: Wed, 18 Feb 2015 18:04:15 +0530 Subject: [PATCH] Removing redundant pressure sensor events PRESSURE_BASE_DATA_SET and PRESSURE_EVENT_RAW_DATA_REPORT_ON_TIME were the same PRESSURE_BASE_DATA_SET has been removed. PRESSURE_BASE_DATA_SET was used for polling events and PRESSURE_EVENT_RAW_DATA_REPORT_ON_TIME was used for event driven Since both these represent the same pressure event, DATA_SET type has been removed. And PRESSURE_EVENT_RAW_DATA_REPORT_ON_TIME has been renamed to PRESSURE_RAW_DATA_EVENT to make it simpler. The change has been tested on rd-pq device for all sensord API and all API were found to be working. Change-Id: I6d4a0c81787dab67b3f61a2c511b181c50a763d1 --- src/libsensord/client_common.cpp | 8 +++----- src/libsensord/sensor_pressure.h | 6 +----- src/pressure/pressure_sensor.cpp | 8 ++++---- test/src/auto_test.c | 2 +- test/src/tc-common.c | 4 ++-- 5 files changed, 11 insertions(+), 17 deletions(-) diff --git a/src/libsensord/client_common.cpp b/src/libsensord/client_common.cpp index 340f281..ba15264 100755 --- a/src/libsensord/client_common.cpp +++ b/src/libsensord/client_common.cpp @@ -53,18 +53,17 @@ log_element g_log_elements[] = { FILL_LOG_ELEMENT(LOG_ID_EVENT, ACCELEROMETER_RAW_DATA_EVENT, 0, 10), FILL_LOG_ELEMENT(LOG_ID_EVENT, GYROSCOPE_RAW_DATA_EVENT, 0, 10), FILL_LOG_ELEMENT(LOG_ID_EVENT, GEOMAGNETIC_EVENT_RAW_DATA_REPORT_ON_TIME, 0, 10), - FILL_LOG_ELEMENT(LOG_ID_EVENT, PRESSURE_EVENT_RAW_DATA_REPORT_ON_TIME, 0, 10), + FILL_LOG_ELEMENT(LOG_ID_EVENT, PRESSURE_RAW_DATA_EVENT, 0, 10), FILL_LOG_ELEMENT(LOG_ID_EVENT, LIGHT_EVENT_LEVEL_DATA_REPORT_ON_TIME, 0, 10), FILL_LOG_ELEMENT(LOG_ID_EVENT, LIGHT_EVENT_LUX_DATA_REPORT_ON_TIME, 0, 10), FILL_LOG_ELEMENT(LOG_ID_EVENT, GRAVITY_EVENT_RAW_DATA_REPORT_ON_TIME, 0, 10), FILL_LOG_ELEMENT(LOG_ID_EVENT, LINEAR_ACCEL_EVENT_RAW_DATA_REPORT_ON_TIME, 0, 10), FILL_LOG_ELEMENT(LOG_ID_EVENT, ORIENTATION_EVENT_RAW_DATA_REPORT_ON_TIME, 0, 10), - FILL_LOG_ELEMENT(LOG_ID_EVENT, PRESSURE_EVENT_RAW_DATA_REPORT_ON_TIME, 0, 10), + FILL_LOG_ELEMENT(LOG_ID_EVENT, PRESSURE_RAW_DATA_EVENT, 0, 10), FILL_LOG_ELEMENT(LOG_ID_EVENT, TEMPERATURE_EVENT_RAW_DATA_REPORT_ON_TIME, 0, 10), FILL_LOG_ELEMENT(LOG_ID_EVENT, ROTATION_VECTOR_EVENT_RAW_DATA_REPORT_ON_TIME, 0, 10), FILL_LOG_ELEMENT(LOG_ID_EVENT, GEOMAGNETIC_RV_EVENT_RAW_DATA_REPORT_ON_TIME, 0, 10), - FILL_LOG_ELEMENT(LOG_ID_DATA, PRESSURE_BASE_DATA_SET, 0, 25), FILL_LOG_ELEMENT(LOG_ID_DATA, GEOMAGNETIC_BASE_DATA_SET, 0, 25), FILL_LOG_ELEMENT(LOG_ID_DATA, LIGHT_BASE_DATA_SET, 0, 25), FILL_LOG_ELEMENT(LOG_ID_DATA, LIGHT_LUX_DATA_SET, 0, 25), @@ -73,7 +72,6 @@ log_element g_log_elements[] = { FILL_LOG_ELEMENT(LOG_ID_DATA, GRAVITY_BASE_DATA_SET, 0, 25), FILL_LOG_ELEMENT(LOG_ID_DATA, LINEAR_ACCEL_BASE_DATA_SET, 0, 25), FILL_LOG_ELEMENT(LOG_ID_DATA, ORIENTATION_BASE_DATA_SET, 0, 25), - FILL_LOG_ELEMENT(LOG_ID_DATA, PRESSURE_BASE_DATA_SET, 0, 25), FILL_LOG_ELEMENT(LOG_ID_DATA, TEMPERATURE_BASE_DATA_SET, 0, 25), }; @@ -159,7 +157,7 @@ bool is_ontime_event(unsigned int event_type) case GRAVITY_EVENT_RAW_DATA_REPORT_ON_TIME: case LINEAR_ACCEL_EVENT_RAW_DATA_REPORT_ON_TIME: case ORIENTATION_EVENT_RAW_DATA_REPORT_ON_TIME: - case PRESSURE_EVENT_RAW_DATA_REPORT_ON_TIME: + case PRESSURE_RAW_DATA_EVENT: return true; break; } diff --git a/src/libsensord/sensor_pressure.h b/src/libsensord/sensor_pressure.h index dcf6b37..e06b39f 100755 --- a/src/libsensord/sensor_pressure.h +++ b/src/libsensord/sensor_pressure.h @@ -36,12 +36,8 @@ extern "C" * @{ */ -enum pressure_data_id { - PRESSURE_BASE_DATA_SET = (PRESSURE_SENSOR << 16) | 0x0001, -}; - enum pressure_event_type { - PRESSURE_EVENT_RAW_DATA_REPORT_ON_TIME = (PRESSURE_SENSOR << 16) | 0x0001, + PRESSURE_RAW_DATA_EVENT = (PRESSURE_SENSOR << 16) | 0x0001, }; /** diff --git a/src/pressure/pressure_sensor.cpp b/src/pressure/pressure_sensor.cpp index b70f48d..407c6f9 100755 --- a/src/pressure/pressure_sensor.cpp +++ b/src/pressure/pressure_sensor.cpp @@ -43,7 +43,7 @@ pressure_sensor::pressure_sensor() { m_name = string(SENSOR_NAME); - register_supported_event(PRESSURE_EVENT_RAW_DATA_REPORT_ON_TIME); + register_supported_event(PRESSURE_RAW_DATA_EVENT); physical_sensor::set_poller(pressure_sensor::working, this); } @@ -122,9 +122,9 @@ bool pressure_sensor::process_event(void) AUTOLOCK(m_client_info_mutex); - if (get_client_cnt(PRESSURE_EVENT_RAW_DATA_REPORT_ON_TIME)) { + if (get_client_cnt(PRESSURE_RAW_DATA_EVENT)) { event.sensor_id = get_id(); - event.event_type = PRESSURE_EVENT_RAW_DATA_REPORT_ON_TIME; + event.event_type = PRESSURE_RAW_DATA_EVENT; raw_to_base(event.data); push(event); } @@ -166,7 +166,7 @@ int pressure_sensor::get_sensor_data(unsigned int type, sensor_data_t &data) if (ret < 0) return -1; - if (type == PRESSURE_BASE_DATA_SET) { + if (type == PRESSURE_RAW_DATA_EVENT) { raw_to_base(data); return 0; } diff --git a/test/src/auto_test.c b/test/src/auto_test.c index a770c69..c369b26 100644 --- a/test/src/auto_test.c +++ b/test/src/auto_test.c @@ -220,7 +220,7 @@ int main(int argc, char **argv) result = check_sensor_api(ORIENTATION_EVENT_RAW_DATA_REPORT_ON_TIME, interval); fprintf(fp, "Orientation - RAW_DATA_REPORT_ON_TIME - %d\n", result); - result = check_sensor_api(PRESSURE_EVENT_RAW_DATA_REPORT_ON_TIME, interval); + result = check_sensor_api(PRESSURE_RAW_DATA_EVENT, interval); fprintf(fp, "Pressure - RAW_DATA_REPORT_ON_TIME - %d\n", result); result = check_sensor_api(ROTATION_VECTOR_EVENT_RAW_DATA_REPORT_ON_TIME, interval); diff --git a/test/src/tc-common.c b/test/src/tc-common.c index 5913216..9c3b633 100644 --- a/test/src/tc-common.c +++ b/test/src/tc-common.c @@ -71,7 +71,7 @@ unsigned int get_event_driven(sensor_type_t sensor_type, char str[]) break; case PRESSURE_SENSOR: if (strcmp(str, "RAW_DATA_REPORT_ON_TIME") == 0) - return PRESSURE_EVENT_RAW_DATA_REPORT_ON_TIME; + return PRESSURE_RAW_DATA_EVENT; break; case GEOMAGNETIC_SENSOR: if (strcmp(str, "RAW_DATA_REPORT_ON_TIME") == 0) @@ -185,7 +185,7 @@ int main(int argc, char **argv) } else if (strcmp(argv[1], "pressure") == 0) { sensor_type = PRESSURE_SENSOR; - event = PRESSURE_EVENT_RAW_DATA_REPORT_ON_TIME; + event = PRESSURE_RAW_DATA_EVENT; } else if (strcmp(argv[1], "temperature") == 0) { sensor_type = TEMPERATURE_SENSOR; -- 2.7.4