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);
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();
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,
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;
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();
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;
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,
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;
}
-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)
* 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,
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]);
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,
{ 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 = {
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 */
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"},
{"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)
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;
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