From: jinhyung.jo Date: Mon, 19 May 2014 10:13:13 +0000 (+0900) Subject: maru: modified some device names X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~365 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1e2f08b495066be53118556a36c3e55f47993eb8;p=sdk%2Femulator%2Fqemu.git maru: modified some device names changed the link letter from the underline to the hyphen and... some modification of logs Change-Id: I31c3a348fc68996fb1c14cb21dbdefc0de905114 Signed-off-by: Jinhyung Jo --- diff --git a/tizen/src/hw/maru_brightness.c b/tizen/src/hw/maru_brightness.c index 0605c4bf1f..f084ad006f 100644 --- a/tizen/src/hw/maru_brightness.c +++ b/tizen/src/hw/maru_brightness.c @@ -39,9 +39,9 @@ #include "skin/maruskin_server.h" #include "debug_ch.h" -MULTI_DEBUG_CHANNEL(qemu, maru_brightness); +MULTI_DEBUG_CHANNEL(tizen, maru-brightness); -#define QEMU_DEV_NAME "maru_brightness" +#define QEMU_DEV_NAME "maru-brightness" #define BRIGHTNESS_MEM_SIZE (4 * 1024) /* 4KB */ #define BRIGHTNESS_REG_SIZE 256 @@ -82,10 +82,10 @@ static uint64_t brightness_reg_read(void *opaque, { switch (addr & 0xFF) { case BRIGHTNESS_LEVEL: - INFO("brightness_reg_read: brightness_level = %d\n", brightness_level); + INFO("current brightness level = %lu\n", brightness_level); return brightness_level; case BRIGHTNESS_OFF: - INFO("brightness_reg_read: brightness_off = %d\n", brightness_off); + INFO("device is turned %s\n", brightness_off ? "off" : "on"); return brightness_off; default: ERR("wrong brightness register read - addr : %d\n", (int)addr); @@ -113,7 +113,6 @@ static void brightness_reg_write(void *opaque, { switch (addr & 0xFF) { case BRIGHTNESS_LEVEL: - INFO("brightness_level : %lld\n", val); if (brightness_level == val) { return; } @@ -122,17 +121,19 @@ static void brightness_reg_write(void *opaque, #else if (val > BRIGHTNESS_MAX) { #endif - ERR("brightness_reg_write: Invalide brightness level.\n"); + ERR("input value is out of range(%llu)\n", val); } else { + INFO("level changes: %lu -> %llu\n", brightness_level, val); brightness_level = val; maru_pixman_image_set_alpha(brightness_tbl[brightness_level]); } return; case BRIGHTNESS_OFF: - INFO("brightness_off : %lld\n", val); if (brightness_off == val) { return; } + + INFO("status changes: %s\n", val ? "OFF" : "ON"); brightness_off = val; if (brightness_off) { maru_pixman_image_set_alpha(0xFF); /* set black */ @@ -169,7 +170,7 @@ static void brightness_exitfn(PCIDevice *dev) } memory_region_destroy(&s->mmio_addr); - INFO("<%s>\n", __func__); + INFO("finalize maru-brightness device\n"); } static void maru_brightness_bh(void *opaque) @@ -191,7 +192,7 @@ static int brightness_initfn(PCIDevice *dev) pci_config_set_class(pci_conf, PCI_CLASS_DISPLAY_OTHER); memory_region_init_io(&s->mmio_addr, OBJECT(s), &brightness_mmio_ops, s, - "maru_brightness_mmio", BRIGHTNESS_REG_SIZE); + "maru-brightness-mmio", BRIGHTNESS_REG_SIZE); pci_register_bar(&s->dev, 1, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->mmio_addr); bh = qemu_bh_new(maru_brightness_bh, s); @@ -201,7 +202,7 @@ static int brightness_initfn(PCIDevice *dev) level_color.green = 0x0000; level_color.blue = 0x0000; brightness_image = pixman_image_create_solid_fill(&level_color); - INFO("Init complete: Maru brightness\n"); + INFO("initialize maru-brightness device\n"); return 0; } diff --git a/tizen/src/hw/maru_camera_common_pci.c b/tizen/src/hw/maru_camera_common_pci.c index 4774e6f072..2845e26179 100644 --- a/tizen/src/hw/maru_camera_common_pci.c +++ b/tizen/src/hw/maru_camera_common_pci.c @@ -43,9 +43,9 @@ #include "maru_device_ids.h" #include "tizen/src/debug_ch.h" -MULTI_DEBUG_CHANNEL(tizen, camera_pci); +MULTI_DEBUG_CHANNEL(tizen, maru-camera); -#define MARU_PCI_CAMERA_DEVICE_NAME "maru_camera_pci" +#define MARU_PCI_CAMERA_DEVICE_NAME "maru-camera" #define MARUCAM_MEM_SIZE (4 * 1024 * 1024) /* 4MB */ #define MARUCAM_REG_SIZE (256) /* 64 * 4Byte */ @@ -240,7 +240,7 @@ static int marucam_initfn(PCIDevice *dev) s->tx_bh = qemu_bh_new(marucam_tx_bh, s); s->initialized = true; - INFO("[%s] camera device was initialized.\n", __func__); + INFO("initialize maru-camera device\n"); return 0; } @@ -263,7 +263,7 @@ static void marucam_exitfn(PCIDevice *pci_dev) memory_region_destroy(&s->mmio); } - INFO("[%s] camera device was released.\n", __func__); + INFO("finalize maru-camera device\n"); } static void marucam_resetfn(DeviceState *d) @@ -277,13 +277,12 @@ static void marucam_resetfn(DeviceState *d) qemu_mutex_unlock(&s->thread_mutex); memset(s->vaddr, 0, MARUCAM_MEM_SIZE); memset(s->param, 0x00, sizeof(MaruCamParam)); - TRACE("[%s] This device has been reset\n", __func__); + INFO("reset maru-camera device\n"); } } int maru_camera_pci_init(PCIBus *bus) { - INFO("[%s] camera device was initialized.\n", __func__); pci_create_simple(bus, -1, MARU_PCI_CAMERA_DEVICE_NAME); return 0; } diff --git a/tizen/src/hw/maru_camera_darwin_pci.m b/tizen/src/hw/maru_camera_darwin_pci.m index c057670734..bb7fa23081 100644 --- a/tizen/src/hw/maru_camera_darwin_pci.m +++ b/tizen/src/hw/maru_camera_darwin_pci.m @@ -38,7 +38,7 @@ #include "maru_camera_darwin.h" #include "tizen/src/debug_ch.h" -MULTI_DEBUG_CHANNEL(tizen, camera_darwin); +MULTI_DEBUG_CHANNEL(tizen, maru-camera); #define MARUCAM_THREAD_NAME "marucam_worker_thread" diff --git a/tizen/src/hw/maru_camera_linux_pci.c b/tizen/src/hw/maru_camera_linux_pci.c index abf98535a5..adcee1e2f3 100644 --- a/tizen/src/hw/maru_camera_linux_pci.c +++ b/tizen/src/hw/maru_camera_linux_pci.c @@ -41,7 +41,7 @@ #include #include -MULTI_DEBUG_CHANNEL(tizen, camera_linux); +MULTI_DEBUG_CHANNEL(tizen, maru-camera); #define MARUCAM_THREAD_NAME "marucam_worker_thread" diff --git a/tizen/src/hw/maru_camera_win32_pci.c b/tizen/src/hw/maru_camera_win32_pci.c index 63b5a0606f..10fb0f331d 100644 --- a/tizen/src/hw/maru_camera_win32_pci.c +++ b/tizen/src/hw/maru_camera_win32_pci.c @@ -39,7 +39,7 @@ #include "mmsystem.h" /* for MAKEFOURCC macro */ #include "maru_camera_win32_interface.h" -MULTI_DEBUG_CHANNEL(tizen, camera_win32); +MULTI_DEBUG_CHANNEL(tizen, maru-camera); /* * COM Interface implementations diff --git a/tizen/src/hw/maru_overlay.c b/tizen/src/hw/maru_overlay.c index 17afdc799b..b2d8563be0 100644 --- a/tizen/src/hw/maru_overlay.c +++ b/tizen/src/hw/maru_overlay.c @@ -36,9 +36,9 @@ #include "maru_overlay.h" #include "debug_ch.h" -MULTI_DEBUG_CHANNEL(qemu, maru_overlay); +MULTI_DEBUG_CHANNEL(tizen, maru-overlay); -#define QEMU_DEV_NAME "maru_overlay" +#define QEMU_DEV_NAME "maru-overlay" #define OVERLAY_MEM_SIZE (8192 * 1024) /* 4MB(overlay0) + 4MB(overlay1) */ #define OVERLAY_REG_SIZE 256 @@ -124,7 +124,7 @@ static void overlay_reg_write(void *opaque, switch (addr) { case OVERLAY_POWER: overlay0_power = val; - TRACE("SET => overlay0 power status(%d)\n", overlay0_power); + INFO("SET => overlay0 power status(%d)\n", overlay0_power); if (!overlay0_power) { /* clear the last overlay area. */ memset(overlay_ptr, 0x00, (OVERLAY_MEM_SIZE / 2)); @@ -156,7 +156,7 @@ static void overlay_reg_write(void *opaque, break; case OVERLAY1_REG_OFFSET + OVERLAY_POWER: overlay1_power = val; - TRACE("SET => overlay1 power status(%d)\n", overlay1_power); + INFO("SET => overlay1 power status(%d)\n", overlay1_power); if (!overlay1_power) { /* clear the last overlay area. */ memset(overlay_ptr + OVERLAY1_REG_OFFSET, @@ -208,12 +208,12 @@ 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, "maru_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, NULL, &overlay_mmio_ops, s, - "maru_overlay_mmio", + "maru-overlay-mmio", OVERLAY_REG_SIZE); /* setup memory space */ @@ -221,7 +221,7 @@ static int overlay_initfn(PCIDevice *dev) /* memory #1 memory-mapped I/O */ pci_register_bar(&s->dev, 0, PCI_BASE_ADDRESS_MEM_PREFETCH, &s->mem_addr); pci_register_bar(&s->dev, 1, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->mmio_addr); - INFO("<%s>\n", __func__); + INFO("initialize maru-overlay device\n"); return 0; } @@ -241,7 +241,7 @@ static void overlay_reset(DeviceState *d) pixman_image_unref(overlay1_image); overlay1_image = NULL; } - INFO("<%s>\n", __func__); + INFO("reset maru-overlay device\n"); } static void overlay_exitfn(PCIDevice *dev) @@ -250,7 +250,7 @@ static void overlay_exitfn(PCIDevice *dev) memory_region_destroy(&s->mem_addr); memory_region_destroy(&s->mmio_addr); - INFO("<%s>\n", __func__); + INFO("finalize maru-overlay device\n"); } static void overlay_classinit(ObjectClass *klass, void *data)