Accept FS#7134 - Sansa: external sd card support by Antonius Hellmann with some tweaks. All testers have given the green light. (Now for the RED ?? ;).

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

1 files changed, 2 insertions, 22 deletions

diff --git a/firmware/export/ata_mmc.h b/firmware/export/ata_mmc.h
index a4e9f71f09..2361c439b5 100644
--- a/firmware/export/ata_mmc.h
+++ b/firmware/export/ata_mmc.h
@@ -18,34 +18,14 @@
  ****************************************************************************/
 #ifndef __ATA_MMC_H__
 #define __ATA_MMC_H__
-
-typedef struct
-{  
-    bool initialized;
-    unsigned char bitrate_register;
-    unsigned long read_timeout;   /* n * 8 clock cycles */
-    unsigned long write_timeout;  /* n * 8 clock cycles */
-
-    unsigned long ocr;            /* OCR register */
-    unsigned long csd[4];         /* CSD register, 16 bytes */
-    unsigned long cid[4];         /* CID register, 16 bytes */
-    unsigned long speed;          /* bit/s */
-    unsigned int nsac;            /* clock cycles */
-    unsigned long tsac;           /* n * 0.1 ns */
-    unsigned int r2w_factor;
-    unsigned long size;           /* size in bytes */
-    unsigned long numblocks;      /* size in flash blocks */
-    unsigned int blocksize;       /* block size in bytes */
-    unsigned int block_exp;       /* block size exponent */
-} tCardInfo;
+#include "hotswap.h"
 
 void mmc_enable_int_flash_clock(bool on);
 bool mmc_detect(void);
-unsigned long mmc_extract_bits(const unsigned long *p, unsigned int start,
-                               unsigned int size);
 tCardInfo *mmc_card_info(int card_no);
 bool mmc_touched(void);
 bool mmc_usb_active(int delayticks);
+
 #ifdef HAVE_HOTSWAP
 void mmc_enable_monitoring(bool on);
 #endif