[Non-ACR] remove excess global variables

Change-Id: I867a86211a100e4cbe50c5c993e344cf9b81db6d
Signed-off-by: Abhishek Vijay <abhishek.v@samsung.com>

diff --git a/src/battery_dump/bm_listeners.c b/src/battery_dump/bm_listeners.c
index 400e74c..7db08db 100644 (file)
--- a/src/battery_dump/bm_listeners.c
+++ b/src/battery_dump/bm_listeners.c
@@ -29,48 +29,23 @@
 #include <device/battery-internal.h>
 
 wifi_manager_h wifi = NULL;
-static bool display_on;
-static int brightness_val = 0;
-static int brightness_flag = 0;
-static int ss_val = 0;
-static int ss_flag = -1;
-static history_item_s *data_obj = NULL;
 struct timeval prev_event_time;
 
 display_state_e display_flag = DISPLAY_STATE_SCREEN_OFF;
-static int listener_hsp = -1;
 
-static int bt_adaptor = 0;
-static int location_flag = 0;
-/* hsp variables */
-static int bt_hsp = 0;
-static int bt_connected_hsp = 0;
-static int bt_scan_hsp = 0;
-static int bt_discovery_state = 1;
-static int bt_flag = 0;
-static int wifi_flag = 0;
-static int wifi_hsp = 0;
-static int wifi_scan_hsp = 0;
-static int wifi_connected_hsp = 0;
-static int display_hsp = 0;
-static int gps_hsp = 0;
-static int lock_hsp = 0;
-static int app_hsp = 0;
-static int wakeup_hsp = 0;
-static int modem_hsp = 0;
-static int modem_flag = 0;
-static int prev_wakeup = 0;
-static int prev_lock = 0;
-static int prev_battery_level = 0;
-static event_pool events_buf[10];
-static int buff_count = 0;
 static pthread_attr_t attr;
 static pthread_cond_t fill = PTHREAD_COND_INITIALIZER;
 static pthread_cond_t empty = PTHREAD_COND_INITIALIZER;
 static pthread_mutex_t battery_lister_mutex = PTHREAD_MUTEX_INITIALIZER;
+
 static int fill_ptr = 0;
 static int use_ptr = 0;
 static TapiHandle *handle = NULL;
+static history_item_s *data_obj = NULL;
+static int listener_hsp = -1;
+static event_pool events_buf[10];
+static int buff_count = 0;
+
 GHashTable *app_list = NULL;
 
 #define DBUS_DEVICED                   "org.tizen.system.deviced"
@@ -165,6 +140,8 @@ static void bd_listener_set_bt_adapter_state_change_data(int adapter_state)
 {
        ENTER;
 
+       static int bt_hsp = 0;
+
        _WARN("state: %s", (adapter_state == BT_ADAPTER_ENABLED) ? "ENABLED" : "DISABLED");
        int bt_state;
        if (adapter_state == BT_ADAPTER_ENABLED)
@@ -218,6 +195,8 @@ static void bd_listener_set_bt_device_discovery_state_change_data(int discovery_
 
        _WARN(" discovery_state = %d", discovery_state);
 
+       static int bt_scan_hsp = 0, bt_flag = 0;
+
        if (data_obj) {
                switch (discovery_state) {
                case BT_ADAPTER_DEVICE_DISCOVERY_STARTED:
@@ -273,6 +252,8 @@ static void bd_listener_set_bt_device_connection_state_change_data(int connected
        if (!connected)
                _INFO("bt is disconnected");
 
+       static int bt_connected_hsp = 0;
+
        if (data_obj) {
                if (connected) {
                        data_obj->event_code = ET_NONE;
@@ -320,6 +301,8 @@ static void bd_listener_set_wifi_device_state_data(int state)
        else
                _INFO(", state : Deactivated\n");
 
+       static int wifi_hsp = 0;
+
        if (data_obj) {
                if (state == WIFI_MANAGER_DEVICE_STATE_ACTIVATED) {
                        data_obj->event_code = ET_NONE;
@@ -363,6 +346,9 @@ static void bd_listener_set_wifi_scan_change_data(int state)
        ENTER;
 
        _WARN("Wifi Scan changed, scan state : %d\n", state);
+
+       static int wifi_flag = 0, wifi_scan_hsp = 0;
+
        if (data_obj) {
                if (state == WIFI_MANAGER_SCAN_STATE_SCANNING) {
                        data_obj->event_code = ET_NONE;
@@ -411,6 +397,8 @@ static void bd_listener_set_wifi_connection_state_change_data(int state)
 
        _WARN("Wifi Connection changed, connection state : %d\n", state);
 
+       static int wifi_connected_hsp = 0;
+
        if (data_obj) {
                switch (state) {
                case WIFI_MANAGER_CONNECTION_STATE_CONNECTED:
@@ -457,10 +445,11 @@ static void bd_listener_set_device_display_change_data(int value)
        ENTER;
        _WARN("device state changed succeeded\n");
 
+       static int display_hsp = 0;
+
        switch (value) {
        case DISPLAY_STATE_NORMAL:
                _INFO("Display on");
-               display_on = true;
                data_obj->event_code = ET_NONE;
                data_obj->event_code |= ET_SCREEN_WAKE_UP;
                data_obj->event_code |= ET_FLAG_START;
@@ -500,7 +489,6 @@ static void bd_listener_set_device_display_change_data(int value)
                }
                data_obj->state_1 &= ~(ST1_SCREEN_ON_FLAG);
                data_obj->state_1 &= ~(ST1_SCREEN_DOZE_FLAG);
-               display_on = false;
                break;
        }
 
@@ -513,6 +501,9 @@ static void bd_listener_set_display_brightness_change_data(int brightness_level)
        ENTER;
 
        _WARN(" device brightness changed =%d ", brightness_level);
+
+       static int brightness_val = 0;
+
        if (data_obj) {
                data_obj->state_1 &= ~brightness_val;
                brightness_val = brightness_level;
@@ -565,6 +556,9 @@ static void bd_listener_set_signal_strength_change_data(int ss)
        ENTER;
 
        _WARN(" device signal_strength changed =%d ", ss);
+
+       static int ss_val = 0;
+
        if (data_obj) {
                data_obj->state_1 &= ~ss_val << ST1_PHONE_SIGNAL_STRENGTH_SHIFT;
                ss_val = ss;
@@ -582,6 +576,9 @@ static void bd_listener_set_sleep_wakeup_change_data(int val)
        ENTER;
 
        _WARN(" sleep/wake up changed =%d ", val);
+
+       static int wakeup_hsp = 0;
+
        if (val) {
                data_obj->event_code = ET_NONE;
                data_obj->event_tag = NULL;
@@ -637,6 +634,9 @@ static void bd_listener_set_location_change_data(int gps)
        ENTER;
 
        _WARN(" maps location changed =%d ", gps);
+
+       static int gps_hsp = 0;
+
        if (data_obj) {
                if (gps) {
                        data_obj->event_code = ET_NONE;
@@ -680,11 +680,17 @@ static int bd_listener_set_power_lock_unlock_change_data(int lock)
        ENTER;
 
        _WARN(" fill_powerlock_change changed =%d ", lock);
+
+       static int prev_wakeup = 0;
+
        if (prev_wakeup == lock)
                return 1;
        else
                prev_wakeup = lock;
 
+
+       static int lock_hsp = 0;
+
        if (data_obj) {
                if (lock) {
                        data_obj->event_code = ET_NONE;
@@ -729,8 +735,10 @@ static int bd_listener_set_app_status_change_data(int val, char *app_id)
        void *prv_data = NULL;
        void *prv_app_id = NULL;
        int error_code = 0;
+       static int app_hsp = 0;
 
        _WARN(" App status changed for = %s ", app_id);
+
        if (data_obj) {
                if (val) {
                        data_obj->event_code = ET_NONE;
@@ -820,6 +828,8 @@ static void bd_listener_set_modem_power_state_change_data(int state)
 
        _WARN("fill_modem_power_state_change - state[%d]", state);
 
+       static int modem_hsp = 0;
+
        if (data_obj && state == 0) { /* ON */
                data_obj->event_code = ET_NONE;
                data_obj->event_code |= ET_ACTIVE;
@@ -870,6 +880,8 @@ static void bd_listener_create_event_data(int type, int val, char *app)
        if (!data_obj)
                return;
 
+       static int prev_battery_level = 0;
+
        switch (type) {
        case LISTEN_BT_STATE:
                bd_listener_set_bt_adapter_state_change_data(val);
@@ -1148,6 +1160,7 @@ void _bd_listener_bt_adapter_state_change_cb(int result, bt_adapter_state_e adap
 
        _INFO("state: %s", (adapter_state == BT_ADAPTER_ENABLED) ? "ENABLED" : "DISABLED");
 
+       static int bt_adaptor = 0;
        int bt_state ;
 
        (adapter_state == BT_ADAPTER_ENABLED) ? (bt_state = 1) : (bt_state = 0);
@@ -1210,6 +1223,8 @@ static void _bd_listener_bt_device_discovery_state_change_cb(int result,
        _INFO("__bt_adapter_state_changed_cb");
        _INFO("result: %d  , discovery_state = %d", result, discovery_state);
 
+       static int bt_discovery_state = 1;
+
        if (discovery_state > 1) {
                _INFO(" This state will be handled later");
                return;
@@ -1342,6 +1357,7 @@ static void _bd_listener_display_brightness_change(keynode_t *key, void* data)
        _INFO("device brightness changed succeeded");
 
        int flag, brightness_level = 0;
+       static int brightness_flag = 0;
 
        vconf_get_int(VCONFKEY_SETAPPL_LCD_BRIGHTNESS, &brightness_level);
 
@@ -1449,6 +1465,9 @@ static void _bd_listener_location_change(keynode_t *key, void* data)
 {
        ENTER;
        _INFO("device location changed succeeded\n");
+
+       static int location_flag = 0;
+
        int location = 0;
        vconf_get_int(VCONFKEY_LOCATION_ENABLED, &location);
 
@@ -1483,6 +1502,8 @@ static void _bd_listener_notify_signal_strength(TapiHandle *handle, const char *
                return;
        }
 
+       static int ss_flag = -1;
+
        int sig_strength_level = *((int *)data);
 
        _INFO(" device signal strength changed = %d ", sig_strength_level);
@@ -1518,6 +1539,8 @@ static void _bd_listener_notify_modem_power(TapiHandle *handle, const char *noti
 
        _INFO("modem power change notification - data[%d]", *((int *)data));
 
+       static int modem_flag = 0;
+
        int *status = (int *)data;
 
        if (*status && !modem_flag) {
@@ -1561,6 +1584,7 @@ static void _bd_listener_notify_modem_power(TapiHandle *handle, const char *noti
 static void _bd_listener_create_lock_event(char *lock_type)
 {
        int val;
+       static int prev_lock = 0;
 
        if (g_strcmp0(lock_type, "lcdoff") == 0)
                val = 0;