summaryrefslogtreecommitdiffstats
path: root/bootloader
diff options
context:
space:
mode:
authorBertrik Sikken <bertrik@sikken.nl>2011-09-08 18:31:15 +0000
committerBertrik Sikken <bertrik@sikken.nl>2011-09-08 18:31:15 +0000
commit7e3a3f491d67cf2be3d89791c246826ae62d2a53 (patch)
tree2dd6838fc363814f748cb3501b190d628f693430 /bootloader
parente6317d51e95c4ff9dc632085cac0445ca96f4d7a (diff)
downloadrockbox-7e3a3f491d67cf2be3d89791c246826ae62d2a53.tar.gz
rockbox-7e3a3f491d67cf2be3d89791c246826ae62d2a53.tar.bz2
rockbox-7e3a3f491d67cf2be3d89791c246826ae62d2a53.zip
Remove return value from show_logo() in bootloader/
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30485 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'bootloader')
-rw-r--r--bootloader/gigabeat-s.c2
-rw-r--r--bootloader/lyre_proto1.c2
-rw-r--r--bootloader/main-pp.c2
-rw-r--r--bootloader/ondavx747.c2
-rw-r--r--bootloader/rk27xx.c2
-rw-r--r--bootloader/sansa_as3525.c2
-rw-r--r--bootloader/show_logo.c4
-rw-r--r--bootloader/telechips.c2
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 @@
#include "version.h"
/* Show the Rockbox logo - in show_logo.c */
-extern int show_logo(void);
+extern void show_logo(void);
#define TAR_CHUNK 512
#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 @@
#include "system.h"
/* Show the Rockbox logo - in show_logo.c */
-extern int show_logo(void);
+extern void show_logo(void);
int main(void)
{
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);
#endif
/* Show the Rockbox logo - in show_logo.c */
-extern int show_logo(void);
+extern void show_logo(void);
/* Button definitions */
#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 @@
#include "adc.h"
#include "version.h"
-extern int show_logo(void);
+extern void show_logo(void);
extern void power_off(void);
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[] = {
-31163, -30465, -29648, -28713, -27666, -26509, -25247, -23886, -22430, -20886,
-19259, -17557, -15785, -13951, -12062, -10125, -8148, -6139, -4106, -2057 };
-extern int show_logo( void );
+extern void show_logo( void );
void INT_HDMA(void)
{
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 @@
#include "panic.h"
#include "power.h"
-int show_logo(void);
+void show_logo(void);
#ifdef USE_ROCKBOX_USB
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 @@
#define TEXT_WIDTH ((sizeof(BOOT_VERSION)-1)*SYSFONT_WIDTH)
#define TEXT_XPOS ((TEXT_WIDTH > LCD_WIDTH) ? 0 : ((LCD_WIDTH - TEXT_WIDTH) / 2))
-int show_logo( void )
+void show_logo( void )
{
lcd_clear_display();
lcd_setfont(FONT_SYSFIXED);
@@ -53,6 +53,4 @@ int show_logo( void )
#endif
lcd_update();
-
- return 0;
}
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 @@
#include "version.h"
/* Show the Rockbox logo - in show_logo.c */
-extern int show_logo(void);
+extern void show_logo(void);
/* Address to load main Rockbox image to */
#define LOAD_ADDRESS 0x20000000 /* DRAM_START */