Apply new enums for usb-gadget mode

Change-Id: I135458cc935e84f66a0fff841d48f6158e5a8c11
Signed-off-by: Jihoon Jung <jh8801.jung@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e80df8050163445f4fbed57356cd66e198a5bba..a23036d65993f4d487dd30d5337c9303a6899682 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 
 SET(REQUIRED_PKGS capi-content-media-content capi-media-metadata-extractor
-       capi-system-info dlog glib-2.0 libsystemd storage tapi vconf
+       capi-system-device capi-system-info dlog glib-2.0 libsystemd storage tapi vconf
 )
 PKG_CHECK_MODULES(PKGS REQUIRED ${REQUIRED_PKGS})
 INCLUDE_DIRECTORIES(${PKGS_INCLUDE_DIRS})

diff --git a/packaging/mtp-responder.spec b/packaging/mtp-responder.spec
index fddda5d2a0770d89d3ecb7b7a4fea5f602a61406..d629c468ea66acf462936a7e2890e2b19d537b40 100644 (file)
--- a/packaging/mtp-responder.spec
+++ b/packaging/mtp-responder.spec
@@ -15,6 +15,7 @@ BuildRequires: cmake
 BuildRequires: libgcrypt-devel
 BuildRequires: pkgconfig(capi-content-media-content)
 BuildRequires: pkgconfig(capi-media-metadata-extractor)
+BuildRequires: pkgconfig(capi-system-device)
 BuildRequires: pkgconfig(capi-system-info)
 BuildRequires: pkgconfig(dlog)
 BuildRequires: pkgconfig(glib-2.0)

diff --git a/src/mtp_util.c b/src/mtp_util.c
index 3972f4f1639647b270fccecacbfb0cf0fc7d7f6b..df5ec81c1090a31893319dd11adc9bb1bbb18bfe 100644 (file)
--- a/src/mtp_util.c
+++ b/src/mtp_util.c
@@ -36,7 +36,7 @@
 #include "mtp_util.h"
 #include "mtp_util_support.h"
 #include "mtp_util_fs.h"
-
+#include <device/usb-gadget.h>
 /* time to wait for user session creation, in ms */
 #define WAIT_FOR_USER_TIMEOUT 10000
 
@@ -295,7 +295,7 @@ void _util_get_usbmode_status(phone_status_t *val)
                return;
        }
 
-       if (state == SET_USB_NONE)
+       if (state == USB_GADGET_FUNC_NONE)
                *val = MTP_PHONE_USB_DISCONNECTED;
        else
                *val = MTP_PHONE_USB_CONNECTED;