[Title] convert maru_pci_ids.h to maru_device_ids.h

[Type] enhancement
[Module] Emulator
[Priority] major
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

diff --git a/hw/vga-pci.c b/hw/vga-pci.c
index 6dbde6c..0e509ff 100644 (file)
--- a/hw/vga-pci.c
+++ b/hw/vga-pci.c
@@ -30,7 +30,7 @@
 #include "qemu-timer.h"
 #include "loader.h"
 #ifdef CONFIG_MARU
-#include "../tizen/src/hw/maru_pci_ids.h"
+#include "../tizen/src/hw/maru_device_ids.h"
 #include "../tizen/src/hw/maru_vga_int.h"
 #endif
 

diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
index f859f79..8645edd 100644 (file)
--- a/hw/virtio-pci.c
+++ b/hw/virtio-pci.c
@@ -30,7 +30,7 @@
 #include "virtio-pci.h"
 #include "range.h"
 #ifdef CONFIG_MARU
-#include "../tizen/src/hw/maru_pci_ids.h"
+#include "../tizen/src/hw/maru_device_ids.h"
 #endif
 
 /* from Linux's linux/virtio_pci.h */
@@ -933,7 +933,7 @@ static PCIDeviceInfo virtio_info[] = {
         .init      = maru_virtio_touchscreen_init_pci,
         .exit      = maru_virtio_touchscreen_exit_pci,
         .vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET,
-        .device_id = PCI_DEVICE_ID_VIRTUAL_TOUCHSCREEN,
+        .device_id = PCI_DEVICE_ID_VIRTIO_TOUCHSCREEN,
         .revision  = VIRTIO_PCI_ABI_VERSION,
         .class_id  = PCI_CLASS_OTHERS,
         .qdev.props = (Property[]) {

diff --git a/tizen/src/hw/maru_brightness.c b/tizen/src/hw/maru_brightness.c
index a7d1fe1..4403eaa 100644 (file)
--- a/tizen/src/hw/maru_brightness.c
+++ b/tizen/src/hw/maru_brightness.c
@@ -39,7 +39,7 @@
 
 #include "pc.h"
 #include "pci.h"
-#include "maru_pci_ids.h"
+#include "maru_device_ids.h"
 #include "maru_brightness.h"
 #include "debug_ch.h"
 

diff --git a/tizen/src/hw/maru_camera_common_pci.c b/tizen/src/hw/maru_camera_common_pci.c
index 75766e9..95dfd49 100644 (file)
--- a/tizen/src/hw/maru_camera_common_pci.c
+++ b/tizen/src/hw/maru_camera_common_pci.c
@@ -39,7 +39,7 @@
 \r
 #include "pci.h"\r
 #include "pci_ids.h"\r
-#include "maru_pci_ids.h"\r
+#include "maru_device_ids.h"\r
 \r
 #include "maru_camera_common.h"\r
 #include "tizen/src/debug_ch.h"\r

diff --git a/tizen/src/hw/maru_codec.h b/tizen/src/hw/maru_codec.h
index 9b8155f..5713071 100644 (file)
--- a/tizen/src/hw/maru_codec.h
+++ b/tizen/src/hw/maru_codec.h
@@ -36,7 +36,7 @@
 #include "pci_ids.h"
 #include "qemu-thread.h"
 #include "tizen/src/debug_ch.h"
-#include "maru_pci_ids.h"
+#include "maru_device_ids.h"
 
 #include <libavformat/avformat.h>
 

diff --git a/tizen/src/hw/maru_pci_ids.h b/tizen/src/hw/maru_device_ids.h
similarity index 90%
rename from tizen/src/hw/maru_pci_ids.h
rename to tizen/src/hw/maru_device_ids.h
index 97bd386..46b81d8 100644 (file)
--- a/tizen/src/hw/maru_pci_ids.h
+++ b/tizen/src/hw/maru_device_ids.h
@@ -1,5 +1,5 @@
 /*
- * Maru PCI device id
+ * Maru Device IDs
  *
  * Copyright (C) 2011 - 2012 Samsung Electronics Co., Ltd. All rights reserved.
  *
@@ -37,17 +37,20 @@
  */
 
 
-#ifndef MARU_PCI_IDS_H_
-#define MARU_PCI_IDS_H_
+#ifndef MARU_DEVICE_IDS_H_
+#define MARU_DEVICE_IDS_H_
 
+
+/* PCI */
 #define PCI_VENDOR_ID_TIZEN              0xC9B5
 #define PCI_DEVICE_ID_VIRTUAL_OVERLAY    0x1010
 #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_TOUCHSCREEN 0x101D
-
+#define PCI_DEVICE_ID_VIRTIO_TOUCHSCREEN 0x101D
 
+/* virtio */
 #define VIRTIO_ID_TOUCHSCREEN 10
 
-#endif /* MARU_PCI_IDS_H_ */
+
+#endif /* MARU_DEVICE_IDS_H_ */

diff --git a/tizen/src/hw/maru_overlay.c b/tizen/src/hw/maru_overlay.c
index 3fe013b..438bc91 100644 (file)
--- a/tizen/src/hw/maru_overlay.c
+++ b/tizen/src/hw/maru_overlay.c
@@ -37,7 +37,7 @@
  */
 #include "pc.h"
 #include "pci.h"
-#include "maru_pci_ids.h"
+#include "maru_device_ids.h"
 #include "maru_overlay.h"
 #include "debug_ch.h"
 

diff --git a/tizen/src/hw/maru_virtio_touchscreen.c b/tizen/src/hw/maru_virtio_touchscreen.c
index f80d30a..cc8981f 100644 (file)
--- a/tizen/src/hw/maru_virtio_touchscreen.c
+++ b/tizen/src/hw/maru_virtio_touchscreen.c
@@ -29,7 +29,7 @@
 
 #include <pthread.h>
 #include "maru_virtio_touchscreen.h"
-#include "maru_pci_ids.h"
+#include "maru_device_ids.h"
 #include "debug_ch.h"
 
 MULTI_DEBUG_CHANNEL(qemu, touchscreen);