From 61320ce0ebf39e47953086de95f1b48f2fd09333 Mon Sep 17 00:00:00 2001
From: Thomas Martitz <kugel@rockbox.org>
Date: Mon, 8 Mar 2010 23:43:11 +0000
Subject: Make mini2440 compile again.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25081 a1c6a512-1295-4272-9138-f99709370657
---
 apps/SOURCES                             | 2 ++
 apps/gui/usb_screen.c                    | 8 +-------
 apps/gui/usb_screen.h                    | 4 ++++
 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
 #ifdef USB_ENABLE_HID
 usb_keymaps.c
 #endif
+#ifndef USB_NONE
 gui/usb_screen.c
+#endif
 metadata.c
 metadata/mp3.c
 #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)
 
     return 0;
 }
-#endif
+#endif /* SIMULATOR */
 
-#ifdef USB_NONE
-void gui_usb_screen_run(void)
-{
-}
-#else
 #define MODE_NAME_LEN 32
 
 struct usb_screen_vps_t
@@ -315,5 +310,4 @@ void gui_usb_screen_run(void)
     }
 
 }
-#endif /* !defined(USB_NONE) */
 
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 @@
 #ifndef _USB_SCREEN_H_
 #define _USB_SCREEN_H_
 
+#ifdef USB_NONE
+static inline void gui_usb_screen_run(void) {}
+#else
 extern void gui_usb_screen_run(void);
+#endif
 
 #endif
 
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,
 }
 
 /*****************************************************************************/
-int sd_write_sectors(IF_MD2(int card_no,) unsigned long start, int count,
+int sd_write_sectors(IF_MD2(int drive,) unsigned long start, int count,
                       const void* outbuf)
 {
 #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,
     return -1;
 #else
 #ifdef HAVE_MULTIDRIVE
-    dbgprintf ("sd_write %d %x %d\n", card_no, start, count);
+    dbgprintf ("sd_write %d %x %d\n", drive, start, count);
 #else
     dbgprintf ("sd_write %x %d\n", start, count);
 #endif
@@ -904,7 +904,7 @@ int sd_write_sectors(IF_MD2(int card_no,) unsigned long start, int count,
         return 0; /* assume success */
     else
 #endif
-        return sd_transfer_sectors(card_no, start, count, (void*)outbuf, true);
+        return sd_transfer_sectors(drive, start, count, (void*)outbuf, true);
 #endif
 }
 /*****************************************************************************/
-- 
cgit v1.2.3