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")
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)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/strs DESTINATION /etc/mtp-responder)
IF(BUILD_GTESTS)
- ADD_SUBDIRECTORY(unittest)
+ ADD_SUBDIRECTORY(tests)
ENDIF(BUILD_GTESTS)
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"
extern "C" {
#endif
-#include "mtp_device.h"
+#include "mtp_entity_device.h"
typedef struct {
mtp_uint32 store_id;
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
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))
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
extern "C" {
#endif
-#include "mtp_object.h"
+#include "mtp_entity_object.h"
/* First six members of SStorageInfo structure */
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*/
#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"
%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
#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
#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"
/*
#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"
#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;
*/
#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"
/*
#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"
#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
#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"
/*
#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"
/*
#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"
/*
#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"
#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>
#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>
#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
#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
*/
#include <glib.h>
-#include "mtp_list.h"
+#include "mtp_util_list.h"
/*
* FUNCTIONS
#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)
#include <sys/types.h>
#include <sys/ipc.h>
#include <sys/msg.h>
-#include "mtp_msgq.h"
+#include "mtp_util_msgq.h"
/*
* FUNCTIONS
#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"
* limitations under the License.
*/
-#include <mtp_thread.h>
+#include "mtp_util_thread.h"
/*
* FUNCTIONS
#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"
/*
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})
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)
#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"