[Title] renamed maruskin_sdl

[Type]
[Module]
[Priority]
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

diff --git a/tizen/src/Makefile.tizen b/tizen/src/Makefile.tizen
index 8166b5f..a93e9e7 100644 (file)
--- a/tizen/src/Makefile.tizen
+++ b/tizen/src/Makefile.tizen
@@ -11,7 +11,7 @@ QEMU_CFLAGS += -L$(SRC_PATH)/tizen/distrib/ffmpeg/lib
 LIBS += -lavformat -lavcodec -lavutil -lm -lGL
 
 # maru loader
-obj-y += emulator.o emulsignal.o
+obj-y += emulator.o emulsignal.o maru_sdl.o
 
 # sdb
 obj-y += sdb.o
@@ -29,7 +29,7 @@ obj-i386-y += maru_brightness.o
 obj-i386-y += maru_touchscreen.o
 
 # maru skin
-obj-i386-y += maruskin_sdl.o maruskin_client.o maruskin_server.o maruskin_operation.o
+obj-i386-y += maruskin_client.o maruskin_server.o maruskin_operation.o
 
 
 ##########################################################

diff --git a/tizen/src/hw/maru_brightness.c b/tizen/src/hw/maru_brightness.c
index 9d9ffef..1cb95c1 100644 (file)
--- a/tizen/src/hw/maru_brightness.c
+++ b/tizen/src/hw/maru_brightness.c
@@ -41,7 +41,7 @@
 #include "pci.h"
 #include "maru_pci_ids.h"
 #include "maru_brightness.h"
-#include "../debug_ch.h"
+#include "debug_ch.h"
 
 MULTI_DEBUG_CHANNEL(qemu, maru_brightness);
 

diff --git a/tizen/src/hw/maru_pm.c b/tizen/src/hw/maru_pm.c
index fe1275d..b46461f 100644 (file)
--- a/tizen/src/hw/maru_pm.c
+++ b/tizen/src/hw/maru_pm.c
@@ -38,7 +38,7 @@
 #include "sysemu.h"
 #include "range.h"
 #include "ioport.h"
-#include "../debug_ch.h"
+#include "debug_ch.h"
 
 //#define DEBUG
 

diff --git a/tizen/src/hw/maru_touchscreen.c b/tizen/src/hw/maru_touchscreen.c
index 0b60571..26c49a6 100644 (file)
--- a/tizen/src/hw/maru_touchscreen.c
+++ b/tizen/src/hw/maru_touchscreen.c
@@ -33,7 +33,7 @@
 #include "console.h"
 #include "usb.h"
 #include "usb-desc.h"
-#include "../debug_ch.h"
+#include "debug_ch.h"
 
 MULTI_DEBUG_CHANNEL(qemu, touchscreen);
 

diff --git a/tizen/src/skin/maruskin_sdl.c b/tizen/src/maru_sdl.c
similarity index 97%
rename from tizen/src/skin/maruskin_sdl.c
rename to tizen/src/maru_sdl.c
index bd7f850..1f8a8a4 100644 (file)
--- a/tizen/src/skin/maruskin_sdl.c
+++ b/tizen/src/maru_sdl.c
@@ -1,5 +1,5 @@
 /*
- * sdl display
+ * MARU SDL display driver
  *
  * Copyright (C) 2011 - 2012 Samsung Electronics Co., Ltd. All rights reserved.
  *
@@ -29,10 +29,10 @@
 
 
 #include <pthread.h>
-#include "maruskin_sdl.h"
-#include "../debug_ch.h"
+#include "maru_sdl.h"
+#include "debug_ch.h"
 
-MULTI_DEBUG_CHANNEL(tizen, maruskin_sdl);
+MULTI_DEBUG_CHANNEL(tizen, maru_sdl);
 
 
 // TODO : organize

diff --git a/tizen/src/skin/maruskin_sdl.h b/tizen/src/maru_sdl.h
similarity index 93%
rename from tizen/src/skin/maruskin_sdl.h
rename to tizen/src/maru_sdl.h
index 33ff1f8..33a3dd7 100644 (file)
--- a/tizen/src/skin/maruskin_sdl.h
+++ b/tizen/src/maru_sdl.h
@@ -1,5 +1,5 @@
 /*
- * sdl display
+ * MARU SDL display driver
  *
  * Copyright (C) 2011 - 2012 Samsung Electronics Co., Ltd. All rights reserved.
  *
@@ -28,8 +28,8 @@
  */
 
 
-#ifndef MARUSKIN_SDL_H_
-#define MARUSKIN_SDL_H_
+#ifndef MARU_SDL_H_
+#define MARU_SDL_H_
 
 #include "console.h"
 #ifndef _WIN32
@@ -48,4 +48,4 @@
 void maruskin_display_init(DisplayState *ds);
 void maruskin_sdl_init(int swt_handle);
 
-#endif /* MARUSKIN_SDL_H_ */
+#endif /* MARU_SDL_H_ */

diff --git a/tizen/src/skin/maruskin_operation.c b/tizen/src/skin/maruskin_operation.c
old mode 100755 (executable)
new mode 100644 (file)
index 34cee1d..5b09e17
--- a/tizen/src/skin/maruskin_operation.c
+++ b/tizen/src/skin/maruskin_operation.c
@@ -30,13 +30,13 @@
 #include <unistd.h>
 #include <stdio.h>
 #include "maruskin_operation.h"
-#include "maruskin_sdl.h"
-#include "../debug_ch.h"
+#include "maru_sdl.h"
+#include "debug_ch.h"
 #include "console.h"
 //FIXME uncomment
 //#include "maru_pm.h"
 
-MULTI_DEBUG_CHANNEL(qemu, maruskin_operation);
+MULTI_DEBUG_CHANNEL(qemu, skin_operation);
 
 
 enum {

diff --git a/tizen/src/skin/maruskin_server.c b/tizen/src/skin/maruskin_server.c
index 0e2f81a..1e53378 100644 (file)
--- a/tizen/src/skin/maruskin_server.c
+++ b/tizen/src/skin/maruskin_server.c
@@ -39,7 +39,7 @@
 #include <pthread.h>
 #include "maruskin_server.h"
 #include "maruskin_operation.h"
-#include "../debug_ch.h"
+#include "debug_ch.h"
 
 MULTI_DEBUG_CHANNEL(qemu, maruskin_server);
 

diff --git a/vl.c b/vl.c
index 7eb25af..044a08c 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -177,7 +177,7 @@ int qemu_main(int argc, char **argv, char **envp);
 
 #ifdef CONFIG_MARU
 #include "tizen/src/sdb.h"
-#include "tizen/src/skin/maruskin_sdl.h"
+#include "tizen/src/maru_sdl.h"
 #endif
 
 //#define DEBUG_NET