From: jinhyung.jo Date: Wed, 4 Dec 2013 02:29:18 +0000 (+0900) Subject: maru_brightness : Modified exit & init functions X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~566^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=659525f5eeb52c61fe1e2d5b92c83e478a62ac45;p=sdk%2Femulator%2Fqemu.git maru_brightness : Modified exit & init functions Added the info log in the functions. Added a missing statement for releasing memory in the exit function. Modified the position that initialize the level variable. Change-Id: I6a7026f66c9da683e36de3622724e83676ea21b4 Signed-off-by: Jinhyung Jo --- diff --git a/tizen/src/hw/maru_brightness.c b/tizen/src/hw/maru_brightness.c index 5a8b25e9a5..9d924ea7a2 100644 --- a/tizen/src/hw/maru_brightness.c +++ b/tizen/src/hw/maru_brightness.c @@ -50,7 +50,6 @@ MULTI_DEBUG_CHANNEL(qemu, maru_brightness); typedef struct BrightnessState { PCIDevice dev; - ram_addr_t vram_offset; MemoryRegion mmio_addr; } BrightnessState; @@ -59,7 +58,7 @@ enum { BRIGHTNESS_OFF = 0x04, }; -uint32_t brightness_level = BRIGHTNESS_MAX; +uint32_t brightness_level; uint32_t brightness_off; pixman_color_t level_color; pixman_image_t *brightness_image; @@ -167,12 +166,18 @@ static const MemoryRegionOps brightness_mmio_ops = { static void brightness_exitfn(PCIDevice *dev) { + BrightnessState *s = DO_UPCAST(BrightnessState, dev, dev); + if (bh) { qemu_bh_delete(bh); } if (brightness_image) { pixman_image_unref(brightness_image); + brightness_image = NULL; } + + memory_region_destroy(&s->mmio_addr); + INFO("<%s>\n", __func__); } static void maru_brightness_bh(void *opaque) @@ -198,12 +203,13 @@ static int brightness_initfn(PCIDevice *dev) pci_register_bar(&s->dev, 1, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->mmio_addr); bh = qemu_bh_new(maru_brightness_bh, s); - + brightness_level = BRIGHTNESS_MAX; level_color.alpha = 0x0000; level_color.red = 0x0000; level_color.green = 0x0000; level_color.blue = 0x0000; brightness_image = pixman_image_create_solid_fill(&level_color); + INFO("Init complete: Maru brightness\n"); return 0; }