diff options
| author | David 'Digit' Turner <digit@android.com> | 2011-02-10 17:40:04 +0100 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2011-02-16 20:27:15 -0800 |
| commit | 8b9887163ce94928aec159956d1a61fc93bb949d (patch) | |
| tree | c62d4c51819511c1197041f8603eaaafe92dedb6 /hw | |
| parent | 3566adb4537f898eea2466331b13a31522f11358 (diff) | |
| download | external_qemu-8b9887163ce94928aec159956d1a61fc93bb949d.zip external_qemu-8b9887163ce94928aec159956d1a61fc93bb949d.tar.gz external_qemu-8b9887163ce94928aec159956d1a61fc93bb949d.tar.bz2 | |
Merge 59e8e196 into tools_r10. DO NOT MERGE.
Add hw.keyboard.lid
This is used to control the lid switch virtual device.
+ Add support for a "version <number>" field to the skin format.
This will later be used for skin format #3.
+ Fix a bug where string hw properties didn't work/compile
Change-Id: I27ff3293b439917a51c584a25139264ddb1aff12
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/goldfish_events_device.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/goldfish_events_device.c b/hw/goldfish_events_device.c index f9775bf..340dc76 100644 --- a/hw/goldfish_events_device.c +++ b/hw/goldfish_events_device.c @@ -458,10 +458,9 @@ void events_dev_init(uint32_t base, qemu_irq irq) * was closed or opened (done when we switch layouts through * KP-7 or KP-9). * - * We only support this when there is a real keyboard, which - * we assume can be hidden/revealed. + * We only support this when hw.keyboard.lid is true. */ - if (config->hw_keyboard) { + if (config->hw_keyboard && config->hw_keyboard_lid) { events_set_bit(s, EV_SYN, EV_SW); events_set_bit(s, EV_SW, 0); } |