diff options
Diffstat (limited to 'firmware/usb.c')
-rw-r--r-- | firmware/usb.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/firmware/usb.c b/firmware/usb.c index a7b19eb065..fc89df709c 100644 --- a/firmware/usb.c +++ b/firmware/usb.c | |||
@@ -48,10 +48,10 @@ | |||
48 | (defined(HAVE_USBSTACK) && defined(HAVE_BOOTLOADER_USB_MODE)) || \ | 48 | (defined(HAVE_USBSTACK) && defined(HAVE_BOOTLOADER_USB_MODE)) || \ |
49 | (defined(HAVE_USBSTACK) && (defined(CREATIVE_ZVx))) || \ | 49 | (defined(HAVE_USBSTACK) && (defined(CREATIVE_ZVx))) || \ |
50 | (defined(HAVE_USBSTACK) && (defined(OLYMPUS_MROBE_500))) || \ | 50 | (defined(HAVE_USBSTACK) && (defined(OLYMPUS_MROBE_500))) || \ |
51 | (defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB) && CONFIG_USBOTG == USBOTG_S3C6400X) || \ | 51 | (defined(HAVE_USBSTACK) && CONFIG_USBOTG == USBOTG_S3C6400X) || \ |
52 | defined(CPU_TCC77X) || defined(CPU_TCC780X) || \ | 52 | defined(CPU_TCC77X) || defined(CPU_TCC780X) || \ |
53 | (CONFIG_USBOTG == USBOTG_JZ4740) || \ | 53 | (CONFIG_USBOTG == USBOTG_JZ4740) || \ |
54 | (defined(USE_ROCKBOX_USB) && CONFIG_USBOTG == USBOTG_AS3525) | 54 | (defined(HAVE_USBSTACK) && CONFIG_USBOTG == USBOTG_AS3525) |
55 | #define USB_FULL_INIT | 55 | #define USB_FULL_INIT |
56 | #endif | 56 | #endif |
57 | 57 | ||
@@ -88,8 +88,7 @@ static long usb_last_broadcast_tick = 0; | |||
88 | static bool usb_charging_only = false; | 88 | static bool usb_charging_only = false; |
89 | #endif | 89 | #endif |
90 | 90 | ||
91 | #if defined(USB_FIREWIRE_HANDLING) \ | 91 | #if defined(USB_FIREWIRE_HANDLING) |
92 | || (defined(HAVE_USBSTACK) && !defined(USE_ROCKBOX_USB)) | ||
93 | static void try_reboot(void) | 92 | static void try_reboot(void) |
94 | { | 93 | { |
95 | #ifdef HAVE_DISK_STORAGE | 94 | #ifdef HAVE_DISK_STORAGE |
@@ -111,7 +110,7 @@ static void try_reboot(void) | |||
111 | 110 | ||
112 | system_reboot(); /* Reboot */ | 111 | system_reboot(); /* Reboot */ |
113 | } | 112 | } |
114 | #endif /* USB_FIRWIRE_HANDLING || (HAVE_USBSTACK && !USE_ROCKBOX_USB) */ | 113 | #endif /* USB_FIRWIRE_HANDLING */ |
115 | 114 | ||
116 | /* Screen dump */ | 115 | /* Screen dump */ |
117 | #ifdef HAVE_LCD_BITMAP | 116 | #ifdef HAVE_LCD_BITMAP |
@@ -232,7 +231,6 @@ static inline bool usb_configure_drivers(int for_state) | |||
232 | return false; | 231 | return false; |
233 | } | 232 | } |
234 | 233 | ||
235 | #ifdef USE_ROCKBOX_USB | ||
236 | static inline void usb_slave_mode(bool on) | 234 | static inline void usb_slave_mode(bool on) |
237 | { | 235 | { |
238 | int rc; | 236 | int rc; |
@@ -259,15 +257,6 @@ static inline void usb_slave_mode(bool on) | |||
259 | cancel_cpu_boost(); | 257 | cancel_cpu_boost(); |
260 | } | 258 | } |
261 | } | 259 | } |
262 | #else /* !USE_ROCKBOX_USB */ | ||
263 | static inline void usb_slave_mode(bool on) | ||
264 | { | ||
265 | /* Until we have native mass-storage mode, we want to reboot on USB host | ||
266 | * connect */ | ||
267 | if(on) | ||
268 | try_reboot(); | ||
269 | } | ||
270 | #endif /* USE_ROCKBOX_USB */ | ||
271 | 260 | ||
272 | void usb_signal_transfer_completion( | 261 | void usb_signal_transfer_completion( |
273 | struct usb_transfer_completion_event_data* event_data) | 262 | struct usb_transfer_completion_event_data* event_data) |