From: Tomas <tomas_at_salfischberger.nl>
Date: Sun, 20 Nov 2005 12:11:14 +0100

Sorry, didn't read the code... it checks both :)

Tomas

cvs_at_labb.contactor.se wrote:

>Update of /cvsroot/rockbox/bootloader
>In directory labb:/tmp/cvs-serv19752
>
>Modified Files:
> ipod.c
>Log Message:
>iPod: Change bootloader so that Rockbox loads by default. Holding down MENU now boots to the Apple firmware. Check .rockbox/ for a firmware file (to be consistent with the iriver bootloader) and remove the cosmetic sleep.
>
>Index: ipod.c
>===================================================================
>RCS file: /cvsroot/rockbox/bootloader/ipod.c,v
>retrieving revision 1.4
>retrieving revision 1.5
>diff -u -d -r1.4 -r1.5
>--- ipod.c 14 Nov 2005 21:54:22 -0000 1.4
>+++ ipod.c 20 Nov 2005 10:57:53 -0000 1.5
>_at__at_ -220,9 +220,13 _at__at_
> int i;
> char str[80];
>
>- fd = open("/rockbox.ipod", O_RDONLY);
>+ fd = open("/.rockbox/" BOOTFILE, O_RDONLY);
> if(fd < 0)
>- return -1;
>+ {
>+ fd = open("/" BOOTFILE, O_RDONLY);
>+ if(fd < 0)
>+ return -1;
>+ }
>
> len = filesize(fd) - 8;
>
>_at__at_ -399,7 +403,7 _at__at_
> /* Check for a keypress */
> i=key_pressed();
>
>- if (i==BUTTON_MENU) {
>+ if ((i!=BUTTON_MENU) && (i!=BUTTON_PLAY)) {
> lcd_puts(0, line, "Loading Rockbox...");
> lcd_update();
> rc=load_rockbox(loadbuffer);
>_at__at_ -410,11 +414,8 _at__at_
> } else {
> lcd_puts(0, line++, "Rockbox loaded.");
> lcd_update();
>-#if 0
>- /* Rockbox is not yet runable, so we disable this */
> memcpy((void*)DRAM_START,loadbuffer,rc);
> return (void*)DRAM_START;
>-#endif
> }
> }
>
>_at__at_ -438,7 +439,7 _at__at_
> lcd_update();
>
> /* Pause for 5 seconds so we can see what's happened */
>- usleep(5000000);
>+// usleep(5000000);
>
> entry = tblp->addr + tblp->entryOffset;
> if (imageno || ((int)tblp->addr & 0xffffff) != 0) {
>
>_______________________________________________
>rockbox-cvs mailing list
>rockbox-cvs_at_cool.haxx.se
>http://cool.haxx.se/cgi-bin/mailman/listinfo/rockbox-cvs
>
>
Received on 2005-11-20