From 8b9887163ce94928aec159956d1a61fc93bb949d Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Thu, 10 Feb 2011 17:40:04 +0100 Subject: 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 " 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 --- hw/goldfish_events_device.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'hw') 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); } -- cgit v1.1