nihilazo
/
rockbox
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make mini2440 bootloader compile again, and remove a few warnings from sd driver. 

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23440 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Wenger 2009-10-31 16:48:08 +00:00
parent 4b7de91884
commit d25baecc0b
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bootloader/mini2440.c
View File

@ -73,7 +73,8 @@ int main(void)
/* mini2440_test(); */
/* Show debug messages if button is pressed */
if(button_read_device() & BUTTON_MENU)
int touch_data;
if(button_read_device(&touch_data) & BUTTON_MENU)
verbose = true;
printf("Rockbox boot loader");

16
firmware/target/arm/s3c2440/sd-s3c2440.c
View File

@ -811,19 +811,23 @@ int sd_read_sectors(IF_MD2(int card_no,) unsigned long start, int incount,
}
/*****************************************************************************/
#ifndef X_BOOTLOADER
/* writing not required for Bootloader - or is it? */
int sd_write_sectors(IF_MD2(int card_no,) unsigned long start, int count,
const void* outbuf)
{
#ifndef HAVE_MULTIDRIVE
const int card_no = 0;
#ifdef BOOTLOADER /* we don't need write support in bootloader */
#ifdef HAVE_MULTIDRIVE
(void) drive;
#endif
(void) start;
(void) count;
(void) outbuf;
return -1;
#else
dbgprintf ("sd_write %d %x %d\n", card_no, start, count);
return sd_transfer_sectors(IF_MD2(card_no,) start, count, outbuf, true);
return sd_transfer_sectors(IF_MD2(card_no,) start, count, (void*)outbuf, true);
#endif
}
#endif /* BOOTLOADER */
/*****************************************************************************/
void sd_enable(bool on)