From e0e913227ba6f4eeb39ae14c9a12ca8f95f273f1 Mon Sep 17 00:00:00 2001 From: Youngjae Cho Date: Tue, 3 May 2022 09:38:40 +0900 Subject: [PATCH] usb: apply new enums for usb-gadget mode Change-Id: I2b5328d2c51f3002820f7de8e40ed801eabb4852 Signed-off-by: Youngjae Cho --- CMakeLists.txt | 1 + packaging/data-router.spec | 1 + src/dr-noti-handler.c | 10 ++-------- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a66e76..289aa9c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,6 +19,7 @@ INCLUDE(FindPkgConfig) pkg_check_modules(pkgs REQUIRED glib-2.0 gio-2.0 dlog vconf + capi-system-device ) FOREACH(flag ${pkgs_CFLAGS}) diff --git a/packaging/data-router.spec b/packaging/data-router.spec index a14cacf..9222901 100755 --- a/packaging/data-router.spec +++ b/packaging/data-router.spec @@ -11,6 +11,7 @@ BuildRequires: pkgconfig(glib-2.0) >= 2.26 BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(vconf) +BuildRequires: pkgconfig(capi-system-device) Requires(post): /usr/bin/vconftool %description diff --git a/src/dr-noti-handler.c b/src/dr-noti-handler.c index a99e05d..b47f762 100755 --- a/src/dr-noti-handler.c +++ b/src/dr-noti-handler.c @@ -23,6 +23,7 @@ #include #include +#include #include "dr-main.h" #include "dr-usb.h" @@ -38,14 +39,7 @@ volatile gboolean dsr_status = FALSE; static gboolean acm_enabled(int mode) { - switch (mode) { - case SET_USB_DEFAULT: - case SET_USB_SDB: - case SET_USB_SDB_DIAG: - return TRUE; - default: - return FALSE; - } + return (mode & USB_GADGET_FUNC_ACM); } static void __usb_status_noti_handler(void *data) -- 2.34.1