emulator: clean-up source directories

Source files under "tizen/src/hw/" moved into each parent bus directory.

Change-Id: I32d4cd527583a5cacf43cb4e2bc490212b849ee4
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

diff --git a/tizen/src/Makefile.objs b/tizen/src/Makefile.objs
index 2a6d433..44bddfa 100644 (file)
--- a/tizen/src/Makefile.objs
+++ b/tizen/src/Makefile.objs
@@ -23,9 +23,6 @@ obj-y += tethering/
 # maru skin
 obj-y += skin/
 
-# sdb noti server
-obj-y += sdb_noti_server.o
-
 # debug channel
 obj-y += debug_ch.o
 

diff --git a/tizen/src/display/maru_finger.c b/tizen/src/display/maru_finger.c
index b97a71e..de365e8 100644 (file)
--- a/tizen/src/display/maru_finger.c
+++ b/tizen/src/display/maru_finger.c
@@ -33,7 +33,7 @@
 #include <SDL.h>
 #include "maru_finger.h"
 #include "emul_state.h"
-#include "hw/maru_virtio_touchscreen.h"
+#include "hw/virtio/maru_virtio_touchscreen.h"
 #include "debug_ch.h"
 
 MULTI_DEBUG_CHANNEL(qemu, maru_finger);

diff --git a/tizen/src/display/maru_sdl.c b/tizen/src/display/maru_sdl.c
index 35be462..426daa9 100644 (file)
--- a/tizen/src/display/maru_sdl.c
+++ b/tizen/src/display/maru_sdl.c
@@ -36,7 +36,7 @@
 #include "maru_display.h"
 #include "maru_sdl.h"
 #include "maru_sdl_processing.h"
-#include "hw/maru_brightness.h"
+#include "hw/pci/maru_brightness.h"
 #include "debug_ch.h"
 
 MULTI_DEBUG_CHANNEL(tizen, maru_sdl);

diff --git a/tizen/src/display/maru_sdl_processing.c b/tizen/src/display/maru_sdl_processing.c
index 4e28eb8..174198e 100644 (file)
--- a/tizen/src/display/maru_sdl_processing.c
+++ b/tizen/src/display/maru_sdl_processing.c
@@ -30,7 +30,7 @@
 
 
 #include "maru_sdl_processing.h"
-#include "hw/maru_brightness.h"
+#include "hw/pci/maru_brightness.h"
 #include "debug_ch.h"
 
 MULTI_DEBUG_CHANNEL(tizen, sdl_processing);

diff --git a/tizen/src/ecs/ecs_mon.c b/tizen/src/ecs/ecs_mon.c
index 1161e07..9957144 100644 (file)
--- a/tizen/src/ecs/ecs_mon.c
+++ b/tizen/src/ecs/ecs_mon.c
@@ -39,9 +39,9 @@
 #include "qapi/qmp/json-parser.h"
 
 #include "ecs.h"
-#include "hw/maru_virtio_evdi.h"
-#include "hw/maru_virtio_sensor.h"
-#include "hw/maru_virtio_nfc.h"
+#include "hw/virtio/maru_virtio_evdi.h"
+#include "hw/virtio/maru_virtio_sensor.h"
+#include "hw/virtio/maru_virtio_nfc.h"
 
 #include "debug_ch.h"
 MULTI_DEBUG_CHANNEL(qemu, ecs);

diff --git a/tizen/src/ecs/ecs_msg.c b/tizen/src/ecs/ecs_msg.c
index d6b023b..866b9ef 100644 (file)
--- a/tizen/src/ecs/ecs_msg.c
+++ b/tizen/src/ecs/ecs_msg.c
@@ -58,12 +58,12 @@
 #include "display/maru_finger.h"
 #endif
 
-#include "hw/maru_virtio_evdi.h"
-#include "hw/maru_virtio_sensor.h"
-#include "hw/maru_virtio_jack.h"
-#include "hw/maru_virtio_power.h"
-#include "hw/maru_virtio_nfc.h"
-#include "hw/maru_virtio_vmodem.h"
+#include "hw/virtio/maru_virtio_evdi.h"
+#include "hw/virtio/maru_virtio_sensor.h"
+#include "hw/virtio/maru_virtio_jack.h"
+#include "hw/virtio/maru_virtio_power.h"
+#include "hw/virtio/maru_virtio_nfc.h"
+#include "hw/virtio/maru_virtio_vmodem.h"
 #include "skin/maruskin_operation.h"
 #include "skin/maruskin_server.h"
 #include "util/maru_device_hotplug.h"

diff --git a/tizen/src/ecs/ecs_sensor.c b/tizen/src/ecs/ecs_sensor.c
index 4d82e7c..46d7ee4 100644 (file)
--- a/tizen/src/ecs/ecs_sensor.c
+++ b/tizen/src/ecs/ecs_sensor.c
@@ -36,9 +36,9 @@
 //#include "qemu-timer.h"
 
 #include "ecs.h"
-#include "hw/maru_virtio_sensor.h"
-#include "hw/maru_virtio_power.h"
-#include "hw/maru_virtio_jack.h"
+#include "hw/virtio/maru_virtio_sensor.h"
+#include "hw/virtio/maru_virtio_power.h"
+#include "hw/virtio/maru_virtio_jack.h"
 
 #define TEMP_BUF_SIZE   255
 #define MAX_VAL_LENGTH  40

diff --git a/tizen/src/ecs/ecs_tethering.c b/tizen/src/ecs/ecs_tethering.c
index 0b588b2..eec010b 100644 (file)
--- a/tizen/src/ecs/ecs_tethering.c
+++ b/tizen/src/ecs/ecs_tethering.c
@@ -32,7 +32,7 @@
 #include "ecs.h"
 #include "ecs_tethering.h"
 #include "tethering/app_tethering.h"
-#include "hw/maru_virtio_touchscreen.h"
+#include "hw/virtio/maru_virtio_touchscreen.h"
 #include "debug_ch.h"
 
 MULTI_DEBUG_CHANNEL(tizen, ecs_tethering);

diff --git a/tizen/src/emulator.c b/tizen/src/emulator.c
index 7bc6d19..a659db8 100644 (file)
--- a/tizen/src/emulator.c
+++ b/tizen/src/emulator.c
@@ -37,8 +37,8 @@
 #include "build_info.h"
 #include "emulator.h"
 #include "emul_state.h"
-#include "sdb_noti_server.h"
 #include "emulator_options.h"
+#include "util/sdb_noti_server.h"
 #include "util/check_gl.h"
 #include "maru_err_table.h"
 #include "util/osutil.h"

diff --git a/tizen/src/emulator_legacy.c b/tizen/src/emulator_legacy.c
index 721c8c8..85fa9d5 100644 (file)
--- a/tizen/src/emulator_legacy.c
+++ b/tizen/src/emulator_legacy.c
@@ -39,7 +39,7 @@
 #include "emulator.h"
 #include "emul_state.h"
 #include "guest_debug.h"
-#include "hw/maru_virtio_touchscreen.h"
+#include "hw/virtio/maru_virtio_touchscreen.h"
 #include "util/check_gl.h"
 #include "maru_err_table.h"
 #include "display/maru_display.h"

diff --git a/tizen/src/hw/Makefile.objs b/tizen/src/hw/Makefile.objs
index 42c9dc6..a72d5d6 100644 (file)
--- a/tizen/src/hw/Makefile.objs
+++ b/tizen/src/hw/Makefile.objs
@@ -1,36 +1,7 @@
 obj-y += maru_board.o maru_pm.o
 
-obj-y += maru_brill_codec.o
-obj-y += maru_brightness.o
+obj-y += pci/
+obj-y += virtio/
 
-obj-y += maru_virtio_pci.o
-obj-y += maru_virtio_touchscreen.o
-obj-y += maru_virtio_esm.o
-obj-y += maru_virtio_evdi.o
-obj-y += maru_virtio_hwkey.o
-obj-y += maru_virtio_jack.o
-obj-y += maru_virtio_keyboard.o
-obj-y += maru_virtio_nfc.o
-obj-y += maru_virtio_power.o
-obj-y += maru_virtio_sensor.o
-obj-y += maru_virtio_vmodem.o
-
-obj-y += maru_camera_common_pci.o
-ifdef CONFIG_LINUX
-obj-y += maru_camera_linux_pci.o
-LIBS += -lv4l2 -lv4lconvert
-endif
-ifdef CONFIG_WIN32
-obj-y += maru_camera_win32_pci.o
-LIBS += -lole32 -loleaut32 -luuid -lstrmiids
-endif
-ifdef CONFIG_DARWIN
-obj-y += maru_camera_darwin_converter.o
-obj-y += maru_camera_darwin_pci.o
-LIBS += -framework Foundation -framework SystemConfiguration
-LIBS += -framework Cocoa -framework QTKit -framework CoreVideo
-LIBS += -framework AppKit
-endif
-
-#obj-y += maru_codec.o
-#obj-y += maru_usb_touchscreen.o
+#obj-y += usb/
+#obj-y += arm/

diff --git a/tizen/src/hw/Makefile.objs.arm b/tizen/src/hw/arm/Makefile.objs
similarity index 100%
rename from tizen/src/hw/Makefile.objs.arm
rename to tizen/src/hw/arm/Makefile.objs

diff --git a/tizen/src/hw/maru_arm.h b/tizen/src/hw/arm/maru_arm.h
similarity index 100%
rename from tizen/src/hw/maru_arm.h
rename to tizen/src/hw/arm/maru_arm.h

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

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

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

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

diff --git a/tizen/src/hw/maru_pm.c b/tizen/src/hw/maru_pm.c
index abaf96c..2b963e5 100644 (file)
--- a/tizen/src/hw/maru_pm.c
+++ b/tizen/src/hw/maru_pm.c
@@ -31,7 +31,7 @@
 #include "sysemu/sysemu.h"
 
 #include "debug_ch.h"
-#include "sdb_noti_server.h"
+#include "util/sdb_noti_server.h"
 
 /* define debug channel */
 MULTI_DEBUG_CHANNEL(tizen, maru_pm);

diff --git a/tizen/src/hw/pci/Makefile.objs b/tizen/src/hw/pci/Makefile.objs
new file mode 100644 (file)
index 0000000..7d142a3
--- /dev/null
+++ b/tizen/src/hw/pci/Makefile.objs
@@ -0,0 +1,19 @@
+obj-y += maru_brill_codec.o
+obj-y += maru_brightness.o
+
+obj-y += maru_camera_common_pci.o
+ifdef CONFIG_LINUX
+obj-y += maru_camera_linux_pci.o
+LIBS += -lv4l2 -lv4lconvert
+endif
+ifdef CONFIG_WIN32
+obj-y += maru_camera_win32_pci.o
+LIBS += -lole32 -loleaut32 -luuid -lstrmiids
+endif
+ifdef CONFIG_DARWIN
+obj-y += maru_camera_darwin_converter.o
+obj-y += maru_camera_darwin_pci.o
+LIBS += -framework Foundation -framework SystemConfiguration
+LIBS += -framework Cocoa -framework QTKit -framework CoreVideo
+LIBS += -framework AppKit
+endif

diff --git a/tizen/src/hw/maru_brightness.c b/tizen/src/hw/pci/maru_brightness.c
similarity index 99%
rename from tizen/src/hw/maru_brightness.c
rename to tizen/src/hw/pci/maru_brightness.c
index 3d04d6c..7cc309f 100644 (file)
--- a/tizen/src/hw/maru_brightness.c
+++ b/tizen/src/hw/pci/maru_brightness.c
@@ -34,7 +34,7 @@
 #include "hw/i386/pc.h"
 #include "ui/console.h"
 #include "hw/pci/pci.h"
-#include "maru_device_ids.h"
+#include "hw/maru_device_ids.h"
 #include "maru_brightness.h"
 #include "skin/maruskin_server.h"
 #include "debug_ch.h"

diff --git a/tizen/src/hw/maru_brightness.h b/tizen/src/hw/pci/maru_brightness.h
similarity index 100%
rename from tizen/src/hw/maru_brightness.h
rename to tizen/src/hw/pci/maru_brightness.h

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

diff --git a/tizen/src/hw/maru_brill_codec.h b/tizen/src/hw/pci/maru_brill_codec.h
similarity index 99%
rename from tizen/src/hw/maru_brill_codec.h
rename to tizen/src/hw/pci/maru_brill_codec.h
index 5a0cc6d..21c5bd5 100644 (file)
--- a/tizen/src/hw/maru_brill_codec.h
+++ b/tizen/src/hw/pci/maru_brill_codec.h
@@ -41,7 +41,7 @@
 
 #include "util/osutil.h"
 #include "debug_ch.h"
-#include "maru_device_ids.h"
+#include "hw/maru_device_ids.h"
 
 #include "libavformat/avformat.h"
 #include "libavresample/avresample.h"

diff --git a/tizen/src/hw/maru_camera_common.h b/tizen/src/hw/pci/maru_camera_common.h
similarity index 100%
rename from tizen/src/hw/maru_camera_common.h
rename to tizen/src/hw/pci/maru_camera_common.h

diff --git a/tizen/src/hw/maru_camera_common_pci.c b/tizen/src/hw/pci/maru_camera_common_pci.c
similarity index 99%
rename from tizen/src/hw/maru_camera_common_pci.c
rename to tizen/src/hw/pci/maru_camera_common_pci.c
index 4618f4b..694dea4 100644 (file)
--- a/tizen/src/hw/maru_camera_common_pci.c
+++ b/tizen/src/hw/pci/maru_camera_common_pci.c
@@ -40,7 +40,7 @@
 #include "exec/cpu-common.h"
 
 #include "maru_camera_common.h"
-#include "maru_device_ids.h"
+#include "hw/maru_device_ids.h"
 #include "debug_ch.h"
 
 MULTI_DEBUG_CHANNEL(tizen, maru-camera);

diff --git a/tizen/src/hw/maru_camera_darwin.h b/tizen/src/hw/pci/maru_camera_darwin.h
similarity index 100%
rename from tizen/src/hw/maru_camera_darwin.h
rename to tizen/src/hw/pci/maru_camera_darwin.h

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

diff --git a/tizen/src/hw/maru_camera_darwin_pci.m b/tizen/src/hw/pci/maru_camera_darwin_pci.m
similarity index 100%
rename from tizen/src/hw/maru_camera_darwin_pci.m
rename to tizen/src/hw/pci/maru_camera_darwin_pci.m

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

diff --git a/tizen/src/hw/maru_camera_win32_interface.h b/tizen/src/hw/pci/maru_camera_win32_interface.h
similarity index 100%
rename from tizen/src/hw/maru_camera_win32_interface.h
rename to tizen/src/hw/pci/maru_camera_win32_interface.h

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

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

diff --git a/tizen/src/hw/maru_codec.h b/tizen/src/hw/pci/maru_codec.h
similarity index 100%
rename from tizen/src/hw/maru_codec.h
rename to tizen/src/hw/pci/maru_codec.h

diff --git a/tizen/src/hw/usb/Makefile.objs b/tizen/src/hw/usb/Makefile.objs
new file mode 100644 (file)
index 0000000..ab68d31
--- /dev/null
+++ b/tizen/src/hw/usb/Makefile.objs
@@ -0,0 +1 @@
+obj-y += maru_usb_touchscreen.o

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

diff --git a/tizen/src/hw/maru_usb_touchscreen.h b/tizen/src/hw/usb/maru_usb_touchscreen.h
similarity index 100%
rename from tizen/src/hw/maru_usb_touchscreen.h
rename to tizen/src/hw/usb/maru_usb_touchscreen.h

diff --git a/tizen/src/hw/virtio/Makefile.objs b/tizen/src/hw/virtio/Makefile.objs
new file mode 100644 (file)
index 0000000..dd29fc4
--- /dev/null
+++ b/tizen/src/hw/virtio/Makefile.objs
@@ -0,0 +1,11 @@
+obj-y += maru_virtio_pci.o
+obj-y += maru_virtio_touchscreen.o
+obj-y += maru_virtio_esm.o
+obj-y += maru_virtio_evdi.o
+obj-y += maru_virtio_hwkey.o
+obj-y += maru_virtio_jack.o
+obj-y += maru_virtio_keyboard.o
+obj-y += maru_virtio_nfc.o
+obj-y += maru_virtio_power.o
+obj-y += maru_virtio_sensor.o
+obj-y += maru_virtio_vmodem.o

diff --git a/tizen/src/hw/maru_virtio_esm.c b/tizen/src/hw/virtio/maru_virtio_esm.c
similarity index 99%
rename from tizen/src/hw/maru_virtio_esm.c
rename to tizen/src/hw/virtio/maru_virtio_esm.c
index e4568c1..455c33b 100644 (file)
--- a/tizen/src/hw/maru_virtio_esm.c
+++ b/tizen/src/hw/virtio/maru_virtio_esm.c
@@ -26,7 +26,7 @@
  *
  */
 
-#include "maru_device_ids.h"
+#include "hw/maru_device_ids.h"
 #include "maru_virtio_esm.h"
 #include "skin/maruskin_server.h"
 #include "emul_state.h"

diff --git a/tizen/src/hw/maru_virtio_esm.h b/tizen/src/hw/virtio/maru_virtio_esm.h
similarity index 100%
rename from tizen/src/hw/maru_virtio_esm.h
rename to tizen/src/hw/virtio/maru_virtio_esm.h

diff --git a/tizen/src/hw/maru_virtio_evdi.c b/tizen/src/hw/virtio/maru_virtio_evdi.c
similarity index 99%
rename from tizen/src/hw/maru_virtio_evdi.c
rename to tizen/src/hw/virtio/maru_virtio_evdi.c
index b04c686..d3ff432 100644 (file)
--- a/tizen/src/hw/maru_virtio_evdi.c
+++ b/tizen/src/hw/virtio/maru_virtio_evdi.c
@@ -28,7 +28,7 @@
 
 #include <pthread.h>
 
-#include "maru_device_ids.h"
+#include "hw/maru_device_ids.h"
 #include "maru_virtio_evdi.h"
 #include "debug_ch.h"
 #include "ecs/ecs.h"

diff --git a/tizen/src/hw/maru_virtio_evdi.h b/tizen/src/hw/virtio/maru_virtio_evdi.h
similarity index 100%
rename from tizen/src/hw/maru_virtio_evdi.h
rename to tizen/src/hw/virtio/maru_virtio_evdi.h

diff --git a/tizen/src/hw/maru_virtio_hwkey.c b/tizen/src/hw/virtio/maru_virtio_hwkey.c
similarity index 99%
rename from tizen/src/hw/maru_virtio_hwkey.c
rename to tizen/src/hw/virtio/maru_virtio_hwkey.c
index a76d77e..8d010bc 100644 (file)
--- a/tizen/src/hw/maru_virtio_hwkey.c
+++ b/tizen/src/hw/virtio/maru_virtio_hwkey.c
@@ -30,7 +30,7 @@
 #include <pthread.h>
 #include "emul_state.h"
 #include "maru_virtio_hwkey.h"
-#include "maru_device_ids.h"
+#include "hw/maru_device_ids.h"
 #include "debug_ch.h"
 
 MULTI_DEBUG_CHANNEL(qemu, hwkey);

diff --git a/tizen/src/hw/maru_virtio_hwkey.h b/tizen/src/hw/virtio/maru_virtio_hwkey.h
similarity index 100%
rename from tizen/src/hw/maru_virtio_hwkey.h
rename to tizen/src/hw/virtio/maru_virtio_hwkey.h

diff --git a/tizen/src/hw/maru_virtio_jack.c b/tizen/src/hw/virtio/maru_virtio_jack.c
similarity index 99%
rename from tizen/src/hw/maru_virtio_jack.c
rename to tizen/src/hw/virtio/maru_virtio_jack.c
index a1a7173..f1f1fdb 100644 (file)
--- a/tizen/src/hw/maru_virtio_jack.c
+++ b/tizen/src/hw/virtio/maru_virtio_jack.c
@@ -31,7 +31,7 @@
 
 #include "hw/pci/pci.h"
 
-#include "maru_device_ids.h"
+#include "hw/maru_device_ids.h"
 #include "debug_ch.h"
 
 #include "maru_virtio_jack.h"

diff --git a/tizen/src/hw/maru_virtio_jack.h b/tizen/src/hw/virtio/maru_virtio_jack.h
similarity index 100%
rename from tizen/src/hw/maru_virtio_jack.h
rename to tizen/src/hw/virtio/maru_virtio_jack.h

diff --git a/tizen/src/hw/maru_virtio_keyboard.c b/tizen/src/hw/virtio/maru_virtio_keyboard.c
similarity index 99%
rename from tizen/src/hw/maru_virtio_keyboard.c
rename to tizen/src/hw/virtio/maru_virtio_keyboard.c
index 341b6f9..7132d51 100644 (file)
--- a/tizen/src/hw/maru_virtio_keyboard.c
+++ b/tizen/src/hw/virtio/maru_virtio_keyboard.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include "maru_device_ids.h"
+#include "hw/maru_device_ids.h"
 #include "maru_virtio_keyboard.h"
 #include "debug_ch.h"
 

diff --git a/tizen/src/hw/maru_virtio_keyboard.h b/tizen/src/hw/virtio/maru_virtio_keyboard.h
similarity index 100%
rename from tizen/src/hw/maru_virtio_keyboard.h
rename to tizen/src/hw/virtio/maru_virtio_keyboard.h

diff --git a/tizen/src/hw/maru_virtio_nfc.c b/tizen/src/hw/virtio/maru_virtio_nfc.c
similarity index 99%
rename from tizen/src/hw/maru_virtio_nfc.c
rename to tizen/src/hw/virtio/maru_virtio_nfc.c
index 2afafef..ce632e6 100644 (file)
--- a/tizen/src/hw/maru_virtio_nfc.c
+++ b/tizen/src/hw/virtio/maru_virtio_nfc.c
@@ -28,7 +28,7 @@
 
 #include <pthread.h>
 
-#include "maru_device_ids.h"
+#include "hw/maru_device_ids.h"
 #include "maru_virtio_nfc.h"
 #include "debug_ch.h"
 #include "ecs/ecs.h"

diff --git a/tizen/src/hw/maru_virtio_nfc.h b/tizen/src/hw/virtio/maru_virtio_nfc.h
similarity index 100%
rename from tizen/src/hw/maru_virtio_nfc.h
rename to tizen/src/hw/virtio/maru_virtio_nfc.h

diff --git a/tizen/src/hw/maru_virtio_pci.c b/tizen/src/hw/virtio/maru_virtio_pci.c
similarity index 97%
rename from tizen/src/hw/maru_virtio_pci.c
rename to tizen/src/hw/virtio/maru_virtio_pci.c
index 1bc4efb..b8c71bf 100644 (file)
--- a/tizen/src/hw/maru_virtio_pci.c
+++ b/tizen/src/hw/virtio/maru_virtio_pci.c
@@ -29,17 +29,17 @@
 
 #include "hw/virtio/virtio-pci.h"
 
-#include "tizen/src/hw/maru_device_ids.h"
-#include "tizen/src/hw/maru_virtio_evdi.h"
-#include "tizen/src/hw/maru_virtio_esm.h"
-#include "tizen/src/hw/maru_virtio_hwkey.h"
-#include "tizen/src/hw/maru_virtio_keyboard.h"
-#include "tizen/src/hw/maru_virtio_touchscreen.h"
-#include "tizen/src/hw/maru_virtio_sensor.h"
-#include "tizen/src/hw/maru_virtio_jack.h"
-#include "tizen/src/hw/maru_virtio_power.h"
-#include "tizen/src/hw/maru_virtio_nfc.h"
-#include "tizen/src/hw/maru_virtio_vmodem.h"
+#include "hw/maru_device_ids.h"
+#include "maru_virtio_evdi.h"
+#include "maru_virtio_esm.h"
+#include "maru_virtio_hwkey.h"
+#include "maru_virtio_keyboard.h"
+#include "maru_virtio_touchscreen.h"
+#include "maru_virtio_sensor.h"
+#include "maru_virtio_jack.h"
+#include "maru_virtio_power.h"
+#include "maru_virtio_nfc.h"
+#include "maru_virtio_vmodem.h"
 
 typedef struct VirtIOTouchscreenPCI VirtIOTouchscreenPCI;
 typedef struct VirtIOEVDIPCI VirtIOEVDIPCI;

diff --git a/tizen/src/hw/maru_virtio_power.c b/tizen/src/hw/virtio/maru_virtio_power.c
similarity index 99%
rename from tizen/src/hw/maru_virtio_power.c
rename to tizen/src/hw/virtio/maru_virtio_power.c
index 7e72a66..c275fdd 100644 (file)
--- a/tizen/src/hw/maru_virtio_power.c
+++ b/tizen/src/hw/virtio/maru_virtio_power.c
@@ -31,7 +31,7 @@
 
 #include "hw/pci/pci.h"
 
-#include "maru_device_ids.h"
+#include "hw/maru_device_ids.h"
 #include "debug_ch.h"
 
 #include "maru_virtio_power.h"

diff --git a/tizen/src/hw/maru_virtio_power.h b/tizen/src/hw/virtio/maru_virtio_power.h
similarity index 100%
rename from tizen/src/hw/maru_virtio_power.h
rename to tizen/src/hw/virtio/maru_virtio_power.h

diff --git a/tizen/src/hw/maru_virtio_sensor.c b/tizen/src/hw/virtio/maru_virtio_sensor.c
similarity index 99%
rename from tizen/src/hw/maru_virtio_sensor.c
rename to tizen/src/hw/virtio/maru_virtio_sensor.c
index 3c03392..95516dd 100644 (file)
--- a/tizen/src/hw/maru_virtio_sensor.c
+++ b/tizen/src/hw/virtio/maru_virtio_sensor.c
@@ -31,7 +31,7 @@
 
 #include "hw/pci/pci.h"
 
-#include "maru_device_ids.h"
+#include "hw/maru_device_ids.h"
 #include "maru_virtio_sensor.h"
 #include "debug_ch.h"
 #include "ecs/ecs.h"

diff --git a/tizen/src/hw/maru_virtio_sensor.h b/tizen/src/hw/virtio/maru_virtio_sensor.h
similarity index 100%
rename from tizen/src/hw/maru_virtio_sensor.h
rename to tizen/src/hw/virtio/maru_virtio_sensor.h

diff --git a/tizen/src/hw/maru_virtio_touchscreen.c b/tizen/src/hw/virtio/maru_virtio_touchscreen.c
similarity index 99%
rename from tizen/src/hw/maru_virtio_touchscreen.c
rename to tizen/src/hw/virtio/maru_virtio_touchscreen.c
index 42f2d96..4e60b8b 100644 (file)
--- a/tizen/src/hw/maru_virtio_touchscreen.c
+++ b/tizen/src/hw/virtio/maru_virtio_touchscreen.c
@@ -29,7 +29,7 @@
 
 #include <pthread.h>
 #include "maru_virtio_touchscreen.h"
-#include "maru_device_ids.h"
+#include "hw/maru_device_ids.h"
 #include "emul_state.h"
 #include "debug_ch.h"
 

diff --git a/tizen/src/hw/maru_virtio_touchscreen.h b/tizen/src/hw/virtio/maru_virtio_touchscreen.h
similarity index 100%
rename from tizen/src/hw/maru_virtio_touchscreen.h
rename to tizen/src/hw/virtio/maru_virtio_touchscreen.h

diff --git a/tizen/src/hw/maru_virtio_vmodem.c b/tizen/src/hw/virtio/maru_virtio_vmodem.c
similarity index 99%
rename from tizen/src/hw/maru_virtio_vmodem.c
rename to tizen/src/hw/virtio/maru_virtio_vmodem.c
index bb4e4d5..93974fd 100644 (file)
--- a/tizen/src/hw/maru_virtio_vmodem.c
+++ b/tizen/src/hw/virtio/maru_virtio_vmodem.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include "maru_device_ids.h"
+#include "hw/maru_device_ids.h"
 #include "maru_virtio_vmodem.h"
 #include "maru_virtio_evdi.h"
 #include "debug_ch.h"

diff --git a/tizen/src/hw/maru_virtio_vmodem.h b/tizen/src/hw/virtio/maru_virtio_vmodem.h
similarity index 100%
rename from tizen/src/hw/maru_virtio_vmodem.h
rename to tizen/src/hw/virtio/maru_virtio_vmodem.h

diff --git a/tizen/src/skin/maruskin_keymap.h b/tizen/src/skin/maruskin_keymap.h
index e21dfd3..96f9719 100644 (file)
--- a/tizen/src/skin/maruskin_keymap.h
+++ b/tizen/src/skin/maruskin_keymap.h
@@ -31,7 +31,7 @@
 #ifndef MARUSKIN_KEYMAP_H_
 #define MARUSKIN_KEYMAP_H_
 
-#include "hw/maru_virtio_keyboard.h"
+#include "hw/virtio/maru_virtio_keyboard.h"
 
 /* keep it consistent with emulator-skin(swt) virtual keycode */
 #define JAVA_KEYCODE_BIT (1 << 24)

diff --git a/tizen/src/skin/maruskin_operation.c b/tizen/src/skin/maruskin_operation.c
index 8d4bbfa..7bad11b 100644 (file)
--- a/tizen/src/skin/maruskin_operation.c
+++ b/tizen/src/skin/maruskin_operation.c
@@ -37,9 +37,9 @@
 
 #include "maru_common.h"
 #include "maruskin_operation.h"
-#include "hw/maru_brightness.h"
-#include "hw/maru_virtio_hwkey.h"
-#include "hw/maru_virtio_touchscreen.h"
+#include "hw/pci/maru_brightness.h"
+#include "hw/virtio/maru_virtio_hwkey.h"
+#include "hw/virtio/maru_virtio_touchscreen.h"
 #include "display/maru_display.h"
 #include "emulator.h"
 #include "debug_ch.h"

diff --git a/tizen/src/util/Makefile.objs b/tizen/src/util/Makefile.objs
index 1102f2e..2234ec0 100644 (file)
--- a/tizen/src/util/Makefile.objs
+++ b/tizen/src/util/Makefile.objs
@@ -8,6 +8,9 @@ obj-$(CONFIG_DARWIN) += osutil-darwin.o
 #sdb
 obj-y += sdb.o
 
+# sdb noti server
+obj-y += sdb_noti_server.o
+
 # check gl
 obj-y += check_gl_core.o
 obj-$(CONFIG_LINUX) += check_gl_glx.o

diff --git a/tizen/src/sdb_noti_server.c b/tizen/src/util/sdb_noti_server.c
similarity index 99%
rename from tizen/src/sdb_noti_server.c
rename to tizen/src/util/sdb_noti_server.c
index 252b770..3d22b4b 100644 (file)
--- a/tizen/src/sdb_noti_server.c
+++ b/tizen/src/util/sdb_noti_server.c
@@ -30,8 +30,8 @@
 
 #include "qemu/sockets.h"
 
-#include "hw/maru_virtio_hwkey.h"
 #include "hw/maru_pm.h"
+#include "hw/virtio/maru_virtio_hwkey.h"
 #include "skin/maruskin_server.h"
 #include "ecs/ecs.h"
 

diff --git a/tizen/src/sdb_noti_server.h b/tizen/src/util/sdb_noti_server.h
similarity index 100%
rename from tizen/src/sdb_noti_server.h
rename to tizen/src/util/sdb_noti_server.h