From 2c74343c98d2d77c7af8e2e14a10e6c2b40bd404 Mon Sep 17 00:00:00 2001 From: Taeyoung Kim Date: Tue, 5 Jan 2016 18:48:06 +0900 Subject: [PATCH] usb: enable usb configuration by usb module of deviced - Previously, usb configuration is set by udev rule since usb uevent is delivered by different subsystem - Now, udev rule is removed and usb configuration is set by usb module of deviced since uevent is delivered by HAL for TM1 device Change-Id: If2fd2ca8522c704dee6deee9f6612cd4b6ec1bf3 Signed-off-by: Taeyoung Kim --- packaging/deviced.spec | 11 +---------- rules/99-deviced-sdb-enable.rules | 2 -- scripts/direct_set_debug.sh | 6 ++---- src/usb/usb-operation.conf | 2 ++ src/usb/usb-setting.conf | 4 ++-- 5 files changed, 7 insertions(+), 18 deletions(-) delete mode 100644 rules/99-deviced-sdb-enable.rules diff --git a/packaging/deviced.spec b/packaging/deviced.spec index f990b8e..e64f119 100644 --- a/packaging/deviced.spec +++ b/packaging/deviced.spec @@ -20,7 +20,7 @@ %define usbhost_module off #Just For debugging -%define sdb_prestart on +%define sdb_prestart off %if "%{?profile}" == "mobile" %define battery_module on @@ -289,11 +289,6 @@ rm -rf %{buildroot} %install_service basic.target.wants sdb-prestart.service %endif -%if "%{?tizen_target_name}" == "TM1" -mkdir -p %{buildroot}%{_prefix}/lib/udev/rules.d/ -install -m 644 rules/99-deviced-sdb-enable.rules %{buildroot}%{_prefix}/lib/udev/rules.d/ -%endif - %post #memory type vconf key init users_gid=$(getent group %{TZ_SYS_USER_GROUP} | cut -f3 -d':') @@ -376,10 +371,6 @@ systemctl daemon-reload %{_unitdir}/basic.target.wants/sdb-prestart.service %endif -%if "%{?tizen_target_name}" == "TM1" -%{_prefix}/lib/udev/rules.d/99-deviced-sdb-enable.rules -%endif - %files tools %manifest %{name}.manifest %{_bindir}/devicectl diff --git a/rules/99-deviced-sdb-enable.rules b/rules/99-deviced-sdb-enable.rules deleted file mode 100644 index 8d460c8..0000000 --- a/rules/99-deviced-sdb-enable.rules +++ /dev/null @@ -1,2 +0,0 @@ -SUBSYSTEM=="switch", ENV{SWITCH_NAME}=="usb_cable", ENV{SWITCH_STATE}=="1", RUN+="/usr/bin/direct_set_debug.sh --sdb-set" -SUBSYSTEM=="switch", ENV{SWITCH_NAME}=="usb_cable", ENV{SWITCH_STATE}=="0", RUN+="/usr/bin/direct_set_debug.sh --sdb-unset" diff --git a/scripts/direct_set_debug.sh b/scripts/direct_set_debug.sh index c32ef41..1bc131f 100755 --- a/scripts/direct_set_debug.sh +++ b/scripts/direct_set_debug.sh @@ -17,10 +17,9 @@ unload_usb_gadget() { } sdb_set() { - load_usb_gadget "6860" "mtp" "mtp,acm,sdb" - /usr/bin/systemctl start mtp-responder.service + load_usb_gadget "6860" "" "sdb" /usr/bin/systemctl start sdbd.service - /usr/bin/vconftool set -t int memory/sysman/usb_status 1 -f + /usr/bin/vconftool set -t int memory/sysman/usb_status 2 -f echo "SDB enabled" } @@ -28,7 +27,6 @@ sdb_unset() { unload_usb_gadget /usr/bin/vconftool set -t int memory/sysman/usb_status 0 -f /usr/bin/systemctl stop sdbd.service - /usr/bin/systemctl stop mtp-responder.service echo "SDB disabled" } diff --git a/src/usb/usb-operation.conf b/src/usb/usb-operation.conf index 8db280d..89d6088 100644 --- a/src/usb/usb-operation.conf +++ b/src/usb/usb-operation.conf @@ -1,3 +1,5 @@ [SDB] +start=/usr/bin/systemctl start mtp-responder.service start=/usr/bin/systemctl start sdbd.service stop=/usr/bin/systemctl stop sdbd.service +stop=/usr/bin/systemctl stop mtp-responder.service diff --git a/src/usb/usb-setting.conf b/src/usb/usb-setting.conf index 7ab4ff7..988b77b 100644 --- a/src/usb/usb-setting.conf +++ b/src/usb/usb-setting.conf @@ -6,8 +6,8 @@ default=SDB [SDB] idVendor=04e8 idProduct=6860 -funcs_fconf= -funcs_sconf=sdb +funcs_fconf=mtp +funcs_sconf=mtp,acm,sdb bDeviceClass=239 bDeviceSubClass=2 bDeviceProtocol=1 -- 2.7.4