From: Kitae Kim <kt920.kim@samsung.com>
Date: Tue, 18 Dec 2012 08:44:04 +0000 (+0900)
Subject: maru_codec : fixed build break on windows.
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~1266
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=39474e06972b854164897014724a9708fb67167c;p=sdk%2Femulator%2Fqemu.git

maru_codec : fixed build break on windows.

The member field of struct QemuThread on windows is not the same as on linux.

Signed-off-by: Kitae Kim <kt920.kim@samsung.com>
---

diff --git a/tizen/src/hw/maru_codec.c b/tizen/src/hw/maru_codec.c
index 88451d7b0a..c98a502a5c 100644
--- a/tizen/src/hw/maru_codec.c
+++ b/tizen/src/hw/maru_codec.c
@@ -99,7 +99,7 @@ void wake_codec_worker_thread(SVCodecState *s)
 void *codec_worker_thread(void *opaque)
 {
     SVCodecState *s = (SVCodecState *)opaque;
-    QemuThread  thread;
+    QemuThread thread;
     AVCodecContext *avctx;
 
     TRACE("Enter, %s\n", __func__);
@@ -110,7 +110,9 @@ void *codec_worker_thread(void *opaque)
         qemu_cond_wait(&s->codec_thread.cond, &s->thread_mutex);
 
         qemu_thread_get_self(&thread);
+#ifdef CONFIG_LINUX
         TRACE("wake up a worker thread. :%x\n", thread.thread);
+#endif
         avctx = s->codec_ctx[s->codec_param.ctx_index].avctx;
         if (avctx) {
             if (avctx->codec->decode) {
@@ -1303,11 +1305,9 @@ void codec_write(void *opaque, target_phys_addr_t addr,
     case CODEC_CMD_SET_DEVICE_MEM:
         qemu_mutex_lock(&s->thread_mutex);
         s->device_mem_avail = value;
-        printf("set device_mem: %d\n", value);
         qemu_mutex_unlock(&s->thread_mutex);
         break;
 	case CODEC_CMD_SET_MMAP_OFFSET:
-        printf("set mem index: %d\n", value);
 		s->codec_param.mem_index = value;
 		break;
     default:
@@ -1370,7 +1370,7 @@ static int codec_initfn(PCIDevice *dev)
     return 0;
 }
 
-static int codec_exitfn(PCIDevice *dev)
+static void codec_exitfn(PCIDevice *dev)
 {
     SVCodecState *s = DO_UPCAST(SVCodecState, dev, dev);
     INFO("[%s] device exit\n", __func__);
@@ -1379,7 +1379,6 @@ static int codec_exitfn(PCIDevice *dev)
 
     memory_region_destroy(&s->vram);
     memory_region_destroy(&s->mmio);
-    return 0;
 }
 
 int codec_init(PCIBus *bus)
diff --git a/tizen/src/hw/maru_codec.h b/tizen/src/hw/maru_codec.h
index 25e1bdcb58..ba4289847a 100644
--- a/tizen/src/hw/maru_codec.h
+++ b/tizen/src/hw/maru_codec.h
@@ -151,6 +151,7 @@ int codec_operate(uint32_t api_index, uint32_t ctx_index,
 void qemu_parser_init(SVCodecState *s, int ctx_index);
 void qemu_codec_close(SVCodecState *s, uint32_t value);
 void qemu_get_codec_ver(SVCodecState *s);
+void qemu_reset_codec_info(SVCodecState *s, uint32_t value);
 
 /*
  *  FFMPEG Functions