[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1 06/15] android-console: Add missing hw_has_batter
From: |
Greg Bellows |
Subject: |
[Qemu-devel] [PATCH v1 06/15] android-console: Add missing hw_has_battery prop |
Date: |
Tue, 11 Nov 2014 18:25:54 -0600 |
Added the missing hw_has_battery property to the Goldfish batter state. This
property indicates whether the device has a battery and controls whether some
power commands are available.
In the Android emulator this property is acquired from the AVD for the device.
For now, this is wired as always enabled.
Signed-off-by: Greg Bellows <address@hidden>
---
hw/misc/goldfish_battery.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/hw/misc/goldfish_battery.c b/hw/misc/goldfish_battery.c
index 89fd05d..a0bc379 100644
--- a/hw/misc/goldfish_battery.c
+++ b/hw/misc/goldfish_battery.c
@@ -52,6 +52,7 @@ struct goldfish_battery_state {
uint32_t health;
uint32_t present;
uint32_t capacity;
+ uint32_t hw_has_battery;;
};
/* update this each time you update the battery_state struct */
@@ -70,6 +71,7 @@ static const VMStateDescription goldfish_battery_vmsd = {
VMSTATE_UINT32(health, struct goldfish_battery_state),
VMSTATE_UINT32(present, struct goldfish_battery_state),
VMSTATE_UINT32(capacity, struct goldfish_battery_state),
+ VMSTATE_UINT32(hw_has_battery, struct goldfish_battery_state),
VMSTATE_END_OF_LIST()
}
};
@@ -146,6 +148,11 @@ static void goldfish_battery_realize(DeviceState *dev,
Error **errp)
// default values for the battery
s->ac_online = 1;
+ /* TODO: The Android Emulator gets this attribute from the AVD
+ * hw-config-defs.h. For now we hard-code the value to match the
+ * other values.
+ */
+ s->hw_has_battery = 1;
s->status = POWER_SUPPLY_STATUS_CHARGING;
s->health = POWER_SUPPLY_HEALTH_GOOD;
s->present = 1; // battery is present
--
1.8.3.2
- [Qemu-devel] [PATCH v1 00/15] android-console: Add console power command, Greg Bellows, 2014/11/11
- [Qemu-devel] [PATCH v1 01/15] android-console: Fix goldfish audio misnaming, Greg Bellows, 2014/11/11
- [Qemu-devel] [PATCH v1 02/15] android-console: Unify available commands output, Greg Bellows, 2014/11/11
- [Qemu-devel] [PATCH v1 03/15] android-console: Remove extra redir help message, Greg Bellows, 2014/11/11
- [Qemu-devel] [PATCH v1 04/15] android-console: Consolidate redir help text, Greg Bellows, 2014/11/11
- [Qemu-devel] [PATCH v1 05/15] android-console: Add console base power command, Greg Bellows, 2014/11/11
- [Qemu-devel] [PATCH v1 09/15] android-console: Add GF battery prop print func, Greg Bellows, 2014/11/11
- [Qemu-devel] [PATCH v1 06/15] android-console: Add missing hw_has_battery prop,
Greg Bellows <=
- [Qemu-devel] [PATCH v1 08/15] android-console: Add header for battery externs, Greg Bellows, 2014/11/11
- [Qemu-devel] [PATCH v1 07/15] android-console: Init the battery ID state field, Greg Bellows, 2014/11/11
- [Qemu-devel] [PATCH v1 10/15] android-console: Add GF battery property getter, Greg Bellows, 2014/11/11
- [Qemu-devel] [PATCH v1 12/15] android-console: Add power status command, Greg Bellows, 2014/11/11
- [Qemu-devel] [PATCH v1 11/15] android-console: Add power ac command, Greg Bellows, 2014/11/11
- [Qemu-devel] [PATCH v1 13/15] android-console: Add power present command, Greg Bellows, 2014/11/11
- [Qemu-devel] [PATCH v1 14/15] android-console: Add power health command, Greg Bellows, 2014/11/11
- [Qemu-devel] [PATCH v1 15/15] android-console: Add power capacity command, Greg Bellows, 2014/11/11