From: Greg Bellows <greg.bellows@linaro.org>
To: qemu-devel@nongnu.org, peter.maydell@linaro.org,
christoffer.dall@linaro.org, alex.bennee@linaro.org
Cc: Greg Bellows <greg.bellows@linaro.org>
Subject: [Qemu-devel] [PATCH v1 15/15] android-console: Add power capacity command
Date: Tue, 11 Nov 2014 18:26:03 -0600 [thread overview]
Message-ID: <1415751963-4081-16-git-send-email-greg.bellows@linaro.org> (raw)
In-Reply-To: <1415751963-4081-1-git-send-email-greg.bellows@linaro.org>
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 <greg.bellows@linaro.org>
---
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 <percentage>\"\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 <percentage>' 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
next prev parent reply other threads:[~2014-11-12 0:26 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-12 0:25 [Qemu-devel] [PATCH v1 00/15] android-console: Add console power command Greg Bellows
2014-11-12 0:25 ` [Qemu-devel] [PATCH v1 01/15] android-console: Fix goldfish audio misnaming Greg Bellows
2014-11-13 10:01 ` Alex Bennée
2014-11-12 0:25 ` [Qemu-devel] [PATCH v1 02/15] android-console: Unify available commands output Greg Bellows
2014-11-12 0:25 ` [Qemu-devel] [PATCH v1 03/15] android-console: Remove extra redir help message Greg Bellows
2014-11-12 0:25 ` [Qemu-devel] [PATCH v1 04/15] android-console: Consolidate redir help text Greg Bellows
2014-11-12 0:25 ` [Qemu-devel] [PATCH v1 05/15] android-console: Add console base power command Greg Bellows
2014-11-12 0:25 ` [Qemu-devel] [PATCH v1 06/15] android-console: Add missing hw_has_battery prop Greg Bellows
2014-11-13 10:03 ` Alex Bennée
2014-11-12 0:25 ` [Qemu-devel] [PATCH v1 07/15] android-console: Init the battery ID state field Greg Bellows
2014-11-13 10:05 ` Alex Bennée
2014-11-12 0:25 ` [Qemu-devel] [PATCH v1 08/15] android-console: Add header for battery externs Greg Bellows
2014-11-12 0:25 ` [Qemu-devel] [PATCH v1 09/15] android-console: Add GF battery prop print func Greg Bellows
2014-11-12 0:25 ` [Qemu-devel] [PATCH v1 10/15] android-console: Add GF battery property getter Greg Bellows
2014-11-12 0:25 ` [Qemu-devel] [PATCH v1 11/15] android-console: Add power ac command Greg Bellows
2014-11-12 0:26 ` [Qemu-devel] [PATCH v1 12/15] android-console: Add power status command Greg Bellows
2014-11-12 0:26 ` [Qemu-devel] [PATCH v1 13/15] android-console: Add power present command Greg Bellows
2014-11-12 0:26 ` [Qemu-devel] [PATCH v1 14/15] android-console: Add power health command Greg Bellows
2014-11-12 0:26 ` Greg Bellows [this message]
2014-11-13 10:17 ` [Qemu-devel] [PATCH v1 15/15] android-console: Add power capacity command Alex Bennée
2014-11-12 13:39 ` [Qemu-devel] [PATCH v1 00/15] android-console: Add console power command Greg Bellows
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1415751963-4081-16-git-send-email-greg.bellows@linaro.org \
--to=greg.bellows@linaro.org \
--cc=alex.bennee@linaro.org \
--cc=christoffer.dall@linaro.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).