Get rid of USE_ROCKBOX_USB

Except for unfinished or experimental ports, it isthe case that
USE_ROCKBOX_USB and HAVE_USBSTACK are both defined or both undefined.
Furthermore, it is a leftover of some early developments on the USB stack and
doesn't make sense anymore.

Change-Id: Ic87a865b6bb4c7c9a8d45d1f0bb0f2fb536b8cad
Reviewed-on: http://gerrit.rockbox.org/1091
Reviewed-by: Amaury Pouly <amaury.pouly@gmail.com>

66 files changed, 7 insertions, 81 deletions

diff --git a/apps/features.txt b/apps/features.txt
index d9ca1a3..997727d 100644
--- a/apps/features.txt
+++ b/apps/features.txt
@@ -258,7 +258,7 @@ scrollwheel
 usb_power
 #endif
 
-#if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB)
+#if defined(HAVE_USBSTACK)
 usbstack
 #endif
 
diff --git a/firmware/drivers/ata.c b/firmware/drivers/ata.c
index 355ff37..b98567e 100644
--- a/firmware/drivers/ata.c
+++ b/firmware/drivers/ata.c
@@ -79,7 +79,7 @@
 static unsigned int ata_thread_id = 0;
 #endif
 
-#if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB)
+#if defined(HAVE_USBSTACK)
 #define ALLOW_USB_SPINDOWN
 #endif
 
diff --git a/firmware/export/config.h b/firmware/export/config.h
index bf95dc4..1f57734 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -1178,9 +1178,7 @@ Lyre prototype 1 */
 #if (CONFIG_PLATFORM & PLATFORM_NATIVE)
 #ifdef USB_HAS_BULK
 //#define USB_ENABLE_SERIAL
-#ifdef USE_ROCKBOX_USB
 #define USB_ENABLE_STORAGE
-#endif /* USE_ROCKBOX_USB */
 #endif /* USB_HAS_BULK */
 
 #ifdef USB_HAS_INTERRUPT
diff --git a/firmware/export/config/cowond2.h b/firmware/export/config/cowond2.h
index 1d9961b..d462338 100644
--- a/firmware/export/config/cowond2.h
+++ b/firmware/export/config/cowond2.h
@@ -9,7 +9,6 @@
 
 #if 0
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x0e21
 #define USB_PRODUCT_ID 0x0800
 #endif
diff --git a/firmware/export/config/creativezen.h b/firmware/export/config/creativezen.h
index ab95067..3667142 100644
--- a/firmware/export/config/creativezen.h
+++ b/firmware/export/config/creativezen.h
@@ -180,7 +180,6 @@
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
 //#define USB_HANDLED_BY_OF
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x041e
 #define USB_PRODUCT_ID 0x4162
 #define HAVE_USB_HID_MOUSE
diff --git a/firmware/export/config/creativezenmozaic.h b/firmware/export/config/creativezenmozaic.h
index 664459b..3a95d03 100644
--- a/firmware/export/config/creativezenmozaic.h
+++ b/firmware/export/config/creativezenmozaic.h
@@ -180,7 +180,6 @@
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
 //#define USB_HANDLED_BY_OF
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x041e
 #define USB_PRODUCT_ID 0x4133
 #define HAVE_USB_HID_MOUSE
diff --git a/firmware/export/config/creativezenv.h b/firmware/export/config/creativezenv.h
index 03dc261b..3e9be8b 100644
--- a/firmware/export/config/creativezenv.h
+++ b/firmware/export/config/creativezenv.h
@@ -177,7 +177,6 @@
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
 //#define USB_HANDLED_BY_OF
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x041e
 #define USB_PRODUCT_ID 0x4133
 #define HAVE_USB_HID_MOUSE
diff --git a/firmware/export/config/creativezenxfi.h b/firmware/export/config/creativezenxfi.h
index db68617..35bd1ef 100644
--- a/firmware/export/config/creativezenxfi.h
+++ b/firmware/export/config/creativezenxfi.h
@@ -187,7 +187,6 @@
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
 //#define USB_HANDLED_BY_OF
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x041e
 #define USB_PRODUCT_ID 0x4162
 #define HAVE_USB_HID_MOUSE
diff --git a/firmware/export/config/creativezenxfi2.h b/firmware/export/config/creativezenxfi2.h
index cc38aae..5b275b1 100644
--- a/firmware/export/config/creativezenxfi2.h
+++ b/firmware/export/config/creativezenxfi2.h
@@ -189,7 +189,6 @@
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
 //#define USB_HANDLED_BY_OF
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x041e
 #define USB_PRODUCT_ID 0x2020
 #define HAVE_USB_HID_MOUSE
diff --git a/firmware/export/config/creativezenxfi3.h b/firmware/export/config/creativezenxfi3.h
index 1a5fa25..9adf593 100644
--- a/firmware/export/config/creativezenxfi3.h
+++ b/firmware/export/config/creativezenxfi3.h
@@ -193,7 +193,6 @@
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
 //#define USB_HANDLED_BY_OF
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x041e
 #define USB_PRODUCT_ID 0x2020
 #define HAVE_USB_HID_MOUSE
diff --git a/firmware/export/config/creativezenxfistyle.h b/firmware/export/config/creativezenxfistyle.h
index 7b8415c..b7d3d61 100644
--- a/firmware/export/config/creativezenxfistyle.h
+++ b/firmware/export/config/creativezenxfistyle.h
@@ -183,7 +183,6 @@
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
 //#define USB_HANDLED_BY_OF
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x041e
 #define USB_PRODUCT_ID 0x200a
 #define HAVE_USB_HID_MOUSE
diff --git a/firmware/export/config/creativezv.h b/firmware/export/config/creativezv.h
index b96bfcc..ce812d3 100644
--- a/firmware/export/config/creativezv.h
+++ b/firmware/export/config/creativezv.h
@@ -163,7 +163,6 @@
 
 #define CONFIG_USBOTG USBOTG_ISP1583
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x041e 
 #define USB_PRODUCT_ID 0x4133
 #define USB_NUM_ENDPOINTS 7
diff --git a/firmware/export/config/gigabeats.h b/firmware/export/config/gigabeats.h
index 6657134..b20a693 100644
--- a/firmware/export/config/gigabeats.h
+++ b/firmware/export/config/gigabeats.h
@@ -217,7 +217,6 @@
 #define CONFIG_USBOTG USBOTG_ARC
 
 /* enable these for the usb stack */
-#define USE_ROCKBOX_USB
 #define HAVE_USBSTACK
 /* usb stack and driver settings */
 #define USB_PORTSCX_PHY_TYPE PORTSCX_PTS_ULPI
diff --git a/firmware/export/config/gogearhdd1630.h b/firmware/export/config/gogearhdd1630.h
index e1e0af0..3898c3f 100644
--- a/firmware/export/config/gogearhdd1630.h
+++ b/firmware/export/config/gogearhdd1630.h
@@ -192,7 +192,6 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x0471
 #define USB_PRODUCT_ID 0x014C
 #define HAVE_USB_HID_MOUSE
diff --git a/firmware/export/config/gogearhdd6330.h b/firmware/export/config/gogearhdd6330.h
index fde8364..b250de8 100644
--- a/firmware/export/config/gogearhdd6330.h
+++ b/firmware/export/config/gogearhdd6330.h
@@ -194,7 +194,6 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x0471
 #define USB_PRODUCT_ID 0x014B
 #define HAVE_USB_HID_MOUSE
diff --git a/firmware/export/config/gogearsa9200.h b/firmware/export/config/gogearsa9200.h
index 90d5ad6..04dcf8a 100644
--- a/firmware/export/config/gogearsa9200.h
+++ b/firmware/export/config/gogearsa9200.h
@@ -173,7 +173,6 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x0471
 #define USB_PRODUCT_ID 0x014f
 #define HAVE_USB_HID_MOUSE
diff --git a/firmware/export/config/hifietma8.h b/firmware/export/config/hifietma8.h
index f5cf8cf..53aee99 100644
--- a/firmware/export/config/hifietma8.h
+++ b/firmware/export/config/hifietma8.h
@@ -115,7 +115,6 @@
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
 
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x071b
 #define USB_PRODUCT_ID 0x3202
 #define HAVE_BOOTLOADER_USB_MODE
diff --git a/firmware/export/config/hifietma8c.h b/firmware/export/config/hifietma8c.h
index 897716b..bc49701 100644
--- a/firmware/export/config/hifietma8c.h
+++ b/firmware/export/config/hifietma8c.h
@@ -115,7 +115,6 @@
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
 
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x071b
 #define USB_PRODUCT_ID 0x3202
 #define HAVE_BOOTLOADER_USB_MODE
diff --git a/firmware/export/config/hifietma9.h b/firmware/export/config/hifietma9.h
index 5df1a5f..81eedb3 100644
--- a/firmware/export/config/hifietma9.h
+++ b/firmware/export/config/hifietma9.h
@@ -115,7 +115,6 @@
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
 
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x071b
 #define USB_PRODUCT_ID 0x3202
 #define HAVE_BOOTLOADER_USB_MODE
diff --git a/firmware/export/config/hifietma9c.h b/firmware/export/config/hifietma9c.h
index 43f20de..21106c7 100644
--- a/firmware/export/config/hifietma9c.h
+++ b/firmware/export/config/hifietma9c.h
@@ -115,7 +115,6 @@
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
 
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x071b
 #define USB_PRODUCT_ID 0x3202
 #define HAVE_BOOTLOADER_USB_MODE
diff --git a/firmware/export/config/hifimanhm60x.h b/firmware/export/config/hifimanhm60x.h
index dbd7478..433b2c4 100644
--- a/firmware/export/config/hifimanhm60x.h
+++ b/firmware/export/config/hifimanhm60x.h
@@ -149,7 +149,6 @@
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
 
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x071b
 #define USB_PRODUCT_ID 0x3202
 #define HAVE_BOOTLOADER_USB_MODE
diff --git a/firmware/export/config/hifimanhm801.h b/firmware/export/config/hifimanhm801.h
index b1c1550..9b4feea 100644
--- a/firmware/export/config/hifimanhm801.h
+++ b/firmware/export/config/hifimanhm801.h
@@ -137,7 +137,6 @@
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
 
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x071b
 #define USB_PRODUCT_ID 0x3202
 #define HAVE_BOOTLOADER_USB_MODE
diff --git a/firmware/export/config/ihifi760.h b/firmware/export/config/ihifi760.h
index f31d64c..e618c1b 100644
--- a/firmware/export/config/ihifi760.h
+++ b/firmware/export/config/ihifi760.h
@@ -149,7 +149,6 @@
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
 
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x071b
 #define USB_PRODUCT_ID 0x3202
 #define HAVE_BOOTLOADER_USB_MODE
diff --git a/firmware/export/config/ihifi960.h b/firmware/export/config/ihifi960.h
index 06dcc86..d39ef82 100644
--- a/firmware/export/config/ihifi960.h
+++ b/firmware/export/config/ihifi960.h
@@ -149,7 +149,6 @@
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
 
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x071b
 #define USB_PRODUCT_ID 0x3202
 #define HAVE_BOOTLOADER_USB_MODE
diff --git a/firmware/export/config/ipod4g.h b/firmware/export/config/ipod4g.h
index 39890cb..dc83a59 100644
--- a/firmware/export/config/ipod4g.h
+++ b/firmware/export/config/ipod4g.h
@@ -202,7 +202,6 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x05ac
 #define USB_PRODUCT_ID 0x1203
 #define HAVE_USB_HID_MOUSE
diff --git a/firmware/export/config/ipod6g.h b/firmware/export/config/ipod6g.h
index 5590c96..d38f604 100644
--- a/firmware/export/config/ipod6g.h
+++ b/firmware/export/config/ipod6g.h
@@ -243,7 +243,6 @@
 #define USB_VENDOR_ID 0x05AC
 #define USB_PRODUCT_ID 0x1261
 #define USB_NUM_ENDPOINTS 6
-#define USE_ROCKBOX_USB
 #define USB_DEVBSS_ATTR __attribute__((aligned(16)))
 
 /* Define this if you can switch on/off the accessory power supply */
diff --git a/firmware/export/config/ipodcolor.h b/firmware/export/config/ipodcolor.h
index 960adf9..9f34a79 100644
--- a/firmware/export/config/ipodcolor.h
+++ b/firmware/export/config/ipodcolor.h
@@ -189,7 +189,6 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x05ac
 #define USB_PRODUCT_ID 0x1204
 #define HAVE_USB_HID_MOUSE
diff --git a/firmware/export/config/ipodmini1g.h b/firmware/export/config/ipodmini1g.h
index 1478121..71dfe16 100644
--- a/firmware/export/config/ipodmini1g.h
+++ b/firmware/export/config/ipodmini1g.h
@@ -201,7 +201,6 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x05ac
 #define USB_PRODUCT_ID 0x1205
 #define HAVE_USB_HID_MOUSE
diff --git a/firmware/export/config/ipodmini2g.h b/firmware/export/config/ipodmini2g.h
index 60959d6..a2b199a 100644
--- a/firmware/export/config/ipodmini2g.h
+++ b/firmware/export/config/ipodmini2g.h
@@ -202,7 +202,6 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x05ac
 #define USB_PRODUCT_ID 0x1205
 #define HAVE_USB_HID_MOUSE
diff --git a/firmware/export/config/ipodnano1g.h b/firmware/export/config/ipodnano1g.h
index 2a3bf4b..acdfff3 100644
--- a/firmware/export/config/ipodnano1g.h
+++ b/firmware/export/config/ipodnano1g.h
@@ -189,7 +189,6 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x05ac
 #define USB_PRODUCT_ID 0x120a
 #define HAVE_USB_HID_MOUSE
diff --git a/firmware/export/config/ipodnano2g.h b/firmware/export/config/ipodnano2g.h
index 2c7db2a..5ad41a1 100644
--- a/firmware/export/config/ipodnano2g.h
+++ b/firmware/export/config/ipodnano2g.h
@@ -227,7 +227,6 @@
 #define USB_VENDOR_ID 0x05AC
 #define USB_PRODUCT_ID 0x1260
 #define USB_NUM_ENDPOINTS 6
-#define USE_ROCKBOX_USB
 #define USB_DEVBSS_ATTR __attribute__((aligned(16)))
 
 /* Define this if you can switch on/off the accessory power supply */
diff --git a/firmware/export/config/ipodvideo.h b/firmware/export/config/ipodvideo.h
index 8a6e53d..2f28182 100644
--- a/firmware/export/config/ipodvideo.h
+++ b/firmware/export/config/ipodvideo.h
@@ -208,7 +208,6 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x05ac
 #define USB_PRODUCT_ID 0x1209
 #define HAVE_USB_HID_MOUSE
diff --git a/firmware/export/config/iriverh10.h b/firmware/export/config/iriverh10.h
index a5d0bf5..efa0c99 100644
--- a/firmware/export/config/iriverh10.h
+++ b/firmware/export/config/iriverh10.h
@@ -173,7 +173,6 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x0B70
 #define USB_PRODUCT_ID 0x00BA
 #define HAVE_USB_HID_MOUSE
diff --git a/firmware/export/config/iriverh10_5gb.h b/firmware/export/config/iriverh10_5gb.h
index 9d52c8b..4d3c3f2 100644
--- a/firmware/export/config/iriverh10_5gb.h
+++ b/firmware/export/config/iriverh10_5gb.h
@@ -160,7 +160,6 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x0B70
 #define USB_PRODUCT_ID 0x00BA
 #define HAVE_USB_HID_MOUSE
diff --git a/firmware/export/config/mrobe100.h b/firmware/export/config/mrobe100.h
index c020bbc..5b6a489 100644
--- a/firmware/export/config/mrobe100.h
+++ b/firmware/export/config/mrobe100.h
@@ -178,7 +178,6 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x07B4
 #define USB_PRODUCT_ID 0x0280
 #define HAVE_USB_HID_MOUSE
diff --git a/firmware/export/config/mrobe500.h b/firmware/export/config/mrobe500.h
index c2738f9..32b4f7c 100644
--- a/firmware/export/config/mrobe500.h
+++ b/firmware/export/config/mrobe500.h
@@ -211,7 +211,6 @@
 
 /* enable these for the usb stack */
 #define CONFIG_USBOTG       USBOTG_M66591
-#define USE_ROCKBOX_USB
 
 #define HAVE_USBSTACK
 //#define HAVE_USB_POWER
diff --git a/firmware/export/config/ondavx747.h b/firmware/export/config/ondavx747.h
index 8499c15..d028458 100644
--- a/firmware/export/config/ondavx747.h
+++ b/firmware/export/config/ondavx747.h
@@ -207,7 +207,6 @@ No access to the NAND yet..
 
 #define CONFIG_USBOTG     USBOTG_JZ4740
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 /* Connect by events, not by tick polling */
 #define USB_STATUS_BY_EVENT
 
diff --git a/firmware/export/config/ondavx767.h b/firmware/export/config/ondavx767.h
index 7499873..77fce1d 100644
--- a/firmware/export/config/ondavx767.h
+++ b/firmware/export/config/ondavx767.h
@@ -163,7 +163,6 @@
 
 #define CONFIG_USBOTG   USBOTG_JZ4740
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID   0x07C4
 #define USB_PRODUCT_ID  0xA4A5
 
diff --git a/firmware/export/config/ondavx777.h b/firmware/export/config/ondavx777.h
index a254b01..404d193 100644
--- a/firmware/export/config/ondavx777.h
+++ b/firmware/export/config/ondavx777.h
@@ -194,7 +194,6 @@ No access to the NAND yet..
 
 #define CONFIG_USBOTG     USBOTG_JZ4740
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 /* Connect by events, not by tick polling */
 #define USB_STATUS_BY_EVENT
 #define USB_VENDOR_ID     0x07C4
diff --git a/firmware/export/config/rk27generic.h b/firmware/export/config/rk27generic.h
index 4d5f1b6..786ac28 100644
--- a/firmware/export/config/rk27generic.h
+++ b/firmware/export/config/rk27generic.h
@@ -157,7 +157,6 @@
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
 
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x071b
 #define USB_PRODUCT_ID 0x3202
 #define HAVE_BOOTLOADER_USB_MODE
diff --git a/firmware/export/config/samsungyh820.h b/firmware/export/config/samsungyh820.h
index fef914e..52ed821 100644
--- a/firmware/export/config/samsungyh820.h
+++ b/firmware/export/config/samsungyh820.h
@@ -165,7 +165,6 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID   0x04e8
 #define USB_PRODUCT_ID  0x5023
 #define HAVE_USB_HID_MOUSE
diff --git a/firmware/export/config/samsungyh920.h b/firmware/export/config/samsungyh920.h
index a05ee94..27f1ca7 100644
--- a/firmware/export/config/samsungyh920.h
+++ b/firmware/export/config/samsungyh920.h
@@ -181,7 +181,6 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID   0x04e8
 #define USB_PRODUCT_ID  0x5022
 #define HAVE_USB_HID_MOUSE
diff --git a/firmware/export/config/samsungyh925.h b/firmware/export/config/samsungyh925.h
index 4816117..e6c2133 100644
--- a/firmware/export/config/samsungyh925.h
+++ b/firmware/export/config/samsungyh925.h
@@ -172,7 +172,6 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID   0x04e8
 #define USB_PRODUCT_ID  0x5024
 #define HAVE_USB_HID_MOUSE
diff --git a/firmware/export/config/samsungyps3.h b/firmware/export/config/samsungyps3.h
index ddfe176..3843a3c 100644
--- a/firmware/export/config/samsungyps3.h
+++ b/firmware/export/config/samsungyps3.h
@@ -149,7 +149,6 @@
 
 /* USB */
 //#define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x04E8
 #define USB_PRODUCT_ID 0x5090
 
diff --git a/firmware/export/config/samsungypz5.h b/firmware/export/config/samsungypz5.h
index b1f382e..0580fbb 100644
--- a/firmware/export/config/samsungypz5.h
+++ b/firmware/export/config/samsungypz5.h
@@ -184,7 +184,6 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x04e8
 #define USB_PRODUCT_ID 0x5041
 #define HAVE_USB_HID_MOUSE
diff --git a/firmware/export/config/sansac200.h b/firmware/export/config/sansac200.h
index c3fd2d0..4e8ea55 100644
--- a/firmware/export/config/sansac200.h
+++ b/firmware/export/config/sansac200.h
@@ -189,7 +189,6 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x0781
 #define USB_PRODUCT_ID 0x7451
 #define HAVE_USB_HID_MOUSE
diff --git a/firmware/export/config/sansac200v2.h b/firmware/export/config/sansac200v2.h
index 2d61124..9e9c8b8 100644
--- a/firmware/export/config/sansac200v2.h
+++ b/firmware/export/config/sansac200v2.h
@@ -184,7 +184,6 @@
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
 //#define USB_HANDLED_BY_OF
-#define USE_ROCKBOX_USB
 //#define USB_ENABLE_SERIAL
 #define USB_VENDOR_ID 0x0781
 #define USB_PRODUCT_ID 0x7452
diff --git a/firmware/export/config/sansaclip.h b/firmware/export/config/sansaclip.h
index 6070a6e..5450040 100644
--- a/firmware/export/config/sansaclip.h
+++ b/firmware/export/config/sansaclip.h
@@ -179,7 +179,6 @@
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
 //#define USB_HANDLED_BY_OF
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x0781
 #define USB_PRODUCT_ID 0x7433
 #define HAVE_USB_HID_MOUSE
diff --git a/firmware/export/config/sansaclipplus.h b/firmware/export/config/sansaclipplus.h
index 0bdf82d..dc9ad90 100644
--- a/firmware/export/config/sansaclipplus.h
+++ b/firmware/export/config/sansaclipplus.h
@@ -186,7 +186,6 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x0781
 #define USB_PRODUCT_ID 0x74d1
 
diff --git a/firmware/export/config/sansaclipv2.h b/firmware/export/config/sansaclipv2.h
index a8ccebc..a61d5ba 100644
--- a/firmware/export/config/sansaclipv2.h
+++ b/firmware/export/config/sansaclipv2.h
@@ -182,7 +182,6 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x0781
 #define USB_PRODUCT_ID 0x7435
 
diff --git a/firmware/export/config/sansaclipzip.h b/firmware/export/config/sansaclipzip.h
index eaf51d9..50147b9 100644
--- a/firmware/export/config/sansaclipzip.h
+++ b/firmware/export/config/sansaclipzip.h
@@ -185,7 +185,6 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x0781
 #define USB_PRODUCT_ID 0x74e5
 
diff --git a/firmware/export/config/sansae200.h b/firmware/export/config/sansae200.h
index 296416a..db3ccb1 100644
--- a/firmware/export/config/sansae200.h
+++ b/firmware/export/config/sansae200.h
@@ -189,7 +189,6 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x0781
 #define USB_PRODUCT_ID 0x7421
 #define HAVE_USB_HID_MOUSE
diff --git a/firmware/export/config/sansae200v2.h b/firmware/export/config/sansae200v2.h
index c703439..23bee8c 100644
--- a/firmware/export/config/sansae200v2.h
+++ b/firmware/export/config/sansae200v2.h
@@ -201,7 +201,6 @@
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
 //#define USB_HANDLED_BY_OF
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x0781
 #define USB_PRODUCT_ID 0x7423
 #define HAVE_USB_HID_MOUSE
diff --git a/firmware/export/config/sansafuze.h b/firmware/export/config/sansafuze.h
index c03106e..b2cdf06 100644
--- a/firmware/export/config/sansafuze.h
+++ b/firmware/export/config/sansafuze.h
@@ -202,7 +202,6 @@
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
 //#define USB_HANDLED_BY_OF
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x0781
 #define USB_PRODUCT_ID 0x74c1
 #define HAVE_USB_HID_MOUSE
diff --git a/firmware/export/config/sansafuzeplus.h b/firmware/export/config/sansafuzeplus.h
index 270060d..73ac5b9 100644
--- a/firmware/export/config/sansafuzeplus.h
+++ b/firmware/export/config/sansafuzeplus.h
@@ -185,7 +185,6 @@
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
 //#define USB_HANDLED_BY_OF
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x0781
 #define USB_PRODUCT_ID 0x74e1
 #define HAVE_USB_HID_MOUSE
diff --git a/firmware/export/config/sansafuzev2.h b/firmware/export/config/sansafuzev2.h
index beb18d9..a0197bf 100644
--- a/firmware/export/config/sansafuzev2.h
+++ b/firmware/export/config/sansafuzev2.h
@@ -203,7 +203,6 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x0781
 #define USB_PRODUCT_ID 0x74c3   /* MSC = 0x74c3, MTP = 0x74c2 */
 
diff --git a/firmware/export/config/sansam200v4.h b/firmware/export/config/sansam200v4.h
index f6b2ebc..99e84e6 100644
--- a/firmware/export/config/sansam200v4.h
+++ b/firmware/export/config/sansam200v4.h
@@ -145,7 +145,6 @@
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
 //#define USB_HANDLED_BY_OF
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x0781
 #define USB_PRODUCT_ID 0x7431
 #define HAVE_USB_HID_MOUSE
diff --git a/firmware/export/config/sansaview.h b/firmware/export/config/sansaview.h
index 1404074..21083da 100644
--- a/firmware/export/config/sansaview.h
+++ b/firmware/export/config/sansaview.h
@@ -171,7 +171,6 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x0781
 #define USB_PRODUCT_ID 0x74b1
 
diff --git a/firmware/export/config/sim.h b/firmware/export/config/sim.h
index 2f819b7..2dd6a92 100644
--- a/firmware/export/config/sim.h
+++ b/firmware/export/config/sim.h
@@ -51,7 +51,6 @@
 #undef USB_HANDLED_BY_OF
 
 #undef HAVE_USBSTACK
-#undef USE_ROCKBOX_USB
 #undef USB_VENDOR_ID
 #undef USB_PRODUCT_ID
 #undef USB_NUM_ENDPOINTS
diff --git a/firmware/export/config/sonynwze360.h b/firmware/export/config/sonynwze360.h
index 685391d..5f5b1cd 100644
--- a/firmware/export/config/sonynwze360.h
+++ b/firmware/export/config/sonynwze360.h
@@ -167,7 +167,6 @@
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
 //#define USB_HANDLED_BY_OF
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x054c
 #define USB_PRODUCT_ID 0x059b
 #define HAVE_USB_HID_MOUSE
diff --git a/firmware/export/config/sonynwze370.h b/firmware/export/config/sonynwze370.h
index 053d103..b4c4f16 100644
--- a/firmware/export/config/sonynwze370.h
+++ b/firmware/export/config/sonynwze370.h
@@ -164,7 +164,6 @@
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
 //#define USB_HANDLED_BY_OF
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x054c
 #define USB_PRODUCT_ID 0x068a
 #define HAVE_USB_HID_MOUSE
diff --git a/firmware/export/config/vibe500.h b/firmware/export/config/vibe500.h
index 96b5321..8e61726 100644
--- a/firmware/export/config/vibe500.h
+++ b/firmware/export/config/vibe500.h
@@ -175,7 +175,6 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x0409
 #define USB_PRODUCT_ID 0x8038
 #define HAVE_USB_HID_MOUSE
diff --git a/firmware/export/config/zenvisionm30gb.h b/firmware/export/config/zenvisionm30gb.h
index 73d8524..6ce2876 100644
--- a/firmware/export/config/zenvisionm30gb.h
+++ b/firmware/export/config/zenvisionm30gb.h
@@ -164,7 +164,6 @@
 
 #define CONFIG_USBOTG USBOTG_ISP1583
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x041e 
 #define USB_PRODUCT_ID 0x4133
 #define USB_NUM_ENDPOINTS 7
diff --git a/firmware/export/config/zenvisionm60gb.h b/firmware/export/config/zenvisionm60gb.h
index d1bd911..5510e9a 100644
--- a/firmware/export/config/zenvisionm60gb.h
+++ b/firmware/export/config/zenvisionm60gb.h
@@ -164,7 +164,6 @@
 /* #define CONFIG_USBOTG    USBOTG_ISP1761 */
 #define CONFIG_USBOTG USBOTG_ISP1583
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x041e 
 #define USB_PRODUCT_ID 0x4133
 #define USB_NUM_ENDPOINTS 7
diff --git a/firmware/target/arm/as3525/usb-as3525.c b/firmware/target/arm/as3525/usb-as3525.c
index 99ae66d..d9fb1fd 100644
--- a/firmware/target/arm/as3525/usb-as3525.c
+++ b/firmware/target/arm/as3525/usb-as3525.c
@@ -32,7 +32,7 @@ static int usb_status = USB_EXTRACTED;
 
 void usb_enable(bool on)
 {
-#if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB)
+#if defined(HAVE_USBSTACK)
     if (on)
         usb_core_init();
     else
diff --git a/firmware/usb.c b/firmware/usb.c
index a7b19eb..fc89df7 100644
--- a/firmware/usb.c
+++ b/firmware/usb.c
@@ -48,10 +48,10 @@
      (defined(HAVE_USBSTACK) && defined(HAVE_BOOTLOADER_USB_MODE)) || \
      (defined(HAVE_USBSTACK) && (defined(CREATIVE_ZVx))) || \
      (defined(HAVE_USBSTACK) && (defined(OLYMPUS_MROBE_500))) || \
-     (defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB) && CONFIG_USBOTG == USBOTG_S3C6400X) || \
+     (defined(HAVE_USBSTACK) && CONFIG_USBOTG == USBOTG_S3C6400X) || \
      defined(CPU_TCC77X) || defined(CPU_TCC780X) || \
      (CONFIG_USBOTG == USBOTG_JZ4740) || \
-     (defined(USE_ROCKBOX_USB) && CONFIG_USBOTG == USBOTG_AS3525)
+     (defined(HAVE_USBSTACK) && CONFIG_USBOTG == USBOTG_AS3525)
 #define USB_FULL_INIT
 #endif
 
@@ -88,8 +88,7 @@ static long usb_last_broadcast_tick = 0;
 static bool usb_charging_only = false;
 #endif
 
-#if defined(USB_FIREWIRE_HANDLING) \
-    || (defined(HAVE_USBSTACK) && !defined(USE_ROCKBOX_USB))
+#if defined(USB_FIREWIRE_HANDLING)
 static void try_reboot(void)
 {
 #ifdef HAVE_DISK_STORAGE
@@ -111,7 +110,7 @@ static void try_reboot(void)
 
     system_reboot(); /* Reboot */
 }
-#endif /* USB_FIRWIRE_HANDLING || (HAVE_USBSTACK && !USE_ROCKBOX_USB) */
+#endif /* USB_FIRWIRE_HANDLING */
 
 /* Screen dump */
 #ifdef HAVE_LCD_BITMAP
@@ -232,7 +231,6 @@ static inline bool usb_configure_drivers(int for_state)
     return false;
 }
 
-#ifdef USE_ROCKBOX_USB
 static inline void usb_slave_mode(bool on)
 {
     int rc;
@@ -259,15 +257,6 @@ static inline void usb_slave_mode(bool on)
         cancel_cpu_boost();
     }
 }
-#else /* !USE_ROCKBOX_USB */
-static inline void usb_slave_mode(bool on)
-{
-    /* Until we have native mass-storage mode, we want to reboot on USB host
-     * connect */
-    if(on)
-        try_reboot();
-}
-#endif /* USE_ROCKBOX_USB */
 
 void usb_signal_transfer_completion(
     struct usb_transfer_completion_event_data* event_data)