devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Do some gigabeat S bootloader cleanup (includes, const, static-ing, number of variables, etc.). Make sure a tar file isn't too big before loading it however unlikely that is. No overall functional change but bump to v.00000013 for tracking purposes.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17403 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sevakis 2008-05-07 07:14:39 +00:00
parent 82cda9b091
commit c41cacaf30
1 changed files with 22 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

55
bootloader/gigabeat-s.c
View file

@ -17,48 +17,32 @@
* *
****************************************************************************/ ****************************************************************************/
#include "config.h" #include "config.h"
#include <stdlib.h>
#include <stdio.h>
#include "inttypes.h"
#include "string.h"
#include "cpu.h"
#include "system.h" #include "system.h"
#include "lcd.h" #include <sprintf.h>
#include "kernel.h" #include "kernel.h"
#include "thread.h" #include "string.h"
#include "ata.h" #include "ata.h"
#include "dir.h" #include "dir.h"
#include "fat.h"
#include "disk.h" #include "disk.h"
#include "font.h"
#include "adc.h"
#include "backlight.h"
#include "backlight-target.h"
#include "button.h"
#include "panic.h"
#include "power.h"
#include "file.h"
#include "common.h" #include "common.h"
#include "rbunicode.h"
#include "usb.h" #include "usb.h"
#include "mmu-imx31.h" #include "font.h"
#include "lcd-target.h" #include "lcd.h"
#include "avic-imx31.h"
#include <stdarg.h>
#include "usb-target.h" #include "usb-target.h"
#define TAR_CHUNK 512 #define TAR_CHUNK 512
#define TAR_HEADER_SIZE 157 #define TAR_HEADER_SIZE 157
char version[] = APPSVERSION; const char version[] = APPSVERSION;
char basedir[] = "/Content/0b00/00/"; /* Where files sent via MTP are stored */ /* Where files sent via MTP are stored */
int (*kernel_entry)(void); static const char basedir[] = "/Content/0b00/00/";
char *tarbuf = (char *)0x00000040; /* Can use memory after vector table up to 0x01f00000 */
extern void reference_system_c(void); static char * const tarbuf = (char *)0x00000040;
static const size_t tarbuf_size = 0x01f00000 - 0x00000040;
/* Queue to get notifications when in USB mode */
static struct event_queue usb_wait_queue; static struct event_queue usb_wait_queue;
void show_splash(int timeout, const char *msg) static void show_splash(int timeout, const char *msg)
{ {
lcd_putsxy( (LCD_WIDTH - (SYSFONT_WIDTH * strlen(msg))) / 2, lcd_putsxy( (LCD_WIDTH - (SYSFONT_WIDTH * strlen(msg))) / 2,
(LCD_HEIGHT - SYSFONT_HEIGHT) / 2, msg); (LCD_HEIGHT - SYSFONT_HEIGHT) / 2, msg);
@ -67,13 +51,19 @@ void show_splash(int timeout, const char *msg)
sleep(timeout); sleep(timeout);
} }
void untar(int tar_fd) static void untar(int tar_fd)
{ {
char header[TAR_HEADER_SIZE]; char header[TAR_HEADER_SIZE];
char *ptr; char *ptr;
char path[102]; char path[102];
int fd, i, size = 0; int fd, i;
int ret; int ret;
size_t size = filesize(tar_fd);
if (size > tarbuf_size) {
printf("tar file too large"); /* Paranoid but proper */
return;
}
ret = read(tar_fd, tarbuf, filesize(tar_fd)); ret = read(tar_fd, tarbuf, filesize(tar_fd));
if (ret < 0) { if (ret < 0) {
@ -151,7 +141,7 @@ void main(void)
invalidate_icache(); invalidate_icache();
lcd_clear_display(); lcd_clear_display();
printf("Gigabeat S Rockbox Bootloader v.00000012"); printf("Gigabeat S Rockbox Bootloader v.00000013");
system_init(); system_init();
kernel_init(); kernel_init();
printf("kernel init done"); printf("kernel init done");
@ -286,9 +276,8 @@ void main(void)
if (rc == EOK) if (rc == EOK)
{ {
kernel_entry = (void*) loadbuffer;
invalidate_icache(); invalidate_icache();
rc = kernel_entry(); asm volatile ("bx %0": : "r"(loadbuffer));
} }
/* Halt */ /* Halt */