sensord: clean up sensor fw code

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

diff --git a/src/client/client_common.cpp b/src/client/client_common.cpp
index cc2e919..73f9b45 100644 (file)
--- a/src/client/client_common.cpp
+++ b/src/client/client_common.cpp
@@ -48,6 +48,7 @@ log_element g_log_elements[] = {
        FILL_LOG_ELEMENT(LOG_ID_SENSOR_TYPE, GYROSCOPE_UNCAL_SENSOR, 0, 1),
        FILL_LOG_ELEMENT(LOG_ID_SENSOR_TYPE, ULTRAVIOLET_SENSOR, 0, 1),
        FILL_LOG_ELEMENT(LOG_ID_SENSOR_TYPE, BIO_LED_RED_SENSOR, 0, 1),
+       FILL_LOG_ELEMENT(LOG_ID_SENSOR_TYPE, GESTURE_WRIST_UP_SENSOR, 0, 1),
 
        FILL_LOG_ELEMENT(LOG_ID_EVENT, PROXIMITY_CHANGE_STATE_EVENT, 0,1),
        FILL_LOG_ELEMENT(LOG_ID_EVENT, LIGHT_CHANGE_LEVEL_EVENT, 0, 1),

diff --git a/src/server/plugins/auto_rotation/auto_rotation_sensor.cpp b/src/server/plugins/auto_rotation/auto_rotation_sensor.cpp
index 5b400b1..d8b1700 100644 (file)
--- a/src/server/plugins/auto_rotation/auto_rotation_sensor.cpp
+++ b/src/server/plugins/auto_rotation/auto_rotation_sensor.cpp
@@ -255,6 +255,9 @@ bool auto_rotation_sensor::check_lib(void)
 
 auto_rotation_alg *auto_rotation_sensor::get_alg()
 {
-       return new auto_rotation_alg_emul();
+       auto_rotation_alg *alg = new(std::nothrow) auto_rotation_alg_emul();
+       retvm_if(!alg, NULL, "Failed to allocate memory");
+
+       return alg;
 }
 

diff --git a/src/shared/poller.cpp b/src/shared/poller.cpp
index d2861ad..2fb902b 100644 (file)
--- a/src/shared/poller.cpp
+++ b/src/shared/poller.cpp
@@ -24,12 +24,12 @@
 
 poller::poller()
 {
-       m_epfd = epoll_create(EPOLL_MAX);
+       init_poll_fd();
 }
 
 poller::poller(int fd)
-: poller()
 {
+       init_poll_fd();
        add_fd(fd);
 }
 
@@ -39,6 +39,11 @@ poller::~poller()
                close(m_epfd);
 }
 
+void poller::init_poll_fd(void)
+{
+       m_epfd = epoll_create(EPOLL_MAX);
+}
+
 bool poller::add_fd(int fd)
 {
        struct epoll_event event;
@@ -94,7 +99,7 @@ bool poller::poll(struct epoll_event &event)
                        m_event_queue.pop();
 
                        if (event.events & EPOLLERR) {
-                               ERR("Poll error!");
+                               DBG("Poll error!");
                                return false;
                        }
 

diff --git a/src/shared/poller.h b/src/shared/poller.h
index 8e91b0d..5f7e112 100644 (file)
--- a/src/shared/poller.h
+++ b/src/shared/poller.h
@@ -37,6 +37,7 @@ private:
        int m_epfd;
        std::queue<struct epoll_event> m_event_queue;
 
+       void init_poll_fd(void);
        bool fill_event_queue(void);
 };
 

diff --git a/src/shared/sensor_common.h b/src/shared/sensor_common.h
index ac3450f..cae4de6 100644 (file)
--- a/src/shared/sensor_common.h
+++ b/src/shared/sensor_common.h
@@ -55,13 +55,18 @@ typedef enum {
 #define SENSOR_HUB_DATA_SIZE   4096
 
 typedef struct sensorhub_data_t {
-    int version;
-    int sensorhub;
-    int type;
-    int hub_data_size;
-    unsigned long long timestamp;
-    char hub_data[SENSOR_HUB_DATA_SIZE];
-    float data[16];
+       int accuracy;
+       unsigned long long timestamp;
+       int value_count;
+       char values[SENSOR_HUB_DATA_SIZE];
+
+       /* deprecated */
+       char hub_data[SENSOR_HUB_DATA_SIZE];
+       int version;
+       int sensorhub;
+       int type;
+       int hub_data_size;
+       float data[16];
 } sensorhub_data_t;
 
 /*