From 7485c2989d727a1d0c14a66fb75e140f885a1583 Mon Sep 17 00:00:00 2001 From: Vladimir Chtchetkine Date: Mon, 19 Mar 2012 11:35:29 -0700 Subject: 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 --- hw/goldfish_events_device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'hw') 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); } -- cgit v1.1