Cosmetic fixes for the iAudio bootloader: Don't display 'Hold switch on' if the reason for getting there was a spurious ON event. Don't disable the multi-colour LED in the M3 bootloader.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16690 a1c6a512-1295-4272-9138-f99709370657
diff --git a/bootloader/iaudio_coldfire.c b/bootloader/iaudio_coldfire.c
index bb7fbeb..0f3798d 100644
--- a/bootloader/iaudio_coldfire.c
+++ b/bootloader/iaudio_coldfire.c
@@ -180,7 +180,8 @@
{
/* No need to check for USB connection here, as USB is handled
* in the cowon loader. */
- printf("Hold switch on");
+ if (on_button || rc_on_button)
+ printf("Hold switch on");
shutdown();
}
diff --git a/firmware/target/coldfire/iaudio/m3/power-m3.c b/firmware/target/coldfire/iaudio/m3/power-m3.c
index a7f3fc4..475f64e 100644
--- a/firmware/target/coldfire/iaudio/m3/power-m3.c
+++ b/firmware/target/coldfire/iaudio/m3/power-m3.c
@@ -37,9 +37,11 @@
and_l(~0x00000020, &GPIO1_ENABLE);
or_l(0x00000020, &GPIO1_FUNCTION);
+#ifndef BOOTLOADER
/* FIXME: Just disable the multi-colour LED for now. */
and_l(~0x00000210, &GPIO1_OUT);
and_l(~0x00008000, &GPIO_OUT);
+#endif
}
bool charger_inserted(void)