maru_camera: Modified camera sources

Add thread names and remove a wrong property.

Change-Id: I4c2ccde03980db5351d42e7b976809ac426c5375
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 0c40ffe..aa7a1f9 100644 (file)
--- a/tizen/src/hw/maru_camera_common_pci.c
+++ b/tizen/src/hw/maru_camera_common_pci.c
@@ -278,7 +278,6 @@ static void maru_camera_pci_class_init(ObjectClass *klass, void *data)
     DeviceClass *dc = DEVICE_CLASS(klass);
     PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
 
-    k->no_hotplug = 1;
     k->init = marucam_initfn;
     k->exit = marucam_exitfn;
     k->vendor_id = PCI_VENDOR_ID_TIZEN;

diff --git a/tizen/src/hw/maru_camera_darwin_pci.m b/tizen/src/hw/maru_camera_darwin_pci.m
index 7de11b1..c057670 100644 (file)
--- a/tizen/src/hw/maru_camera_darwin_pci.m
+++ b/tizen/src/hw/maru_camera_darwin_pci.m
@@ -40,6 +40,8 @@
 
 MULTI_DEBUG_CHANNEL(tizen, camera_darwin);
 
+#define MARUCAM_THREAD_NAME    "marucam_worker_thread"
+
 /* V4L2 defines copy from videodev2.h */
 #define V4L2_CTRL_FLAG_SLIDER       0x0020
 
@@ -526,13 +528,15 @@ int marucam_device_check(int log_flag)
 /**********************************************
  * MARU camera routines
  **********************************************/
-
 void marucam_device_init(MaruCamState *state)
 {
     g_state = state;
     g_state->destroying = false;
-    qemu_thread_create(&state->thread_id, marucam_worker_thread,
-                       NULL, QEMU_THREAD_JOINABLE);
+    qemu_thread_create(&state->thread_id,
+                       MARUCAM_THREAD_NAME,
+                       marucam_worker_thread,
+                       NULL,
+                       QEMU_THREAD_JOINABLE);
 }
 
 void marucam_device_exit(MaruCamState *state)

diff --git a/tizen/src/hw/maru_camera_linux_pci.c b/tizen/src/hw/maru_camera_linux_pci.c
index 9629212..abf9853 100644 (file)
--- a/tizen/src/hw/maru_camera_linux_pci.c
+++ b/tizen/src/hw/maru_camera_linux_pci.c
@@ -43,6 +43,8 @@
 
 MULTI_DEBUG_CHANNEL(tizen, camera_linux);
 
+#define MARUCAM_THREAD_NAME    "marucam_worker_thread"
+
 #define CLEAR(x) memset(&(x), 0, sizeof(x))
 
 #define MARUCAM_DEFAULT_BUFFER_COUNT    4
@@ -815,8 +817,11 @@ int marucam_device_check(int log_flag)
 void marucam_device_init(MaruCamState *state)
 {
     state->destroying = false;
-    qemu_thread_create(&state->thread_id, marucam_worker_thread, (void *)state,
-            QEMU_THREAD_JOINABLE);
+    qemu_thread_create(&state->thread_id,
+                       MARUCAM_THREAD_NAME,
+                       marucam_worker_thread,
+                       (void *)state,
+                       QEMU_THREAD_JOINABLE);
 }
 
 void marucam_device_exit(MaruCamState *state)