Renaming cconfig files and references to csensor_config

renaming cconfig to csensor_config to add cvirtual_sensor_config
class for adding virtual sensor configuration. A virtual parent
class cconfig will be added later.

Change-Id: I801793991233a0b27cafdf0792c57443a098a067

diff --git a/src/accel/accel_sensor_hal.cpp b/src/accel/accel_sensor_hal.cpp
index f38a0ed..cb74385 100755 (executable)
--- a/src/accel/accel_sensor_hal.cpp
+++ b/src/accel/accel_sensor_hal.cpp
@@ -20,13 +20,13 @@
 #include <sys/stat.h>
 
 #include <linux/input.h>
-#include <cconfig.h>
+#include <csensor_config.h>
 
 #include <accel_sensor_hal.h>
 #include <sys/poll.h>
 
 using std::ifstream;
-using config::CConfig;
+using config::csensor_config;
 
 #define GRAVITY 9.80665
 #define G_TO_MG 1000
@@ -63,7 +63,7 @@ accel_sensor_hal::accel_sensor_hal()
 , m_fired_time(0)
 {
        const string sensorhub_interval_node_name = "accel_poll_delay";
-       CConfig &config = CConfig::get_instance();
+       csensor_config &config = csensor_config::get_instance();
 
        node_path_info_query query;
        node_path_info info;

diff --git a/src/geo/geo_sensor_hal.cpp b/src/geo/geo_sensor_hal.cpp
index 872525b..bfbb50e 100755 (executable)
--- a/src/geo/geo_sensor_hal.cpp
+++ b/src/geo/geo_sensor_hal.cpp
@@ -19,18 +19,15 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <dirent.h>
-
 #include <linux/input.h>
-#include <cconfig.h>
-
+#include <csensor_config.h>
 #include <geo_sensor_hal.h>
 #include <sys/ioctl.h>
 #include <fstream>
-#include <cconfig.h>
 #include <iio_common.h>
 
 using std::ifstream;
-using config::CConfig;
+using config::csensor_config;
 
 #define SENSOR_TYPE_MAGNETIC   "MAGNETIC"
 #define ELEMENT_NAME                   "NAME"
@@ -53,7 +50,7 @@ geo_sensor_hal::geo_sensor_hal()
 , m_fired_time(INITIAL_TIME)
 {
        const string sensorhub_interval_node_name = "mag_poll_delay";
-       CConfig &config = CConfig::get_instance();
+       csensor_config &config = csensor_config::get_instance();
 
        node_path_info_query query;
        node_path_info info;

diff --git a/src/gyro/gyro_sensor_hal.cpp b/src/gyro/gyro_sensor_hal.cpp
index fe04ca0..34184bc 100755 (executable)
--- a/src/gyro/gyro_sensor_hal.cpp
+++ b/src/gyro/gyro_sensor_hal.cpp
@@ -21,16 +21,15 @@
 #include <dirent.h>
 
 #include <linux/input.h>
-#include <cconfig.h>
+#include <csensor_config.h>
 
 #include <gyro_sensor_hal.h>
 #include <sys/ioctl.h>
 #include <fstream>
-#include <cconfig.h>
 #include <sys/poll.h>
 
 using std::ifstream;
-using config::CConfig;
+using config::csensor_config;
 
 #define DPS_TO_MDPS 1000
 #define MIN_RANGE(RES) (-((1 << (RES))/2))
@@ -63,7 +62,7 @@ gyro_sensor_hal::gyro_sensor_hal()
 {
 
        const string sensorhub_interval_node_name = "gyro_poll_delay";
-       CConfig &config = CConfig::get_instance();
+       csensor_config &config = csensor_config::get_instance();
 
        node_path_info_query query;
        node_path_info info;

diff --git a/src/light/light_sensor_hal.cpp b/src/light/light_sensor_hal.cpp
index 445828c..b429ffc 100755 (executable)
--- a/src/light/light_sensor_hal.cpp
+++ b/src/light/light_sensor_hal.cpp
@@ -23,12 +23,12 @@
 #include <sys/ioctl.h>
 #include <dirent.h>
 #include <linux/input.h>
-#include <cconfig.h>
+#include <csensor_config.h>
 #include <light_sensor_hal.h>
 #include <iio_common.h>
 
 using std::ifstream;
-using config::CConfig;
+using config::csensor_config;
 
 #define BIAS                           1
 #define INITIAL_VALUE          -1
@@ -52,7 +52,7 @@ light_sensor_hal::light_sensor_hal()
                throw ENXIO;
        }
 
-       CConfig &config = CConfig::get_instance();
+       csensor_config &config = csensor_config::get_instance();
 
        if (!config.get(SENSOR_TYPE_LIGHT, m_model_id, ELEMENT_VENDOR, m_vendor))
        {

diff --git a/src/pressure/pressure_sensor.cpp b/src/pressure/pressure_sensor.cpp
index e13c3a4..35461a7 100755 (executable)
--- a/src/pressure/pressure_sensor.cpp
+++ b/src/pressure/pressure_sensor.cpp
@@ -23,9 +23,9 @@
 #include <pressure_sensor.h>
 #include <sensor_plugin_loader.h>
 #include <algorithm>
-#include <cconfig.h>
+#include <csensor_config.h>
 
-using config::CConfig;
+using config::csensor_config;
 using std::bind1st;
 using std::mem_fun;
 
@@ -79,7 +79,7 @@ bool pressure_sensor::init()
 
        string model_id = m_sensor_hal->get_model_id();
 
-       CConfig &config = CConfig::get_instance();
+       csensor_config &config = csensor_config::get_instance();
 
        double temperature_resolution;
 

diff --git a/src/pressure/pressure_sensor_hal.cpp b/src/pressure/pressure_sensor_hal.cpp
index 37dc7ac..764adc9 100755 (executable)
--- a/src/pressure/pressure_sensor_hal.cpp
+++ b/src/pressure/pressure_sensor_hal.cpp
@@ -19,18 +19,15 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <dirent.h>
-
 #include <linux/input.h>
-#include <cconfig.h>
-
+#include <csensor_config.h>
 #include <pressure_sensor_hal.h>
 #include <sys/ioctl.h>
 #include <fstream>
-#include <cconfig.h>
 #include <iio_common.h>
 
 using std::ifstream;
-using config::CConfig;
+using config::csensor_config;
 
 #define SENSOR_TYPE_PRESSURE   "PRESSURE"
 #define ELEMENT_NAME                   "NAME"
@@ -61,7 +58,7 @@ pressure_sensor_hal::pressure_sensor_hal()
                throw ENXIO;
        }
 
-       CConfig &config = CConfig::get_instance();
+       csensor_config &config = csensor_config::get_instance();
 
        if (!config.get(SENSOR_TYPE_PRESSURE, m_model_id, ELEMENT_VENDOR, m_vendor))
        {

diff --git a/src/proxi/proxi_sensor.cpp b/src/proxi/proxi_sensor.cpp
index c55bc74..37dfce6 100755 (executable)
--- a/src/proxi/proxi_sensor.cpp
+++ b/src/proxi/proxi_sensor.cpp
@@ -19,11 +19,9 @@
 
 #include <common.h>
 #include <sf_common.h>
-
 #include <proxi_sensor.h>
 #include <sensor_plugin_loader.h>
 
-
 #define SENSOR_NAME "PROXI_SENSOR"
 
 proxi_sensor::proxi_sensor()

diff --git a/src/proxi/proxi_sensor.h b/src/proxi/proxi_sensor.h
index b61da04..f058724 100755 (executable)
--- a/src/proxi/proxi_sensor.h
+++ b/src/proxi/proxi_sensor.h
@@ -21,7 +21,6 @@
 #define _PROXI_SENSOR_H_
 
 #include <sensor_common.h>
-
 #include <physical_sensor.h>
 #include <sensor_hal.h>
 

diff --git a/src/proxi/proxi_sensor_hal.cpp b/src/proxi/proxi_sensor_hal.cpp
index 1701100..328211e 100755 (executable)
--- a/src/proxi/proxi_sensor_hal.cpp
+++ b/src/proxi/proxi_sensor_hal.cpp
@@ -19,16 +19,16 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <dirent.h>
-
 #include <linux/input.h>
-#include <cconfig.h>
-
+#include <csensor_config.h>
 #include <proxi_sensor_hal.h>
 #include <sys/ioctl.h>
 #include <fstream>
-#include <cconfig.h>
 #include <iio_common.h>
 
+using std::ifstream;
+using config::csensor_config;
+
 #define NO_FLAG                        0
 #define PROXIMITY_TYPE 8
 
@@ -42,8 +42,6 @@
 
 #define PROXI_CODE     0x0019
 
-using std::ifstream;
-using config::CConfig;
 
 proxi_sensor_hal::proxi_sensor_hal()
 : m_state(PROXIMITY_STATE_FAR)
@@ -51,7 +49,7 @@ proxi_sensor_hal::proxi_sensor_hal()
 , m_node_handle(-1)
 {
        const string sensorhub_interval_node_name = "prox_poll_delay";
-       CConfig &config = CConfig::get_instance();
+       csensor_config &config = csensor_config::get_instance();
 
        node_path_info_query query;
        node_path_info info;

diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt
index 8ef03d8..9bad5a5 100755 (executable)
--- a/src/shared/CMakeLists.txt
+++ b/src/shared/CMakeLists.txt
@@ -38,7 +38,7 @@ include_directories(${CMAKE_SOURCE_DIR}/src/libsensord)
 add_library(sensord-server SHARED
        crw_lock.cpp
        worker_thread.cpp
-       cconfig.cpp
+       csensor_config.cpp
        csensor_event_queue.cpp
        csensor_event_dispatcher.cpp
        csensor_usage.cpp
@@ -74,7 +74,7 @@ install(FILES ${PROJECT_NAME}.pc DESTINATION lib/pkgconfig)
 install(FILES
        crw_lock.h
        worker_thread.h
-       cconfig.h
+       csensor_config.h
        csensor_event_queue.h
        cinterval_info_list.h
        sensor_plugin_loader.h

diff --git a/src/shared/cconfig.cpp b/src/shared/csensor_config.cpp
similarity index 84%
rename from src/shared/cconfig.cpp
rename to src/shared/csensor_config.cpp
index 34a7337..5c831b7 100755 (executable)
--- a/src/shared/cconfig.cpp
+++ b/src/shared/csensor_config.cpp
@@ -1,7 +1,7 @@
 /*
  * libsensord-share
  *
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2013 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
  *
  */
 
-#include <cconfig.h>
+#include <csensor_config.h>
 #include "common.h"
 #include <libxml/xmlmemory.h>
 #include <libxml/parser.h>
@@ -33,17 +33,17 @@ using std::ifstream;
 #define MODEL_ID_ATTR  "id"
 #define DEFAULT_ATTR   "value"
 
-CConfig::CConfig()
+csensor_config::csensor_config()
 {
 }
 
-CConfig& CConfig::get_instance(void)
+csensor_config& csensor_config::get_instance(void)
 {
        static bool load_done = false;
-       static CConfig inst;
+       static csensor_config inst;
 
        if (!load_done) {
-               inst.load_config();
+               inst.load_config(SENSOR_CONFIG_FILE_PATH);
                inst.get_device_id();
                if (!inst.m_device_id.empty())
                        INFO("Device ID = %s", inst.m_device_id.c_str());
@@ -55,12 +55,12 @@ CConfig& CConfig::get_instance(void)
        return inst;
 }
 
-bool CConfig::load_config(const string& config_path)
+bool csensor_config::load_config(const string& config_path)
 {
        xmlDocPtr doc;
        xmlNodePtr cur;
 
-       DBG("CConfig::load_config(\"%s\") is called!\n",config_path.c_str());
+       DBG("csensor_config::load_config(\"%s\") is called!\n",config_path.c_str());
 
        doc = xmlParseFile(config_path.c_str());
 
@@ -163,7 +163,7 @@ bool CConfig::load_config(const string& config_path)
 }
 
 
-bool CConfig::get(const string& sensor_type,const string& model_id, const string& element, const string& attr, string& value)
+bool csensor_config::get(const string& sensor_type,const string& model_id, const string& element, const string& attr, string& value)
 {
        auto it_model_list = m_sensor_config.find(sensor_type);
 
@@ -198,7 +198,7 @@ bool CConfig::get(const string& sensor_type,const string& model_id, const string
        return true;
 }
 
-bool CConfig::get(const string& sensor_type, const string& model_id, const string& element, const string& attr, double& value)
+bool csensor_config::get(const string& sensor_type, const string& model_id, const string& element, const string& attr, double& value)
 {
        string str_value;
 
@@ -213,7 +213,7 @@ bool CConfig::get(const string& sensor_type, const string& model_id, const strin
        return true;
 }
 
-bool CConfig::get(const string& sensor_type, const string& model_id, const string& element, const string& attr, long& value)
+bool csensor_config::get(const string& sensor_type, const string& model_id, const string& element, const string& attr, long& value)
 {
        string str_value;
 
@@ -228,7 +228,7 @@ bool CConfig::get(const string& sensor_type, const string& model_id, const strin
        return true;
 }
 
-bool CConfig::get(const string& sensor_type, const string& model_id, const string& element, string& value)
+bool csensor_config::get(const string& sensor_type, const string& model_id, const string& element, string& value)
 {
        if (get(sensor_type, model_id, element, m_device_id, value))
                return true;
@@ -239,7 +239,7 @@ bool CConfig::get(const string& sensor_type, const string& model_id, const strin
        return false;
 }
 
-bool CConfig::get(const string& sensor_type, const string& model_id, const string& element, double& value)
+bool csensor_config::get(const string& sensor_type, const string& model_id, const string& element, double& value)
 {
        if (get(sensor_type, model_id, element, m_device_id, value))
                return true;
@@ -250,7 +250,7 @@ bool CConfig::get(const string& sensor_type, const string& model_id, const strin
        return false;
 }
 
-bool CConfig::get(const string& sensor_type, const string& model_id, const string& element, long& value)
+bool csensor_config::get(const string& sensor_type, const string& model_id, const string& element, long& value)
 {
        if (get(sensor_type, model_id, element, m_device_id, value))
                return true;
@@ -261,7 +261,7 @@ bool CConfig::get(const string& sensor_type, const string& model_id, const strin
        return false;
 }
 
-bool CConfig::is_supported(const string& sensor_type,const string& model_id)
+bool csensor_config::is_supported(const string& sensor_type,const string& model_id)
 {
        auto it_model_list = m_sensor_config.find(sensor_type);
 
@@ -276,7 +276,7 @@ bool CConfig::is_supported(const string& sensor_type,const string& model_id)
        return true;
 }
 
-bool CConfig::get_device_id(void)
+bool csensor_config::get_device_id(void)
 {
        const string INFO_INI_PATH = "/etc/info.ini";
        const string START_DELIMETER = "Model=";

diff --git a/src/shared/cconfig.h b/src/shared/csensor_config.h
similarity index 85%
rename from src/shared/cconfig.h
rename to src/shared/csensor_config.h
index 0017e27..03e72ea 100755 (executable)
--- a/src/shared/cconfig.h
+++ b/src/shared/csensor_config.h
@@ -1,7 +1,7 @@
 /*
  * libsensord-share
  *
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2013 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@
  *
  */
 
-#if !defined(_CCONFIG_CLASS_H_)
-#define _CCONFIG_CLASS_H_
+#if !defined(_CSENSOR_CONFIG_CLASS_H_)
+#define _CSENSOR_CONFIG_CLASS_H_
 
 #include <string>
 #include <unordered_map>
@@ -28,7 +28,7 @@ using std::unordered_map;
 using std::string;
 using std::istringstream;
 
-#define CONFIG_FILE_PATH "/usr/etc/sensors.xml"
+#define SENSOR_CONFIG_FILE_PATH "/usr/etc/sensors.xml"
 
 typedef unordered_map<string,string> Element;
 /*
@@ -76,17 +76,17 @@ typedef unordered_map<string,Model_list> Sensor_config;
 
 namespace config
 {
-       class CConfig
+       class csensor_config
        {
        private:
-               CConfig();
-               CConfig(CConfig const&) {};
-               CConfig& operator=(CConfig const&);
-               bool load_config(const string& config_path = CONFIG_FILE_PATH);
+               csensor_config();
+               csensor_config(csensor_config const&) {};
+               csensor_config& operator=(csensor_config const&);
+               bool load_config(const string& config_path);
                Sensor_config m_sensor_config;
                string m_device_id;
        public:
-               static CConfig& get_instance(void);
+               static csensor_config& get_instance(void);
 
                bool get(const string& sensor_type, const string& model_id, const string& element, const string& attr, string& value);
                bool get(const string& sensor_type, const string& model_id, const string& element, const string& attr, double& value);

diff --git a/src/shared/sensor_hal.cpp b/src/shared/sensor_hal.cpp
index e036203..55c20f7 100755 (executable)
--- a/src/shared/sensor_hal.cpp
+++ b/src/shared/sensor_hal.cpp
@@ -21,11 +21,11 @@
 #include <dirent.h>
 #include <string.h>
 #include <fstream>
-#include <cconfig.h>
+#include <csensor_config.h>
 
 using std::ifstream;
 using std::fstream;
-using config::CConfig;
+using config::csensor_config;
 
 cmutex sensor_hal::m_shared_mutex;
 
@@ -310,7 +310,7 @@ bool sensor_hal::find_model_id(int method, const string &sensor_type, string &mo
 
                        infile >> name;
 
-                       if (CConfig::get_instance().is_supported(sensor_type, name)) {
+                       if (csensor_config::get_instance().is_supported(sensor_type, name)) {
                                model_id = name;
                                find = true;
                                break;

diff --git a/src/temperature/temperature_sensor_hal.cpp b/src/temperature/temperature_sensor_hal.cpp
index 2ba0b57..9d81381 100755 (executable)
--- a/src/temperature/temperature_sensor_hal.cpp
+++ b/src/temperature/temperature_sensor_hal.cpp
@@ -19,17 +19,14 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <dirent.h>
-
 #include <linux/input.h>
-#include <cconfig.h>
-
+#include <csensor_config.h>
 #include <temperature_sensor_hal.h>
 #include <fstream>
-#include <cconfig.h>
 #include <iio_common.h>
 
 using std::ifstream;
-using config::CConfig;
+using config::csensor_config;
 
 #define SENSOR_TYPE_TEMPERATURE                "TEMPERATURE"
 #define ELEMENT_NAME                           "NAME"
@@ -56,7 +53,7 @@ temperature_sensor_hal::temperature_sensor_hal()
                throw ENXIO;
        }
 
-       CConfig &config = CConfig::get_instance();
+       csensor_config &config = csensor_config::get_instance();
 
        if (!config.get(SENSOR_TYPE_TEMPERATURE, m_model_id, ELEMENT_VENDOR, m_vendor))
        {