summaryrefslogtreecommitdiffstats
path: root/bootloader/iriver_h300.c
diff options
context:
space:
mode:
authorJames Buren <braewoods+rb@braewoods.net>2020-11-14 14:29:18 +0000
committerJames Buren <braewoods+rb@braewoods.net>2020-11-14 14:29:18 +0000
commitaaa9a2cceedf45b04a85b206cd622a6fb1d9da77 (patch)
treee993961c0746ed1efd6d5c6a6ebbe976be1d2cd4 /bootloader/iriver_h300.c
parent37eabbfe51e7ed7938c51934921f28cd54a1140d (diff)
downloadrockbox-aaa9a2cceedf45b04a85b206cd622a6fb1d9da77.tar.gz
rockbox-aaa9a2cceedf45b04a85b206cd622a6fb1d9da77.tar.bz2
rockbox-aaa9a2cceedf45b04a85b206cd622a6fb1d9da77.zip
h1x0/h300: clean up the bootloader source a bit
First this removes most of the conditionals for the CPP as they are always true for the targets that use the bootloader source. Second this moves some global variable references around to reduce some redundancy in the h1x0 bootloader source. All of this is done to make it easier to compare the two bootloaders as they are very heavily related to each other. Change-Id: I7eb4a3106fb9fce6059797310d9e053a3d3ecf63
Diffstat (limited to 'bootloader/iriver_h300.c')
-rw-r--r--bootloader/iriver_h300.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/bootloader/iriver_h300.c b/bootloader/iriver_h300.c
index 4f4baf8cb5..ee344d4165 100644
--- a/bootloader/iriver_h300.c
+++ b/bootloader/iriver_h300.c
@@ -58,6 +58,10 @@
#define DRAM_START 0x31000000
+/* From common.c */
+extern int line;
+extern int remote_line;
+
/* Reset the cookie for the crt0 crash check */
inline void __reset_cookie(void)
{
@@ -130,10 +134,6 @@ void check_battery(void)
/* From the pcf50606 driver */
extern unsigned char pcf50606_intregs[3];
-/* From common.c */
-extern int line;
-extern int remote_line;
-
void main(void)
{
int i;
@@ -144,7 +144,6 @@ void main(void)
bool hold_status = false;
int data;
bool rtc_alarm;
- int button;
int mask;
bool usb_charge = false;
@@ -267,7 +266,7 @@ void main(void)
while(charger_inserted() && !request_start)
{
- button = button_get_w_tmo(HZ);
+ long button = button_get_w_tmo(HZ);
switch(button)
{