X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Fsd.h;h=8b85240a0c60ac7da020a32bde146e4581bca023;hb=00a373a2b0382bcf9fe234db2964eb75a0cd2a5d;hp=3a8484fbb473cbae343fcf4c46f6affd47742ed7;hpb=f57ced5005f3378b0ba52cce00b14a7976363ae3;p=bertos.git

diff --git a/bertos/drv/sd.h b/bertos/drv/sd.h
index 3a8484fb..8b85240a 100644
--- a/bertos/drv/sd.h
+++ b/bertos/drv/sd.h
@@ -35,7 +35,7 @@
  * \author Francesco Sacchi <batt@develer.com>
  *
  * $WIZ$ module_name = "sd"
- * $WIZ$ module_depends = "kfile", "timer", "kblock"
+ * $WIZ$ module_depends = "kfile", "timer", "kblock", "sd_spi"
  * $WIZ$ module_hw = "bertos/hw/hw_sd.h"
  * $WIZ$ module_configuration = "bertos/cfg/cfg_sd.h"
  */
@@ -51,51 +51,59 @@
 
 #include <fs/fatfs/diskio.h>
 
-#if CPU_CM3_SAM3X8
-
-typedef struct SDcid
+typedef struct SdCID
 {
-    uint8_t        manfid;
-    uint8_t        prod_name[8];
-    uint32_t       serial;
-    uint16_t       oemid;
-    uint32_t       year_off;
-    uint8_t        m_rev;
-    uint8_t        l_rev;
-}SDcid;
-
-typedef struct SDcsd
+	uint8_t        manfid;
+	uint8_t        prod_name[8];
+	uint32_t       serial;
+	uint16_t       oemid;
+	uint32_t       year_off;
+	uint8_t        m_rev;
+	uint8_t        l_rev;
+}SdCID;
+
+typedef struct SdCSD
 {
 	uint8_t     structure;
-    uint8_t     ccc;          ///< Card command classes
-    uint32_t    erase_size;  ///< The size of an erasable sector, in write block len
+	uint8_t     ccc;          ///< Card command classes
+	uint32_t    erase_size;  ///< The size of an erasable sector, in write block len
 	uint32_t    capacity;     ///< Card size in byte
-    uint32_t    blk_len;      ///< Block data size len in byte
-	uint32_t    blk_num;      ///< Number of block in card
+	uint32_t    max_data_rate; ///< Step rate, usec
+	uint32_t    block_len;      ///< Block data size len in byte
+	uint32_t    block_num;      ///< Number of block in card
 	uint32_t  	write_blk_bits; ///< Max write block length in bits
 	uint32_t  	read_blk_bits;  ///< Max read block length in bits
-    uint8_t     read_partial:1,
-                read_misalign:1,
-                write_partial:1,
-                write_misalign:1;
-} SDcsd;
-
-int sd_decode_csd(SDcsd *csd, uint32_t *resp, size_t len);
-void sd_dump_csd(SDcsd *csd);
-void sd_decode_cid(SDcid *cid, uint32_t *resp, size_t len);
-void sd_dump_cid(SDcid *cid);
-void sd_send_init(void);
-void sd_go_idle(void);
-int sd_send_if_cond(void);
-int sd_send_app_op_cond(void);
-int sd_get_cid(uint32_t *resp, size_t len);
-int sd_get_csd(uint32_t *resp, size_t len);
-int sd_app_status(void);
-#endif
+	uint8_t     read_partial:1,
+				read_misalign:1,
+				write_partial:1,
+				write_misalign:1;
+} SdCSD;
 
+typedef struct SdSSR
+{
+	uint8_t    bus_width;
+	uint8_t    card_type;
+	uint8_t    speed_class;
+	uint8_t    au_size;
+	uint8_t    erase_size;
+} SdSSR;
+
+#define SD_START_DELAY  10
+#define SD_INIT_TIMEOUT ms_to_ticks(2000)
+#define SD_IDLE_RETRIES 4
+#define SD_DEFAULT_BLOCKLEN 512
+
+/**
+ * $WIZ$ sd_mode = "SD_SDMMC_MODE", "SD_SPI_MODE"
+ * \{
+ */
+#define SD_SDMMC_MODE  0
+#define SD_SPI_MODE    1
+/** \} */
 
 #define SD_UNBUFFERED     BV(0) ///< Open SD memory disabling page caching, no modification and partial write are allowed.
 
+struct SdHardware* hw;
 /**
  * SD Card context structure.
  */
@@ -103,14 +111,25 @@ typedef struct Sd
 {
 	KBlock b;   ///< KBlock base class
 	KFile *ch;  ///< SPI communication channel
-	uint16_t r1;  ///< Last status data received from SD
-	uint16_t tranfer_len; ///< Lenght for the read/write commands, cached in order to increase speed.
+	struct SdHardware* hw;
+	uint32_t addr;
+	uint32_t status;
 } Sd;
 
-bool sd_initUnbuf(Sd *sd, KFile *ch);
-bool sd_initBuf(Sd *sd, KFile *ch);
+bool sd_hw_initUnbuf(Sd *sd, KFile *ch);
+bool sd_hw_initBuf(Sd *sd, KFile *ch);
+
+bool sd_spi_initUnbuf(Sd *sd, KFile *ch);
+bool sd_spi_initBuf(Sd *sd, KFile *ch);
+
+// For old compatibility.
+#ifndef CONFIG_SD_MODE
+	#define CONFIG_SD_MODE  SD_SPI_MODE
+	#define SD_INCLUDE_SPI_SOURCE
+#endif
 
 #if CONFIG_SD_OLD_INIT
+
 	#if !(ARCH & ARCH_NIGHTTEST)
 		#warning "Deprecated: this API will be removed in the next major release,"
 		#warning "please disable CONFIG_SD_OLD_INIT and pass explicitly the SD context to sd_init()."
@@ -128,7 +147,11 @@ bool sd_initBuf(Sd *sd, KFile *ch);
 	 *
 	 * \see CONFIG_SD_OLD_INIT.
 	 */
-	#define sd_init(ch) {static struct Sd sd; sd_initUnbuf(&sd, (ch));}
+	#if CONFIG_SD_MODE == SD_SPI_MODE
+		#define sd_init(ch) {static struct Sd sd; sd_spi_initUnbuf(&sd, (ch));}
+	#else
+		#define sd_init(ch) {static struct Sd sd; sd_hw_initUnbuf(&sd, (ch));}
+	#endif
 
 #else
 
@@ -144,7 +167,11 @@ bool sd_initBuf(Sd *sd, KFile *ch);
 	 *
 	 * \return true if initialization succeds, false otherwise.
 	 */
-	#define sd_init(sd, ch, buffered) ((buffered & SD_UNBUFFERED) ? sd_initUnbuf((sd), (ch)) : sd_initBuf((sd), (ch)))
+	#if CONFIG_SD_MODE == SD_SPI_MODE
+		#define sd_init(sd, ch, buffered) ((buffered & SD_UNBUFFERED) ? sd_spi_initUnbuf((sd), (ch)) : sd_spi_initBuf((sd), (ch)))
+	#else
+		#define sd_init(sd, ch, buffered) ((buffered & SD_UNBUFFERED) ? sd_hw_initUnbuf((sd), (ch)) : sd_hw_initBuf((sd), (ch)))
+	#endif
 
 #endif
 
@@ -161,3 +188,4 @@ INLINE Sd *SD_CAST(KBlock *b)
 }
 
 #endif /* DRV_SD_H */
+