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) | |
download | rockbox-d25baecc0bb15308ff430340da8c461a43ed235a.tar.gz rockbox-d25baecc0bb15308ff430340da8c461a43ed235a.zip |
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) | |||
73 | /* mini2440_test(); */ | 73 | /* mini2440_test(); */ |
74 | 74 | ||
75 | /* Show debug messages if button is pressed */ | 75 | /* Show debug messages if button is pressed */ |
76 | if(button_read_device() & BUTTON_MENU) | 76 | int touch_data; |
77 | if(button_read_device(&touch_data) & BUTTON_MENU) | ||
77 | verbose = true; | 78 | verbose = true; |
78 | 79 | ||
79 | printf("Rockbox boot loader"); | 80 | 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, | |||
811 | } | 811 | } |
812 | 812 | ||
813 | /*****************************************************************************/ | 813 | /*****************************************************************************/ |
814 | #ifndef X_BOOTLOADER | ||
815 | /* writing not required for Bootloader - or is it? */ | ||
816 | int sd_write_sectors(IF_MD2(int card_no,) unsigned long start, int count, | 814 | int sd_write_sectors(IF_MD2(int card_no,) unsigned long start, int count, |
817 | const void* outbuf) | 815 | const void* outbuf) |
818 | { | 816 | { |
819 | #ifndef HAVE_MULTIDRIVE | 817 | #ifdef BOOTLOADER /* we don't need write support in bootloader */ |
820 | const int card_no = 0; | 818 | #ifdef HAVE_MULTIDRIVE |
819 | (void) drive; | ||
821 | #endif | 820 | #endif |
821 | (void) start; | ||
822 | (void) count; | ||
823 | (void) outbuf; | ||
824 | return -1; | ||
825 | #else | ||
822 | dbgprintf ("sd_write %d %x %d\n", card_no, start, count); | 826 | dbgprintf ("sd_write %d %x %d\n", card_no, start, count); |
823 | 827 | ||
824 | return sd_transfer_sectors(IF_MD2(card_no,) start, count, outbuf, true); | 828 | return sd_transfer_sectors(IF_MD2(card_no,) start, count, (void*)outbuf, true); |
829 | #endif | ||
825 | } | 830 | } |
826 | #endif /* BOOTLOADER */ | ||
827 | /*****************************************************************************/ | 831 | /*****************************************************************************/ |
828 | 832 | ||
829 | void sd_enable(bool on) | 833 | void sd_enable(bool on) |