diff options
-rw-r--r-- | bootloader/gigabeat-s.c | 2 | ||||
-rw-r--r-- | bootloader/lyre_proto1.c | 2 | ||||
-rw-r--r-- | bootloader/main-pp.c | 2 | ||||
-rw-r--r-- | bootloader/ondavx747.c | 2 | ||||
-rw-r--r-- | bootloader/rk27xx.c | 2 | ||||
-rw-r--r-- | bootloader/sansa_as3525.c | 2 | ||||
-rw-r--r-- | bootloader/show_logo.c | 4 | ||||
-rw-r--r-- | bootloader/telechips.c | 2 |
8 files changed, 8 insertions, 10 deletions
diff --git a/bootloader/gigabeat-s.c b/bootloader/gigabeat-s.c index 2500496fd4..223d839010 100644 --- a/bootloader/gigabeat-s.c +++ b/bootloader/gigabeat-s.c | |||
@@ -40,7 +40,7 @@ | |||
40 | #include "version.h" | 40 | #include "version.h" |
41 | 41 | ||
42 | /* Show the Rockbox logo - in show_logo.c */ | 42 | /* Show the Rockbox logo - in show_logo.c */ |
43 | extern int show_logo(void); | 43 | extern void show_logo(void); |
44 | 44 | ||
45 | #define TAR_CHUNK 512 | 45 | #define TAR_CHUNK 512 |
46 | #define TAR_HEADER_SIZE 157 | 46 | #define TAR_HEADER_SIZE 157 |
diff --git a/bootloader/lyre_proto1.c b/bootloader/lyre_proto1.c index b40143b988..8503b5cdb8 100644 --- a/bootloader/lyre_proto1.c +++ b/bootloader/lyre_proto1.c | |||
@@ -24,7 +24,7 @@ | |||
24 | #include "system.h" | 24 | #include "system.h" |
25 | 25 | ||
26 | /* Show the Rockbox logo - in show_logo.c */ | 26 | /* Show the Rockbox logo - in show_logo.c */ |
27 | extern int show_logo(void); | 27 | extern void show_logo(void); |
28 | 28 | ||
29 | int main(void) | 29 | int main(void) |
30 | { | 30 | { |
diff --git a/bootloader/main-pp.c b/bootloader/main-pp.c index 339f4a82e1..03c5aa01b8 100644 --- a/bootloader/main-pp.c +++ b/bootloader/main-pp.c | |||
@@ -56,7 +56,7 @@ void lcd_reset(void); | |||
56 | #endif | 56 | #endif |
57 | 57 | ||
58 | /* Show the Rockbox logo - in show_logo.c */ | 58 | /* Show the Rockbox logo - in show_logo.c */ |
59 | extern int show_logo(void); | 59 | extern void show_logo(void); |
60 | 60 | ||
61 | /* Button definitions */ | 61 | /* Button definitions */ |
62 | #if CONFIG_KEYPAD == IRIVER_H10_PAD | 62 | #if CONFIG_KEYPAD == IRIVER_H10_PAD |
diff --git a/bootloader/ondavx747.c b/bootloader/ondavx747.c index 42a6075bfc..7b4615b10b 100644 --- a/bootloader/ondavx747.c +++ b/bootloader/ondavx747.c | |||
@@ -35,7 +35,7 @@ | |||
35 | #include "adc.h" | 35 | #include "adc.h" |
36 | #include "version.h" | 36 | #include "version.h" |
37 | 37 | ||
38 | extern int show_logo(void); | 38 | extern void show_logo(void); |
39 | extern void power_off(void); | 39 | extern void power_off(void); |
40 | 40 | ||
41 | static void show_splash(int timeout, const char *msg) | 41 | static void show_splash(int timeout, const char *msg) |
diff --git a/bootloader/rk27xx.c b/bootloader/rk27xx.c index d94b080345..b74526fe90 100644 --- a/bootloader/rk27xx.c +++ b/bootloader/rk27xx.c | |||
@@ -28,7 +28,7 @@ const int16_t samples[] = { | |||
28 | -31163, -30465, -29648, -28713, -27666, -26509, -25247, -23886, -22430, -20886, | 28 | -31163, -30465, -29648, -28713, -27666, -26509, -25247, -23886, -22430, -20886, |
29 | -19259, -17557, -15785, -13951, -12062, -10125, -8148, -6139, -4106, -2057 }; | 29 | -19259, -17557, -15785, -13951, -12062, -10125, -8148, -6139, -4106, -2057 }; |
30 | 30 | ||
31 | extern int show_logo( void ); | 31 | extern void show_logo( void ); |
32 | 32 | ||
33 | void INT_HDMA(void) | 33 | void INT_HDMA(void) |
34 | { | 34 | { |
diff --git a/bootloader/sansa_as3525.c b/bootloader/sansa_as3525.c index e402eadd17..c384007898 100644 --- a/bootloader/sansa_as3525.c +++ b/bootloader/sansa_as3525.c | |||
@@ -40,7 +40,7 @@ | |||
40 | #include "panic.h" | 40 | #include "panic.h" |
41 | #include "power.h" | 41 | #include "power.h" |
42 | 42 | ||
43 | int show_logo(void); | 43 | void show_logo(void); |
44 | 44 | ||
45 | #ifdef USE_ROCKBOX_USB | 45 | #ifdef USE_ROCKBOX_USB |
46 | static void usb_mode(void) | 46 | static void usb_mode(void) |
diff --git a/bootloader/show_logo.c b/bootloader/show_logo.c index 3273034d05..4b52e94084 100644 --- a/bootloader/show_logo.c +++ b/bootloader/show_logo.c | |||
@@ -37,7 +37,7 @@ | |||
37 | #define TEXT_WIDTH ((sizeof(BOOT_VERSION)-1)*SYSFONT_WIDTH) | 37 | #define TEXT_WIDTH ((sizeof(BOOT_VERSION)-1)*SYSFONT_WIDTH) |
38 | #define TEXT_XPOS ((TEXT_WIDTH > LCD_WIDTH) ? 0 : ((LCD_WIDTH - TEXT_WIDTH) / 2)) | 38 | #define TEXT_XPOS ((TEXT_WIDTH > LCD_WIDTH) ? 0 : ((LCD_WIDTH - TEXT_WIDTH) / 2)) |
39 | 39 | ||
40 | int show_logo( void ) | 40 | void show_logo( void ) |
41 | { | 41 | { |
42 | lcd_clear_display(); | 42 | lcd_clear_display(); |
43 | lcd_setfont(FONT_SYSFIXED); | 43 | lcd_setfont(FONT_SYSFIXED); |
@@ -53,6 +53,4 @@ int show_logo( void ) | |||
53 | #endif | 53 | #endif |
54 | 54 | ||
55 | lcd_update(); | 55 | lcd_update(); |
56 | |||
57 | return 0; | ||
58 | } | 56 | } |
diff --git a/bootloader/telechips.c b/bootloader/telechips.c index adf3e63483..fca475e20d 100644 --- a/bootloader/telechips.c +++ b/bootloader/telechips.c | |||
@@ -46,7 +46,7 @@ | |||
46 | #include "version.h" | 46 | #include "version.h" |
47 | 47 | ||
48 | /* Show the Rockbox logo - in show_logo.c */ | 48 | /* Show the Rockbox logo - in show_logo.c */ |
49 | extern int show_logo(void); | 49 | extern void show_logo(void); |
50 | 50 | ||
51 | /* Address to load main Rockbox image to */ | 51 | /* Address to load main Rockbox image to */ |
52 | #define LOAD_ADDRESS 0x20000000 /* DRAM_START */ | 52 | #define LOAD_ADDRESS 0x20000000 /* DRAM_START */ |