summaryrefslogtreecommitdiffstats
path: root/bootloader
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2012-01-01 03:19:52 +0000
committerMichael Sevakis <jethead71@rockbox.org>2012-01-01 03:19:52 +0000
commit36bc6a1fd5273a22daf4e00e5da058250ab54774 (patch)
tree0ad1128efd7c414c20ea5de577d345b25be1592e /bootloader
parent7b22ea0d377f69ec7a0d7be7215ef3c560ce13e7 (diff)
downloadrockbox-36bc6a1fd5273a22daf4e00e5da058250ab54774.tar.gz
rockbox-36bc6a1fd5273a22daf4e00e5da058250ab54774.tar.bz2
rockbox-36bc6a1fd5273a22daf4e00e5da058250ab54774.zip
Gigabeat S: Revert removal of usb_plugged in r31489
Synchronous cable read is still required because the timing of the receipt of the cable event cannot be known for sure-- basically it introduced a thread race between main and pmic. If a keypress is desired instead to enter BL USB mode a la AS3525, then it's possible to remove that. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31510 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'bootloader')
-rw-r--r--bootloader/gigabeat-s.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/bootloader/gigabeat-s.c b/bootloader/gigabeat-s.c
index 5b5361530b..909194e1b2 100644
--- a/bootloader/gigabeat-s.c
+++ b/bootloader/gigabeat-s.c
@@ -109,7 +109,7 @@ static void handle_usb(int connect_timeout)
break;
}
- if (usb_detect() == USB_EXTRACTED)
+ if (usb_plugged() == USB_EXTRACTED)
break; /* Cable pulled */
}
@@ -376,7 +376,7 @@ void main(void)
/* Do USB first since a tar or binary could be added to the MTP directory
* at the time and we can untar or move after unplugging. */
- if (usb_detect() == USB_INSERTED)
+ if (usb_plugged() == USB_INSERTED)
handle_usb(HZ*2);
handle_untar();