[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 6dbde6c02974e6983201489074f19c59ebd52cc8..0e509ff67bd4800f0faa4bbf476d4963bac425b3 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 f859f797dd335cc9074f465d0b8275581e0c0d91..8645eddcb4d408f1157cb8ff09589588cc1de597 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 a7d1fe19ecdc1a2d93587d644a0c21e4c94aa49d..4403eaa82f5f35355b7dcba131d0f0bebc163a3b 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 75766e9396be1441f8a81f90e7c0210ac853cb44..95dfd49ce54b4cffbe5c1c66a3077b93b4cb79eb 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 9b8155fa04cfff132fdddf6233e1298edd74d50f..57130719f0c793d34d8a75b5b2991baa04dd1dd1 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_device_ids.h b/tizen/src/hw/maru_device_ids.h
new file mode 100644 (file)
index 0000000..46b81d8
--- /dev/null
+++ b/tizen/src/hw/maru_device_ids.h
@@ -0,0 +1,56 @@
+/*
+ * Maru Device IDs
+ *
+ * Copyright (C) 2011 - 2012 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Contact:
+ * DoHyung Hong <don.hong@samsung.com>
+ * SeokYeon Hwang <syeon.hwang@samsung.com>
+ * Hyunjun Son <hj79.son@samsung.com>
+ * SangJin Kim <sangjin3.kim@samsung.com>
+ * MunKyu Im <munkyu.im@samsung.com>
+ * KiTae Kim <kt920.kim@samsung.com>
+ * JinHyung Jo <jinhyung.jo@samsung.com>
+ * SungMin Ha <sungmin82.ha@samsung.com>
+ * JiHye Kim <jihye1128.kim@samsung.com>
+ * GiWoong Kim <giwoong.kim@samsung.com>
+ * YeongKyoon Lee <yeongkyoon.lee@samsung.com>
+ * DongKyun Yun <dk77.yun@samsung.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Contributors:
+ * - S-Core Co., Ltd
+ *
+ */
+
+
+#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_VIRTIO_TOUCHSCREEN 0x101D
+
+/* virtio */
+#define VIRTIO_ID_TOUCHSCREEN 10
+
+
+#endif /* MARU_DEVICE_IDS_H_ */

diff --git a/tizen/src/hw/maru_overlay.c b/tizen/src/hw/maru_overlay.c
index 3fe013bc420f2d43038222121f5c0de85ee0212d..438bc91a82d807ac7937e57a6300b0d56da1d5f4 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_pci_ids.h b/tizen/src/hw/maru_pci_ids.h
deleted file mode 100644 (file)
index 97bd386..0000000
--- a/tizen/src/hw/maru_pci_ids.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Maru PCI device id
- *
- * Copyright (C) 2011 - 2012 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact:
- * DoHyung Hong <don.hong@samsung.com>
- * SeokYeon Hwang <syeon.hwang@samsung.com>
- * Hyunjun Son <hj79.son@samsung.com>
- * SangJin Kim <sangjin3.kim@samsung.com>
- * MunKyu Im <munkyu.im@samsung.com>
- * KiTae Kim <kt920.kim@samsung.com>
- * JinHyung Jo <jinhyung.jo@samsung.com>
- * SungMin Ha <sungmin82.ha@samsung.com>
- * JiHye Kim <jihye1128.kim@samsung.com>
- * GiWoong Kim <giwoong.kim@samsung.com>
- * YeongKyoon Lee <yeongkyoon.lee@samsung.com>
- * DongKyun Yun <dk77.yun@samsung.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * Contributors:
- * - S-Core Co., Ltd
- *
- */
-
-
-#ifndef MARU_PCI_IDS_H_
-#define MARU_PCI_IDS_H_
-
-#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 VIRTIO_ID_TOUCHSCREEN 10
-
-#endif /* MARU_PCI_IDS_H_ */

diff --git a/tizen/src/hw/maru_virtio_touchscreen.c b/tizen/src/hw/maru_virtio_touchscreen.c
index f80d30aa1b60bb9566f9005fe95853f301a78a48..cc8981fb84f4aaec7788524e31addbb52290bb4f 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);