diff options
| author | Dominik Wenger <domonoky@googlemail.com> | 2009-10-31 16:48:08 +0000 |
|---|---|---|
| committer | Dominik Wenger <domonoky@googlemail.com> | 2009-10-31 16:48:08 +0000 |
| commit | d25baecc0bb15308ff430340da8c461a43ed235a (patch) | |
| tree | 0378556d056bea1e1da320f6f33f917c898908ac | |
| parent | 4b7de9188482db440680caa9d6f2c5713b5c8f4f (diff) | |
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
| -rw-r--r-- | bootloader/mini2440.c | 3 | ||||
| -rw-r--r-- | firmware/target/arm/s3c2440/sd-s3c2440.c | 16 |
2 files changed, 12 insertions, 7 deletions
diff --git a/bootloader/mini2440.c b/bootloader/mini2440.c index 09698ed833..d735084c6a 100644 --- a/bootloader/mini2440.c +++ b/bootloader/mini2440.c @@ -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"); diff --git a/firmware/target/arm/s3c2440/sd-s3c2440.c b/firmware/target/arm/s3c2440/sd-s3c2440.c index 9cb9bdfc58..4fcdfefd27 100644 --- a/firmware/target/arm/s3c2440/sd-s3c2440.c +++ b/firmware/target/arm/s3c2440/sd-s3c2440.c @@ -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) |