battery: fix name of battery charging state

Change-Id: Ide4c233bf2c69ffdec270622a5d23736cfb661e4
Signed-off-by: Youngjae Cho <y0.cho@samsung.com>

diff --git a/src/battery/lowbat-handler.c b/src/battery/lowbat-handler.c
index 56a4959..7358f40 100644 (file)
--- a/src/battery/lowbat-handler.c
+++ b/src/battery/lowbat-handler.c
@@ -737,7 +737,7 @@ static void lowbat_exit(void *data)
        }
 }
 
-static gboolean low_battery_charge_status(void *data)
+static gboolean low_battery_charging_status(void *data)
 {
        low_batt_sig_timer = 0;
        battery->charging_level = lowbat_monitor(data);
@@ -768,9 +768,9 @@ static int lowbat_execute(void *data)
         * This prevents poweroff from being delayed infinitely when the uevent continues
         * to occur shorter than 1.5 seconds on realoff capacity */
        if (capacity <= battery_info.realoff || !uevent_buffering)
-               low_battery_charge_status(data);
+               low_battery_charging_status(data);
        else
-               low_batt_sig_timer = g_timeout_add(1500, low_battery_charge_status, data);
+               low_batt_sig_timer = g_timeout_add(1500, low_battery_charging_status, data);
 
        return 0;
 }

diff --git a/src/battery/power-supply.c b/src/battery/power-supply.c
index 08f00cd..ace82a3 100644 (file)
--- a/src/battery/power-supply.c
+++ b/src/battery/power-supply.c
@@ -400,14 +400,14 @@ static void charger_state_send_system_event(int state)
        const char *str;
 
        switch (state) {
-       case CHARGE_STATUS_CHARGING:
+       case CHARGING_STATUS_CHARGING:
                str = EVT_VAL_BATTERY_CHARGER_CHARGING;
                break;
-       case CHARGE_STATUS_FULL:
+       case CHARGING_STATUS_FULL:
                str = EVT_VAL_BATTERY_CHARGER_DISCHARGING;
                CRITICAL_LOG("Battery charger: %s", str);
                break;
-       case CHARGE_STATUS_DISCHARGING:
+       case CHARGING_STATUS_DISCHARGING:
                str = EVT_VAL_BATTERY_CHARGER_DISCHARGING;
                CRITICAL_LOG("Battery charger: %s", str);
                break;
@@ -546,7 +546,7 @@ static void check_abnormal_status(void)
        }
 }
 
-static void check_charge_status(const char *env_value)
+static void check_charging_status(const char *env_value)
 {
        int len;
 
@@ -555,26 +555,26 @@ static void check_charge_status(const char *env_value)
 
        len = strlen(env_value);
        if (strncmp(env_value, CHARGEFULL_NAME, len) == 0)
-               battery.charge_status = CHARGE_STATUS_FULL;
+               battery.charging_status = CHARGING_STATUS_FULL;
        else if (strncmp(env_value, CHARGENOW_NAME, len) == 0)
-               battery.charge_status = CHARGE_STATUS_CHARGING;
+               battery.charging_status = CHARGING_STATUS_CHARGING;
        else if (strncmp(env_value, DISCHARGE_NAME, len) == 0)
-               battery.charge_status = CHARGE_STATUS_DISCHARGING;
+               battery.charging_status = CHARGING_STATUS_DISCHARGING;
        else if (strncmp(env_value, NOTCHARGE_NAME, len) == 0)
-               battery.charge_status = CHARGE_STATUS_NOT_CHARGING;
+               battery.charging_status = CHARGING_STATUS_NOT_CHARGING;
        else
-               battery.charge_status = CHARGE_STATUS_UNKNOWN;
+               battery.charging_status = CHARGING_STATUS_UNKNOWN;
 
-       if (battery.charge_status == CHARGE_STATUS_FULL) {
+       if (battery.charging_status == CHARGING_STATUS_FULL) {
                battery.charge_full = CHARGING_FULL;
                battery.charge_now = CHARGER_DISCHARGING;
-       } else if (battery.charge_status == CHARGE_STATUS_CHARGING) {
+       } else if (battery.charging_status == CHARGING_STATUS_CHARGING) {
                battery.charge_full = CHARGING_NOT_FULL;
                battery.charge_now = CHARGER_CHARGING;
-       } else if (battery.charge_status == CHARGE_STATUS_DISCHARGING) {
+       } else if (battery.charging_status == CHARGING_STATUS_DISCHARGING) {
                battery.charge_full = CHARGING_NOT_FULL;
                battery.charge_now = CHARGER_DISCHARGING;
-       } else if (battery.charge_status == CHARGE_STATUS_NOT_CHARGING) {
+       } else if (battery.charging_status == CHARGING_STATUS_NOT_CHARGING) {
                battery.charge_full = CHARGING_NOT_FULL;
                battery.charge_now = CHARGER_ABNORMAL;
        } else {
@@ -769,8 +769,8 @@ static void process_power_supply(void *data)
                }
        }
 
-       if (old_battery.charge_status != battery.charge_status)
-               charger_state_send_system_event(battery.charge_status);
+       if (old_battery.charging_status != battery.charging_status)
+               charger_state_send_system_event(battery.charging_status);
 
        if (old_battery.online_type != battery.online_type) {
                ret_val = vconf_set_int(VCONFKEY_SYSMAN_CHARGER_TYPE, battery.online_type);
@@ -815,7 +815,7 @@ static void process_power_supply(void *data)
        old_battery.charging_level = battery.charging_level;
        old_battery.charger_connected = battery.charger_connected;
        old_battery.online_type = battery.online_type;
-       old_battery.charge_status = battery.charge_status;
+       old_battery.charging_status = battery.charging_status;
        old_battery.charge_full = battery.charge_full;
 
        old_battery.misc = battery.misc;
@@ -869,7 +869,7 @@ static void uevent_power_handler(struct udev_device *dev)
                return;
 
        env_value = udev_device_get_property_value(dev, CHARGE_STATUS);
-       check_charge_status(env_value);
+       check_charging_status(env_value);
        env_value = udev_device_get_property_value(dev, CHARGE_ONLINE);
        check_online_type(env_value);
        env_value = udev_device_get_property_value(dev, CHARGE_HEALTH);
@@ -913,7 +913,7 @@ static int battery_state(struct battery_info *info)
        }
 
        if (battery.capacity != 0 && prev_status.capacity == battery.capacity &&
-           prev_status.charge_status == battery.charge_status &&
+           prev_status.charging_status == battery.charging_status &&
                prev_status.online_type == battery.online_type &&
            prev_status.charge_full == battery.charge_full &&
            prev_status.charge_now == battery.charge_now &&
@@ -924,7 +924,7 @@ static int battery_state(struct battery_info *info)
                return 0;
 
        prev_status.capacity = battery.capacity;
-       prev_status.charge_status = battery.charge_status;
+       prev_status.charging_status = battery.charging_status;
        prev_status.charge_full = battery.charge_full;
        prev_status.charge_now = battery.charge_now;
        prev_status.health = battery.health;
@@ -987,7 +987,7 @@ static void battery_changed(struct battery_info *info, void *data)
        if (info->status) {
                snprintf(battery.status_s, sizeof(battery.status_s),
                                "%s", info->status);
-               check_charge_status(info->status);
+               check_charging_status(info->status);
        } else
                battery.status_s[0] = '\0';
 
@@ -1022,11 +1022,11 @@ static void battery_changed(struct battery_info *info, void *data)
        ret_val = delayed_init_done(NULL);
        if (ret_val) {
                /* If the same notification is requested repeatedly, it is ignored by power_supply_noti().
-                * A notification will be triggered only when charge_status changes between
-                * CHARGE_STATUS_CHARGING/FULL <-> CHARGE_STATUS_DISCHARGING. */
-               if (battery.charge_status == CHARGE_STATUS_CHARGING || battery.charge_status == CHARGE_STATUS_FULL)
+                * A notification will be triggered only when charging_status changes between
+                * CHARGING_STATUS_CHARGING/FULL <-> CHARGING_STATUS_DISCHARGING. */
+               if (battery.charging_status == CHARGING_STATUS_CHARGING || battery.charging_status == CHARGING_STATUS_FULL)
                        power_supply_noti(DEVICE_NOTI_BATT_CHARGE, DEVICE_NOTI_ON);
-               else if (battery.charge_status == CHARGE_STATUS_DISCHARGING)
+               else if (battery.charging_status == CHARGING_STATUS_DISCHARGING)
                        power_supply_noti(DEVICE_NOTI_BATT_CHARGE, DEVICE_NOTI_OFF);
        }
 
@@ -1257,7 +1257,7 @@ static GVariant *dbus_get_power_supply_handler(GDBusConnection *conn,
 
        return g_variant_new("(iiiiiiiisiiiii)", 0,
                                battery.capacity,
-                               battery.charge_status,
+                               battery.charging_status,
                                battery.health,
                                battery.charger_connected,
                                battery.present,

diff --git a/src/battery/power-supply.h b/src/battery/power-supply.h
index 547a2d2..1350299 100644 (file)
--- a/src/battery/power-supply.h
+++ b/src/battery/power-supply.h
@@ -30,12 +30,12 @@ enum device_change_type {
        DEVICE_CHANGE_NORMAL,
 };
 
-enum charge_status_type {
-       CHARGE_STATUS_UNKNOWN,
-       CHARGE_STATUS_CHARGING,
-       CHARGE_STATUS_DISCHARGING,
-       CHARGE_STATUS_NOT_CHARGING,
-       CHARGE_STATUS_FULL,
+enum charging_status_type {
+       CHARGING_STATUS_UNKNOWN,
+       CHARGING_STATUS_CHARGING,
+       CHARGING_STATUS_DISCHARGING,
+       CHARGING_STATUS_NOT_CHARGING,
+       CHARGING_STATUS_FULL,
 };
 
 enum charge_full_type {
@@ -94,7 +94,7 @@ enum charger_type {
 
 struct battery_status {
        int capacity;
-       int charge_status;
+       int charging_status;
        int charge_full;
        int charge_now;
        int health;

diff --git a/tests/auto-test/battery.c b/tests/auto-test/battery.c
index 14b3964..e245b64 100644 (file)
--- a/tests/auto-test/battery.c
+++ b/tests/auto-test/battery.c
@@ -101,12 +101,12 @@
 #define S_ENTER        1
 #define S_LEAVE        0
 
-enum charge_status_type {
-       CHARGE_STATUS_UNKNOWN,
-       CHARGE_STATUS_CHARGING,
-       CHARGE_STATUS_DISCHARGING,
-       CHARGE_STATUS_NOT_CHARGING,
-       CHARGE_STATUS_FULL,
+enum charging_status_type {
+       CHARGING_STATUS_UNKNOWN,
+       CHARGING_STATUS_CHARGING,
+       CHARGING_STATUS_DISCHARGING,
+       CHARGING_STATUS_NOT_CHARGING,
+       CHARGING_STATUS_FULL,
 };
 
 enum charge_now_type {
@@ -135,7 +135,7 @@ static struct power_supply_type {
        const char *scenario;
        const int status;
        const char *capacity;
-       const char *charge_status;
+       const char *charging_status;
        const char *health;
        const int online;
        const char *present;
@@ -445,7 +445,7 @@ static bool get_battery_info_direct(struct device_battery_info *info)
        return capi_result(METHOD_BATTERY_GETINFO_DIRECT, ret);
 }
 
-static int change_charge_status_to_enum(const char *env_value)
+static int change_charging_status_to_enum(const char *env_value)
 {
        int len, ret;
 
@@ -454,15 +454,15 @@ static int change_charge_status_to_enum(const char *env_value)
 
        len = strlen(env_value);
        if (strncmp(env_value, CHARGEFULL, len) == 0)
-               ret = CHARGE_STATUS_FULL;
+               ret = CHARGING_STATUS_FULL;
        else if (strncmp(env_value, CHARGENOW, len) == 0)
-               ret = CHARGE_STATUS_CHARGING;
+               ret = CHARGING_STATUS_CHARGING;
        else if (strncmp(env_value, DISCHARGE, len) == 0)
-               ret = CHARGE_STATUS_DISCHARGING;
+               ret = CHARGING_STATUS_DISCHARGING;
        else if (strncmp(env_value, NOTCHARGE, len) == 0)
-               ret = CHARGE_STATUS_NOT_CHARGING;
+               ret = CHARGING_STATUS_NOT_CHARGING;
        else
-               ret = CHARGE_STATUS_UNKNOWN;
+               ret = CHARGING_STATUS_UNKNOWN;
 
        return ret;
 }
@@ -492,7 +492,7 @@ static int change_health_status_to_enum(const char *env_value)
 static bool compare_vconf(struct power_supply_type list)
 {
        int value, ret, temp;
-       int capacity, online, charge_status;
+       int capacity, online, charging_status;
        int invalid;
 
        invalid = (strcmp(list.present, PRESENT_ABNORMAL) == 0);
@@ -504,22 +504,22 @@ static bool compare_vconf(struct power_supply_type list)
        }
 
        if (invalid) {
-               charge_status = CHARGE_STATUS_NOT_CHARGING;
+               charging_status = CHARGING_STATUS_NOT_CHARGING;
                temp = -ENODEV;
-       } else if (!strcmp(list.charge_status, CHARGEFULL)) {
-               charge_status = CHARGE_STATUS_FULL;
+       } else if (!strcmp(list.charging_status, CHARGEFULL)) {
+               charging_status = CHARGING_STATUS_FULL;
                temp = CHARGER_DISCHARGING;
-       } else if (!strcmp(list.charge_status, CHARGENOW)) {
-               charge_status = CHARGE_STATUS_CHARGING;
+       } else if (!strcmp(list.charging_status, CHARGENOW)) {
+               charging_status = CHARGING_STATUS_CHARGING;
                temp = CHARGER_CHARGING;
-       } else if (!strcmp(list.charge_status, DISCHARGE)) {
-               charge_status = CHARGE_STATUS_DISCHARGING;
+       } else if (!strcmp(list.charging_status, DISCHARGE)) {
+               charging_status = CHARGING_STATUS_DISCHARGING;
                temp = CHARGER_DISCHARGING;
-       } else if (!strcmp(list.charge_status, NOTCHARGE)) {
-               charge_status = CHARGE_STATUS_NOT_CHARGING;
+       } else if (!strcmp(list.charging_status, NOTCHARGE)) {
+               charging_status = CHARGING_STATUS_NOT_CHARGING;
                temp = CHARGER_ABNORMAL;
        } else {
-               charge_status = CHARGE_STATUS_UNKNOWN;
+               charging_status = CHARGING_STATUS_UNKNOWN;
                temp = CHARGER_DISCHARGING;
        }
 
@@ -538,7 +538,7 @@ static bool compare_vconf(struct power_supply_type list)
        if (invalid) {
                temp = -ENODEV;
        } else if (capacity <= DEFAULT_REALOFF) {
-               if (charge_status == CHARGE_STATUS_CHARGING)
+               if (charging_status == CHARGING_STATUS_CHARGING)
                        temp = VCONFKEY_SYSMAN_BAT_POWER_OFF;
                else
                        temp = VCONFKEY_SYSMAN_BAT_REAL_POWER_OFF;
@@ -549,7 +549,7 @@ static bool compare_vconf(struct power_supply_type list)
        } else if (capacity <= DEFAULT_WARNING) {
                temp = VCONFKEY_SYSMAN_BAT_WARNING_LOW;
        } else if (capacity >= DEFAULT_NORMAL &&
-               charge_status == CHARGE_STATUS_FULL) {
+               charging_status == CHARGING_STATUS_FULL) {
                temp = VCONFKEY_SYSMAN_BAT_FULL;
        } else {
                temp = VCONFKEY_SYSMAN_BAT_NORMAL;
@@ -629,8 +629,8 @@ static bool compare_power_supply(struct power_supply_type list, int value[], con
                return false;
        }
 
-       if (change_charge_status_to_enum(list.charge_status) != value[1]) {
-               _E("Different charge_status : %d %d", change_charge_status_to_enum(list.charge_status), value[1]);
+       if (change_charging_status_to_enum(list.charging_status) != value[1]) {
+               _E("Different charging_status : %d %d", change_charging_status_to_enum(list.charging_status), value[1]);
                return false;
        }
 
@@ -696,7 +696,7 @@ static bool set_battery_power_supply(int index)
        var = g_variant_new("(sisssisssssssss)", POWER_SUBSYSTEM,
                                13,
                                power_supply_types[index].capacity,
-                               power_supply_types[index].charge_status,
+                               power_supply_types[index].charging_status,
                                power_supply_types[index].health,
                                power_supply_types[index].online,
                                power_supply_types[index].present,
@@ -711,7 +711,7 @@ static bool set_battery_power_supply(int index)
 
                                _I("C(%s) S(%s) H(%s) O(%d) P(%s) M(%s) F(%s) SRC(%s) Vol(%s %s) Cur(%s %s) T(%s)",
                                power_supply_types[index].capacity,
-                               power_supply_types[index].charge_status,
+                               power_supply_types[index].charging_status,
                                power_supply_types[index].health,
                                power_supply_types[index].online,
                                power_supply_types[index].present,
@@ -767,7 +767,7 @@ static bool get_battery_power_supply(int out_rsp[], char **out_power_source)
 
        if (!g_variant_get_safe(reply, "(iiiiiiiisiiiii)", &reply_val,  //return value
                                                        &out_rsp[0],    //capacity
-                                                       &out_rsp[1],    //charge_status
+                                                       &out_rsp[1],    //charging_status
                                                        &out_rsp[2],    //health
                                                        &out_rsp[3],    //online
                                                        &out_rsp[4],    //present