len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

h1x0/h300: consolidate a few code paths to logical equivalents

Browse source 
This saves a few bytes of precious space by consolidating paths where
they can be combined with no change to the underlying algorithm.

Change-Id: Ie6b7ead190a87d66fcbdcf2e351010bab751d952
This commit is contained in:
James Buren 2020-11-15 09:02:42 +00:00
parent 3ef8455626
commit 29a20bd209
2 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

17
bootloader/iriver_h1x0.c
View file

@ -209,25 +209,24 @@ void try_flashboot(void)
if (!firmware_settings.initialized)
return ;
switch (firmware_settings.bootmethod)
switch (firmware_settings.bootmethod)
{
case BOOT_DISK:
return;
case BOOT_ROM:
start_flashed_romimage();
recovery_mode = true;
break;
case BOOT_RAM:
start_flashed_ramimage();
recovery_mode = true;
break;
default:
recovery_mode = true;
return;
case BOOT_RECOVERY:
break;
}
recovery_mode = true;
}
void failsafe_menu(void)
@ -451,10 +450,12 @@ void main(void)
/* Power on the hard drive early, to speed up the loading. */
if (!hold_status && !recovery_mode)
{
ide_power_enable(true);
if (!hold_status && (usb_detect() != USB_INSERTED) && !recovery_mode)
try_flashboot();
if (usb_detect() != USB_INSERTED)
try_flashboot();
}
lcd_init();

17
bootloader/iriver_h300.c
View file

@ -211,25 +211,24 @@ void try_flashboot(void)
if (!firmware_settings.initialized)
return ;
switch (firmware_settings.bootmethod)
switch (firmware_settings.bootmethod)
{
case BOOT_DISK:
return;
case BOOT_ROM:
start_flashed_romimage();
recovery_mode = true;
break;
case BOOT_RAM:
start_flashed_ramimage();
recovery_mode = true;
break;
default:
recovery_mode = true;
return;
case BOOT_RECOVERY:
break;
}
recovery_mode = true;
}
void failsafe_menu(void)
@ -429,10 +428,12 @@ void main(void)
/* Power on the hard drive early, to speed up the loading. */
if (!hold_status && !recovery_mode)
{
ide_power_enable(true);
if (!hold_status && (usb_detect() != USB_INSERTED) && !recovery_mode)
try_flashboot();
if (usb_detect() != USB_INSERTED)
try_flashboot();
}
lcd_init();
lcd_remote_init();