Fix compilation error and some source refining

diff --git a/tizen/src/Makefile.tizen b/tizen/src/Makefile.tizen
index cd203bb..da0566f 100644 (file)
--- a/tizen/src/Makefile.tizen
+++ b/tizen/src/Makefile.tizen
@@ -3,7 +3,7 @@
 
 
 $(call set-vpath, $(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw:$(SRC_PATH)/tizen/src:$(SRC_PATH)/tizen/src/hw:$(SRC_PATH)/tizen/src/skin)
-QEMU_CFLAGS += -I$(SRC_PATH)/hw
+QEMU_CFLAGS += -I$(SRC_PATH)/hw -I$(SRC_PATH)/tizen/src
 
 # maru loader
 obj-y += emulator.o
@@ -11,6 +11,9 @@ obj-y += emulator.o
 # sdb
 obj-y += sdb.o
 
+# debugch
+#obj-y += debug_ch.c
+
 # maru hw
 #hw-obj-y += maru_board.o
 obj-i386-y += maru_overlay.o

diff --git a/tizen/src/debug_ch.h b/tizen/src/debug_ch.h
index ed8c27e..89327fc 100644 (file)
--- a/tizen/src/debug_ch.h
+++ b/tizen/src/debug_ch.h
@@ -33,7 +33,7 @@
 
 #include <sys/types.h>
 
-//#define NO_DEBUG
+#define NO_DEBUG
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/tizen/src/emulator.c b/tizen/src/emulator.c
index 2464636..74374c7 100644 (file)
--- a/tizen/src/emulator.c
+++ b/tizen/src/emulator.c
@@ -1,21 +1,14 @@
 /* 
  * Emulator
  *
- * Copyright (C) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (C) 2011, 2012 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Contact: 
- * DoHyung Hong <don.hong@samsung.com>
  * SeokYeon Hwang <syeon.hwang@samsung.com>
  * HyunJun Son <hj79.son@samsung.com>
- * SangJin Kim <sangjin3.kim@samsung.com>
  * MunKyu Im <munkyu.im@samsung.com>
- * KiTae Kim <kt920.kim@samsung.com>
- * JinHyung Jo <jinhyung.jo@samsung.com>
- * SungMin Ha <sungmin82.ha@samsung.com>
- * JiHye Kim <jihye1128.kim@samsung.com>
  * GiWoong Kim <giwoong.kim@samsung.com>
  * YeongKyoon Lee <yeongkyoon.lee@samsung.com>
- * DongKyun Yun <dk77.yun@samsung.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -38,8 +31,7 @@
 
 
 #include "emulator.h"
-#include "vl.h"
-#include "skin_server.h"
+#include "skin/skin_server.h"
 
 MULTI_DEBUG_CHANNEL(tizen, main);
 
@@ -72,7 +64,7 @@ static void construct_main_window(void)
 int main(int argc, char** argv)
 {
        construct_main_window();
-       qemu_main(g_qemu_arglist.argc, g_qemu_arglist.argv, NULL);
+       qemu_main(argc, argv, NULL);
 
        return 0;
 }

diff --git a/tizen/src/emulator.h b/tizen/src/emulator.h
index ba96640..feae9b5 100644 (file)
--- a/tizen/src/emulator.h
+++ b/tizen/src/emulator.h
@@ -1,21 +1,14 @@
 /*
  * Emulator
  *
- * Copyright (C) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
+ * Copyright (C) 2011, 2012 Samsung Electronics Co., Ltd. All rights reserved.
  *
  * Contact: 
- * DoHyung Hong <don.hong@samsung.com>
  * SeokYeon Hwang <syeon.hwang@samsung.com>
  * Hyunjun Son <hj79.son@samsung.com>
- * SangJin Kim <sangjin3.kim@samsung.com>
  * MunKyu Im <munkyu.im@samsung.com>
- * KiTae Kim <kt920.kim@samsung.com>
- * JinHyung Jo <jinhyung.jo@samsung.com>
- * SungMin Ha <sungmin82.ha@samsung.com>
- * JiHye Kim <jihye1128.kim@samsung.com>
  * GiWoong Kim <giwoong.kim@samsung.com>
  * YeongKyoon Lee <yeongkyoon.lee@samsung.com>
- * DongKyun Yun <dk77.yun@samsung.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -44,6 +37,7 @@
 #ifndef __EMULATOR_H__
 #define __EMULATOR_H__
 
+#include "maru_common.h"
 
 int get_emulator_condition(void);
 void set_emulator_condition(int state);

diff --git a/tizen/src/maru_common.h b/tizen/src/maru_common.h
new file mode 100644 (file)
index 0000000..6e043c9
--- /dev/null
+++ b/tizen/src/maru_common.h
@@ -0,0 +1,49 @@
+/*
+ * Emulator
+ *
+ * Copyright (C) 2011, 2012 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Contact: 
+ * SeokYeon Hwang <syeon.hwang@samsung.com>
+ * Hyunjun Son <hj79.son@samsung.com>
+ * MunKyu Im <munkyu.im@samsung.com>
+ * GiWoong Kim <giwoong.kim@samsung.com>
+ * YeongKyoon Lee <yeongkyoon.lee@samsung.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Contributors:
+ * - S-Core Co., Ltd
+ *
+ */
+
+/**
+ * @file emulator.h
+ * @brief - header of file these are config struecture and defines in emulator
+ */
+
+#ifndef __MARU_COMMON_H__
+#define __MARU_COMMON_H__
+
+#include <stddef.h>
+#include <stdint.h>
+#include <stdbool.h>
+
+int get_emulator_condition(void);
+void set_emulator_condition(int state);
+void exit_emulator(void);
+
+
+#endif

diff --git a/sdb.c b/tizen/src/sdb.c
similarity index 100%
rename from sdb.c
rename to tizen/src/sdb.c

diff --git a/sdb.h b/tizen/src/sdb.h
similarity index 98%
rename from sdb.h
rename to tizen/src/sdb.h
index c4ec1fb..999802a 100644 (file)
--- a/sdb.h
+++ b/tizen/src/sdb.h
@@ -10,8 +10,8 @@
 ** GNU General Public License for more details.
 */
 
-#include <stddef.h>
-#include <stdint.h>
+#include "maru_common.h"
+
 #include <errno.h>
 
 #define SDB_HOST_PORT 26099

diff --git a/vl.c b/vl.c
index c62d7c9..772e200 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -93,6 +93,9 @@
 #include <windows.h>
 #endif
 
+#ifdef CONFIG_MARU
+#endif
+
 #ifdef CONFIG_SDL
 #if defined(__APPLE__) || defined(main)
 #include <SDL.h>
@@ -166,9 +169,9 @@ int main(int argc, char **argv)
 #include "arch_init.h"
 
 #include "ui/qemu-spice.h"
-#include "sdb.h"
 
 #ifdef CONFIG_MARU
+#include "tizen/src/sdb.h"
 #include "tizen/src/skin/maruskin_sdl.h"
 #endif