diff options
| author | Vladimir Chtchetkine <vchtchetkine@google.com> | 2012-03-19 11:35:29 -0700 |
|---|---|---|
| committer | Vladimir Chtchetkine <vchtchetkine@google.com> | 2012-03-19 14:22:59 -0700 |
| commit | 7485c2989d727a1d0c14a66fb75e140f885a1583 (patch) | |
| tree | d4e44279f3f7c2c12a58e3ed23eca8fe376ab207 /hw | |
| parent | 863d1010d9c8fa4342b1b0ea860bcfb096806acc (diff) | |
| download | external_qemu-7485c2989d727a1d0c14a66fb75e140f885a1583.zip external_qemu-7485c2989d727a1d0c14a66fb75e140f885a1583.tar.gz external_qemu-7485c2989d727a1d0c14a66fb75e140f885a1583.tar.bz2 | |
Refactor HW config to use hw.camera_back, and hw.camera_front properties.
This is a continuation of an effort to simplify HW config, and make the UI for it clearer.
This CL gets rid of multiple camera emulation properties, combining everything into just
two properties:
- hw.camera_back that controls emulation of a camera facing back, and
- hw.camera_front that controls emulation of a camera facing front.
Change-Id: Ia114ae4caf2053685cbff00f39088e5b5be2952c
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/goldfish_events_device.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/goldfish_events_device.c b/hw/goldfish_events_device.c index 0aa5a1f..dad76ad 100644 --- a/hw/goldfish_events_device.c +++ b/hw/goldfish_events_device.c @@ -406,7 +406,9 @@ void events_dev_init(uint32_t base, qemu_irq irq) events_set_bit(s, EV_KEY, BTN_TOUCH); } - if (config->hw_camera) { + if (strcmp(config->hw_camera_back, "none") || + strcmp(config->hw_camera_front, "none")) { + /* Camera emulation is enabled. */ events_set_bit(s, EV_KEY, KEY_CAMERA); } |