[cleanup]revise file location and name

Change-Id: I5c62655cafe64b496a8f58ed3cffda02f4e5c70f

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3c916cf..0e6ba45 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,14 +2,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(mtp-responder C)
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include/entity)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include/transport)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include/util)
 
 AUX_SOURCE_DIRECTORY(${CMAKE_SOURCE_DIR}/src SRCS)
-AUX_SOURCE_DIRECTORY(${CMAKE_SOURCE_DIR}/src/entity SRCS)
-AUX_SOURCE_DIRECTORY(${CMAKE_SOURCE_DIR}/src/transport SRCS)
-AUX_SOURCE_DIRECTORY(${CMAKE_SOURCE_DIR}/src/util SRCS)
 
 IF(BUILD_GCOV)
        ADD_DEFINITIONS("-DTIZEN_TEST_GCOV")
@@ -33,10 +27,10 @@ ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS})
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} pthread rt gcrypt)
 
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin)
-INSTALL(FILES mtp-responder.conf DESTINATION /opt/var/lib/misc)
+INSTALL(FILES conf/mtp-responder.conf DESTINATION /opt/var/lib/misc)
 
-ADD_EXECUTABLE(extract_descs_strs ${CMAKE_SOURCE_DIR}/src/extract_descs/mtp_extract_descs_strs.c
-       ${CMAKE_SOURCE_DIR}/src/transport/mtp_descs_strings.c)
+ADD_EXECUTABLE(extract_descs_strs ${CMAKE_SOURCE_DIR}/ffs_tool/ffs_descs_strs_writer.c
+       ${CMAKE_SOURCE_DIR}/src/mtp_descs_strings.c)
 ADD_CUSTOM_COMMAND(OUTPUT descs strs
        COMMAND ./extract_descs_strs
        DEPENDS extract_descs_strs)
@@ -46,5 +40,5 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/descs DESTINATION /etc/mtp-responder)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/strs DESTINATION /etc/mtp-responder)
 
 IF(BUILD_GTESTS)
-       ADD_SUBDIRECTORY(unittest)
+       ADD_SUBDIRECTORY(tests)
 ENDIF(BUILD_GTESTS)

diff --git a/packaging/99-mtp-responder.rules b/conf/99-mtp-responder.rules
similarity index 100%
rename from packaging/99-mtp-responder.rules
rename to conf/99-mtp-responder.rules

diff --git a/mtp-responder.conf b/conf/mtp-responder.conf
similarity index 100%
rename from mtp-responder.conf
rename to conf/mtp-responder.conf

diff --git a/mtp-responder.service b/conf/mtp-responder.service
similarity index 100%
rename from mtp-responder.service
rename to conf/mtp-responder.service

diff --git a/mtp-responder.socket b/conf/mtp-responder.socket
similarity index 100%
rename from mtp-responder.socket
rename to conf/mtp-responder.socket

diff --git a/src/extract_descs/mtp_extract_descs_strs.c b/ffs_tool/ffs_descs_strs_writer.c
similarity index 100%
rename from src/extract_descs/mtp_extract_descs_strs.c
rename to ffs_tool/ffs_descs_strs_writer.c

diff --git a/include/mtp_cmd_handler.h b/include/mtp_cmd_handler.h
index 49c459e..59126d4 100644 (file)
--- a/include/mtp_cmd_handler.h
+++ b/include/mtp_cmd_handler.h
@@ -21,8 +21,8 @@
 extern "C" {
 #endif
 
-#include "mtp_object.h"
-#include "mtp_device.h"
+#include "mtp_entity_object.h"
+#include "mtp_entity_device.h"
 #include "ptp_container.h"
 #include "mtp_event_handler.h"
 

diff --git a/include/mtp_cmd_handler_util.h b/include/mtp_cmd_handler_util.h
index e2a9d73..e95ef1e 100644 (file)
--- a/include/mtp_cmd_handler_util.h
+++ b/include/mtp_cmd_handler_util.h
@@ -21,7 +21,7 @@
 extern "C" {
 #endif
 
-#include "mtp_device.h"
+#include "mtp_entity_device.h"
 
 typedef struct {
        mtp_uint32 store_id;

diff --git a/include/transport/mtp_descs_strings.h b/include/mtp_descs_strings.h
similarity index 100%
rename from include/transport/mtp_descs_strings.h
rename to include/mtp_descs_strings.h

diff --git a/include/entity/mtp_device.h b/include/mtp_entity_device.h
similarity index 99%
rename from include/entity/mtp_device.h
rename to include/mtp_entity_device.h
index 4b242a6..08b9bc3 100644 (file)
--- a/include/entity/mtp_device.h
+++ b/include/mtp_entity_device.h
@@ -21,8 +21,8 @@
 extern "C" {
 #endif
 
-#include "mtp_store.h"
-#include "mtp_property.h"
+#include "mtp_entity_store.h"
+#include "mtp_entity_property.h"
 
 #define MTP_NUM_DEVICE_DEFAULT         3
 

diff --git a/include/entity/mtp_object.h b/include/mtp_entity_object.h
similarity index 97%
rename from include/entity/mtp_object.h
rename to include/mtp_entity_object.h
index ae778d2..277d1a9 100644 (file)
--- a/include/entity/mtp_object.h
+++ b/include/mtp_entity_object.h
@@ -21,10 +21,10 @@
 extern "C" {
 #endif
 
-#include "mtp_list.h"
+#include "mtp_util_list.h"
 #include "ptp_datacodes.h"
-#include "mtp_fs.h"
-#include "mtp_media_info.h"
+#include "mtp_util_fs.h"
+#include "mtp_util_media_info.h"
 
 #define FIXED_LENGTH_MEMBERS_SIZE \
        (4 * sizeof(mtp_uint16) + 11 * sizeof(mtp_uint32))

diff --git a/include/entity/mtp_property.h b/include/mtp_entity_property.h
similarity index 99%
rename from include/entity/mtp_property.h
rename to include/mtp_entity_property.h
index 5db1f0a..a29d037 100644 (file)
--- a/include/entity/mtp_property.h
+++ b/include/mtp_entity_property.h
@@ -21,8 +21,8 @@
 extern "C" {
 #endif
 
-#include "mtp_list.h"
-#include "mtp_object.h"
+#include "mtp_util_list.h"
+#include "mtp_entity_object.h"
 
 #define MAX_SIZE_IN_BYTES_OF_PROP_VALUE                16000
 #define ELEMENT_NOT_FOUND                      -1

diff --git a/include/entity/mtp_store.h b/include/mtp_entity_store.h
similarity index 99%
rename from include/entity/mtp_store.h
rename to include/mtp_entity_store.h
index 7d298c2..c544c74 100644 (file)
--- a/include/entity/mtp_store.h
+++ b/include/mtp_entity_store.h
@@ -21,7 +21,7 @@
 extern "C" {
 #endif
 
-#include "mtp_object.h"
+#include "mtp_entity_object.h"
 
 
 /* First six members of SStorageInfo structure */

diff --git a/include/mtp_init.h b/include/mtp_init.h
index 2fdbce9..f2da501 100644 (file)
--- a/include/mtp_init.h
+++ b/include/mtp_init.h
@@ -21,7 +21,7 @@
 extern "C" {
 #endif
 
-#include "mtp_store.h"
+#include "mtp_entity_store.h"
 
 #define MTP_LOG_FILE                   "/var/log/mtp.log"
 #define MTP_LOG_MAX_SIZE               5 * 1024 * 1024 /*5MB*/

diff --git a/include/transport/mtp_transport.h b/include/mtp_transport.h
similarity index 100%
rename from include/transport/mtp_transport.h
rename to include/mtp_transport.h

diff --git a/include/transport/mtp_usb_driver.h b/include/mtp_usb_driver.h
similarity index 99%
rename from include/transport/mtp_usb_driver.h
rename to include/mtp_usb_driver.h
index dea197c..da13f9a 100644 (file)
--- a/include/transport/mtp_usb_driver.h
+++ b/include/mtp_usb_driver.h
@@ -23,7 +23,7 @@ extern "C" {
 
 #include "mtp_config.h"
 #include "mtp_datatype.h"
-#include "mtp_msgq.h"
+#include "mtp_util_msgq.h"
 
 /* Start of driver related defines */
 #define MTP_DRIVER_PATH                        "/dev/usb_mtp_gadget"

diff --git a/include/util/mtp_util.h b/include/mtp_util.h
similarity index 100%
rename from include/util/mtp_util.h
rename to include/mtp_util.h

diff --git a/include/util/mtp_fs.h b/include/mtp_util_fs.h
similarity index 100%
rename from include/util/mtp_fs.h
rename to include/mtp_util_fs.h

diff --git a/include/util/mtp_list.h b/include/mtp_util_list.h
similarity index 100%
rename from include/util/mtp_list.h
rename to include/mtp_util_list.h

diff --git a/include/util/mtp_media_info.h b/include/mtp_util_media_info.h
similarity index 100%
rename from include/util/mtp_media_info.h
rename to include/mtp_util_media_info.h

diff --git a/include/util/mtp_msgq.h b/include/mtp_util_msgq.h
similarity index 100%
rename from include/util/mtp_msgq.h
rename to include/mtp_util_msgq.h

diff --git a/include/util/mtp_support.h b/include/mtp_util_support.h
similarity index 100%
rename from include/util/mtp_support.h
rename to include/mtp_util_support.h

diff --git a/include/util/mtp_thread.h b/include/mtp_util_thread.h
similarity index 100%
rename from include/util/mtp_thread.h
rename to include/mtp_util_thread.h

diff --git a/packaging/mtp-responder.spec b/packaging/mtp-responder.spec
index 201c8bb..b4434ed 100644 (file)
--- a/packaging/mtp-responder.spec
+++ b/packaging/mtp-responder.spec
@@ -62,10 +62,10 @@ make %{?jobs:-j%jobs}
 %make_install
 
 mkdir -p %{buildroot}/%{_prefix}/lib/udev/rules.d
-cp packaging/99-mtp-responder.rules %{buildroot}/%{_prefix}/lib/udev/rules.d/99-mtp-responder.rules
+cp conf/99-mtp-responder.rules %{buildroot}/%{_prefix}/lib/udev/rules.d/99-mtp-responder.rules
 
-install -D -m 0644 mtp-responder.service %{buildroot}/%{_unitdir}/mtp-responder.service
-install -D -m 0644 mtp-responder.socket %{buildroot}/%{_unitdir}/mtp-responder.socket
+install -D -m 0644 conf/mtp-responder.service %{buildroot}/%{_unitdir}/mtp-responder.service
+install -D -m 0644 conf/mtp-responder.socket %{buildroot}/%{_unitdir}/mtp-responder.socket
 
 %files
 %manifest mtp-responder.manifest

diff --git a/src/mtp_cmd_handler.c b/src/mtp_cmd_handler.c
index 7c50c55..30e9eae 100644 (file)
--- a/src/mtp_cmd_handler.c
+++ b/src/mtp_cmd_handler.c
@@ -24,14 +24,14 @@
 #include <glib.h>
 #include <glib/gprintf.h>
 #include <vconf.h>
-#include "mtp_support.h"
+#include "mtp_util_support.h"
 #include "ptp_datacodes.h"
-#include "mtp_media_info.h"
+#include "mtp_util_media_info.h"
 #include "mtp_usb_driver.h"
 #include "mtp_cmd_handler.h"
 #include "mtp_cmd_handler_util.h"
 #include "mtp_transport.h"
-#include "mtp_thread.h"
+#include "mtp_util_thread.h"
 
 /*
  * GLOBAL AND EXTERN VARIABLES

diff --git a/src/mtp_cmd_handler_util.c b/src/mtp_cmd_handler_util.c
index 7282a49..a63488e 100644 (file)
--- a/src/mtp_cmd_handler_util.c
+++ b/src/mtp_cmd_handler_util.c
@@ -19,8 +19,8 @@
 #include <glib/gprintf.h>
 #include "mtp_cmd_handler.h"
 #include "mtp_cmd_handler_util.h"
-#include "mtp_support.h"
-#include "mtp_media_info.h"
+#include "mtp_util_support.h"
+#include "mtp_util_media_info.h"
 #include "mtp_transport.h"
 
 /*

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

diff --git a/src/entity/mtp_device.c b/src/mtp_entity_device.c
similarity index 99%
rename from src/entity/mtp_device.c
rename to src/mtp_entity_device.c
index 7e380c3..1b9d7db 100644 (file)
--- a/src/entity/mtp_device.c
+++ b/src/mtp_entity_device.c
@@ -16,10 +16,10 @@
 
 #include <unistd.h>
 #include <glib.h>
-#include "mtp_support.h"
+#include "mtp_util_support.h"
 #include "mtp_util.h"
 #include "ptp_datacodes.h"
-#include "mtp_device.h"
+#include "mtp_entity_device.h"
 #include "mtp_transport.h"
 #include "ptp_container.h"
 

diff --git a/src/entity/mtp_object.c b/src/mtp_entity_object.c
similarity index 99%
rename from src/entity/mtp_object.c
rename to src/mtp_entity_object.c
index 2447693..d4c556e 100644 (file)
--- a/src/entity/mtp_object.c
+++ b/src/mtp_entity_object.c
@@ -19,10 +19,10 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <glib.h>
-#include "mtp_fs.h"
-#include "mtp_support.h"
+#include "mtp_util_fs.h"
+#include "mtp_util_support.h"
 #include "mtp_util.h"
-#include "mtp_device.h"
+#include "mtp_entity_device.h"
 
 
 extern mtp_bool g_is_full_enum;

diff --git a/src/entity/mtp_property.c b/src/mtp_entity_property.c
similarity index 99%
rename from src/entity/mtp_property.c
rename to src/mtp_entity_property.c
index c14f61d..3d4f18d 100644 (file)
--- a/src/entity/mtp_property.c
+++ b/src/mtp_entity_property.c
@@ -15,9 +15,9 @@
  */
 
 #include <glib.h>
-#include "mtp_property.h"
-#include "mtp_media_info.h"
-#include "mtp_support.h"
+#include "mtp_entity_property.h"
+#include "mtp_util_media_info.h"
+#include "mtp_util_support.h"
 #include "mtp_transport.h"
 
 /*

diff --git a/src/entity/mtp_store.c b/src/mtp_entity_store.c
similarity index 99%
rename from src/entity/mtp_store.c
rename to src/mtp_entity_store.c
index b778cc7..cabc0aa 100644 (file)
--- a/src/entity/mtp_store.c
+++ b/src/mtp_entity_store.c
@@ -20,9 +20,9 @@
 #include <dirent.h>
 #include <system_info.h>
 #include "mtp_util.h"
-#include "mtp_support.h"
-#include "mtp_device.h"
-#include "mtp_media_info.h"
+#include "mtp_util_support.h"
+#include "mtp_entity_device.h"
+#include "mtp_util_media_info.h"
 #include "mtp_transport.h"
 #include "mtp_inoti_handler.h"
 

diff --git a/src/mtp_event_handler.c b/src/mtp_event_handler.c
index a2aa7e0..30421fc 100644 (file)
--- a/src/mtp_event_handler.c
+++ b/src/mtp_event_handler.c
@@ -23,11 +23,11 @@
 #include "mtp_event_handler.h"
 #include "mtp_cmd_handler.h"
 #include "mtp_util.h"
-#include "mtp_thread.h"
+#include "mtp_util_thread.h"
 #include "mtp_init.h"
 #include "mtp_usb_driver.h"
 #include "mtp_transport.h"
-#include "mtp_media_info.h"
+#include "mtp_util_media_info.h"
 
 /*
  * GLOBAL AND EXTERN VARIABLES

diff --git a/src/mtp_init.c b/src/mtp_init.c
index ff4777a..040ac21 100644 (file)
--- a/src/mtp_init.c
+++ b/src/mtp_init.c
@@ -23,15 +23,15 @@
 #include <vconf.h>
 #include "mtp_init.h"
 #include "mtp_config.h"
-#include "mtp_thread.h"
-#include "mtp_support.h"
-#include "mtp_device.h"
+#include "mtp_util_thread.h"
+#include "mtp_util_support.h"
+#include "mtp_entity_device.h"
 #include "mtp_event_handler.h"
 #include "mtp_cmd_handler.h"
 #include "mtp_inoti_handler.h"
 #include "mtp_transport.h"
 #include "mtp_util.h"
-#include "mtp_media_info.h"
+#include "mtp_util_media_info.h"
 #include "mtp_usb_driver.h"
 
 /*

diff --git a/src/mtp_inoti_handler.c b/src/mtp_inoti_handler.c
index c899a75..d6cdc1b 100644 (file)
--- a/src/mtp_inoti_handler.c
+++ b/src/mtp_inoti_handler.c
@@ -20,11 +20,11 @@
 #include <sys/stat.h>
 #include <glib.h>
 #include <glib/gprintf.h>
-#include "mtp_thread.h"
+#include "mtp_util_thread.h"
 #include "mtp_inoti_handler.h"
 #include "mtp_event_handler.h"
-#include "mtp_support.h"
-#include "mtp_device.h"
+#include "mtp_util_support.h"
+#include "mtp_entity_device.h"
 #include "mtp_util.h"
 
 /*

diff --git a/src/transport/mtp_transport.c b/src/mtp_transport.c
similarity index 99%
rename from src/transport/mtp_transport.c
rename to src/mtp_transport.c
index bcb3125..ae62d7e 100644 (file)
--- a/src/transport/mtp_transport.c
+++ b/src/mtp_transport.c
@@ -18,13 +18,13 @@
 #include <glib.h>
 #include "mtp_config.h"
 #include "mtp_transport.h"
-#include "mtp_support.h"
+#include "mtp_util_support.h"
 #include "mtp_util.h"
 #include "ptp_datacodes.h"
-#include "mtp_device.h"
-#include "mtp_msgq.h"
+#include "mtp_entity_device.h"
+#include "mtp_util_msgq.h"
 #include "mtp_cmd_handler.h"
-#include "mtp_thread.h"
+#include "mtp_util_thread.h"
 #include "mtp_usb_driver.h"
 
 /*

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

diff --git a/src/transport/mtp_usb_driver_ffs.c b/src/mtp_usb_driver_ffs.c
similarity index 99%
rename from src/transport/mtp_usb_driver_ffs.c
rename to src/mtp_usb_driver_ffs.c
index 4a21ab2..5c135b3 100644 (file)
--- a/src/transport/mtp_usb_driver_ffs.c
+++ b/src/mtp_usb_driver_ffs.c
@@ -22,13 +22,13 @@
 #include <signal.h>
 #include <glib.h>
 #include "mtp_usb_driver.h"
-#include "mtp_device.h"
+#include "mtp_entity_device.h"
 #include "mtp_descs_strings.h"
 #include "ptp_datacodes.h"
-#include "mtp_support.h"
+#include "mtp_util_support.h"
 #include "ptp_container.h"
-#include "mtp_msgq.h"
-#include "mtp_thread.h"
+#include "mtp_util_msgq.h"
+#include "mtp_util_thread.h"
 #include "mtp_transport.h"
 #include "mtp_event_handler.h"
 #include "mtp_init.h"

diff --git a/src/transport/mtp_usb_driver_slp.c b/src/mtp_usb_driver_slp.c
similarity index 99%
rename from src/transport/mtp_usb_driver_slp.c
rename to src/mtp_usb_driver_slp.c
index a19de3d..4d9db9c 100644 (file)
--- a/src/transport/mtp_usb_driver_slp.c
+++ b/src/mtp_usb_driver_slp.c
@@ -20,12 +20,12 @@
 #include <signal.h>
 #include <glib.h>
 #include "mtp_usb_driver.h"
-#include "mtp_device.h"
+#include "mtp_entity_device.h"
 #include "ptp_datacodes.h"
-#include "mtp_support.h"
+#include "mtp_util_support.h"
 #include "ptp_container.h"
-#include "mtp_msgq.h"
-#include "mtp_thread.h"
+#include "mtp_util_msgq.h"
+#include "mtp_util_thread.h"
 #include "mtp_transport.h"
 #include "mtp_event_handler.h"
 #include <sys/prctl.h>

diff --git a/src/util/mtp_util.c b/src/mtp_util.c
similarity index 99%
rename from src/util/mtp_util.c
rename to src/mtp_util.c
index 21f077d..3972f4f 100644 (file)
--- a/src/util/mtp_util.c
+++ b/src/mtp_util.c
@@ -25,9 +25,6 @@
 #include <system_info.h>
 #include <vconf.h>
 #include <gcrypt.h>
-#include "mtp_util.h"
-#include "mtp_support.h"
-#include "mtp_fs.h"
 #include <storage/storage.h>
 #include <sys/stat.h>
 #include <systemd/sd-login.h>
@@ -36,6 +33,9 @@
 #include <media_content_internal.h>
 #include <pwd.h>
 #include <poll.h>
+#include "mtp_util.h"
+#include "mtp_util_support.h"
+#include "mtp_util_fs.h"
 
 /* time to wait for user session creation, in ms */
 #define WAIT_FOR_USER_TIMEOUT 10000

diff --git a/src/util/mtp_fs.c b/src/mtp_util_fs.c
similarity index 99%
rename from src/util/mtp_fs.c
rename to src/mtp_util_fs.c
index ec3f2c7..65f21d7 100644 (file)
--- a/src/util/mtp_fs.c
+++ b/src/mtp_util_fs.c
@@ -24,14 +24,15 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
+#include <errno.h>
 #include <glib.h>
 #include <glib/gprintf.h>
 #include <storage.h>
-#include "mtp_fs.h"
+#include "mtp_util_fs.h"
 #include "mtp_util.h"
-#include "mtp_support.h"
+#include "mtp_util_support.h"
 #include "ptp_datacodes.h"
-#include "mtp_device.h"
+#include "mtp_entity_device.h"
 
 /*
  * FUNCTIONS

diff --git a/src/util/mtp_list.c b/src/mtp_util_list.c
similarity index 99%
rename from src/util/mtp_list.c
rename to src/mtp_util_list.c
index 4016ef2..f2ac661 100644 (file)
--- a/src/util/mtp_list.c
+++ b/src/mtp_util_list.c
@@ -15,7 +15,7 @@
  */
 
 #include <glib.h>
-#include "mtp_list.h"
+#include "mtp_util_list.h"
 
 /*
  * FUNCTIONS

diff --git a/src/util/mtp_media_info.c b/src/mtp_util_media_info.c
similarity index 99%
rename from src/util/mtp_media_info.c
rename to src/mtp_util_media_info.c
index 5076009..8fb89db 100644 (file)
--- a/src/util/mtp_media_info.c
+++ b/src/mtp_util_media_info.c
@@ -21,10 +21,10 @@
 #include <glib.h>
 #include <glib/gprintf.h>
 #include <metadata_extractor.h>
-#include "mtp_media_info.h"
+#include "mtp_util_media_info.h"
 #include "mtp_util.h"
-#include "mtp_support.h"
-#include "mtp_fs.h"
+#include "mtp_util_support.h"
+#include "mtp_util_fs.h"
 
 /* LCOV_EXCL_START */
 static bool __fill_media_id_cb(media_info_h media, void *user_data)

diff --git a/src/util/mtp_msgq.c b/src/mtp_util_msgq.c
similarity index 99%
rename from src/util/mtp_msgq.c
rename to src/mtp_util_msgq.c
index 793dd8f..69838ca 100644 (file)
--- a/src/util/mtp_msgq.c
+++ b/src/mtp_util_msgq.c
@@ -17,7 +17,7 @@
 #include <sys/types.h>
 #include <sys/ipc.h>
 #include <sys/msg.h>
-#include "mtp_msgq.h"
+#include "mtp_util_msgq.h"
 
 /*
  * FUNCTIONS

diff --git a/src/util/mtp_support.c b/src/mtp_util_support.c
similarity index 99%
rename from src/util/mtp_support.c
rename to src/mtp_util_support.c
index fb2b44b..b749d31 100644 (file)
--- a/src/util/mtp_support.c
+++ b/src/mtp_util_support.c
@@ -19,7 +19,7 @@
 #include <unistd.h>
 #include <sys/wait.h>
 #include <stdint.h>
-#include "mtp_support.h"
+#include "mtp_util_support.h"
 #include "ptp_datacodes.h"
 #include "mtp_util.h"
 

diff --git a/src/util/mtp_thread.c b/src/mtp_util_thread.c
similarity index 98%
rename from src/util/mtp_thread.c
rename to src/mtp_util_thread.c
index e779a50..45bb5aa 100644 (file)
--- a/src/util/mtp_thread.c
+++ b/src/mtp_util_thread.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <mtp_thread.h>
+#include "mtp_util_thread.h"
 
 /*
  * FUNCTIONS

diff --git a/src/ptp_container.c b/src/ptp_container.c
index 9d44f57..9f04faf 100644 (file)
--- a/src/ptp_container.c
+++ b/src/ptp_container.c
@@ -18,7 +18,7 @@
 #include "ptp_container.h"
 #include "ptp_datacodes.h"
 #include "mtp_transport.h"
-#include "mtp_support.h"
+#include "mtp_util_support.h"
 #include "mtp_util.h"
 
 /*

diff --git a/unittest/CMakeLists.txt b/tests/CMakeLists.txt
similarity index 82%
rename from unittest/CMakeLists.txt
rename to tests/CMakeLists.txt
index e8384c1..44ad8c2 100644 (file)
--- a/unittest/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -29,7 +29,7 @@ ENDIF(BUILD_GCOV)
 
 INCLUDE(FindPkgConfig)
 
-FILE(GLOB GTEST_TEST_SRCS *.cpp ${CMAKE_SOURCE_DIR}/src/*.c ${CMAKE_SOURCE_DIR}/src/entity/*.c ${CMAKE_SOURCE_DIR}/src/transport/*.c ${CMAKE_SOURCE_DIR}/src/util/*.c )
+FILE(GLOB GTEST_TEST_SRCS *.cpp ${CMAKE_SOURCE_DIR}/src/*.c)
 
 PKG_CHECK_MODULES(GTEST_TEST_PKG REQUIRED ${REQUIRES_LIST})
 
@@ -50,9 +50,6 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS}")
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include/entity)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include/transport)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include/util)
 
 #AUX_SOURCE_DIRECTORY(${CMAKE_SOURCE_DIR}/src SRCS)
 #AUX_SOURCE_DIRECTORY(${CMAKE_SOURCE_DIR}/src/entity SRCS)

diff --git a/unittest/mtpResponder.cpp b/tests/mtpResponder.cpp
similarity index 100%
rename from unittest/mtpResponder.cpp
rename to tests/mtpResponder.cpp

diff --git a/unittest/mtpResponder.h b/tests/mtpResponder.h
similarity index 96%
rename from unittest/mtpResponder.h
rename to tests/mtpResponder.h
index 6d62c39..7c256d2 100644 (file)
--- a/unittest/mtpResponder.h
+++ b/tests/mtpResponder.h
@@ -22,16 +22,16 @@
 #include "mtpconf.h"
 #include "mtp_init.h"
 
-#include "mtp_thread.h"
-#include "mtp_support.h"
-#include "mtp_device.h"
+#include "mtp_util_thread.h"
+#include "mtp_util_support.h"
+#include "mtp_entity_device.h"
 #include "mtp_event_handler.h"
 #include "mtp_cmd_handler.h"
 #include "mtp_cmd_handler_util.h"
 #include "mtp_inoti_handler.h"
 #include "mtp_transport.h"
 #include "mtp_util.h"
-#include "mtp_media_info.h"
+#include "mtp_util_media_info.h"
 #include "mtp_usb_driver.h"
 #include "mtp_descs_strings.h"
 

diff --git a/unittest/mtpconf.h b/tests/mtpconf.h
similarity index 100%
rename from unittest/mtpconf.h
rename to tests/mtpconf.h

diff --git a/unittest/unittest.cpp b/tests/unittest.cpp
similarity index 100%
rename from unittest/unittest.cpp
rename to tests/unittest.cpp