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

Use BOOTDIR and BOOTFILE defines instead of hardcoded path and file. FS#9559

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19190 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Björn Stenberg 2008-11-23 22:07:48 +00:00
parent 078753395d
commit b69be10d98
5 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
bootloader/main-pp.c
View file

@ -23,6 +23,8 @@
****************************************************************************/
#include <stdio.h>
#include <stdlib.h>
#include "config.h"
#include "common.h"
#include "cpu.h"
#include "file.h"
@ -292,7 +294,7 @@ int load_mi4(unsigned char* buf, char* firmware, unsigned int buffer_size)
unsigned long sum;
char filename[MAX_PATH];
snprintf(filename,sizeof(filename),"/.rockbox/%s",firmware);
snprintf(filename,sizeof(filename), BOOTDIR "/%s",firmware);
fd = open(filename, O_RDONLY);
if(fd < 0)
{
@ -610,14 +612,14 @@ void* main(void)
printf("Loading Rockbox...");
rc=load_mi4(loadbuffer, BOOTFILE, MAX_LOADSIZE);
if (rc < EOK) {
printf("Can't load %s:", BOOTFILE);
printf("Can't load " BOOTFILE ": ");
printf(strerror(rc));
#ifdef OLD_BOOTFILE
/* Try loading rockbox from old rockbox.e200/rockbox.h10 format */
rc=load_firmware(loadbuffer, OLD_BOOTFILE, MAX_LOADSIZE);
if (rc < EOK) {
printf("Can't load %s:", OLD_BOOTFILE);
printf("Can't load " OLD_BOOTFILE" : ");
error(EBOOTFILE, rc);
}
#endif