summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Gevaerts <frank@gevaerts.be>2008-03-02 00:32:20 +0000
committerFrank Gevaerts <frank@gevaerts.be>2008-03-02 00:32:20 +0000
commit014568590d72729add3d508f7a1ab6a2ed6468fc (patch)
treebd3e559d6382f7cf8cfb3ab0c2e10eb687d1dcff
parentf18d20ee36f8a23e0f37fd342cf186e3b6a91408 (diff)
downloadrockbox-014568590d72729add3d508f7a1ab6a2ed6468fc.zip
rockbox-014568590d72729add3d508f7a1ab6a2ed6468fc.tar.gz
rockbox-014568590d72729add3d508f7a1ab6a2ed6468fc.tar.bz2
rockbox-014568590d72729add3d508f7a1ab6a2ed6468fc.tar.xz
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
-rw-r--r--firmware/usb.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/firmware/usb.c b/firmware/usb.c
index d9c13df..725dd5e 100644
--- a/firmware/usb.c
+++ b/firmware/usb.c
@@ -199,15 +199,11 @@ static void usb_thread(void)
#endif
{
#ifdef HAVE_USBSTACK
-#ifdef USE_ROCKBOX_USB
usb_core_enable_protocol(USB_DRIVER_MASS_STORAGE,true);
usb_core_enable_protocol(USB_DRIVER_SERIAL,false);/* TODO: add debug setting */
usb_core_enable_protocol(USB_DRIVER_CHARGING_ONLY,false);
usb_enable(true);
#else
- usb_request_exclusive_ata();
-#endif /* USE_ROCKBOX_USB */
-#else
/* Tell all threads that they have to back off the ATA.
We subtract one for our own thread. */
num_acks_to_expect =