devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

FS #7691 - improved USB detection on PP devices. This patch modifies the target-tree function usb_detect() on all targets from bool to int, returning USB_INSERTED or USB_EXTRACTED instead of true or false. This was done to enable the PP usb_detect() to check for USB_POWER (either a connection to a USB wall charger, or the user holding "charge mode" button) and return that as a third value.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14600 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dave Chapman 2007-09-04 08:03:07 +00:00
parent 946a815cd4
commit 1672350378
19 changed files with 163 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

10
bootloader/main.c
View file

@ -388,7 +388,7 @@ void main(void)
power_init();
/* Turn off if neither ON button is pressed */
if(!(on_button || rc_on_button || usb_detect()))
if(!(on_button || rc_on_button || (usb_detect() == USB_INSERTED)))
{
__reset_cookie();
power_off();
@ -439,7 +439,7 @@ void main(void)
}
# ifdef EEPROM_SETTINGS
if (!hold_status && !usb_detect() && !recovery_mode)
if (!hold_status && (usb_detect() != USB_INSERTED) && !recovery_mode)
try_flashboot();
# endif
@ -467,7 +467,7 @@ void main(void)
/* Don't start if the Hold button is active on the device you
are starting with */
if (!usb_detect() && (hold_status
if ((usb_detect() != USB_INSERTED) && (hold_status
#ifdef HAVE_EEPROM_SETTINGS
|| recovery_mode
#endif
@ -494,7 +494,7 @@ void main(void)
usb_init();
/* A hack to enter USB mode without using the USB thread */
if(usb_detect())
if(usb_detect() == USB_INSERTED)
{
const char msg[] = "Bootloader USB mode";
int w, h;
@ -520,7 +520,7 @@ void main(void)
sleep(HZ/20);
usb_enable(true);
cpu_idle_mode(true);
while (usb_detect())
while (usb_detect() == USB_INSERTED)
{
/* Print the battery status. */
line = 0;