[Title] device init & fixed build error

[Type] Bugfix
[Module] Camera
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

diff --git a/tizen/src/Makefile.tizen b/tizen/src/Makefile.tizen
index a93e9e7..f9fdec0 100644 (file)
--- a/tizen/src/Makefile.tizen
+++ b/tizen/src/Makefile.tizen
@@ -27,6 +27,14 @@ obj-i386-y += maru_pm.o
 obj-i386-y += maru_vga.o
 obj-i386-y += maru_brightness.o
 obj-i386-y += maru_touchscreen.o
+obj-i386-$(CONFIG_PCI) += maru_camera_common_pci.o
+obj-i386-$(CONFIG_LINUX) += maru_camera_linux_pci.o
+obj-i386-$(CONFIG_WIN32) += maru_camera_win32_pci.o
+# libs for maru camera on linux host
+ifdef CONFIG_LINUX
+LIBS += -lv4l2 -lv4lconvert
+endif
+
 
 # maru skin
 obj-i386-y += maruskin_client.o maruskin_server.o maruskin_operation.o

diff --git a/tizen/src/hw/maru_board.c b/tizen/src/hw/maru_board.c
index 2d20f56..85e57b1 100644 (file)
--- a/tizen/src/hw/maru_board.c
+++ b/tizen/src/hw/maru_board.c
@@ -253,7 +253,7 @@ static void maru_x86_machine_init(MemoryRegion *system_memory,
 
 // maru specialized device init...
     if (pci_enabled) {
-       //svcamera_pci_init(pci_bus);
+               maru_camera_pci_init(pci_bus);
        //tizen_ac97_init(pci_bus);
                codec_init(pci_bus);        
     }

diff --git a/tizen/src/hw/maru_camera_common_pci.c b/tizen/src/hw/maru_camera_common_pci.c
index 1a59636..f6eccd0 100644 (file)
--- a/tizen/src/hw/maru_camera_common_pci.c
+++ b/tizen/src/hw/maru_camera_common_pci.c
@@ -37,9 +37,9 @@
 #include "qemu-common.h"
 #include "cpu-common.h"
 
-#include "pc.h"
 #include "pci.h"
 #include "pci_ids.h"
+#include "maru_pci_ids.h"
 
 #include "maru_camera_common.h"
 #include "tizen/src/debug_ch.h"
@@ -86,7 +86,7 @@ static inline uint32_t marucam_mmio_read(void *opaque, target_phys_addr_t offset
                ret = state->thread->param->errCode;
                state->thread->param->errCode = 0;
                break;
-       ldefault:
+       default:
                WARN("Not supported command!!\n");
                break;
        }
@@ -214,7 +214,7 @@ static int marucam_initfn(PCIDevice *dev)
 /*
  *  Termination function
  */
-static int marucam_exitfn(PCIBus *bus)
+static int marucam_exitfn(PCIDevice *dev)
 {
        MaruCamState *s = DO_UPCAST(MaruCamState, dev, dev);
 
@@ -242,7 +242,7 @@ static PCIDeviceInfo maru_camera_info = {
     .exit         = marucam_exitfn,
     .vendor_id    = PCI_VENDOR_ID_TIZEN,
     .device_id    = PCI_DEVICE_ID_VIRTUAL_CAMERA,
-    .class_id     = PCI_CLASS_MULTIMEDIA_OTHER,
+    .class_id     = PCI_CLASS_OTHERS,
 };
 
 static void maru_camera_pci_register(void)