From patchwork Wed Nov 12 00:26:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 40632 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f72.google.com (mail-wg0-f72.google.com [74.125.82.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 39FA2205DF for ; Wed, 12 Nov 2014 00:36:40 +0000 (UTC) Received: by mail-wg0-f72.google.com with SMTP id k14sf5970905wgh.11 for ; Tue, 11 Nov 2014 16:36:39 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=CCe0tzNWEFBdvtaDleeK4CR26We1wrBIqfwMQtnPKkY=; b=UOwh0G4PwVN2j4hE3N4oCw1ekxG6ov2OHqUVBQtUIFjPW3oMTsHBTFHvuRtCx0uoYo uvJqlxRpedfg5plrD/YPX3pTMK5KZxE3+JQHJKNh5mdENbFaMCSdIuolq0bWOoV6Thgz ulkfps146norlrNf7el8LyFKh/jd168DYfrIqNHA9rDSiaG+BvDco73BrR8a5P3T7Zbb Yde1fGwtnt8t+oOW/ZtoibtoRDEDZ159gBd8CGcq7oR9Ppc3RTYoqAXnw1KUPy6hzW93 X8dWZV9XbPpL7kTX/GAWUMcsuypeb8KAU9iMUKLwAwE+ZQUqQ+23chdCNP8fu17MA/Cy 98WQ== X-Gm-Message-State: ALoCoQky3QXEDBprEcvkydBNVx40uGTlGbTpoV6swG5+leZpWYlD2mOQLZnzVVfkLW+G22mR77tP X-Received: by 10.194.176.106 with SMTP id ch10mr3524wjc.6.1415752599530; Tue, 11 Nov 2014 16:36:39 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.37.226 with SMTP id b2ls601001lak.36.gmail; Tue, 11 Nov 2014 16:36:38 -0800 (PST) X-Received: by 10.152.36.201 with SMTP id s9mr18367503laj.17.1415752598943; Tue, 11 Nov 2014 16:36:38 -0800 (PST) Received: from mail-lb0-f173.google.com (mail-lb0-f173.google.com. [209.85.217.173]) by mx.google.com with ESMTPS id ir2si33004143lac.127.2014.11.11.16.36.38 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 11 Nov 2014 16:36:38 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.173 as permitted sender) client-ip=209.85.217.173; Received: by mail-lb0-f173.google.com with SMTP id n15so8642780lbi.18 for ; Tue, 11 Nov 2014 16:36:38 -0800 (PST) X-Received: by 10.112.73.103 with SMTP id k7mr39163439lbv.41.1415752598806; Tue, 11 Nov 2014 16:36:38 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp347837lbc; Tue, 11 Nov 2014 16:36:38 -0800 (PST) X-Received: by 10.194.19.4 with SMTP id a4mr57749866wje.3.1415752598186; Tue, 11 Nov 2014 16:36:38 -0800 (PST) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id df5si30669742wib.0.2014.11.11.16.36.37 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 11 Nov 2014 16:36:38 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:51633 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XoLvJ-0000M8-2P for patch@linaro.org; Tue, 11 Nov 2014 19:36:37 -0500 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) X-Received: by 10.182.50.168 with SMTP id d8mr35606369obo.2.1415751990249; Tue, 11 Nov 2014 16:26:30 -0800 (PST) Received: from gbellows-linaro.bellowshome.net (99-179-1-128.lightspeed.austtx.sbcglobal.net. [99.179.1.128]) by mx.google.com with ESMTPSA id d3sm6239765obs.18.2014.11.11.16.26.29 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 11 Nov 2014 16:26:29 -0800 (PST) From: Greg Bellows To: qemu-devel@nongnu.org, peter.maydell@linaro.org, christoffer.dall@linaro.org, alex.bennee@linaro.org Date: Tue, 11 Nov 2014 18:26:03 -0600 Message-Id: <1415751963-4081-16-git-send-email-greg.bellows@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1415751963-4081-1-git-send-email-greg.bellows@linaro.org> References: <1415751963-4081-1-git-send-email-greg.bellows@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.218.51 Cc: Greg Bellows Subject: [Qemu-devel] [PATCH v1 15/15] android-console: Add power capacity command X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: greg.bellows@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.173 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 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, ...);