Fixed camera issue of no default dispaly

Change-Id: If36954c6e96e77087adea62402a935c56720b5b9
Signed-off-by: varinder.p <varinder.p@samsung.com>

diff --git a/tizen/src/ecs/ecs_mon.c b/tizen/src/ecs/ecs_mon.c
index 42474b97a14154ecc544d2f574b1b8766aed2cd4..cb1f132f2414bf9be7f362f5209e39172e7de9f3 100644 (file)
--- a/tizen/src/ecs/ecs_mon.c
+++ b/tizen/src/ecs/ecs_mon.c
@@ -181,7 +181,6 @@ static QDict *qmp_check_input_obj(QObject *input_obj, Error **errp)
 
     input_dict =  qobject_to(QDict, input_obj);   
 
-
     for (ent = qdict_first(input_dict); ent;
             ent = qdict_next(input_dict, ent)) {
         const char *arg_name = qdict_entry_key(ent);
@@ -328,7 +327,7 @@ out_err:
 
 bool msgproc_monitor_req(ECS_Client *ccli, ECS__MonitorReq *msg)
 {
-    TRACE(">> monitor req: data = %s\n", msg->command);
+    LOG_INFO(">> monitor req: data = %s\n", msg->command);
     json_message_parser_feed(&(ccli->parser), (const char *) msg->command, strlen(msg->command));
     return true;
 }

diff --git a/tizen/src/hw/pci/maru_camera.c b/tizen/src/hw/pci/maru_camera.c
index d992216e37d804a777f516978838d01ff10028f3..68bd219aa3af3dbb2ba984960cf7ae5ab07e4402 100644 (file)
--- a/tizen/src/hw/pci/maru_camera.c
+++ b/tizen/src/hw/pci/maru_camera.c
@@ -50,6 +50,8 @@ MULTI_DEBUG_CHANNEL(tizen, camera);
 
 #define MARU_PCI_CAMERA_DEVICE_NAME     "maru-camera"
 
+#define MARU_PCI_CAMERA_DEVICE(obj) OBJECT_CHECK(MaruCamState, (obj), MARU_PCI_CAMERA_DEVICE_NAME)
+
 /* PCI region size must be pow2.               */
 /* set to 1024(2^10) * 1024(2^10) * 4(2^2) = 4,194,304(2^22) */
 #define MARUCAM_MEM_SIZE      (1 << 22)
@@ -60,13 +62,15 @@ MULTI_DEBUG_CHANNEL(tizen, camera);
 /*
  *  I/O functions
  */
-static inline uint32_t
-marucam_mmio_read(void *opaque, hwaddr offset)
+static inline uint64_t
+marucam_mmio_read(void *opaque,
+                     hwaddr addr,
+                     unsigned size)
 {
-    uint32_t ret = 0;
+    uint64_t ret = 0;
     MaruCamState *state = (MaruCamState *)opaque;
 
-    switch (offset & 0xFF) {
+    switch (addr) {
     /* Passes the index into the kernel driver */
     case MARUCAM_CMD_INIT:
         ret = state->index;
@@ -104,15 +108,18 @@ marucam_mmio_read(void *opaque, hwaddr offset)
         ret = state->req_frame - 1;
         qemu_mutex_unlock(&state->thread_mutex);
     default:
-        ERR("Not supported command: 0x%x\n", offset);
+        ERR("Not supported command: 0x%x\n", addr);
         ret = EINVAL;
         break;
     }
     return ret;
 }
 
-static inline void
-marucam_mmio_write(void *opaque, hwaddr offset, uint32_t value)
+static void
+marucam_mmio_write(void *opaque,
+                  hwaddr addr,
+                  uint64_t value,
+                  unsigned size)
 {
     MaruCamState *state = (MaruCamState *)opaque;
 
@@ -123,7 +130,7 @@ marucam_mmio_write(void *opaque, hwaddr offset, uint32_t value)
     }
 
     state->ret_val = 0;
-    switch (offset & 0xFF) {
+    switch (addr) {
     case MARUCAM_CMD_OPEN:
         state->backend->open(state);
         break;
@@ -176,22 +183,13 @@ marucam_mmio_write(void *opaque, hwaddr offset, uint32_t value)
         qemu_mutex_unlock(&state->thread_mutex);
         break;
     default:
-        ERR("Not supported command: 0x%x\n", offset);
+        ERR("Not supported command: 0x%x\n", addr);
         break;
     }
 }
-static uint64_t marucam_readfn(void *opaque, hwaddr addr,
-                                   unsigned size) {
-    return marucam_mmio_read(opaque, addr);
-}
-
-static void marucam_writefn(void *opaque, hwaddr addr,
-                                uint64_t value, unsigned size) {
-    marucam_mmio_write(opaque, addr,size);
-}
 static const MemoryRegionOps maru_camera_mmio_ops = {
-    .read = marucam_readfn,
-    .write = marucam_writefn,
+    .read = marucam_mmio_read,
+    .write = marucam_mmio_write,
     .endianness = DEVICE_LITTLE_ENDIAN,
 };
 
@@ -215,7 +213,7 @@ static void marucam_tx_bh(void *opaque)
 
 static void marucam_initfn(PCIDevice *dev, Error **errp)
 {
-    MaruCamState *s = DO_UPCAST(MaruCamState, dev, dev);
+    MaruCamState *s = MARU_PCI_CAMERA_DEVICE(dev);
     uint8_t *pci_conf = s->dev.config;
     static bool is_used_index[2];
     static bool has_native;
@@ -304,8 +302,7 @@ static void marucam_initfn(PCIDevice *dev, Error **errp)
  */
 static void marucam_exitfn(PCIDevice *pci_dev)
 {
-    MaruCamState *s =
-        OBJECT_CHECK(MaruCamState, pci_dev, MARU_PCI_CAMERA_DEVICE_NAME);
+    MaruCamState *s = MARU_PCI_CAMERA_DEVICE(pci_dev);
 
     if (s->initialized) {
         s->backend->release(s);