6 files changed, 31 insertions, 15 deletions

diff --git a/firmware/export/as3525.h b/firmware/export/as3525.h
index 39e0706637..b7da19320d 100644
--- a/firmware/export/as3525.h
+++ b/firmware/export/as3525.h
@@ -500,4 +500,8 @@ interface */
 /* Timer frequency */
 #define TIMER_FREQ (24000000 / 16)
 
+/* USB : TODO */
+#define USB_NUM_ENDPOINTS 4
+#define USB_DEVBSS_ATTR IBSS_ATTR
+
 #endif /*__AS3525_H__*/
diff --git a/firmware/export/config-c200v2.h b/firmware/export/config-c200v2.h
index ae2cd04c0b..cde5e9b0e5 100644
--- a/firmware/export/config-c200v2.h
+++ b/firmware/export/config-c200v2.h
@@ -168,17 +168,21 @@
 /* Type of LCD : Samsung S6B33B2 */
 #define CONFIG_LCD LCD_C200
 
-#define USB_HANDLED_BY_OF
-
 #ifndef BOOTLOADER
 #define HAVE_MULTIVOLUME
 #define HAVE_HOTSWAP
-#endif
+
+#define USB_HANDLED_BY_OF
+
+#define CONFIG_USB USBOTG_AS3525
 
 /* enable these for the experimental usb stack */
-//#define HAVE_USBSTACK
-//#define USB_VENDOR_ID 0x0781
-//#define USB_PRODUCT_ID 0x7452
+#define HAVE_USBSTACK
+#define USB_VENDOR_ID 0x0781
+#define USB_PRODUCT_ID 0x7452
+
+#endif /* BOOTLOADER */
+
 /* Virtual LED (icon) */
 #define CONFIG_LED LED_VIRTUAL
 
diff --git a/firmware/export/config-clip.h b/firmware/export/config-clip.h
index 37b1a3185a..45b0a607c0 100644
--- a/firmware/export/config-clip.h
+++ b/firmware/export/config-clip.h
@@ -175,19 +175,14 @@
 
 #define USB_HANDLED_BY_OF
 
-#if 0 /* disabled since there is no USB driver */
-
-/* USB On-the-go */
-#define CONFIG_USBOTG USBOTG_ARC
+#define CONFIG_USB USBOTG_AS3525
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
 #define USB_VENDOR_ID 0x0781
 #define USB_PRODUCT_ID 0x7433
-#endif /* BOOTLOADER */
-
-#endif
 
+#endif /* BOOTLOADER */
 
 /* Virtual LED (icon) */
 #define CONFIG_LED LED_VIRTUAL
diff --git a/firmware/export/config-e200v2.h b/firmware/export/config-e200v2.h
index cc66b73249..a1c41fbe7d 100644
--- a/firmware/export/config-e200v2.h
+++ b/firmware/export/config-e200v2.h
@@ -190,7 +190,7 @@
 #define CONFIG_USBOTG USBOTG_AS3525
 
 /* enable these for the experimental usb stack */
-//#define HAVE_USBSTACK
+#define HAVE_USBSTACK
 #define USB_VENDOR_ID 0x0781
 #define USB_PRODUCT_ID 0x7423
 
diff --git a/firmware/export/config-fuze.h b/firmware/export/config-fuze.h
index c8fae9aca9..b9c5acb9b1 100644
--- a/firmware/export/config-fuze.h
+++ b/firmware/export/config-fuze.h
@@ -188,7 +188,7 @@
 #define CONFIG_USBOTG USBOTG_AS3525
 
 /* enable these for the experimental usb stack */
-//#define HAVE_USBSTACK
+#define HAVE_USBSTACK
 #define USB_VENDOR_ID 0x0781
 #define USB_PRODUCT_ID 0x7423
 
diff --git a/firmware/export/config-m200v4.h b/firmware/export/config-m200v4.h
index 16b704cea4..e23f3eb0e2 100644
--- a/firmware/export/config-m200v4.h
+++ b/firmware/export/config-m200v4.h
@@ -139,6 +139,19 @@
 /* Offset ( in the firmware file's header ) to the real data */
 #define FIRMWARE_OFFSET_FILE_DATA 8
 
+#ifndef BOOTLOADER
+
+#define USB_HANDLED_BY_OF
+
+#define CONFIG_USB USBOTG_AS3525
+
+/* enable these for the experimental usb stack */
+#define HAVE_USBSTACK
+#define USB_VENDOR_ID 0x0781
+#define USB_PRODUCT_ID 0x7431
+
+#endif /* BOOTLOADER */
+
 /* Software controlled LED */
 #define CONFIG_LED LED_VIRTUAL