Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

HD200 - Add delay when leaving bootloader USB mode. Add more comments in bootloader.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27355 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Marcin Bukat 2010-07-09 09:12:51 +00:00
parent b99066440f
commit 78d54fae75
1 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
bootloader/mpio_hd200.c
View file

@ -129,6 +129,10 @@ static void __reset(void)
static void __shutdown(void) static void __shutdown(void)
{ {
if (_charger_inserted())
/* if AC power do nothing */
return;
/* We need to gracefully spin down the disk to prevent clicks. */ /* We need to gracefully spin down the disk to prevent clicks. */
if (ide_powered()) if (ide_powered())
{ {
@ -143,15 +147,7 @@ static void __shutdown(void)
_backlight_off(); _backlight_off();
__reset_cookie(); __reset_cookie();
if (_charger_inserted())
{
/* reset instead of power_off() */
__reset();
}
else
{
power_off(); power_off();
}
} }
/* Print the battery voltage (and a warning message). */ /* Print the battery voltage (and a warning message). */
@ -271,6 +267,7 @@ static void bootmenu(void)
lcd_update(); lcd_update();
button = BUTTON_NONE;
button = button_get_w_tmo(HZ); button = button_get_w_tmo(HZ);
switch (button) switch (button)
@ -396,6 +393,7 @@ void main(void)
break; break;
case EVENT_AC: case EVENT_AC:
/* AC plug in */
if (!(last_event & EVENT_AC)) if (!(last_event & EVENT_AC))
{ {
/* reset charging circuit */ /* reset charging circuit */
@ -406,7 +404,9 @@ void main(void)
if (last_event & EVENT_USB) if (last_event & EVENT_USB)
{ {
usb_enable(false); usb_enable(false);
sleep(HZ);
ide_power_enable(false); ide_power_enable(false);
sleep(HZ);
} }
if(!_battery_full()) if(!_battery_full())
@ -441,12 +441,14 @@ void main(void)
case EVENT_USB: case EVENT_USB:
case (EVENT_USB | EVENT_AC): case (EVENT_USB | EVENT_AC):
/* AC plug in while in USB mode */
if (!(last_event & EVENT_AC)) if (!(last_event & EVENT_AC))
{ {
/* reset charger circuit */ /* reset charger circuit */
and_l(~(1<<23), &GPIO_ENABLE); and_l(~(1<<23), &GPIO_ENABLE);
} }
/* USB plug in */
if (!(last_event & EVENT_USB)) if (!(last_event & EVENT_USB))
{ {
/* init USB */ /* init USB */
@ -454,7 +456,8 @@ void main(void)
sleep(HZ/20); sleep(HZ/20);
usb_enable(true); usb_enable(true);
} }
/* display blinking USB indicator */
line = 0; line = 0;
if (blink_toggle) if (blink_toggle)
@ -466,14 +469,17 @@ void main(void)
break; break;
default: default:
/* USB unplug */
if (last_event & EVENT_USB) if (last_event & EVENT_USB)
{ {
/* USB unplug */ /* disable USB */
usb_enable(false); usb_enable(false);
sleep(HZ);
ide_power_enable(false); ide_power_enable(false);
sleep(HZ);
} }
/* spurious wakeup */ /* spurious wakeup ?*/
__shutdown(); __shutdown();
break; break;
} }