[Title] renamed skin_operaion & skin_server

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

diff --git a/tizen/src/Makefile.tizen b/tizen/src/Makefile.tizen
index 3acc2a8..a305311 100644 (file)
--- a/tizen/src/Makefile.tizen
+++ b/tizen/src/Makefile.tizen
@@ -28,7 +28,7 @@ obj-i386-y += maru_vga.o
 obj-i386-y += maru_brightness.o
 
 # maru skin
-obj-i386-y += maruskin_sdl.o maruskin_client.o skin_server.o skin_operation.o
+obj-i386-y += maruskin_sdl.o maruskin_client.o maruskin_server.o maruskin_operation.o
 
 
 ##########################################################

diff --git a/tizen/src/emulator.c b/tizen/src/emulator.c
index bd729d7..0b4846e 100644 (file)
--- a/tizen/src/emulator.c
+++ b/tizen/src/emulator.c
@@ -33,8 +33,8 @@
 #include "maru_common.h"
 #include "emulator.h"
 #include "sdb.h"
-#include "skin/skin_server.h"
 #include "string.h"
+#include "skin/maruskin_server.h"
 #include "skin/maruskin_client.h"
 #include "debug_ch.h"
 

diff --git a/tizen/src/skin/skin_operation.c b/tizen/src/skin/maruskin_operation.c
similarity index 97%
rename from tizen/src/skin/skin_operation.c
rename to tizen/src/skin/maruskin_operation.c
index 6046e43..8117079 100644 (file)
--- a/tizen/src/skin/skin_operation.c
+++ b/tizen/src/skin/maruskin_operation.c
@@ -29,14 +29,14 @@
 
 #include <unistd.h>
 #include <stdio.h>
-#include "skin_operation.h"
+#include "maruskin_operation.h"
 #include "maruskin_sdl.h"
 #include "../debug_ch.h"
 //FIXME uncomment
 //#include "console.h"
 //#include "maru_pm.h"
 
-MULTI_DEBUG_CHANNEL(qemu, skin_operation);
+MULTI_DEBUG_CHANNEL(qemu, maruskin_operation);
 
 
 enum {

diff --git a/tizen/src/skin/skin_operation.h b/tizen/src/skin/maruskin_operation.h
similarity index 93%
rename from tizen/src/skin/skin_operation.h
rename to tizen/src/skin/maruskin_operation.h
index 8aa699c..80d3782 100644 (file)
--- a/tizen/src/skin/skin_operation.h
+++ b/tizen/src/skin/maruskin_operation.h
@@ -27,8 +27,8 @@
  *
  */
 
-#ifndef SKIN_OPERATION_H_
-#define SKIN_OPERATION_H_
+#ifndef MARUSKIN_OPERATION_H_
+#define MARUSKIN_OPERATION_H_
 
 void start_display( int handle_id, short scale, short direction );
 
@@ -44,4 +44,4 @@ void open_shell(void);
 
 void request_close( void );
 
-#endif /* SKIN_OPERATION_H_ */
+#endif /* MARUSKIN_OPERATION_H_ */

diff --git a/tizen/src/skin/maruskin_sdl.h b/tizen/src/skin/maruskin_sdl.h
index 63455ad..33ff1f8 100644 (file)
--- a/tizen/src/skin/maruskin_sdl.h
+++ b/tizen/src/skin/maruskin_sdl.h
@@ -28,6 +28,9 @@
  */
 
 
+#ifndef MARUSKIN_SDL_H_
+#define MARUSKIN_SDL_H_
+
 #include "console.h"
 #ifndef _WIN32
 #include <SDL/SDL.h>
@@ -45,3 +48,4 @@
 void maruskin_display_init(DisplayState *ds);
 void maruskin_sdl_init(int swt_handle);
 
+#endif /* MARUSKIN_SDL_H_ */

diff --git a/tizen/src/skin/skin_server.c b/tizen/src/skin/maruskin_server.c
similarity index 99%
rename from tizen/src/skin/skin_server.c
rename to tizen/src/skin/maruskin_server.c
index 314dcf4..7583754 100644 (file)
--- a/tizen/src/skin/skin_server.c
+++ b/tizen/src/skin/maruskin_server.c
@@ -37,11 +37,11 @@
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <pthread.h>
-#include "skin_server.h"
-#include "skin_operation.h"
+#include "maruskin_server.h"
+#include "maruskin_operation.h"
 #include "../debug_ch.h"
 
-MULTI_DEBUG_CHANNEL(qemu, skin_server);
+MULTI_DEBUG_CHANNEL(qemu, maruskin_server);
 
 
 

diff --git a/tizen/src/skin/skin_server.h b/tizen/src/skin/maruskin_server.h
similarity index 93%
rename from tizen/src/skin/skin_server.h
rename to tizen/src/skin/maruskin_server.h
index 2731eb7..73a846e 100644 (file)
--- a/tizen/src/skin/skin_server.h
+++ b/tizen/src/skin/maruskin_server.h
@@ -27,8 +27,8 @@
  *
  */
 
-#ifndef SKIN_SERVER_H_
-#define SKIN_SERVER_H_
+#ifndef MARUSKIN_SERVER_H_
+#define MARUSKIN_SERVER_H_
 
 #include <pthread.h>
 #include <stdint.h>
@@ -36,4 +36,4 @@
 pthread_t start_skin_server( uint16_t default_svr_port, int argc, char** argv );
 void shutdown_skin_server(void);
 
-#endif /* SKIN_SERVER_H_ */
+#endif /* MARUSKIN_SERVER_H_ */