From b0d61f64bebf08d65e41c00d1347dcc62fd31c57 Mon Sep 17 00:00:00 2001 From: Son Hyunjun Date: Fri, 9 Mar 2012 12:19:10 +0900 Subject: [PATCH] modify MACRO --- tizen/src/hw/maru_brightness.c | 4 ++-- tizen/src/hw/maru_overlay.c | 10 ++++++---- tizen/src/hw/maru_pci_ids.h | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/tizen/src/hw/maru_brightness.c b/tizen/src/hw/maru_brightness.c index 8805c81..32c00db 100644 --- a/tizen/src/hw/maru_brightness.c +++ b/tizen/src/hw/maru_brightness.c @@ -45,7 +45,7 @@ MULTI_DEBUG_CHANNEL(qemu, maru_brightness); -#define QEMU_DEV_NAME "brightness" +#define QEMU_DEV_NAME "MARU_BRIGHTNESS" #define BRIGHTNESS_MEM_SIZE (4 * 1024) /* 4KB */ #define BRIGHTNESS_REG_SIZE 256 @@ -127,7 +127,7 @@ static int brightness_initfn(PCIDevice *dev) pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_VIRTUAL_BRIGHTNESS); pci_config_set_class(pci_conf, PCI_CLASS_DISPLAY_OTHER); - memory_region_init_io (&s->mmio_addr, &brightness_mmio_ops, s, "brightness-mmio", BRIGHTNESS_REG_SIZE); + memory_region_init_io (&s->mmio_addr, &brightness_mmio_ops, s, "maru_brightness_mmio", BRIGHTNESS_REG_SIZE); pci_register_bar(&s->dev, 1, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->mmio_addr); return 0; diff --git a/tizen/src/hw/maru_overlay.c b/tizen/src/hw/maru_overlay.c index 5a79de1..ecac547 100644 --- a/tizen/src/hw/maru_overlay.c +++ b/tizen/src/hw/maru_overlay.c @@ -43,6 +43,8 @@ MULTI_DEBUG_CHANNEL(qemu, maru_overlay); +#define QEMU_DEV_NAME "MARU_OVERLAY" + #define OVERLAY_MEM_SIZE (8192 * 1024) // 4MB(overlay0) + 4MB(overlay1) #define OVERLAY_REG_SIZE 256 #define OVERLAY1_REG_OFFSET (OVERLAY_REG_SIZE / 2) @@ -160,10 +162,10 @@ static int overlay_initfn(PCIDevice *dev) pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_VIRTUAL_OVERLAY); pci_config_set_class(pci_conf, PCI_CLASS_DISPLAY_OTHER); - memory_region_init_ram(&s->mem_addr, NULL, "overlay.ram", OVERLAY_MEM_SIZE); + memory_region_init_ram(&s->mem_addr, NULL, "maru_overlay.ram", OVERLAY_MEM_SIZE); overlay_ptr = memory_region_get_ram_ptr(&s->mem_addr); - memory_region_init_io (&s->mmio_addr, &overlay_mmio_ops, s, "overlay-mmio", OVERLAY_REG_SIZE); + memory_region_init_io (&s->mmio_addr, &overlay_mmio_ops, s, "maru_overlay_mmio", OVERLAY_REG_SIZE); /* setup memory space */ /* memory #0 device memory (overlay surface) */ @@ -176,12 +178,12 @@ static int overlay_initfn(PCIDevice *dev) int pci_maru_overlay_init(PCIBus *bus) { - pci_create_simple(bus, -1, "overlay"); + pci_create_simple(bus, -1, QEMU_DEV_NAME); return 0; } static PCIDeviceInfo overlay_info = { - .qdev.name = "overlay", + .qdev.name = QEMU_DEV_NAME, .qdev.size = sizeof(OverlayState), .no_hotplug = 1, .init = overlay_initfn, diff --git a/tizen/src/hw/maru_pci_ids.h b/tizen/src/hw/maru_pci_ids.h index 3529555..af9264e 100644 --- a/tizen/src/hw/maru_pci_ids.h +++ b/tizen/src/hw/maru_pci_ids.h @@ -45,5 +45,5 @@ #define PCI_DEVICE_ID_VIRTUAL_BRIGHTNESS 0x1014 #define PCI_DEVICE_ID_VIRTUAL_CAMERA 0x1018 #define PCI_DEVICE_ID_VIRTUAL_CODEC 0x101C -#define PCI_DEVICE_ID_VIRTUAL_VGA 0x1020 + #endif /* MARU_PCI_IDS_H_ */ -- 2.7.4