summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2010-05-06 04:45:05 +0000
committerMichael Sevakis <jethead71@rockbox.org>2010-05-06 04:45:05 +0000
commit0defb8483c817f18f5ee118bdfb48bc8910b523e (patch)
treeee77f9b39ef10656ba434cb63523916b9d61f3f1
parent992b7e10b83ee8e24c31ac8e918a999869c321aa (diff)
downloadrockbox-0defb8483c817f18f5ee118bdfb48bc8910b523e.tar.gz
rockbox-0defb8483c817f18f5ee118bdfb48bc8910b523e.tar.bz2
rockbox-0defb8483c817f18f5ee118bdfb48bc8910b523e.zip
Gigabeat S bootloader: Fix archaic call placement in dptc_stop which hangs the bootloader before jumping to FW. Let the backlight LED ramp up after unplugging USB which just looks better.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25840 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--bootloader/gigabeat-s.c3
-rw-r--r--firmware/target/arm/imx31/dvfs_dptc-imx31.c9
2 files changed, 8 insertions, 4 deletions
diff --git a/bootloader/gigabeat-s.c b/bootloader/gigabeat-s.c
index 2e95d4cf64..8258e276c3 100644
--- a/bootloader/gigabeat-s.c
+++ b/bootloader/gigabeat-s.c
@@ -143,6 +143,9 @@ static void handle_usb(void)
button_close();
backlight_close();
+ /* Sleep a little to let the backlight ramp up */
+ sleep(HZ*5/4);
+
reset_screen();
}
diff --git a/firmware/target/arm/imx31/dvfs_dptc-imx31.c b/firmware/target/arm/imx31/dvfs_dptc-imx31.c
index cae9a384c9..129e47d55e 100644
--- a/firmware/target/arm/imx31/dvfs_dptc-imx31.c
+++ b/firmware/target/arm/imx31/dvfs_dptc-imx31.c
@@ -571,14 +571,15 @@ static void dptc_stop(void)
if (dptc_running)
{
+ dptc_running = false;
+
/* Disable DPTC and mask interrupt. */
CCM_PMCR0 = (CCM_PMCR0 & ~CCM_PMCR0_DPTEN) | CCM_PMCR0_PTVAIM;
avic_disable_int(INT_CCM_CLK);
- dptc_running = false;
- }
- /* Go back to default working point. */
- dptc_new_wp(DPTC_WP_DEFAULT);
+ /* Go back to default working point. */
+ dptc_new_wp(DPTC_WP_DEFAULT);
+ }
restore_irq(oldlevel);