From patchwork Wed Nov 12 00:26:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 409785 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id F1015140139 for ; Wed, 12 Nov 2014 11:31:25 +1100 (AEDT) Received: from localhost ([::1]:51579 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XoLqG-0002BR-4m for incoming@patchwork.ozlabs.org; Tue, 11 Nov 2014 19:31:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38062) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XoLlb-0002Bc-Pr for qemu-devel@nongnu.org; Tue, 11 Nov 2014 19:26:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XoLlU-0000Nm-SA for qemu-devel@nongnu.org; Tue, 11 Nov 2014 19:26:35 -0500 Received: from mail-oi0-f54.google.com ([209.85.218.54]:37327) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XoLlU-0000Mz-Ne for qemu-devel@nongnu.org; Tue, 11 Nov 2014 19:26:28 -0500 Received: by mail-oi0-f54.google.com with SMTP id i138so386399oig.13 for ; Tue, 11 Nov 2014 16:26:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=yOkwfSkMYMqm3ZtzX7OysfZEn6tLtlN8FcUq5tPnD+E=; b=dYnEvg5fE6iDLoKEaBQ3SMgCKnj8CK0VZuaP2vIYsfQ9wWpa61QId8vQt/zqi/XSL+ HHDWRicmEDO7sr/APqV04AmzWBrO9vKhsbT4C7728Th8Iz1EMCuk3c1GJ0BtLH74F//c lVGE0tbFMJlxyAmhv3YDV+noe7tLvthHWIWy3Qwp9vwvIz1BaoUrGZ+txCnOYSWW04nS OSAxv5MSpI0z1Bx1QhEVGRcJ9pkUHUUlZnz2jr3hlZSTPGVTNvraOrEBteeIUpnLmvlt LPJQ04i2YzySdqmykPufnwEBYxOrq/gv76VFgXK0E2sN2zyPc+tPzwToUvh5M1ktZO+b sAqw== X-Gm-Message-State: ALoCoQl2iBSy+P1hKHAXcPQhJ5XKvgnwNE1xBLHmuBuzc5wgWm3mTzGVru5C8IDlii2N+MlVPp9a X-Received: by 10.60.47.103 with SMTP id c7mr4757072oen.31.1415751988333; Tue, 11 Nov 2014 16:26:28 -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.27 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 11 Nov 2014 16:26:27 -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:01 -0600 Message-Id: <1415751963-4081-14-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.54 Cc: Greg Bellows Subject: [Qemu-devel] [PATCH v1 13/15] android-console: Add power present 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add the Android emulator console "power present" command and associated help messages. The "present" command allows the battery presence in the device to be manipulated. Signed-off-by: Greg Bellows --- android-commands.h | 7 +++++++ android-console.c | 23 +++++++++++++++++++++++ android-console.h | 1 + 3 files changed, 31 insertions(+) diff --git a/android-commands.h b/android-commands.h index 53f89b1..3adef55 100644 --- a/android-commands.h +++ b/android-commands.h @@ -47,6 +47,13 @@ static mon_cmd_t android_power_cmds[] = { .help = "set battery status", .mhandler.cmd = android_console_power_status, }, + { + .name = "present", + .args_type = "arg:s?", + .params = "", + .help = "set battery present state", + .mhandler.cmd = android_console_power_present, + }, { NULL, NULL, }, }; diff --git a/android-console.c b/android-console.c index 04a1971..b08519d 100644 --- a/android-console.c +++ b/android-console.c @@ -356,12 +356,30 @@ void android_console_power_status(Monitor *mon, const QDict *qdict) "discharging|not-charging|full\"\n"); } +void android_console_power_present(Monitor *mon, const QDict *qdict) +{ + const char *arg = qdict_get_try_str(qdict, "arg"); + + if (arg) { + if (strcasecmp(arg, "true") == 0) { + goldfish_battery_set_prop(0, POWER_SUPPLY_PROP_PRESENT, 1); + return; + } + if (strcasecmp(arg, "false") == 0) { + goldfish_battery_set_prop(0, POWER_SUPPLY_PROP_PRESENT, 0); + return; + } + } + + monitor_printf(mon, "KO: Usage: \"present true\" or \"present false\"\n"); +} enum { CMD_POWER, CMD_POWER_DISPLAY, CMD_POWER_AC, CMD_POWER_STATUS, + CMD_POWER_PRESENT, }; static const char *power_help[] = { @@ -374,6 +392,9 @@ static const char *power_help[] = { /* CMD_POWER_STATUS */ "'status unknown|charging|discharging|not-charging|full' allows you " "to set battery status", + /* CMD_POWER_PRESENT */ + "'present true|false' allows you to set battery present state to true " + "or false", }; void android_console_power(Monitor *mon, const QDict *qdict) @@ -391,6 +412,8 @@ void android_console_power(Monitor *mon, const QDict *qdict) cmd = CMD_POWER_AC; } else if (strstr(helptext, "status")) { cmd = CMD_POWER_STATUS; + } else if (strstr(helptext, "present")) { + cmd = CMD_POWER_PRESENT; } } diff --git a/android-console.h b/android-console.h index 184ae69..c7c7c86 100644 --- a/android-console.h +++ b/android-console.h @@ -31,6 +31,7 @@ void android_console_redir_del(Monitor *mon, const QDict *qdict); void android_console_power_display(Monitor *mon, const QDict *qdict); 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(Monitor *mon, const QDict *qdict); void android_monitor_print_error(Monitor *mon, const char *fmt, ...);