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

Display messages only when entering USB mode in Portal Player bootloader to keep timed-out charger-only connects going into verbose mode.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29060 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sevakis 2011-01-16 00:21:54 +00:00
parent bb54c8f315
commit d0178ba01c
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
bootloader/main-pp.c
View file

@ -470,13 +470,6 @@ static int handle_usb(int connect_timeout)
usb_init(); usb_init();
usb_start_monitoring(); usb_start_monitoring();
/* Switch to verbose mode if not in it so that the status updates
* are shown */
/* TODO: Should we forgo any messages except the connect? It might be a
* charger, not a USB host. */
verbose = true;
printf("USB: Connecting"); printf("USB: Connecting");
if (connect_timeout != TIMEOUT_BLOCK) if (connect_timeout != TIMEOUT_BLOCK)
@ -489,6 +482,9 @@ static int handle_usb(int connect_timeout)
if (ev.id == SYS_USB_CONNECTED) if (ev.id == SYS_USB_CONNECTED)
{ {
/* Switch to verbose mode if not in it so that the status updates
* are shown */
verbose = true;
/* Got the message - wait for disconnect */ /* Got the message - wait for disconnect */
printf("Bootloader USB mode"); printf("Bootloader USB mode");
@ -501,7 +497,9 @@ static int handle_usb(int connect_timeout)
if (connect_timeout != TIMEOUT_BLOCK && if (connect_timeout != TIMEOUT_BLOCK &&
TIME_AFTER(current_tick, end_tick)) TIME_AFTER(current_tick, end_tick))
{ {
/* Timed out waiting for the connect */ /* Timed out waiting for the connect - will happen when connected
* to a charger instead of a host port and the charging pin is
* the same as the USB pin */
printf("USB: Timed out"); printf("USB: Timed out");
break; break;
} }
@ -598,10 +596,16 @@ void* main(void)
btn = button_read_device(); btn = button_read_device();
/* Enable bootloader messages if any button is pressed */ /* Enable bootloader messages if any button is pressed */
#ifdef HAVE_BOOTLOADER_USB_MODE
lcd_clear_display();
if (btn)
verbose = true;
#else
if (btn) { if (btn) {
lcd_clear_display(); lcd_clear_display();
verbose = true; verbose = true;
} }
#endif
lcd_setfont(FONT_SYSFIXED); lcd_setfont(FONT_SYSFIXED);