From 66009d493b13978d68c47b5d6ade9e38bf62b6d4 Mon Sep 17 00:00:00 2001 From: sungmin ha Date: Mon, 31 Aug 2015 16:17:01 +0900 Subject: [PATCH] keyboard, tablet: modified device names to prevent duplication from qemu 2.4 Change-Id: I16e9a0ae6ea0bea39008b4de0b9bd15b2abf66a2 Signed-off-by: sungmin ha --- tizen/src/hw/maru_device_ids.h | 36 +++++++++++++-------------- tizen/src/hw/virtio/maru_virtio_keyboard.c | 8 +++--- tizen/src/hw/virtio/maru_virtio_keyboard.h | 6 ++--- tizen/src/hw/virtio/maru_virtio_pci.c | 40 +++++++++++++++--------------- tizen/src/hw/virtio/maru_virtio_tablet.c | 6 ++--- tizen/src/hw/virtio/maru_virtio_tablet.h | 6 ++--- tizen/src/util/device_hotplug.c | 2 +- 7 files changed, 52 insertions(+), 52 deletions(-) diff --git a/tizen/src/hw/maru_device_ids.h b/tizen/src/hw/maru_device_ids.h index 35fa05f..f15f0f7 100644 --- a/tizen/src/hw/maru_device_ids.h +++ b/tizen/src/hw/maru_device_ids.h @@ -43,23 +43,23 @@ /* PCI */ -#define PCI_VENDOR_ID_TIZEN 0xC9B5 -#define PCI_DEVICE_ID_VIRTUAL_BRIGHTNESS 0x1014 -#define PCI_DEVICE_ID_VIRTUAL_CAMERA 0x1018 -#define PCI_DEVICE_ID_VIRTUAL_CODEC 0x101C +#define PCI_VENDOR_ID_TIZEN 0xC9B5 +#define PCI_DEVICE_ID_VIRTUAL_BRIGHTNESS 0x1014 +#define PCI_DEVICE_ID_VIRTUAL_CAMERA 0x1018 +#define PCI_DEVICE_ID_VIRTUAL_CODEC 0x101C /* Device ID 0x1000 through 0x103F inclusive is a virtio device */ -#define PCI_DEVICE_ID_VIRTIO_TOUCHSCREEN 0x101D -#define PCI_DEVICE_ID_VIRTIO_KEYBOARD 0x1020 -#define PCI_DEVICE_ID_VIRTIO_ROTARY 0x1022 -#define PCI_DEVICE_ID_VIRTIO_ESM 0x1024 -#define PCI_DEVICE_ID_VIRTIO_HWKEY 0x1028 -#define PCI_DEVICE_ID_VIRTIO_TABLET 0x1029 -#define PCI_DEVICE_ID_VIRTIO_EVDI 0x102C -#define PCI_DEVICE_ID_VIRTIO_SENSOR 0x1034 -#define PCI_DEVICE_ID_VIRTIO_POWER 0x1035 -#define PCI_DEVICE_ID_VIRTIO_JACK 0x1036 -#define PCI_DEVICE_ID_VIRTIO_NFC 0x1038 -#define PCI_DEVICE_ID_VIRTIO_VMODEM 0x103C +#define PCI_DEVICE_ID_VIRTIO_TOUCHSCREEN 0x101D +#define PCI_DEVICE_ID_VIRTIO_MARU_KEYBOARD 0x1020 +#define PCI_DEVICE_ID_VIRTIO_ROTARY 0x1022 +#define PCI_DEVICE_ID_VIRTIO_ESM 0x1024 +#define PCI_DEVICE_ID_VIRTIO_HWKEY 0x1028 +#define PCI_DEVICE_ID_VIRTIO_MARU_TABLET 0x1029 +#define PCI_DEVICE_ID_VIRTIO_EVDI 0x102C +#define PCI_DEVICE_ID_VIRTIO_SENSOR 0x1034 +#define PCI_DEVICE_ID_VIRTIO_POWER 0x1035 +#define PCI_DEVICE_ID_VIRTIO_JACK 0x1036 +#define PCI_DEVICE_ID_VIRTIO_NFC 0x1038 +#define PCI_DEVICE_ID_VIRTIO_VMODEM 0x103C #define PCI_DEVICE_ID_VIRTUAL_BRILL_CODEC 0x1040 /* Virtio */ @@ -91,7 +91,7 @@ */ #define VIRTIO_ID_TOUCHSCREEN 31 -#define VIRTIO_ID_KEYBOARD 32 +#define VIRTIO_ID_MARU_KEYBOARD 32 #define VIRTIO_ID_ESM 33 #define VIRTIO_ID_HWKEY 34 #define VIRTIO_ID_EVDI 35 @@ -101,6 +101,6 @@ #define VIRTIO_ID_POWER 40 #define VIRTIO_ID_VMODEM 41 #define VIRTIO_ID_ROTARY 42 -#define VIRTIO_ID_TABLET 43 +#define VIRTIO_ID_MARU_TABLET 43 #endif /* MARU_DEVICE_IDS_H_ */ diff --git a/tizen/src/hw/virtio/maru_virtio_keyboard.c b/tizen/src/hw/virtio/maru_virtio_keyboard.c index e49447d..20c6ed5 100644 --- a/tizen/src/hw/virtio/maru_virtio_keyboard.c +++ b/tizen/src/hw/virtio/maru_virtio_keyboard.c @@ -330,7 +330,7 @@ static void virtio_keyboard_bh(void *opaque) static void virtio_keyboard_device_realize(DeviceState *dev, Error **errp) { VirtIODevice *vdev = VIRTIO_DEVICE(dev); - VirtIOKeyboard *vkbd = VIRTIO_KEYBOARD(vdev); + VirtIOKeyboard *vkbd = VIRTIO_MARU_KEYBOARD(vdev); INFO("initialize virtio-keyboard device\n"); @@ -339,7 +339,7 @@ static void virtio_keyboard_device_realize(DeviceState *dev, Error **errp) return; } - virtio_init(vdev, TYPE_VIRTIO_KEYBOARD, VIRTIO_ID_KEYBOARD, 0); + virtio_init(vdev, TYPE_VIRTIO_MARU_KEYBOARD, VIRTIO_ID_MARU_KEYBOARD, 0); memset(&vkbd->kbdqueue, 0x00, sizeof(vkbd->kbdqueue)); vkbd->extension_key = 0; @@ -381,7 +381,7 @@ static void virtio_keyboard_device_unrealize(DeviceState *dev, Error **errp) static void virtio_keyboard_device_reset(VirtIODevice *vdev) { VirtIOKeyboard *vkbd = curr->vkbd; - vkbd = VIRTIO_KEYBOARD(vdev); + vkbd = VIRTIO_MARU_KEYBOARD(vdev); INFO("reset keyboard device\n"); vkbd->kbdqueue.rptr = 0; @@ -398,7 +398,7 @@ static void virtio_keyboard_class_init(ObjectClass *klass, void *data) } static const TypeInfo virtio_keyboard_info = { - .name = TYPE_VIRTIO_KEYBOARD, + .name = TYPE_VIRTIO_MARU_KEYBOARD, .parent = TYPE_VIRTIO_DEVICE, .instance_size = sizeof(VirtIOKeyboard), .class_init = virtio_keyboard_class_init, diff --git a/tizen/src/hw/virtio/maru_virtio_keyboard.h b/tizen/src/hw/virtio/maru_virtio_keyboard.h index c78075e..a4d016e 100644 --- a/tizen/src/hw/virtio/maru_virtio_keyboard.h +++ b/tizen/src/hw/virtio/maru_virtio_keyboard.h @@ -38,9 +38,9 @@ extern "C" { #include "qemu/thread.h" #include "hw/virtio/virtio.h" -#define TYPE_VIRTIO_KEYBOARD "virtio-keyboard-device" -#define VIRTIO_KEYBOARD(obj) \ - OBJECT_CHECK(VirtIOKeyboard, (obj), TYPE_VIRTIO_KEYBOARD) +#define TYPE_VIRTIO_MARU_KEYBOARD "virtio-maru-keyboard-device" +#define VIRTIO_MARU_KEYBOARD(obj) \ + OBJECT_CHECK(VirtIOKeyboard, (obj), TYPE_VIRTIO_MARU_KEYBOARD) #define VIRTIO_KBD_QUEUE_SIZE 100 typedef struct EmulKbdEvent { diff --git a/tizen/src/hw/virtio/maru_virtio_pci.c b/tizen/src/hw/virtio/maru_virtio_pci.c index 1443761..630da3d 100644 --- a/tizen/src/hw/virtio/maru_virtio_pci.c +++ b/tizen/src/hw/virtio/maru_virtio_pci.c @@ -69,11 +69,11 @@ struct VirtIOTouchscreenPCI { }; /* - * virtio-keyboard-pci: This extends VirtioPCIProxy. + * virtio-maru-keyboard-pci: This extends VirtioPCIProxy. */ -#define TYPE_VIRTIO_KEYBOARD_PCI "virtio-keyboard-pci" -#define VIRTIO_KEYBOARD_PCI(obj) \ - OBJECT_CHECK(VirtIOKeyboardPCI, (obj), TYPE_VIRTIO_KEYBOARD_PCI) +#define TYPE_VIRTIO_MARU_KEYBOARD_PCI "virtio-maru-keyboard-pci" +#define VIRTIO_MARU_KEYBOARD_PCI(obj) \ + OBJECT_CHECK(VirtIOKeyboardPCI, (obj), TYPE_VIRTIO_MARU_KEYBOARD_PCI) struct VirtIOKeyboardPCI { VirtIOPCIProxy parent_obj; @@ -115,11 +115,11 @@ struct VirtIOHWKeyPCI { }; /* - * virtio-tablet-pci: This extends VirtioPCIProxy. + * virtio-maru-tablet-pci: This extends VirtioPCIProxy. */ -#define TYPE_VIRTIO_TABLET_PCI "virtio-tablet-pci" -#define VIRTIO_TABLET_PCI(obj) \ - OBJECT_CHECK(VirtIOTabletPCI, (obj), TYPE_VIRTIO_TABLET_PCI) +#define TYPE_VIRTIO_MARU_TABLET_PCI "virtio-maru-tablet-pci" +#define VIRTIO_MARU_TABLET_PCI(obj) \ + OBJECT_CHECK(VirtIOTabletPCI, (obj), TYPE_VIRTIO_MARU_TABLET_PCI) struct VirtIOTabletPCI { VirtIOPCIProxy parent_obj; VirtIOTablet vdev; @@ -242,11 +242,11 @@ static TypeInfo virtio_touchscreen_pci_info = { .class_init = virtio_touchscreen_pci_class_init, }; -/* virtio-keyboard-pci */ +/* virtio-maru-keyboard-pci */ static void virtio_keyboard_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) { - VirtIOKeyboardPCI *dev = VIRTIO_KEYBOARD_PCI(vpci_dev); + VirtIOKeyboardPCI *dev = VIRTIO_MARU_KEYBOARD_PCI(vpci_dev); DeviceState *vdev = DEVICE(&dev->vdev); qdev_set_parent_bus(vdev, BUS(&vpci_dev->bus)); @@ -260,20 +260,20 @@ static void virtio_keyboard_pci_class_init(ObjectClass *klass, void *data) k->realize = virtio_keyboard_pci_realize; pcidev_k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET; - pcidev_k->device_id = PCI_DEVICE_ID_VIRTIO_KEYBOARD; + pcidev_k->device_id = PCI_DEVICE_ID_VIRTIO_MARU_KEYBOARD; pcidev_k->revision = VIRTIO_PCI_ABI_VERSION; pcidev_k->class_id = PCI_CLASS_OTHERS; } static void virtio_keyboard_pci_instance_init(Object *obj) { - VirtIOKeyboardPCI *dev = VIRTIO_KEYBOARD_PCI(obj); + VirtIOKeyboardPCI *dev = VIRTIO_MARU_KEYBOARD_PCI(obj); virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev), - TYPE_VIRTIO_KEYBOARD); + TYPE_VIRTIO_MARU_KEYBOARD); } static TypeInfo virtio_keyboard_pci_info = { - .name = TYPE_VIRTIO_KEYBOARD_PCI, + .name = TYPE_VIRTIO_MARU_KEYBOARD_PCI, .parent = TYPE_VIRTIO_PCI, .instance_size = sizeof(VirtIOKeyboardPCI), .instance_init = virtio_keyboard_pci_instance_init, @@ -356,11 +356,11 @@ static TypeInfo virtio_hwkey_pci_info = { .class_init = virtio_hwkey_pci_class_init, }; -/* virtio-tablet-pci */ +/* virtio-maru-tablet-pci */ static void virtio_tablet_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) { - VirtIOTabletPCI *dev = VIRTIO_TABLET_PCI(vpci_dev); + VirtIOTabletPCI *dev = VIRTIO_MARU_TABLET_PCI(vpci_dev); DeviceState *vdev = DEVICE(&dev->vdev); qdev_set_parent_bus(vdev, BUS(&vpci_dev->bus)); @@ -374,20 +374,20 @@ static void virtio_tablet_pci_class_init(ObjectClass *klass, void *data) k->realize = virtio_tablet_pci_realize; pcidev_k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET; - pcidev_k->device_id = PCI_DEVICE_ID_VIRTIO_TABLET; + pcidev_k->device_id = PCI_DEVICE_ID_VIRTIO_MARU_TABLET; pcidev_k->revision = VIRTIO_PCI_ABI_VERSION; pcidev_k->class_id = PCI_CLASS_OTHERS; } static void virtio_tablet_pci_instance_init(Object *obj) { - VirtIOTabletPCI *dev = VIRTIO_TABLET_PCI(obj); + VirtIOTabletPCI *dev = VIRTIO_MARU_TABLET_PCI(obj); virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev), - TYPE_VIRTIO_TABLET); + TYPE_VIRTIO_MARU_TABLET); } static TypeInfo virtio_tablet_pci_info = { - .name = TYPE_VIRTIO_TABLET_PCI, + .name = TYPE_VIRTIO_MARU_TABLET_PCI, .parent = TYPE_VIRTIO_PCI, .instance_size = sizeof(VirtIOTabletPCI), .instance_init = virtio_tablet_pci_instance_init, diff --git a/tizen/src/hw/virtio/maru_virtio_tablet.c b/tizen/src/hw/virtio/maru_virtio_tablet.c index 6db6053..4217bae 100644 --- a/tizen/src/hw/virtio/maru_virtio_tablet.c +++ b/tizen/src/hw/virtio/maru_virtio_tablet.c @@ -195,14 +195,14 @@ static void virtio_tablet_device_realize(DeviceState *dev, Error **errp) { INFO("initialize the tablet device\n"); VirtIODevice *vdev = VIRTIO_DEVICE(dev); - vtk = VIRTIO_TABLET(dev); + vtk = VIRTIO_MARU_TABLET(dev); if (vdev == NULL) { ERR("failed to initialize the tablet device\n"); return; } - virtio_init(vdev, TYPE_VIRTIO_TABLET, VIRTIO_ID_TABLET, 0); + virtio_init(vdev, TYPE_VIRTIO_MARU_TABLET, VIRTIO_ID_MARU_TABLET, 0); vtk->vq = virtio_add_queue(vdev, MAX_BUF_COUNT, maru_virtio_tablet_handle); @@ -250,7 +250,7 @@ static void virtio_tablet_class_init(ObjectClass *klass, void *data) } static const TypeInfo virtio_tablet_info = { - .name = TYPE_VIRTIO_TABLET, + .name = TYPE_VIRTIO_MARU_TABLET, .parent = TYPE_VIRTIO_DEVICE, .instance_size = sizeof(VirtIOTablet), .class_init = virtio_tablet_class_init, diff --git a/tizen/src/hw/virtio/maru_virtio_tablet.h b/tizen/src/hw/virtio/maru_virtio_tablet.h index 2b35527..069582e 100644 --- a/tizen/src/hw/virtio/maru_virtio_tablet.h +++ b/tizen/src/hw/virtio/maru_virtio_tablet.h @@ -32,9 +32,9 @@ #include "ui/console.h" #include "hw/virtio/virtio.h" -#define TYPE_VIRTIO_TABLET "virtio-tablet-device" -#define VIRTIO_TABLET(obj) \ - OBJECT_CHECK(VirtIOTablet, (obj), TYPE_VIRTIO_TABLET) +#define TYPE_VIRTIO_MARU_TABLET "virtio-maru-tablet-device" +#define VIRTIO_MARU_TABLET(obj) \ + OBJECT_CHECK(VirtIOTablet, (obj), TYPE_VIRTIO_MARU_TABLET) typedef struct VirtIOTablet { diff --git a/tizen/src/util/device_hotplug.c b/tizen/src/util/device_hotplug.c index f7161ab..926023c 100644 --- a/tizen/src/util/device_hotplug.c +++ b/tizen/src/util/device_hotplug.c @@ -38,7 +38,7 @@ #include "hds.h" #include "ecs/ecs_sdcard.h" -#define HOST_KEYBOARD_DRIVER "virtio-keyboard-pci" +#define HOST_KEYBOARD_DRIVER "virtio-maru-keyboard-pci" #define HOST_KEYBOARD_DEFAULT_ID "HOSTKBD0" #define FS_MOUNT_TAG "fileshare" -- 2.7.4