Revert "usb: move vconf enum to deviced"

This reverts commit 0c5bad3d29e5a02272fa5434da4cc99ac19bc7a5.

Change-Id: If26ac0bf037c16ee521c9517296441404e7be159

diff --git a/src/usb/usb-dbus.c b/src/usb/usb-dbus.c
index 35eb16d..137a5e1 100644 (file)
--- a/src/usb/usb-dbus.c
+++ b/src/usb/usb-dbus.c
@@ -25,7 +25,6 @@
 #include "core/log.h"
 
 #include "usb.h"
-#include "usb-gadget.h"
 #include "usb-debug.h"
 
 /* Legacy signals */

diff --git a/src/usb/usb-debug.c b/src/usb/usb-debug.c
index 22b5025..f6bfb23 100644 (file)
--- a/src/usb/usb-debug.c
+++ b/src/usb/usb-debug.c
@@ -26,7 +26,6 @@
 #include "shared/device-notifier.h"
 
 #include "usb.h"
-#include "usb-gadget.h"
 
 static bool debug_state;
 

diff --git a/src/usb/usb-gadget.c b/src/usb/usb-gadget.c
index 6a9030c..efa1da8 100644 (file)
--- a/src/usb/usb-gadget.c
+++ b/src/usb/usb-gadget.c
@@ -3,6 +3,7 @@
 
 #include <libsyscommon/libsystemd.h>
 #include <libsyscommon/list.h>
+#include <vconf-internal-usb-keys.h>
 
 #include <shared/log.h>
 

diff --git a/src/usb/usb-gadget.h b/src/usb/usb-gadget.h
index e49e8e8..161be96 100644 (file)
--- a/src/usb/usb-gadget.h
+++ b/src/usb/usb-gadget.h
@@ -2,6 +2,7 @@
 #define __USB_GADGET_H__
 
 #include <stdint.h>
+#include <vconf-internal-usb-keys.h>
 
 /*The default USB configuration */
 #define DEFAULT_VID 0x04e8
@@ -72,46 +73,6 @@ struct usb_gadget_id {
        unsigned int function_mask;
 };
 
-enum usb_mode_idx {
-       USB_FUNCTION_IDX_MTP = 0,
-               USB_FUNCTION_IDX_ACM = 1,
-               USB_FUNCTION_IDX_SDB = 2,
-               USB_FUNCTION_IDX_RNDIS = 3,
-               USB_FUNCTION_IDX_DIAG = 4,
-               USB_FUNCTION_IDX_CONN_GADGET = 5,
-               USB_FUNCTION_IDX_DM = 6,
-               USB_FUNCTION_IDX_RMNET = 7,
-               USB_FUNCTION_IDX_MAX = 8
-};
-
-enum usb_mode {
-       USB_FUNCTION_NONE = 0,
-               USB_FUNCTION_MTP = 1,
-               USB_FUNCTION_ACM = 2,
-               USB_FUNCTION_SDB = 4,
-               USB_FUNCTION_RNDIS = 8,
-               USB_FUNCTION_DIAG = 16,
-               USB_FUNCTION_CONN_GADGET = 32,
-               USB_FUNCTION_DM = 64,
-               USB_FUNCTION_RMNET = 128
-};
-
-enum usb_mode_deprecated {
-       SET_USB_NONE = 0,
-               SET_USB_DEFAULT = 1,
-               SET_USB_SDB = 2,
-               SET_USB_SDB_DIAG = 3,
-               SET_USB_RNDIS_TETHERING = 4,
-               SET_USB_RNDIS  = 5,
-               SET_USB_RNDIS_SDB = 6,
-               SET_USB_DIAG_SDB = 7,
-               SET_USB_RNDIS_DIAG = 8,
-               SET_USB_ACCESSORY = 9,
-               SET_USB_DIAG_RMNET = 11,
-               SET_USB_ACM_SDB_DM = 12,
-               SET_USB_RNDIS_SDB_ACM = 13
-};
-
 struct usb_function *find_usb_function_by_name(const char *name);
 struct usb_function *find_usb_function_by_name_instance(const char *name, const char *instance);
 

diff --git a/src/usb/usb-tethering.c b/src/usb/usb-tethering.c
index 76dcb7d..f0d7142 100644 (file)
--- a/src/usb/usb-tethering.c
+++ b/src/usb/usb-tethering.c
@@ -25,7 +25,6 @@
 #include "shared/device-notifier.h"
 
 #include "usb.h"
-#include "usb-gadget.h"
 
 static bool tethering_state;