len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Get rid of USE_ROCKBOX_USB

Browse source 
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>
This commit is contained in:
Amaury Pouly 2014-12-30 17:36:59 +01:00
parent f91434cc7b
commit 66690ca987
66 changed files with 7 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/features.txt
View file

@ -258,7 +258,7 @@ scrollwheel
usb_power
#endif
#if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB)
#if defined(HAVE_USBSTACK)
usbstack
#endif

2
firmware/drivers/ata.c
View file

@ -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

2
firmware/export/config.h
View file

@ -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

1
firmware/export/config/cowond2.h
View file

@ -9,7 +9,6 @@
#if 0
#define HAVE_USBSTACK
#define USE_ROCKBOX_USB
#define USB_VENDOR_ID 0x0e21
#define USB_PRODUCT_ID 0x0800
#endif

1
firmware/export/config/creativezen.h
View file

@ -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

1
firmware/export/config/creativezenmozaic.h
View file

@ -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

1
firmware/export/config/creativezenv.h
View file

@ -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

1
firmware/export/config/creativezenxfi.h
View file

@ -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

1
firmware/export/config/creativezenxfi2.h
View file

@ -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

1
firmware/export/config/creativezenxfi3.h
View file

@ -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

1
firmware/export/config/creativezenxfistyle.h
View file

@ -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

1
firmware/export/config/creativezv.h
View file

@ -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

1
firmware/export/config/gigabeats.h
View file

@ -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

1
firmware/export/config/gogearhdd1630.h
View file

@ -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

1
firmware/export/config/gogearhdd6330.h
View file

@ -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

1
firmware/export/config/gogearsa9200.h
View file

@ -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

1
firmware/export/config/hifietma8.h
View file

@ -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

1
firmware/export/config/hifietma8c.h
View file

@ -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

1
firmware/export/config/hifietma9.h
View file

@ -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

1
firmware/export/config/hifietma9c.h
View file

@ -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

1
firmware/export/config/hifimanhm60x.h
View file

@ -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

1
firmware/export/config/hifimanhm801.h
View file

@ -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

1
firmware/export/config/ihifi760.h
View file

@ -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

1
firmware/export/config/ihifi960.h
View file

@ -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

1
firmware/export/config/ipod4g.h
View file

@ -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

1
firmware/export/config/ipod6g.h
View file

@ -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 */

1
firmware/export/config/ipodcolor.h
View file

@ -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

1
firmware/export/config/ipodmini1g.h
View file

@ -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

1
firmware/export/config/ipodmini2g.h
View file

@ -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

1
firmware/export/config/ipodnano1g.h
View file

@ -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

1
firmware/export/config/ipodnano2g.h
View file

@ -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 */

1
firmware/export/config/ipodvideo.h
View file

@ -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

1
firmware/export/config/iriverh10.h
View file

@ -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

1
firmware/export/config/iriverh10_5gb.h
View file

@ -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

1
firmware/export/config/mrobe100.h
View file

@ -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

1
firmware/export/config/mrobe500.h
View file

@ -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

1
firmware/export/config/ondavx747.h
View file

@ -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

1
firmware/export/config/ondavx767.h
View file

@ -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

1
firmware/export/config/ondavx777.h
View file

@ -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

1
firmware/export/config/rk27generic.h
View file

@ -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

1
firmware/export/config/samsungyh820.h
View file

@ -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

1
firmware/export/config/samsungyh920.h
View file

@ -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

1
firmware/export/config/samsungyh925.h
View file

@ -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

1
firmware/export/config/samsungyps3.h
View file

@ -149,7 +149,6 @@
/* USB */
//#define HAVE_USBSTACK
#define USE_ROCKBOX_USB
#define USB_VENDOR_ID 0x04E8
#define USB_PRODUCT_ID 0x5090

1
firmware/export/config/samsungypz5.h
View file

@ -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

1
firmware/export/config/sansac200.h
View file

@ -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

1
firmware/export/config/sansac200v2.h
View file

@ -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

1
firmware/export/config/sansaclip.h
View file

@ -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

1
firmware/export/config/sansaclipplus.h
View file

@ -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

1
firmware/export/config/sansaclipv2.h
View file

@ -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

1
firmware/export/config/sansaclipzip.h
View file

@ -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

1
firmware/export/config/sansae200.h
View file

@ -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

1
firmware/export/config/sansae200v2.h
View file

@ -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

1
firmware/export/config/sansafuze.h
View file

@ -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

1
firmware/export/config/sansafuzeplus.h
View file

@ -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

1
firmware/export/config/sansafuzev2.h
View file

@ -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 */

1
firmware/export/config/sansam200v4.h
View file

@ -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

1
firmware/export/config/sansaview.h
View file

@ -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

1
firmware/export/config/sim.h
View file

@ -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

1
firmware/export/config/sonynwze360.h
View file

@ -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

1
firmware/export/config/sonynwze370.h
View file

@ -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

1
firmware/export/config/vibe500.h
View file

@ -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

1
firmware/export/config/zenvisionm30gb.h
View file

@ -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

1
firmware/export/config/zenvisionm60gb.h
View file

@ -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

2
firmware/target/arm/as3525/usb-as3525.c
View file

@ -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

19
firmware/usb.c
View file

@ -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)