battery: remove unused frequency strength

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

diff --git a/src/battery/power-supply.c b/src/battery/power-supply.c
index ace82a3..214d1b3 100644 (file)
--- a/src/battery/power-supply.c
+++ b/src/battery/power-supply.c
@@ -712,7 +712,6 @@ static void process_power_supply(void *data)
        int ret_lock = -1;
        int ret_val;
 
-       _D("process_power_supply()");
        if (disp_plgn->pm_lock_internal)
                ret_lock = disp_plgn->pm_lock_internal(INTERNAL_LOCK_BATTERY, LCD_OFF, STAY_CUR_STATE, 0);
 
@@ -785,10 +784,6 @@ static void process_power_supply(void *data)
                if (power_supply_broadcast(CHARGE_MISC_EVENT_SIGNAL, battery.misc) < 0)
                        broadcasted = false;
 
-       if (old_battery.freq_strength != battery.freq_strength)
-               if (power_supply_broadcast(CHARGE_FREQ_STRENGTH_SIGNAL, battery.freq_strength) < 0)
-                       broadcasted = false;
-
        if (old_battery.charge_full != battery.charge_full)
                noti_batt_full();
 
@@ -797,9 +792,8 @@ static void process_power_supply(void *data)
            old_battery.capacity != battery.capacity ||
            old_battery.health != battery.health ||
                old_battery.misc != battery.misc ||
-               old_battery.freq_strength != battery.freq_strength ||
                old_battery.online_type != battery.online_type)
-               _I("Signal(%d) %s(%d) %s(%d) %s(%d) %s(%d) %s(%d) %s(%d) %s(%d) %s(%d : %s) %s(%d)",
+               _I("Signal(%d) %s(%d) %s(%d) %s(%d) %s(%d) %s(%d) %s(%d) %s(%d) %s(%d : %s)",
                        broadcasted,
                        CHARGER_STATUS_SIGNAL, battery.charger_connected,
                        CHARGER_TYPE_SIGNAL, battery.online_type,
@@ -808,8 +802,7 @@ static void process_power_supply(void *data)
                        CHARGE_CAPACITY_SIGNAL, battery.capacity,
                        CHARGE_LEVEL_SIGNAL, battery.charging_level,
                        CHARGE_MISC_EVENT_SIGNAL, battery.misc,
-                       CHARGE_HEALTH_SIGNAL, battery.health, battery.health_s,
-                       CHARGE_FREQ_STRENGTH_SIGNAL, battery.freq_strength);
+                       CHARGE_HEALTH_SIGNAL, battery.health, battery.health_s);
 
        old_battery.capacity = battery.capacity;
        old_battery.charging_level = battery.charging_level;
@@ -819,7 +812,6 @@ static void process_power_supply(void *data)
        old_battery.charge_full = battery.charge_full;
 
        old_battery.misc = battery.misc;
-       old_battery.freq_strength = battery.freq_strength;
        snprintf(old_battery.status_s, sizeof(old_battery.status_s), "%s", battery.status_s);
 
        check_abnormal_status();
@@ -919,8 +911,7 @@ static int battery_state(struct battery_info *info)
            prev_status.charge_now == battery.charge_now &&
            prev_status.health == battery.health &&
            prev_status.present == battery.present &&
-           prev_status.charger_connected == battery.charger_connected &&
-               prev_status.freq_strength == battery.freq_strength)
+           prev_status.charger_connected == battery.charger_connected)
                return 0;
 
        prev_status.capacity = battery.capacity;
@@ -930,7 +921,6 @@ static int battery_state(struct battery_info *info)
        prev_status.health = battery.health;
        prev_status.present = battery.present;
        prev_status.charger_connected = battery.charger_connected;
-       prev_status.freq_strength = battery.freq_strength;
 
        _I("%s(%s) %s(%d) Capa(%d) Hth(%s,%d) Pres(%d) Curr(%d,%d)",
                        info->status,
@@ -1011,7 +1001,6 @@ static void battery_changed(struct battery_info *info, void *data)
        battery.temperature = info->temperature;
        battery.voltage_now = info->voltage_now;
        battery.voltage_average = info->voltage_average;
-       battery.freq_strength = info->freq_strength;
 
        battery_initialized = true;
 
@@ -1239,13 +1228,6 @@ static GVariant *dbus_get_misc(GDBusConnection *conn,
 }
 
 
-static GVariant *dbus_get_freq_strength(GDBusConnection *conn,
-       const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
-       GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data)
-{
-       return g_variant_new("(i)", battery.freq_strength);
-}
-
 static GVariant *dbus_get_power_supply_handler(GDBusConnection *conn,
        const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
        GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data)
@@ -1255,14 +1237,13 @@ static GVariant *dbus_get_power_supply_handler(GDBusConnection *conn,
         * had been disabled by test driver. */
        lowbat_enable_uevent_buffering();
 
-       return g_variant_new("(iiiiiiiisiiiii)", 0,
+       return g_variant_new("(iiiiiiisiiiii)", 0,
                                battery.capacity,
                                battery.charging_status,
                                battery.health,
                                battery.charger_connected,
                                battery.present,
                                battery.misc,
-                               battery.freq_strength,
                                battery.power_source_s,
                                battery.voltage_now,
                                battery.voltage_average,
@@ -1323,69 +1304,23 @@ static GVariant *dbus_power_supply_handler(GDBusConnection *conn,
        info.online = charger_connected;
        info.present = atoi(argv[4]);
        check_misc_status(argv[5]);
-       info.freq_strength = atoi(argv[6]);
        info.power_source = strdup(argv[7]);
        info.voltage_now = atoi(argv[8]);
        info.voltage_average = atoi(argv[9]);
        info.current_now = atoi(argv[10]);
        info.current_average = atoi(argv[11]);
        info.temperature = atoi(argv[12]);
-       _D("C(%d) S(%s) H(%s) O(%d) P(%d) F(%d) SRC(%s) Vol(%d %d) Cur(%d %d) T(%d)",
-               info.capacity, info.status, info.health, info.online, info.present, info.freq_strength, info.power_source, info.voltage_now, info.voltage_average, info.current_now, info.current_average, info.temperature);
+       _D("C(%d) S(%s) H(%s) O(%d) P(%d) SRC(%s) Vol(%d %d) Cur(%d %d) T(%d)",
+               info.capacity, info.status, info.health, info.online, info.present, info.power_source, info.voltage_now, info.voltage_average, info.current_now, info.current_average, info.temperature);
 
        if (battery_dev_available)
                battery_changed(&info, NULL);
 
-       /*
-       snprintf(battery.status_s, sizeof(battery.status_s), "%s",
-                       (battery.charge_now == CHARGER_CHARGING) ? "Charging" :
-                       (battery.charge_now == CHARGER_ABNORMAL) ? "Not Charging" :
-                       (battery.charge_full == CHARGING_FULL) ? "Full" :
-                       "Discharging");
-       _I("%s(%d) %s(f:%d n:%d) %s(%d) %s(%d) %s(%d) %s(%d)",
-               argv[0],
-               battery.capacity,
-               argv[1],
-               battery.charge_full,
-               battery.charge_now,
-               argv[2],
-               battery.health,
-               //argv[3],
-               "charger_connected",
-               battery.charger_connected,
-               argv[4],
-               battery.present,
-               argv[5],
-               battery.misc);
-       _I("%s(%d) %s(%s) %s(%d) %s(%d) %s(%d) %s(%d) %s(%d)",
-               argv[6],
-               battery.freq_strength,
-               argv[7],
-               battery.power_source_s,
-               argv[8],
-               battery.voltage_now,
-               argv[9],
-               battery.voltage_average,
-               argv[10],
-               battery.current_now,
-               argv[11],
-               battery.current_average,
-               argv[12],
-               battery.temperature);
-
-       if (battery.charger_connected == 1)
-               power_supply_noti(DEVICE_NOTI_BATT_CHARGE, DEVICE_NOTI_ON);
-       else
-               power_supply_noti(DEVICE_NOTI_BATT_CHARGE, DEVICE_NOTI_OFF);
-
-       //process_power_supply(&battery.capacity);
-       */
 out:
        g_free(type_str);
        g_free(argv[0]);
        g_free(argv[1]);
        g_free(argv[2]);
-       //g_free(argv[3]);
        g_free(argv[4]);
        g_free(argv[5]);
        g_free(argv[6]);
@@ -1421,7 +1356,6 @@ static void battery_get_info(struct battery_info *info, void *data)
        bat->temperature = info->temperature;
        bat->voltage_now = info->voltage_now;
        bat->voltage_average = info->voltage_average;
-       bat->freq_strength = info->freq_strength;
 }
 
 static GVariant *dbus_get_battery_info(GDBusConnection *conn,
@@ -1508,13 +1442,12 @@ static const dbus_method_s dbus_methods[] = {
        { CHARGE_FULL_SIGNAL,         NULL, "i", dbus_is_full },
        { CHARGE_HEALTH_SIGNAL,        NULL, "s", dbus_get_health },
        { POWER_SUBSYSTEM,      "sisssisssssssss", "i", dbus_power_supply_handler },
-       { GET_POWER_SUBSYSTEM,      NULL, "iiiiiiiisiiiii", dbus_get_power_supply_handler },
+       { GET_POWER_SUBSYSTEM,      NULL, "iiiiiiisiiiii", dbus_get_power_supply_handler },
        { "GetBatteryInfo",           NULL, "isssiiiiiiii", dbus_get_battery_info },
        { CHARGER_TYPE_SIGNAL,         NULL, "i", dbus_get_charger_type },
        { "ChargerCharging",            "i", "i", dbus_charger_charging },
        { CHARGE_BATTERY_PROPERTIES,   NULL, "iiiiii", dbus_get_battery_props },
        { CHARGE_MISC_EVENT_SIGNAL,    NULL, "i", dbus_get_misc },
-       { CHARGE_FREQ_STRENGTH_SIGNAL, NULL, "i", dbus_get_freq_strength},
 };
 
 static const dbus_interface_u dbus_interface = {
@@ -1721,7 +1654,6 @@ static void power_supply_init(void *data)
        memset(&old_battery, 0, sizeof(struct battery_status));
        battery.charger_charging = CHARGER_ENABLED;
        battery.misc = MISC_NONE;
-       battery.freq_strength = 0;
        battery.charger_connected = -1;
 
        /* It will be true on initializing battery structure */

diff --git a/src/battery/power-supply.h b/src/battery/power-supply.h
index 1350299..6579f96 100644 (file)
--- a/src/battery/power-supply.h
+++ b/src/battery/power-supply.h
@@ -109,7 +109,6 @@ struct battery_status {
        int charging_level;
        int charger_charging;
        int misc;
-       int freq_strength;
        char status_s[32];
        char health_s[32];
        char power_source_s[32];
@@ -132,6 +131,5 @@ void relaunch_health_popup(void);
 #define CHARGE_FULL_SIGNAL         "IsFull"
 #define CHARGE_BATTERY_PROPERTIES   "BatteryProperties"
 #define CHARGE_MISC_EVENT_SIGNAL    "MiscEvent"
-#define CHARGE_FREQ_STRENGTH_SIGNAL "FreqStrength"
 
 #endif /* __POWER_SUPPLY_H__ */

diff --git a/tests/auto-test/battery.c b/tests/auto-test/battery.c
index e245b64..b21e87d 100644 (file)
--- a/tests/auto-test/battery.c
+++ b/tests/auto-test/battery.c
@@ -146,7 +146,7 @@ static struct power_supply_type {
        const char *current_avg;
        const char *temperature;
        const char *misc;
-       const char *freq_strength;
+       const char *freq_strength; // unused
        const char *name;
 } power_supply_types[] = {
        {"norm",  S_ENTER, "100", CHARGENOW, GOOD,     1,  PRESENT_NORMAL,   USB,      VOLT_4P2, VOLT_4P2, CUR_300, CUR_300, TEMP_250, MISC_NORMAL, LEVEL_0, "CHARGE"},
@@ -202,11 +202,6 @@ static struct power_supply_type {
 
        {"capa",  S_ENTER, "100", DISCHARGE, GOOD,     0,  PRESENT_NORMAL,   USB,      VOLT_4P2, VOLT_4P2, CUR_0,   CUR_0,   TEMP_250, MISC_NORMAL, LEVEL_0, "CAPACITY"},/* discharging */
        {"capa",  S_LEAVE, "100", CHARGENOW, GOOD,     1,  PRESENT_NORMAL,   USB,      VOLT_4P2, VOLT_4P2, CUR_100, CUR_100, TEMP_250, MISC_NORMAL, LEVEL_0, "CAPACITY"},/* charging */
-
-       {"freq",  S_ENTER, "100", CHARGENOW, GOOD,     1,  PRESENT_NORMAL,   WIRELESS, VOLT_4P2, VOLT_4P2, CUR_100, CUR_100, TEMP_250, MISC_NORMAL, LEVEL_0, "CHARGE"},
-       {"freq",  S_ENTER, "100", CHARGENOW, GOOD,     1,  PRESENT_NORMAL,   WIRELESS, VOLT_4P2, VOLT_4P2, CUR_100, CUR_100, TEMP_250, MISC_NORMAL, LEVEL_1, "FREQ LEVEL 1 AFTER CHARGE"},
-       {"freq",  S_ENTER, "100", CHARGENOW, GOOD,     1,  PRESENT_NORMAL,   WIRELESS, VOLT_4P2, VOLT_4P2, CUR_100, CUR_100, TEMP_250, MISC_NORMAL, LEVEL_2, "FREQ LEVEL 2 AFTER CHARGE"},
-       {"freq",  S_LEAVE, "100", DISCHARGE, GOOD,     0,  PRESENT_NORMAL,   WIRELESS, VOLT_4P2, VOLT_4P2, CUR_0,   CUR_0,   TEMP_250, MISC_NORMAL, LEVEL_0, "DISCHARGE"}, /* init */
 };
 
 static bool get_battery_method(const char *method, int *value)
@@ -649,11 +644,6 @@ static bool compare_power_supply(struct power_supply_type list, int value[], con
                return false;
        }
 
-       if (atoi(list.freq_strength) != value[6]) {
-               _E("Different freq_strength : %d %d", atoi(list.freq_strength), value[6]);
-               return false;
-       }
-
        if (strcmp(list.power_source, power_source)) {
                _E("Different power_source : %s %s", list.power_source, power_source);
                return false;
@@ -765,14 +755,13 @@ static bool get_battery_power_supply(int out_rsp[], char **out_power_source)
                return ret;
        }
 
-       if (!g_variant_get_safe(reply, "(iiiiiiiisiiiii)", &reply_val,  //return value
+       if (!g_variant_get_safe(reply, "(iiiiiiisiiiii)", &reply_val,  //return value
                                                        &out_rsp[0],    //capacity
                                                        &out_rsp[1],    //charging_status
                                                        &out_rsp[2],    //health
                                                        &out_rsp[3],    //online
                                                        &out_rsp[4],    //present
                                                        &out_rsp[5],    //misc
-                                                       &out_rsp[6],    //freq_strength
                                                        out_power_source,       //power_source
                                                        &out_rsp[7],    //voltage_now
                                                        &out_rsp[8],    //voltagge_avg