From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38082) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XoLlc-0002DM-MO for qemu-devel@nongnu.org; Tue, 11 Nov 2014 19:26:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XoLlW-0000Os-OO for qemu-devel@nongnu.org; Tue, 11 Nov 2014 19:26:36 -0500 Received: from mail-oi0-f51.google.com ([209.85.218.51]:65088) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XoLlW-0000Oc-JW for qemu-devel@nongnu.org; Tue, 11 Nov 2014 19:26:30 -0500 Received: by mail-oi0-f51.google.com with SMTP id g201so7823310oib.24 for ; Tue, 11 Nov 2014 16:26:30 -0800 (PST) From: Greg Bellows Date: Tue, 11 Nov 2014 18:26:03 -0600 Message-Id: <1415751963-4081-16-git-send-email-greg.bellows@linaro.org> In-Reply-To: <1415751963-4081-1-git-send-email-greg.bellows@linaro.org> References: <1415751963-4081-1-git-send-email-greg.bellows@linaro.org> Subject: [Qemu-devel] [PATCH v1 15/15] android-console: Add power capacity command List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, peter.maydell@linaro.org, christoffer.dall@linaro.org, alex.bennee@linaro.org Cc: Greg Bellows Add the Android emulator console "power capacity" command along associated help messages. The "capacity" command allows the battery capacity of the device to be manipulated. Signed-off-by: Greg Bellows --- android-commands.h | 7 +++++++ android-console.c | 26 ++++++++++++++++++++++++++ android-console.h | 1 + 3 files changed, 34 insertions(+) diff --git a/android-commands.h b/android-commands.h index bb3f783..62b181b 100644 --- a/android-commands.h +++ b/android-commands.h @@ -61,6 +61,13 @@ static mon_cmd_t android_power_cmds[] = { .help = "set battery health state", .mhandler.cmd = android_console_power_health, }, + { + .name = "capacity", + .args_type = "arg:s?", + .params = "", + .help = "set battery capacity state", + .mhandler.cmd = android_console_power_capacity, + }, { NULL, NULL, }, }; diff --git a/android-console.c b/android-console.c index 0a4fc1d..e24a87c 100644 --- a/android-console.c +++ b/android-console.c @@ -415,6 +415,23 @@ void android_console_power_health(Monitor *mon, const QDict *qdict) "dead|overvoltage|failure\"\n"); } +void android_console_power_capacity(Monitor *mon, const QDict *qdict) +{ + const char *arg = qdict_get_try_str(qdict, "arg"); + + if (arg) { + int capacity; + + if (sscanf(arg, "%d", &capacity) == 1 && + capacity >= 0 && capacity <= 100) { + goldfish_battery_set_prop(0, POWER_SUPPLY_PROP_CAPACITY, capacity); + return; + } + } + + monitor_printf(mon, "KO: Usage: \"capacity \"\n"); + } + enum { CMD_POWER, CMD_POWER_DISPLAY, @@ -422,6 +439,7 @@ enum { CMD_POWER_STATUS, CMD_POWER_PRESENT, CMD_POWER_HEALTH, + CMD_POWER_CAPACITY, }; static const char *power_help[] = { @@ -440,6 +458,9 @@ static const char *power_help[] = { /* CMD_POWER_HEALTH */ "'health unknown|good|overheat|dead|overvoltage|failure' allows you " "to set battery health state", + /* CMD_POWER_CAPACITY */ + "'capacity ' allows you to set battery capacity to a " + "value 0 - 100", }; void android_console_power(Monitor *mon, const QDict *qdict) @@ -450,9 +471,14 @@ void android_console_power(Monitor *mon, const QDict *qdict) /* Default to the first entry which is the parent help message */ int cmd = CMD_POWER; + /* In the below command name parsing, "capacity" has to precede "ac" + * otherwise we will hit on "ac" first. + */ if (helptext) { if (strstr(helptext, "display")) { cmd = CMD_POWER_DISPLAY; + } else if (strstr(helptext, "capacity")) { + cmd = CMD_POWER_CAPACITY; } else if (strstr(helptext, "ac")) { cmd = CMD_POWER_AC; } else if (strstr(helptext, "status")) { diff --git a/android-console.h b/android-console.h index aea671f..8801600 100644 --- a/android-console.h +++ b/android-console.h @@ -33,6 +33,7 @@ void android_console_power_ac(Monitor *mon, const QDict *qdict); void android_console_power_status(Monitor *mon, const QDict *qdict); void android_console_power_present(Monitor *mon, const QDict *qdict); void android_console_power_health(Monitor *mon, const QDict *qdict); +void android_console_power_capacity(Monitor *mon, const QDict *qdict); void android_console_power(Monitor *mon, const QDict *qdict); void android_monitor_print_error(Monitor *mon, const char *fmt, ...); -- 1.8.3.2