diff options
author | Thomas Martitz <kugel@rockbox.org> | 2010-03-08 23:43:11 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2010-03-08 23:43:11 +0000 |
commit | 61320ce0ebf39e47953086de95f1b48f2fd09333 (patch) | |
tree | 6c4a3963944aa8518727ed0e9e72dd72cb61ebc1 | |
parent | a2e788b55725a70f586cbe67affd5b54612b0b3c (diff) | |
download | rockbox-61320ce0ebf39e47953086de95f1b48f2fd09333.tar.gz rockbox-61320ce0ebf39e47953086de95f1b48f2fd09333.zip |
Make mini2440 compile again.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25081 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/SOURCES | 2 | ||||
-rw-r--r-- | apps/gui/usb_screen.c | 8 | ||||
-rw-r--r-- | apps/gui/usb_screen.h | 4 | ||||
-rw-r--r-- | firmware/target/arm/s3c2440/sd-s3c2440.c | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/apps/SOURCES b/apps/SOURCES index 4666ec9339..a23e676a8e 100644 --- a/apps/SOURCES +++ b/apps/SOURCES | |||
@@ -162,7 +162,9 @@ eq_arm.S | |||
162 | #ifdef USB_ENABLE_HID | 162 | #ifdef USB_ENABLE_HID |
163 | usb_keymaps.c | 163 | usb_keymaps.c |
164 | #endif | 164 | #endif |
165 | #ifndef USB_NONE | ||
165 | gui/usb_screen.c | 166 | gui/usb_screen.c |
167 | #endif | ||
166 | metadata.c | 168 | metadata.c |
167 | metadata/mp3.c | 169 | metadata/mp3.c |
168 | #if CONFIG_CODEC == SWCODEC | 170 | #if CONFIG_CODEC == SWCODEC |
diff --git a/apps/gui/usb_screen.c b/apps/gui/usb_screen.c index 527ae9fd15..a92ecac27f 100644 --- a/apps/gui/usb_screen.c +++ b/apps/gui/usb_screen.c | |||
@@ -112,13 +112,8 @@ static int handle_usb_events(void) | |||
112 | 112 | ||
113 | return 0; | 113 | return 0; |
114 | } | 114 | } |
115 | #endif | 115 | #endif /* SIMULATOR */ |
116 | 116 | ||
117 | #ifdef USB_NONE | ||
118 | void gui_usb_screen_run(void) | ||
119 | { | ||
120 | } | ||
121 | #else | ||
122 | #define MODE_NAME_LEN 32 | 117 | #define MODE_NAME_LEN 32 |
123 | 118 | ||
124 | struct usb_screen_vps_t | 119 | struct usb_screen_vps_t |
@@ -315,5 +310,4 @@ void gui_usb_screen_run(void) | |||
315 | } | 310 | } |
316 | 311 | ||
317 | } | 312 | } |
318 | #endif /* !defined(USB_NONE) */ | ||
319 | 313 | ||
diff --git a/apps/gui/usb_screen.h b/apps/gui/usb_screen.h index deaca11aba..84d92d24ff 100644 --- a/apps/gui/usb_screen.h +++ b/apps/gui/usb_screen.h | |||
@@ -21,7 +21,11 @@ | |||
21 | #ifndef _USB_SCREEN_H_ | 21 | #ifndef _USB_SCREEN_H_ |
22 | #define _USB_SCREEN_H_ | 22 | #define _USB_SCREEN_H_ |
23 | 23 | ||
24 | #ifdef USB_NONE | ||
25 | static inline void gui_usb_screen_run(void) {} | ||
26 | #else | ||
24 | extern void gui_usb_screen_run(void); | 27 | extern void gui_usb_screen_run(void); |
28 | #endif | ||
25 | 29 | ||
26 | #endif | 30 | #endif |
27 | 31 | ||
diff --git a/firmware/target/arm/s3c2440/sd-s3c2440.c b/firmware/target/arm/s3c2440/sd-s3c2440.c index 8aa53d8891..56aeacd83d 100644 --- a/firmware/target/arm/s3c2440/sd-s3c2440.c +++ b/firmware/target/arm/s3c2440/sd-s3c2440.c | |||
@@ -882,7 +882,7 @@ int sd_read_sectors(IF_MD2(int card_no,) unsigned long start, int incount, | |||
882 | } | 882 | } |
883 | 883 | ||
884 | /*****************************************************************************/ | 884 | /*****************************************************************************/ |
885 | int sd_write_sectors(IF_MD2(int card_no,) unsigned long start, int count, | 885 | int sd_write_sectors(IF_MD2(int drive,) unsigned long start, int count, |
886 | const void* outbuf) | 886 | const void* outbuf) |
887 | { | 887 | { |
888 | #ifdef BOOTLOADER /* we don't need write support in bootloader */ | 888 | #ifdef BOOTLOADER /* we don't need write support in bootloader */ |
@@ -895,7 +895,7 @@ int sd_write_sectors(IF_MD2(int card_no,) unsigned long start, int count, | |||
895 | return -1; | 895 | return -1; |
896 | #else | 896 | #else |
897 | #ifdef HAVE_MULTIDRIVE | 897 | #ifdef HAVE_MULTIDRIVE |
898 | dbgprintf ("sd_write %d %x %d\n", card_no, start, count); | 898 | dbgprintf ("sd_write %d %x %d\n", drive, start, count); |
899 | #else | 899 | #else |
900 | dbgprintf ("sd_write %x %d\n", start, count); | 900 | dbgprintf ("sd_write %x %d\n", start, count); |
901 | #endif | 901 | #endif |
@@ -904,7 +904,7 @@ int sd_write_sectors(IF_MD2(int card_no,) unsigned long start, int count, | |||
904 | return 0; /* assume success */ | 904 | return 0; /* assume success */ |
905 | else | 905 | else |
906 | #endif | 906 | #endif |
907 | return sd_transfer_sectors(card_no, start, count, (void*)outbuf, true); | 907 | return sd_transfer_sectors(drive, start, count, (void*)outbuf, true); |
908 | #endif | 908 | #endif |
909 | } | 909 | } |
910 | /*****************************************************************************/ | 910 | /*****************************************************************************/ |