Revert "Revert "Change default ffs path to match system policy""

This reverts commit a2f21a7ccaab14768d02dd891ca96c3a0e6aff7e.

Change-Id: I96e449da8e6fa9a6c16d4f4c249fb431ea2952e7

diff --git a/packaging/sdbd.socket b/packaging/sdbd.socket
index 486b377..8cce929 100644 (file)
--- a/packaging/sdbd.socket
+++ b/packaging/sdbd.socket
@@ -2,5 +2,5 @@
 Description=sdbd Socket for sdb
 
 [Socket]
-ListenUSBFunction=/dev/usb-funcs/sdb
+ListenUSBFunction=/dev/usb-funcs/sdb/default
 Service=sdbd.service

diff --git a/src/sdb.h b/src/sdb.h
index fe702c3..5be6f89 100644 (file)
--- a/src/sdb.h
+++ b/src/sdb.h
@@ -514,7 +514,7 @@ int copy_packet(apacket* dest, apacket* src);
 int is_emulator(void);
 #define DEFAULT_DEVICENAME "unknown"
 
-#define USB_FUNCFS_SDB_PATH "/dev/usb-funcs/sdb"
+#define USB_FUNCFS_SDB_PATH "/dev/usb-funcs/sdb/default/"
 #define USB_NODE_FILE "/dev/samsung_sdb"
 int create_subprocess(const char *cmd, pid_t *pid, char * const argv[], char * const envp[]);
 void get_env(char *key, char **env);