diff options
author | Frank Gevaerts <frank@gevaerts.be> | 2008-03-02 00:32:20 +0000 |
---|---|---|
committer | Frank Gevaerts <frank@gevaerts.be> | 2008-03-02 00:32:20 +0000 |
commit | 014568590d72729add3d508f7a1ab6a2ed6468fc (patch) | |
tree | bd3e559d6382f7cf8cfb3ab0c2e10eb687d1dcff /firmware | |
parent | f18d20ee36f8a23e0f37fd342cf186e3b6a91408 (diff) | |
download | rockbox-014568590d72729add3d508f7a1ab6a2ed6468fc.tar.gz rockbox-014568590d72729add3d508f7a1ab6a2ed6468fc.zip |
Make it not reboot when plugged into a wall charger with USE_ROCKBOX_USB diabled as well...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16472 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/usb.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/firmware/usb.c b/firmware/usb.c index d9c13dffdf..725dd5ed1d 100644 --- a/firmware/usb.c +++ b/firmware/usb.c | |||
@@ -199,15 +199,11 @@ static void usb_thread(void) | |||
199 | #endif | 199 | #endif |
200 | { | 200 | { |
201 | #ifdef HAVE_USBSTACK | 201 | #ifdef HAVE_USBSTACK |
202 | #ifdef USE_ROCKBOX_USB | ||
203 | usb_core_enable_protocol(USB_DRIVER_MASS_STORAGE,true); | 202 | usb_core_enable_protocol(USB_DRIVER_MASS_STORAGE,true); |
204 | usb_core_enable_protocol(USB_DRIVER_SERIAL,false);/* TODO: add debug setting */ | 203 | usb_core_enable_protocol(USB_DRIVER_SERIAL,false);/* TODO: add debug setting */ |
205 | usb_core_enable_protocol(USB_DRIVER_CHARGING_ONLY,false); | 204 | usb_core_enable_protocol(USB_DRIVER_CHARGING_ONLY,false); |
206 | usb_enable(true); | 205 | usb_enable(true); |
207 | #else | 206 | #else |
208 | usb_request_exclusive_ata(); | ||
209 | #endif /* USE_ROCKBOX_USB */ | ||
210 | #else | ||
211 | /* Tell all threads that they have to back off the ATA. | 207 | /* Tell all threads that they have to back off the ATA. |
212 | We subtract one for our own thread. */ | 208 | We subtract one for our own thread. */ |
213 | num_acks_to_expect = | 209 | num_acks_to_expect = |