Hotswap code shuffling: Fix yellow. Simplify some target function access. Keep fat lock access from compiling for Ondios - think of a nicer way later.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16637 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 3 insertions, 15 deletions

diff --git a/firmware/hotswap.c b/firmware/hotswap.c
index 5620edf10b..bbcdabf649 100644
--- a/firmware/hotswap.c
+++ b/firmware/hotswap.c
@@ -18,10 +18,10 @@
  ****************************************************************************/
 #include <stdbool.h>
 #include "config.h"
-#ifdef TARGET_TREE
-#include "hotswap-target.h"
-#else
+#ifdef HAVE_MMC
 #include "ata_mmc.h"
+#else
+#include "hotswap.h"
 #endif
 
 /* helper function to extract n (<=32) bits from an arbitrary position.
@@ -44,15 +44,3 @@ unsigned long card_extract_bits(
 
     return result;
 }
-
-#ifdef TARGET_TREE
-bool card_detect(void)
-{
-    return card_detect_target();
-}
-
-tCardInfo *card_get_info(int card_no)
-{
-    return card_get_info_target(card_no);
-}
-#endif