From: giwoong.kim Date: Wed, 22 Aug 2012 13:07:50 +0000 (+0900) Subject: [Title] modified usb touchscreen name X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~1444^2~89 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b8d570ef93dcf78723a1a5696aec9fdd9ea31107;p=sdk%2Femulator%2Fqemu.git [Title] modified usb touchscreen name [Type] feature [Module] Emualtor / touch [Priority] minor [Jira#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] --- diff --git a/tizen/src/hw/maru_usb_touchscreen.c b/tizen/src/hw/maru_usb_touchscreen.c index ea8c5701e0..9ab23e655b 100644 --- a/tizen/src/hw/maru_usb_touchscreen.c +++ b/tizen/src/hw/maru_usb_touchscreen.c @@ -1,5 +1,5 @@ /* - * Maru Virtual USB Touchscreen emulation. + * Maru USB Touchscreen Device * Based on hw/usb-wacom.c: * * Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved @@ -95,7 +95,7 @@ static int usb_touchscreen_poll(USBTouchscreenState *s, uint8_t *buf, int len) USBEmulTouchscreenPacket *packet = (USBEmulTouchscreenPacket *)buf; if (s->mouse_grabbed == 0) { - s->eh_entry = qemu_add_mouse_event_handler(usb_touchscreen_event, s, 1, "QEMU Virtual touchscreen"); + s->eh_entry = qemu_add_mouse_event_handler(usb_touchscreen_event, s, 1, "QEMU USB touchscreen"); qemu_activate_mouse_event_handler(s->eh_entry); s->mouse_grabbed = 1; } @@ -250,7 +250,7 @@ static int touchscreen_post_load(void *opaque, int version_id) pthread_mutex_unlock(&event_mutex); if (s->mouse_grabbed == 1) { - s->eh_entry = qemu_add_mouse_event_handler(usb_touchscreen_event, s, 1, "QEMU Virtual touchscreen"); + s->eh_entry = qemu_add_mouse_event_handler(usb_touchscreen_event, s, 1, "QEMU USB touchscreen"); qemu_activate_mouse_event_handler(s->eh_entry); } @@ -289,9 +289,9 @@ static VMStateDescription vmsd = { }; static struct USBDeviceInfo touchscreen_info = { - .product_desc = "QEMU Virtual Touchscreen", + .product_desc = "Maru USB Touchscreen", .qdev.name = "usb-maru-touchscreen", - .qdev.desc = "QEMU Virtual Touchscreen", + .qdev.desc = "Maru USB Touchscreen", .usbdevice_name = "maru-touchscreen", .usb_desc = &desc_touchscreen, .qdev.size = sizeof(USBTouchscreenState), diff --git a/tizen/src/hw/maru_usb_touchscreen.h b/tizen/src/hw/maru_usb_touchscreen.h index f1fcadecad..4e5eadcc74 100644 --- a/tizen/src/hw/maru_usb_touchscreen.h +++ b/tizen/src/hw/maru_usb_touchscreen.h @@ -1,5 +1,5 @@ /* - * Maru Virtual USB Touchscreen emulation. + * Maru USB Touchscreen Device * Based on hw/usb-wacom.c: * * Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved @@ -67,7 +67,7 @@ enum { static const USBDescStrings desc_strings = { [STR_MANUFACTURER] = "QEMU " QEMU_VERSION, - [STR_PRODUCT] = "Maru Virtual Touchscreen", + [STR_PRODUCT] = "Maru USB Touchscreen", [STR_SERIALNUMBER] = "1", }; diff --git a/tizen/src/hw/maru_virtio_touchscreen.c b/tizen/src/hw/maru_virtio_touchscreen.c index c79034be79..bab1d90751 100644 --- a/tizen/src/hw/maru_virtio_touchscreen.c +++ b/tizen/src/hw/maru_virtio_touchscreen.c @@ -1,5 +1,5 @@ /* - * Maru Virtual Virtio Touchscreen emulation + * Maru Virtio Touchscreen Device * * Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved *