Remove return value from show_logo() in bootloader/
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30485 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
e6317d51e9
commit
7e3a3f491d
8 changed files with 8 additions and 10 deletions
|
@ -40,7 +40,7 @@
|
||||||
#include "version.h"
|
#include "version.h"
|
||||||
|
|
||||||
/* Show the Rockbox logo - in show_logo.c */
|
/* Show the Rockbox logo - in show_logo.c */
|
||||||
extern int show_logo(void);
|
extern void show_logo(void);
|
||||||
|
|
||||||
#define TAR_CHUNK 512
|
#define TAR_CHUNK 512
|
||||||
#define TAR_HEADER_SIZE 157
|
#define TAR_HEADER_SIZE 157
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
#include "system.h"
|
#include "system.h"
|
||||||
|
|
||||||
/* Show the Rockbox logo - in show_logo.c */
|
/* Show the Rockbox logo - in show_logo.c */
|
||||||
extern int show_logo(void);
|
extern void show_logo(void);
|
||||||
|
|
||||||
int main(void)
|
int main(void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -56,7 +56,7 @@ void lcd_reset(void);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Show the Rockbox logo - in show_logo.c */
|
/* Show the Rockbox logo - in show_logo.c */
|
||||||
extern int show_logo(void);
|
extern void show_logo(void);
|
||||||
|
|
||||||
/* Button definitions */
|
/* Button definitions */
|
||||||
#if CONFIG_KEYPAD == IRIVER_H10_PAD
|
#if CONFIG_KEYPAD == IRIVER_H10_PAD
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
#include "adc.h"
|
#include "adc.h"
|
||||||
#include "version.h"
|
#include "version.h"
|
||||||
|
|
||||||
extern int show_logo(void);
|
extern void show_logo(void);
|
||||||
extern void power_off(void);
|
extern void power_off(void);
|
||||||
|
|
||||||
static void show_splash(int timeout, const char *msg)
|
static void show_splash(int timeout, const char *msg)
|
||||||
|
|
|
@ -28,7 +28,7 @@ const int16_t samples[] = {
|
||||||
-31163, -30465, -29648, -28713, -27666, -26509, -25247, -23886, -22430, -20886,
|
-31163, -30465, -29648, -28713, -27666, -26509, -25247, -23886, -22430, -20886,
|
||||||
-19259, -17557, -15785, -13951, -12062, -10125, -8148, -6139, -4106, -2057 };
|
-19259, -17557, -15785, -13951, -12062, -10125, -8148, -6139, -4106, -2057 };
|
||||||
|
|
||||||
extern int show_logo( void );
|
extern void show_logo( void );
|
||||||
|
|
||||||
void INT_HDMA(void)
|
void INT_HDMA(void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -40,7 +40,7 @@
|
||||||
#include "panic.h"
|
#include "panic.h"
|
||||||
#include "power.h"
|
#include "power.h"
|
||||||
|
|
||||||
int show_logo(void);
|
void show_logo(void);
|
||||||
|
|
||||||
#ifdef USE_ROCKBOX_USB
|
#ifdef USE_ROCKBOX_USB
|
||||||
static void usb_mode(void)
|
static void usb_mode(void)
|
||||||
|
|
|
@ -37,7 +37,7 @@
|
||||||
#define TEXT_WIDTH ((sizeof(BOOT_VERSION)-1)*SYSFONT_WIDTH)
|
#define TEXT_WIDTH ((sizeof(BOOT_VERSION)-1)*SYSFONT_WIDTH)
|
||||||
#define TEXT_XPOS ((TEXT_WIDTH > LCD_WIDTH) ? 0 : ((LCD_WIDTH - TEXT_WIDTH) / 2))
|
#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_clear_display();
|
||||||
lcd_setfont(FONT_SYSFIXED);
|
lcd_setfont(FONT_SYSFIXED);
|
||||||
|
@ -53,6 +53,4 @@ int show_logo( void )
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
lcd_update();
|
lcd_update();
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -46,7 +46,7 @@
|
||||||
#include "version.h"
|
#include "version.h"
|
||||||
|
|
||||||
/* Show the Rockbox logo - in show_logo.c */
|
/* 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 */
|
/* Address to load main Rockbox image to */
|
||||||
#define LOAD_ADDRESS 0x20000000 /* DRAM_START */
|
#define LOAD_ADDRESS 0x20000000 /* DRAM_START */
|
||||||
|
|
Loading…
Reference in a new issue