Merging : merge the maru_camera files

Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>

diff --git a/tizen/src/hw/maru_camera_common_pci.c b/tizen/src/hw/maru_camera_common_pci.c
index 1dd20cc9c13567c155ffc87dbf8dc90a27791cef..a741492a1b4a987286f51efe306f66f763285abc 100644 (file)
--- a/tizen/src/hw/maru_camera_common_pci.c
+++ b/tizen/src/hw/maru_camera_common_pci.c
@@ -36,13 +36,10 @@
 #include <signal.h>
 
 #include "qemu-common.h"
-#include "cpu-common.h"
-
-#include "pci.h"
-#include "pci_ids.h"
-#include "maru_device_ids.h"
+#include "exec/cpu-common.h"
 
 #include "maru_camera_common.h"
+#include "maru_device_ids.h"
 #include "tizen/src/debug_ch.h"
 
 MULTI_DEBUG_CHANNEL(tizen, camera_pci);
@@ -56,7 +53,7 @@ MULTI_DEBUG_CHANNEL(tizen, camera_pci);
  *  I/O functions
  */
 static inline uint32_t
-marucam_mmio_read(void *opaque, target_phys_addr_t offset)
+marucam_mmio_read(void *opaque, hwaddr offset)
 {
     uint32_t ret = 0;
     MaruCamState *state = (MaruCamState *)opaque;
@@ -101,7 +98,7 @@ marucam_mmio_read(void *opaque, target_phys_addr_t offset)
 }
 
 static inline void
-marucam_mmio_write(void *opaque, target_phys_addr_t offset, uint32_t value)
+marucam_mmio_write(void *opaque, hwaddr offset, uint32_t value)
 {
     MaruCamState *state = (MaruCamState *)opaque;
 

diff --git a/tizen/src/hw/maru_camera_darwin_pci.m b/tizen/src/hw/maru_camera_darwin_pci.m
index d8d3a2f5da832387f540fe5a4d1cc1f137779986..b9c2530190f63d10a4dc897acdef2b8bb7051b7f 100644 (file)
--- a/tizen/src/hw/maru_camera_darwin_pci.m
+++ b/tizen/src/hw/maru_camera_darwin_pci.m
@@ -36,7 +36,6 @@
 #include "qemu-common.h"
 #include "maru_camera_common.h"
 #include "maru_camera_darwin.h"
-#include "pci.h"
 #include "tizen/src/debug_ch.h"
 
 MULTI_DEBUG_CHANNEL(tizen, camera_darwin);

diff --git a/tizen/src/hw/maru_camera_linux_pci.c b/tizen/src/hw/maru_camera_linux_pci.c
index 08cba88089c6805823cac28a127ffb6be1fd68a2..a990abe0af43b1fc9d02e676293d614335ddb762 100644 (file)
--- a/tizen/src/hw/maru_camera_linux_pci.c
+++ b/tizen/src/hw/maru_camera_linux_pci.c
@@ -28,9 +28,8 @@
  */
 
 #include "qemu-common.h"
+#include "sysemu/kvm.h"
 #include "maru_camera_common.h"
-#include "pci.h"
-#include "kvm.h"
 #include "tizen/src/debug_ch.h"
 
 #include <linux/videodev2.h>