Start to extract generic interface from the sd driver implementation.
authorasterix <asterix@38d2e660-2303-0410-9eaa-f027e97ec537>
Mon, 5 Sep 2011 15:49:34 +0000 (15:49 +0000)
committerasterix <asterix@38d2e660-2303-0410-9eaa-f027e97ec537>
Mon, 5 Sep 2011 15:49:34 +0000 (15:49 +0000)
git-svn-id: https://src.develer.com/svnoss/bertos/trunk@5020 38d2e660-2303-0410-9eaa-f027e97ec537

bertos/cpu/cortex-m3/drv/sd_sam3.c [new file with mode: 0644]
bertos/drv/sd.c
bertos/drv/sd.h
bertos/drv/sd_spi.c [new file with mode: 0644]

diff --git a/bertos/cpu/cortex-m3/drv/sd_sam3.c b/bertos/cpu/cortex-m3/drv/sd_sam3.c
new file mode 100644 (file)
index 0000000..fd4062c
--- /dev/null
@@ -0,0 +1,791 @@
+/**
+ * \file
+ * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2007 Develer S.r.l. (http://www.develer.com/)
+ * -->
+ *
+ * \brief Function library for secure digital memory.
+ *
+ * \author Francesco Sacchi <batt@develer.com>
+ */
+
+
+#include "hw/hw_sd.h"
+#include "cfg/cfg_sd.h"
+
+#include <drv/sd.h>
+#include <drv/timer.h>
+#include <drv/hsmci_sam3.h>
+
+#include <io/kfile.h>
+#include <io/kblock.h>
+
+#include <fs/fat.h>
+
+#define LOG_LEVEL  SD_LOG_LEVEL
+#define LOG_FORMAT SD_LOG_FORMAT
+#include <cfg/log.h>
+#include <cpu/power.h>
+
+#include <string.h> /* memset */
+
+
+#define SD_STATUS_APP_CMD      BV(5)
+#define SD_STATUS_READY        BV(8)
+#define SD_STATUS_CURR_MASK    0x1E00
+#define SD_STATUS_CURR_SHIFT   9
+
+#define SD_ADDR_TO_RCA(addr)    (uint32_t)(((addr) << 16) & 0xFFFF0000)
+#define SD_GET_STATE(status)    (uint8_t)(((status) & SD_STATUS_CURR_MASK) >> SD_STATUS_CURR_SHIFT)
+
+static const uint32_t tran_exp[] =
+{
+    10000,      100000,     1000000,    10000000,
+    0,      0,      0,      0
+};
+
+static const uint8_t tran_mant[] =
+{
+    0,  10, 12, 13, 15, 20, 25, 30,
+    35, 40, 45, 50, 55, 60, 70, 80,
+};
+
+
+LOG_INFOB(
+static void dump(const char *label, uint32_t *r, size_t len)
+{
+       ASSERT(r);
+       size_t i;
+       int j = 0;
+       kprintf("\n%s [\n", label);
+       for (i = 0; i < len; i++)
+       {
+               if (j == 5)
+               {
+                       kputs("\n");
+                       j = 0;
+               }
+               kprintf("%08lx ", r[i]);
+               j++;
+       }
+       kprintf("\n] len=%d\n\n", i);
+}
+)
+
+
+static int sd_decodeCsd(SDcsd *csd, uint32_t *resp, size_t len)
+{
+       ASSERT(csd);
+       ASSERT(resp);
+       ASSERT(len >= 4);
+
+    csd->structure = UNSTUFF_BITS(resp, 126, 2);
+       csd->ccc = UNSTUFF_BITS(resp, 84, 12);
+
+    csd->max_data_rate  = tran_exp[UNSTUFF_BITS(resp, 96, 3)] * tran_mant[UNSTUFF_BITS(resp, 99, 4)];
+
+       /*
+        * CSD structure:
+        * - 0:
+        *              - Version 1.01-1.10
+        *              - Version 2.00/Standard Capacity
+        * - 1:
+        *              - Version 2.00/High Capacity
+        * - >1: not defined.
+        */
+
+    if (csd->structure == 0)
+       {
+               // (C_size + 1) x 2^(C_SIZE_MUL+2)
+               csd->blk_num = (1 + UNSTUFF_BITS(resp, 62, 12)) << (UNSTUFF_BITS(resp, 47, 3) + 2);
+
+               csd->read_blk_bits = UNSTUFF_BITS(resp, 80, 4);
+               csd->write_blk_bits = UNSTUFF_BITS(resp, 22, 4);
+
+               csd->blk_len = 1 << csd->read_blk_bits;
+        csd->capacity  = csd->blk_num * csd->blk_len;
+
+        csd->read_partial = UNSTUFF_BITS(resp, 79, 1);
+        csd->read_misalign = UNSTUFF_BITS(resp, 77, 1);
+
+        csd->write_misalign = UNSTUFF_BITS(resp, 78, 1);
+        csd->write_partial = UNSTUFF_BITS(resp, 21, 1);
+
+        if (UNSTUFF_BITS(resp, 46, 1))
+               {
+            csd->erase_size = 1;
+        }
+               else if(csd->write_blk_bits >= 9)
+               {
+            csd->erase_size = UNSTUFF_BITS(resp, 39, 7) + 1;
+            csd->erase_size <<= csd->write_blk_bits - 9;
+        }
+
+               return 0;
+       }
+       else if (csd->structure == 1)
+       {
+               kprintf("csize %ld\n", UNSTUFF_BITS(resp, 48, 22));
+        csd->capacity  = (1 + UNSTUFF_BITS(resp, 48, 22)) << 10;
+
+               csd->write_blk_bits = 9;
+               csd->write_partial = 0;
+        csd->write_misalign = 0;
+
+               csd->read_blk_bits = 9;
+               csd->read_partial = 0;
+        csd->read_misalign = 0;
+
+        csd->erase_size = 1;
+               // the block size if fixed to 512kb
+               csd->blk_len = (1 << csd->write_blk_bits) << 10;
+
+        return 0;
+       }
+    else
+       {
+        kprintf("Unrecognised CSD structure version %d\n", csd->structure);
+        return -1;
+    }
+
+    return 0;
+}
+
+
+void sd_dumpCsd(Sd *sd)
+{
+       ASSERT(sd);
+
+       LOG_INFO("VERSION: %d.0\n", sd->csd.structure ? 2 : 1);
+    LOG_INFO("CARD COMMAND CLASS: %d\n", sd->csd.ccc);
+       LOG_INFO("MAX DATA RATE: %ld\n", sd->csd.max_data_rate);
+       LOG_INFO("WRITE BLK LEN BITS: %ld\n", sd->csd.write_blk_bits);
+       LOG_INFO("READ BLK LEN BITS: %ld\n", sd->csd.read_blk_bits);
+       LOG_INFO("ERASE SIZE: %ld\n", sd->csd.erase_size);
+       LOG_INFO("BLK NUM: %ld\n", sd->csd.blk_num);
+       LOG_INFO("BLK LEN: %ld\n", sd->csd.blk_len);
+       LOG_INFO("CAPACITY %ld\n", sd->csd.capacity);
+       LOG_INFO("FLAG Write: WP %d, W MISALIGN %d\n", sd->csd.write_partial, sd->csd.write_misalign);
+       LOG_INFO("FLAG Read: RP %d, R MISALIGN %d\n", sd->csd.read_partial, sd->csd.read_misalign);
+
+}
+
+void sd_dumpCid(Sd *sd)
+{
+       ASSERT(sd);
+
+       LOG_INFO("MANFID: %d\n", sd->cid.manfid);
+    LOG_INFO("OEMID: %d\n", sd->cid.oemid);
+       LOG_INFO("SERIAL: %ld\n", sd->cid.serial);
+    LOG_INFO("PROD_NAME: %s\n", sd->cid.prod_name);
+    LOG_INFO("REV: %d.%d\n", sd->cid.m_rev, sd->cid.l_rev);
+    LOG_INFO("OFF,Y,M: %lx, %ld %ld\n", sd->cid.year_off, (BCD_TO_INT_32BIT(sd->cid.year_off) / 12) + 2000,
+                                                                                               (BCD_TO_INT_32BIT(sd->cid.year_off) % 12));
+}
+
+void sd_dumpSsr(Sd *sd)
+{
+       ASSERT(sd);
+
+       LOG_INFO("BUS_WIDTH: %d\n", sd->ssr.bus_width);
+    LOG_INFO("TYPE: %d\n", sd->ssr.card_type);
+       LOG_INFO("AU_TYPE: %d\n", sd->ssr.au_size);
+       LOG_INFO("ERASE_SIZE: %d\n", sd->ssr.erase_size);
+       LOG_INFO("SPEED_CLASS: %d\n", sd->ssr.speed_class);
+}
+
+
+void sd_sendInit(void)
+{
+       hsmci_init(NULL); //TODO: REMOVE IT!
+
+       if (hsmci_sendCmd(0, 0, HSMCI_CMDR_SPCMD_INIT | HSMCI_CMDR_RSPTYP_NORESP))
+               LOG_ERR("INIT: %lx\n", HSMCI_SR);
+}
+
+
+void sd_goIdle(void)
+{
+       hsmci_setSpeed(HSMCI_INIT_SPEED, false);
+       if (hsmci_sendCmd(0, 0, HSMCI_CMDR_RSPTYP_NORESP))
+               LOG_ERR("GO_IDLE: %lx\n", HSMCI_SR);
+}
+
+int sd_sendIfCond(Sd *sd)
+{
+       if (hsmci_sendCmd(8, CMD8_V_RANGE_27V_36V, HSMCI_CMDR_RSPTYP_48_BIT))
+       {
+               LOG_ERR("IF_COND %lx\n", HSMCI_SR);
+               return -1;
+       }
+       hsmci_readResp(&(sd->status), 1);
+       if (((sd->status) & 0xFFF) == CMD8_V_RANGE_27V_36V)
+       {
+               LOG_INFO("IF_COND: %lx\n", (sd->status));
+               return 0;
+       }
+       LOG_ERR("IF_COND: %lx\n", (sd->status));
+
+       return -1;
+}
+
+int sd_sendAppOpCond(Sd *sd)
+{
+       if (hsmci_sendCmd(55, 0, HSMCI_CMDR_RSPTYP_48_BIT))
+       {
+               LOG_ERR("APP_CMD %lx\n", HSMCI_SR);
+               return -1;
+       }
+
+       hsmci_readResp(&(sd->status), 1);
+       if ((sd->status) & (SD_STATUS_APP_CMD | SD_STATUS_READY))
+       {
+               if (hsmci_sendCmd(41, SD_HOST_VOLTAGE_RANGE | SD_OCR_CCS, HSMCI_CMDR_RSPTYP_48_BIT))// se cmd 8 va ok.
+               {
+                       LOG_ERR("APP_OP_COND %lx\n", HSMCI_SR);
+                       return -1;
+               }
+               else
+               {
+                       hsmci_readResp(&(sd->status), 1);
+                       if ((sd->status) & SD_OCR_BUSY)
+                       {
+                               LOG_INFO("SD power up! Hight Capability [%d]\n", (bool)((sd->status) & SD_OCR_CCS));
+                               return 0;
+                       }
+
+                       LOG_ERR("sd not ready.\n");
+               }
+       }
+
+       return -1;
+}
+
+
+int sd_getCid(Sd *sd, uint32_t addr, uint8_t flag)
+{
+       ASSERT(sd);
+       memset(&(sd->cid), 0, sizeof(SDcid));
+
+       uint8_t idx = 9; // CMD9 get cid from gived sd address (RCA)
+       if (flag & SD_SEND_ALL_CID)
+               idx = 2;
+
+
+       if (hsmci_sendCmd(idx, SD_ADDR_TO_RCA(addr), HSMCI_CMDR_RSPTYP_136_BIT))
+       {
+               LOG_ERR("GET_CID %lx\n", HSMCI_SR);
+               return -1;
+       }
+       else
+       {
+               uint32_t resp[4];
+               hsmci_readResp(resp, 4);
+               LOG_INFOB(dump("CID", resp, 4););
+
+               sd->cid.manfid        = UNSTUFF_BITS(resp, 120, 8);
+               sd->cid.oemid         = UNSTUFF_BITS(resp, 104, 16);
+               sd->cid.prod_name[0]      = UNSTUFF_BITS(resp, 96, 8);
+               sd->cid.prod_name[1]      = UNSTUFF_BITS(resp, 88, 8);
+               sd->cid.prod_name[2]      = UNSTUFF_BITS(resp, 80, 8);
+               sd->cid.prod_name[3]      = UNSTUFF_BITS(resp, 72, 8);
+               sd->cid.prod_name[4]      = UNSTUFF_BITS(resp, 64, 8);
+               sd->cid.m_rev         = UNSTUFF_BITS(resp, 60, 4);
+               sd->cid.l_rev         = UNSTUFF_BITS(resp, 56, 4);
+               sd->cid.serial        = (uint32_t)UNSTUFF_BITS(resp, 24, 32);
+               sd->cid.year_off      = UNSTUFF_BITS(resp, 8, 12);
+       }
+
+       return 0;
+}
+
+int sd_getCsd(Sd *sd)
+{
+       ASSERT(sd);
+       memset(&(sd->csd), 0, sizeof(SDcsd));
+
+       LOG_INFO("Send to RCA: %lx\n", SD_ADDR_TO_RCA(sd->addr));
+       if (hsmci_sendCmd(9, SD_ADDR_TO_RCA(sd->addr), HSMCI_CMDR_RSPTYP_136_BIT))
+       {
+               LOG_ERR("GET_CSD %lx\n", HSMCI_SR);
+               return -1;
+       }
+       else
+       {
+               uint32_t resp[4];
+               hsmci_readResp(resp, 4);
+               LOG_INFOB(dump("CSD", resp, 4););
+               sd_decodeCsd(&(sd->csd), resp, 4);
+       }
+
+       return 0;
+}
+
+int sd_getRelativeAddr(Sd *sd)
+{
+       ASSERT(sd);
+       if (hsmci_sendCmd(3, 0, HSMCI_CMDR_RSPTYP_48_BIT))
+       {
+               LOG_ERR("RCA: %lx\n", HSMCI_SR);
+               return -1;
+       }
+
+       hsmci_readResp(&sd->addr, 1);
+       sd->addr = sd->addr >> 16;
+
+       LOG_INFOB(dump("RCA", &sd->addr, 1););
+
+       return 0;
+}
+
+int sd_appStatus(Sd *sd)
+{
+       ASSERT(sd);
+       LOG_INFO("Send to RCA: %lx\n", SD_ADDR_TO_RCA(sd->addr));
+       if (hsmci_sendCmd(13, SD_ADDR_TO_RCA(sd->addr), HSMCI_CMDR_RSPTYP_48_BIT))
+       {
+               LOG_ERR("STATUS: %lx\n", HSMCI_SR);
+               return -1;
+       }
+
+       hsmci_readResp(&(sd->status), 1);
+       LOG_INFOB(dump("STATUS", &(sd->status), 1););
+
+       LOG_INFO("State[%d]\n", SD_GET_STATE(sd->status));
+
+       if (sd->status & SD_STATUS_READY)
+               return 0;
+
+       return -1;
+}
+
+
+INLINE int sd_cardSelection(Sd *sd, uint32_t rca)
+{
+       ASSERT(sd);
+       LOG_INFO("Select RCA: %lx\n", rca);
+       if (hsmci_sendCmd(7, rca, HSMCI_CMDR_RSPTYP_R1B))
+       {
+               LOG_ERR("SELECT_SD: %lx\n", HSMCI_SR);
+               return -1;
+       }
+
+       HSMCI_CHECK_BUSY();
+       hsmci_readResp(&(sd->status), 1);
+       LOG_INFOB(dump("SELECT_SD", &(sd->status), 1););
+
+       LOG_INFO("State[%d]\n", SD_GET_STATE(sd->status));
+
+       if (sd->status & SD_STATUS_READY)
+               return 0;
+
+       return -1;
+}
+
+int sd_selectCard(Sd *sd)
+{
+       ASSERT(sd);
+       uint32_t rca = SD_ADDR_TO_RCA(sd->addr);
+       LOG_INFO("Select RCA: %lx\n", rca);
+       if (hsmci_sendCmd(7, rca, HSMCI_CMDR_RSPTYP_R1B))
+       {
+               LOG_ERR("SELECT_SD: %lx\n", HSMCI_SR);
+               return -1;
+       }
+
+       HSMCI_CHECK_BUSY();
+       hsmci_readResp(&(sd->status), 1);
+
+       LOG_INFOB(dump("SELECT_SD", &(sd->status), 1););
+       LOG_INFO("State[%d]\n", SD_GET_STATE(sd->status));
+
+       if (sd->status & SD_STATUS_READY)
+               return 0;
+
+       return -1;
+}
+
+int sd_deSelectCard(Sd *sd)
+{
+       ASSERT(sd);
+
+       uint32_t rca = 0;
+       if (!sd->addr)
+               rca = SD_ADDR_TO_RCA(sd->addr + 1);
+
+       LOG_INFO("Select RCA: %lx\n", rca);
+
+       if (hsmci_sendCmd(7, rca, HSMCI_CMDR_RSPTYP_NORESP))
+       {
+               LOG_ERR("DESELECT_SD: %lx\n", HSMCI_SR);
+               return -1;
+       }
+
+       return 0;
+}
+
+int sd_setBusWidth(Sd *sd, size_t len)
+{
+       ASSERT(sd);
+
+       if (hsmci_sendCmd(55, SD_ADDR_TO_RCA(sd->addr), HSMCI_CMDR_RSPTYP_48_BIT))
+       {
+               LOG_ERR("APP_CMD %lx\n", HSMCI_SR);
+               return -1;
+       }
+
+       hsmci_readResp(&(sd->status), 1);
+       if ((sd->status) & (SD_STATUS_APP_CMD | SD_STATUS_READY))
+       {
+               hsmci_setBusWidth(len);
+
+               uint8_t arg = 0;
+               if (len == 4)
+                       arg = 2;
+
+               if (hsmci_sendCmd(6, arg, HSMCI_CMDR_RSPTYP_48_BIT))
+               {
+                       LOG_ERR("SET_BUS_WIDTH CMD: %lx\n", HSMCI_SR);
+                       return -1;
+               }
+
+               hsmci_readResp(&(sd->status), 1);
+
+               LOG_INFOB(dump("SET_BUS_WIDTH", &(sd->status), 1););
+               LOG_INFO("State[%d]\n", SD_GET_STATE(sd->status));
+
+               if (sd->status & SD_STATUS_READY)
+                       return 0;
+       }
+
+       LOG_ERR("SET_BUS_WIDTH REP %lx\n", (sd->status));
+       return -1;
+}
+
+
+int sd_set_BlockLen(Sd *sd, size_t len)
+{
+       ASSERT(sd);
+
+       if (hsmci_sendCmd(16, len, HSMCI_CMDR_RSPTYP_48_BIT))
+       {
+               LOG_ERR("SET_BLK_LEN: %lx\n", HSMCI_SR);
+               return -1;
+       }
+
+       hsmci_readResp(&(sd->status), 1);
+
+       LOG_INFOB(dump("SET_BLK_LEN", &(sd->status), 1););
+       LOG_INFO("State[%d]\n", SD_GET_STATE(sd->status));
+
+       sd->csd.blk_len = len;
+
+       if (sd->status & SD_STATUS_READY)
+               return 0;
+
+       return -1;
+}
+
+int sd_getStatus(Sd *sd, uint32_t *buf, size_t words)
+{
+       ASSERT(sd);
+
+       // Status reply with 512bit data, so the block size in byte is 64
+       hsmci_prgRxDMA(buf, words, 64);
+
+       if (hsmci_sendCmd(55, SD_ADDR_TO_RCA(sd->addr), HSMCI_CMDR_RSPTYP_48_BIT))
+       {
+               LOG_ERR("APP_CMD %lx\n", HSMCI_SR);
+               return -1;
+       }
+
+       uint32_t status = HSMCI_RSPR;
+       if (status & (SD_STATUS_APP_CMD | SD_STATUS_READY))
+       {
+               if (hsmci_sendCmd(13, 0, HSMCI_CMDR_RSPTYP_48_BIT |
+                               BV(HSMCI_CMDR_TRDIR) | HSMCI_CMDR_TRCMD_START_DATA | HSMCI_CMDR_TRTYP_SINGLE))
+               {
+                       LOG_ERR("STATUS CMD: %lx\n", HSMCI_SR);
+                       return -1;
+               }
+
+               hsmci_readResp(&(sd->status), 1);
+               LOG_INFOB(dump("STATUS", &(sd->status), 1););
+               LOG_INFO("State[%d]\n", SD_GET_STATE(sd->status));
+
+               if (sd->status & SD_STATUS_READY)
+               {
+                       hsmci_waitTransfer();
+
+                       LOG_INFOB(dump("STATUS", buf, words););
+                       memset(&(sd->ssr), 0, sizeof(SDssr));
+
+                       sd->ssr.bus_width  = UNSTUFF_BITS(buf, 510, 2);
+                       sd->ssr.card_type  = UNSTUFF_BITS(buf, 480, 16);
+                       sd->ssr.au_size  = UNSTUFF_BITS(buf, 432, 8);
+                       sd->ssr.speed_class  = UNSTUFF_BITS(buf, 440, 8);
+                       sd->ssr.erase_size = UNSTUFF_BITS(buf, 408, 24);
+
+                       return 0;
+               }
+       }
+
+       return -1;
+}
+
+
+void sd_setHightSpeed(Sd *sd)
+{
+       (void)sd;
+       hsmci_setSpeed(2100000, true);
+}
+
+
+static size_t sd_SdReadDirect(struct KBlock *b, block_idx_t idx, void *buf, size_t offset, size_t size)
+{
+       ASSERT(buf);
+       Sd *sd = SD_CAST(b);
+       LOG_INFO("reading from block %ld, offset %d, size %d\n", idx, offset, size);
+
+       if (sd_selectCard(sd) < 0)
+               return -1;
+
+       hsmci_prgRxDMA(buf, size / 4, sd->csd.blk_len);
+
+       if (hsmci_sendCmd(17, idx * sd->csd.blk_len + offset, HSMCI_CMDR_RSPTYP_48_BIT |
+                       BV(HSMCI_CMDR_TRDIR) | HSMCI_CMDR_TRCMD_START_DATA | HSMCI_CMDR_TRTYP_SINGLE))
+       {
+               LOG_ERR("SIGLE_BLK_READ: %lx\n", HSMCI_SR);
+               sd_deSelectCard(sd);
+               return -1;
+       }
+
+       hsmci_readResp(&(sd->status), 1);
+
+       LOG_INFOB(dump("SIGLE_BLK_READ", &(sd->status), 1););
+       LOG_INFO("State[%d]\n", SD_GET_STATE(sd->status));
+
+       if (sd->status & SD_STATUS_READY)
+       {
+               hsmci_waitTransfer();
+               sd_deSelectCard(sd);
+               return size;
+       }
+
+       sd_deSelectCard(sd);
+       return -1;
+}
+
+static size_t sd_SdWriteDirect(KBlock *b, block_idx_t idx, const void *buf, size_t offset, size_t size)
+{
+       ASSERT(buf);
+       Sd *sd = SD_CAST(b);
+       const uint32_t *_buf = (const uint32_t *)buf;
+       LOG_INFO("reading from block %ld, offset %d, size %d\n", idx, offset, size);
+
+       if (sd_selectCard(sd) < 0)
+               return 0;
+
+       hsmci_prgTxDMA(_buf, size / 4, sd->csd.blk_len);
+
+       if (hsmci_sendCmd(24, idx * sd->csd.blk_len + offset, HSMCI_CMDR_RSPTYP_48_BIT |
+                                               HSMCI_CMDR_TRCMD_START_DATA | HSMCI_CMDR_TRTYP_SINGLE))
+       {
+               LOG_ERR("SIGLE_BLK_WRITE: %lx\n", HSMCI_SR);
+               sd_deSelectCard(sd);
+               return -1;
+       }
+
+       hsmci_readResp(&(sd->status), 1);
+
+       LOG_INFOB(dump("SIGLE_BLK_WR", &(sd->status), 1););
+       LOG_INFO("State[%d]\n", SD_GET_STATE(sd->status));
+
+       if (sd->status & SD_STATUS_READY)
+       {
+               hsmci_waitTransfer();
+               sd_deSelectCard(sd);
+               return size;
+       }
+
+       sd_deSelectCard(sd);
+       return -1;
+}
+
+
+static int sd_SdError(KBlock *b)
+{
+       Sd *sd = SD_CAST(b);
+       return 0;//sd->status;
+}
+
+static void sd_SdClearerr(KBlock *b)
+{
+       Sd *sd = SD_CAST(b);
+       sd->status = 0;
+}
+
+static bool sd_blockInit(Sd *sd, KFile *ch)
+{
+       ASSERT(sd);
+       memset(sd, 0, sizeof(*sd));
+       DB(sd->b.priv.type = KBT_SD);
+
+       /* Wait a few moments for supply voltage to stabilize */
+       timer_delay(SD_START_DELAY);
+
+       sd_sendInit();
+       sd_goIdle();
+
+       sd_sendIfCond(sd);
+
+       ticks_t start = timer_clock();
+       bool sd_power_on = false;
+       do
+       {
+               if (!sd_sendAppOpCond(sd))
+               {
+                       sd_power_on = true;
+                       break;
+               }
+               cpu_relax();
+       }
+       while (timer_clock() - start < SD_INIT_TIMEOUT);
+
+
+       if (sd_power_on)
+       {
+               if(sd_getCid(sd, 0, SD_SEND_ALL_CID) < 0)
+                       return false;
+               else
+               {
+                       sd_dumpCid(sd);
+               }
+
+               if (sd_getRelativeAddr(sd) < 0)
+                       return false;
+               else
+               {
+                       LOG_INFO("RCA: %0lx\n", sd->addr);
+               }
+
+
+               if (sd_getCsd(sd) < 0)
+                       return false;
+               else
+               {
+                       sd_dumpCsd(sd);
+               }
+
+               if (sd_appStatus(sd) < 0)
+               {
+                       LOG_INFO("STATUS: %ld\n", sd->status);
+                       return false;
+               }
+
+               if (sd->status & SD_CARD_IS_LOCKED)
+               {
+                       LOG_INFO("SD is locked!\n");
+                       return false;
+               }
+
+               if (sd->status & SD_READY_FOR_DATA)
+               {
+                       sd_selectCard(sd);
+                       sd_set_BlockLen(sd, SD_DEFAULT_BLOCKLEN);
+                       sd_setBus4bit(sd);
+                       sd_setHightSpeed(sd);
+                       sd_deSelectCard(sd);
+
+                       sd->b.blk_size = SD_DEFAULT_BLOCKLEN;
+                       sd->b.blk_cnt = sd->csd.blk_num * (sd->csd.blk_len / SD_DEFAULT_BLOCKLEN);
+                       LOG_INFO("blk_size %d, blk_cnt %ld\n", sd->b.blk_size, sd->b.blk_cnt);
+
+                       #if CONFIG_SD_AUTOASSIGN_FAT
+                               disk_assignDrive(&sd->b, 0);
+                       #endif
+
+                       return true;
+               }
+       }
+
+       return false;
+}
+
+static const KBlockVTable sd_unbuffered_vt =
+{
+       .readDirect = sd_SdReadDirect,
+       .writeDirect = sd_SdWriteDirect,
+
+       .error = sd_SdError,
+       .clearerr = sd_SdClearerr,
+};
+
+static const KBlockVTable sd_buffered_vt =
+{
+       .readDirect = sd_SdReadDirect,
+       .writeDirect = sd_SdWriteDirect,
+
+       .readBuf = kblock_swReadBuf,
+       .writeBuf = kblock_swWriteBuf,
+       .load = kblock_swLoad,
+       .store = kblock_swStore,
+
+       .error = sd_SdError,
+       .clearerr = sd_SdClearerr,
+};
+
+bool sd_hw_initUnbuf(Sd *sd, KFile *ch)
+{
+       if (sd_blockInit(sd, ch))
+       {
+               sd->b.priv.vt = &sd_unbuffered_vt;
+               return true;
+       }
+       else
+               return false;
+}
+
+static uint8_t sd_buf[SD_DEFAULT_BLOCKLEN];
+
+bool sd_hw_initBuf(Sd *sd, KFile *ch)
+{
+       if (sd_blockInit(sd, ch))
+       {
+               sd->b.priv.buf = sd_buf;
+               sd->b.priv.flags |= KB_BUFFERED | KB_PARTIAL_WRITE;
+               sd->b.priv.vt = &sd_buffered_vt;
+               sd->b.priv.vt->load(&sd->b, 0);
+               return true;
+       }
+       else
+               return false;
+}
+
+
+
index 53e422f8bc8ca6c38e5637515e513f1425fe86f6..441ff8b1501cca2233439049efef0f55686887a7 100644 (file)
 
 #include "sd.h"
 #include "hw/hw_sd.h"
-#include <io/kfile.h>
-#include <io/kblock.h>
-#include <drv/timer.h>
-
-#include <fs/fat.h>
-
 #include "cfg/cfg_sd.h"
 
 #define LOG_LEVEL  SD_LOG_LEVEL
 #define LOG_FORMAT SD_LOG_FORMAT
 #include <cfg/log.h>
-#include <cpu/power.h>
-
-#include <string.h> /* memset */
-
-/**
- * Card Specific Data
- * read directly from the card.
- */
-typedef struct CardCSD
-{
-       uint16_t block_len;  ///< Length of a block
-       uint32_t block_num;  ///< Number of block on the card
-       uint16_t capacity;   ///< Card capacity in MB
-} CardCSD;
-
-#define SD_IN_IDLE    0x01
-#define SD_STARTTOKEN 0xFE
-
-#define TIMEOUT_NAC   16384
-#define SD_DEFAULT_BLOCKLEN 512
-
-#define SD_BUSY_TIMEOUT ms_to_ticks(200)
-
-static bool sd_select(Sd *sd, bool state)
-{
-       KFile *fd = sd->ch;
-
-       if (state)
-       {
-               SD_CS_ON();
-
-               ticks_t start = timer_clock();
-               do
-               {
-                       if (kfile_getc(fd) == 0xff)
-                               return true;
-
-                       cpu_relax();
-               }
-               while (timer_clock() - start < SD_BUSY_TIMEOUT);
-
-               SD_CS_OFF();
-               LOG_ERR("sd_select timeout\n");
-               return false;
-       }
-       else
-       {
-               kfile_putc(0xff, fd);
-               kfile_flush(fd);
-               SD_CS_OFF();
-               return true;
-       }
-}
-
-static int16_t sd_waitR1(Sd *sd)
-{
-       uint8_t datain;
-
-       for (int i = 0; i < TIMEOUT_NAC; i++)
-       {
-               datain = kfile_getc(sd->ch);
-               if (datain != 0xff)
-                       return (int16_t)datain;
-       }
-       LOG_ERR("Timeout waiting R1\n");
-       return EOF;
-}
-
-static int16_t sd_sendCommand(Sd *sd, uint8_t cmd, uint32_t param, uint8_t crc)
-{
-       KFile *fd = sd->ch;
-       /* The 7th bit of command must be a 1 */
-       kfile_putc(cmd | 0x40, fd);
-
-       /* send parameter */
-       kfile_putc((param >> 24) & 0xFF, fd);
-       kfile_putc((param >> 16) & 0xFF, fd);
-       kfile_putc((param >> 8) & 0xFF, fd);
-       kfile_putc((param) & 0xFF, fd);
-
-       kfile_putc(crc, fd);
-
-       return sd_waitR1(sd);
-}
-
-static bool sd_getBlock(Sd *sd, void *buf, size_t len)
-{
-       uint8_t token;
-       uint16_t crc;
-
-       KFile *fd = sd->ch;
-
-       for (int i = 0; i < TIMEOUT_NAC; i++)
-       {
-               token = kfile_getc(fd);
-               if (token != 0xff)
-               {
-                       if (token == SD_STARTTOKEN)
-                       {
-                               if (kfile_read(fd, buf, len) == len)
-                               {
-                                       if (kfile_read(fd, &crc, sizeof(crc)) == sizeof(crc))
-                                               /* check CRC here if needed */
-                                               return true;
-                                       else
-                                               LOG_ERR("get_block error getting crc\n");
-                               }
-                               else
-                                       LOG_ERR("get_block len error: %d\n", (int)len);
-                       }
-                       else
-                               LOG_ERR("get_block token error: %02X\n", token);
-
-                       return false;
-               }
-       }
-
-       LOG_ERR("get_block timeout waiting token\n");
-       return false;
-}
-
-#define SD_SELECT(sd) \
-do \
-{ \
-       if (!sd_select((sd), true)) \
-       { \
-               LOG_ERR("%s failed, card busy\n", __func__); \
-               return EOF; \
-       } \
-} \
-while (0)
-
-#define SD_SETBLOCKLEN 0x50
-
-static int16_t sd_setBlockLen(Sd *sd, uint32_t newlen)
-{
-       SD_SELECT(sd);
-
-       sd->r1 = sd_sendCommand(sd, SD_SETBLOCKLEN, newlen, 0);
-
-       sd_select(sd, false);
-       return sd->r1;
-}
-
-#define SD_SEND_CSD 0x49
-
-static int16_t sd_getCSD(Sd *sd, CardCSD *csd)
-{
-       SD_SELECT(sd);
-
-       int16_t r1 = sd_sendCommand(sd, SD_SEND_CSD, 0, 0);
-
-       if (r1)
-       {
-               LOG_ERR("send_csd failed: %04X\n", sd->r1);
-               sd_select(sd, false);
-               return r1;
-       }
-
-       uint8_t buf[16];
-       bool res = sd_getBlock(sd, buf, sizeof(buf));
-       sd_select(sd, false);
-
-       if (res)
-       {
-               #if LOG_LEVEL >= LOG_LVL_INFO
-                       LOG_INFO("CSD: [");
-                       for (int i = 0; i < 16; i++)
-                               kprintf("%02X ", buf[i]);
-                       kprintf("]\n");
-               #endif
-
-               uint16_t mult = (1L << ((((buf[9] & 0x03) << 1) | ((buf[10] & 0x80) >> 7)) + 2));
-               uint16_t c_size = (((uint16_t)(buf[6] & 0x03)) << 10) | (((uint16_t)buf[7]) << 2) |
-                                 (((uint16_t)(buf[8] & 0xC0)) >> 6);
-
-               csd->block_len = (1L << (buf[5] & 0x0F));
-               csd->block_num = (c_size + 1) * mult;
-               csd->capacity = (csd->block_len * csd->block_num) >> 20; // in MB
-
-               LOG_INFO("block_len %d bytes, block_num %ld, total capacity %dMB\n", csd->block_len, csd->block_num, csd->capacity);
-               return 0;
-       }
-       else
-               return EOF;
-}
-
-#if CPU_CM3_SAM3X8
-
-#include <drv/hsmci_sam3.h>
-
-#define SD_ADDR_TO_RCA(addr)    (uint32_t)(((addr) << 16) & 0xFFFF0000)
-#define SD_GET_STATE(status)    (uint8_t)(((status) & SD_STATUS_CURR_MASK) >> SD_STATUS_CURR_SHIFT)
-
-#define SD_STATUS_APP_CMD      BV(5)
-#define SD_STATUS_READY        BV(8)
-#define SD_STATUS_CURR_MASK    0x1E00
-#define SD_STATUS_CURR_SHIFT   9
-
-
-LOG_INFOB(
-static void dump(const char *label, uint32_t *r, size_t len)
-{
-       ASSERT(r);
-       size_t i;
-       int j = 0;
-       kprintf("\n%s [\n", label);
-       for (i = 0; i < len; i++)
-       {
-               if (j == 5)
-               {
-                       kputs("\n");
-                       j = 0;
-               }
-               kprintf("%08lx ", r[i]);
-               j++;
-       }
-       kprintf("\n] len=%d\n\n", i);
-}
-)
-
-static const uint32_t tran_exp[] =
-{
-    10000,      100000,     1000000,    10000000,
-    0,      0,      0,      0
-};
-
-static const uint8_t tran_mant[] =
-{
-    0,  10, 12, 13, 15, 20, 25, 30,
-    35, 40, 45, 50, 55, 60, 70, 80,
-};
-
-static int sd_decodeCsd(SDcsd *csd, uint32_t *resp, size_t len)
-{
-       ASSERT(csd);
-       ASSERT(resp);
-       ASSERT(len >= 4);
-
-    csd->structure = UNSTUFF_BITS(resp, 126, 2);
-       csd->ccc = UNSTUFF_BITS(resp, 84, 12);
-
-    csd->max_data_rate  = tran_exp[UNSTUFF_BITS(resp, 96, 3)] * tran_mant[UNSTUFF_BITS(resp, 99, 4)];
-
-       /*
-        * CSD structure:
-        * - 0:
-        *              - Version 1.01-1.10
-        *              - Version 2.00/Standard Capacity
-        * - 1:
-        *              - Version 2.00/High Capacity
-        * - >1: not defined.
-        */
-
-    if (csd->structure == 0)
-       {
-               // (C_size + 1) x 2^(C_SIZE_MUL+2)
-               csd->blk_num = (1 + UNSTUFF_BITS(resp, 62, 12)) << (UNSTUFF_BITS(resp, 47, 3) + 2);
-
-               csd->read_blk_bits = UNSTUFF_BITS(resp, 80, 4);
-               csd->write_blk_bits = UNSTUFF_BITS(resp, 22, 4);
-
-               csd->blk_len = 1 << csd->read_blk_bits;
-        csd->capacity  = csd->blk_num * csd->blk_len;
-
-        csd->read_partial = UNSTUFF_BITS(resp, 79, 1);
-        csd->read_misalign = UNSTUFF_BITS(resp, 77, 1);
-
-        csd->write_misalign = UNSTUFF_BITS(resp, 78, 1);
-        csd->write_partial = UNSTUFF_BITS(resp, 21, 1);
-
-        if (UNSTUFF_BITS(resp, 46, 1))
-               {
-            csd->erase_size = 1;
-        }
-               else if(csd->write_blk_bits >= 9)
-               {
-            csd->erase_size = UNSTUFF_BITS(resp, 39, 7) + 1;
-            csd->erase_size <<= csd->write_blk_bits - 9;
-        }
-
-               return 0;
-       }
-       else if (csd->structure == 1)
-       {
-               kprintf("csize %ld\n", UNSTUFF_BITS(resp, 48, 22));
-        csd->capacity  = (1 + UNSTUFF_BITS(resp, 48, 22)) << 10;
-
-               csd->write_blk_bits = 9;
-               csd->write_partial = 0;
-        csd->write_misalign = 0;
-
-               csd->read_blk_bits = 9;
-               csd->read_partial = 0;
-        csd->read_misalign = 0;
-
-        csd->erase_size = 1;
-               // the block size if fixed to 512kb
-               csd->blk_len = (1 << csd->write_blk_bits) << 10;
-
-        return 0;
-       }
-    else
-       {
-        kprintf("Unrecognised CSD structure version %d\n", csd->structure);
-        return -1;
-    }
-
-    return 0;
-}
-
-
-void sd_dumpCsd(Sd *sd)
-{
-       ASSERT(sd);
-
-       LOG_INFO("VERSION: %d.0\n", sd->csd.structure ? 2 : 1);
-    LOG_INFO("CARD COMMAND CLASS: %d\n", sd->csd.ccc);
-       LOG_INFO("MAX DATA RATE: %ld\n", sd->csd.max_data_rate);
-       LOG_INFO("WRITE BLK LEN BITS: %ld\n", sd->csd.write_blk_bits);
-       LOG_INFO("READ BLK LEN BITS: %ld\n", sd->csd.read_blk_bits);
-       LOG_INFO("ERASE SIZE: %ld\n", sd->csd.erase_size);
-       LOG_INFO("BLK NUM: %ld\n", sd->csd.blk_num);
-       LOG_INFO("BLK LEN: %ld\n", sd->csd.blk_len);
-       LOG_INFO("CAPACITY %ld\n", sd->csd.capacity);
-       LOG_INFO("FLAG Write: WP %d, W MISALIGN %d\n", sd->csd.write_partial, sd->csd.write_misalign);
-       LOG_INFO("FLAG Read: RP %d, R MISALIGN %d\n", sd->csd.read_partial, sd->csd.read_misalign);
-
-}
 
-void sd_dumpCid(Sd *sd)
-{
-       ASSERT(sd);
-
-       LOG_INFO("MANFID: %d\n", sd->cid.manfid);
-    LOG_INFO("OEMID: %d\n", sd->cid.oemid);
-       LOG_INFO("SERIAL: %ld\n", sd->cid.serial);
-    LOG_INFO("PROD_NAME: %s\n", sd->cid.prod_name);
-    LOG_INFO("REV: %d.%d\n", sd->cid.m_rev, sd->cid.l_rev);
-    LOG_INFO("OFF,Y,M: %lx, %ld %ld\n", sd->cid.year_off, (BCD_TO_INT_32BIT(sd->cid.year_off) / 12) + 2000,
-                                                                                               (BCD_TO_INT_32BIT(sd->cid.year_off) % 12));
-}
-
-void sd_dumpSsr(Sd *sd)
-{
-       ASSERT(sd);
-
-       LOG_INFO("BUS_WIDTH: %d\n", sd->ssr.bus_width);
-    LOG_INFO("TYPE: %d\n", sd->ssr.card_type);
-       LOG_INFO("AU_TYPE: %d\n", sd->ssr.au_size);
-       LOG_INFO("ERASE_SIZE: %d\n", sd->ssr.erase_size);
-       LOG_INFO("SPEED_CLASS: %d\n", sd->ssr.speed_class);
-}
-
-
-void sd_sendInit(void)
-{
-       hsmci_init(NULL); //TODO: REMOVE IT!
-
-       if (hsmci_sendCmd(0, 0, HSMCI_CMDR_SPCMD_INIT | HSMCI_CMDR_RSPTYP_NORESP))
-               LOG_ERR("INIT: %lx\n", HSMCI_SR);
-}
-
-
-void sd_goIdle(void)
-{
-       hsmci_setSpeed(HSMCI_INIT_SPEED, false);
-       if (hsmci_sendCmd(0, 0, HSMCI_CMDR_RSPTYP_NORESP))
-               LOG_ERR("GO_IDLE: %lx\n", HSMCI_SR);
-}
-
-int sd_sendIfCond(Sd *sd)
-{
-       if (hsmci_sendCmd(8, CMD8_V_RANGE_27V_36V, HSMCI_CMDR_RSPTYP_48_BIT))
-       {
-               LOG_ERR("IF_COND %lx\n", HSMCI_SR);
-               return -1;
-       }
-       hsmci_readResp(&(sd->status), 1);
-       if (((sd->status) & 0xFFF) == CMD8_V_RANGE_27V_36V)
-       {
-               LOG_INFO("IF_COND: %lx\n", (sd->status));
-               return 0;
-       }
-       LOG_ERR("IF_COND: %lx\n", (sd->status));
-
-       return -1;
-}
-
-int sd_sendAppOpCond(Sd *sd)
-{
-       if (hsmci_sendCmd(55, 0, HSMCI_CMDR_RSPTYP_48_BIT))
-       {
-               LOG_ERR("APP_CMD %lx\n", HSMCI_SR);
-               return -1;
-       }
-
-       hsmci_readResp(&(sd->status), 1);
-       if ((sd->status) & (SD_STATUS_APP_CMD | SD_STATUS_READY))
-       {
-               if (hsmci_sendCmd(41, SD_HOST_VOLTAGE_RANGE | SD_OCR_CCS, HSMCI_CMDR_RSPTYP_48_BIT))// se cmd 8 va ok.
-               {
-                       LOG_ERR("APP_OP_COND %lx\n", HSMCI_SR);
-                       return -1;
-               }
-               else
-               {
-                       hsmci_readResp(&(sd->status), 1);
-                       if ((sd->status) & SD_OCR_BUSY)
-                       {
-                               LOG_INFO("SD power up! Hight Capability [%d]\n", (bool)((sd->status) & SD_OCR_CCS));
-                               return 0;
-                       }
-
-                       LOG_ERR("sd not ready.\n");
-               }
-       }
-
-       return -1;
-}
-
-
-int sd_getCid(Sd *sd, uint32_t addr, uint8_t flag)
-{
-       ASSERT(sd);
-       memset(&(sd->cid), 0, sizeof(SDcid));
-
-       uint8_t idx = 9; // CMD9 get cid from gived sd address (RCA)
-       if (flag & SD_SEND_ALL_CID)
-               idx = 2;
-
-
-       if (hsmci_sendCmd(idx, SD_ADDR_TO_RCA(addr), HSMCI_CMDR_RSPTYP_136_BIT))
-       {
-               LOG_ERR("GET_CID %lx\n", HSMCI_SR);
-               return -1;
-       }
-       else
-       {
-               uint32_t resp[4];
-               hsmci_readResp(resp, 4);
-               LOG_INFOB(dump("CID", resp, 4););
-
-               sd->cid.manfid        = UNSTUFF_BITS(resp, 120, 8);
-               sd->cid.oemid         = UNSTUFF_BITS(resp, 104, 16);
-               sd->cid.prod_name[0]      = UNSTUFF_BITS(resp, 96, 8);
-               sd->cid.prod_name[1]      = UNSTUFF_BITS(resp, 88, 8);
-               sd->cid.prod_name[2]      = UNSTUFF_BITS(resp, 80, 8);
-               sd->cid.prod_name[3]      = UNSTUFF_BITS(resp, 72, 8);
-               sd->cid.prod_name[4]      = UNSTUFF_BITS(resp, 64, 8);
-               sd->cid.m_rev         = UNSTUFF_BITS(resp, 60, 4);
-               sd->cid.l_rev         = UNSTUFF_BITS(resp, 56, 4);
-               sd->cid.serial        = (uint32_t)UNSTUFF_BITS(resp, 24, 32);
-               sd->cid.year_off      = UNSTUFF_BITS(resp, 8, 12);
-       }
-
-       return 0;
-}
-
-int sd_getCsd(Sd *sd)
-{
-       ASSERT(sd);
-       memset(&(sd->csd), 0, sizeof(SDcsd));
-
-       LOG_INFO("Send to RCA: %lx\n", SD_ADDR_TO_RCA(sd->addr));
-       if (hsmci_sendCmd(9, SD_ADDR_TO_RCA(sd->addr), HSMCI_CMDR_RSPTYP_136_BIT))
-       {
-               LOG_ERR("GET_CSD %lx\n", HSMCI_SR);
-               return -1;
-       }
-       else
-       {
-               uint32_t resp[4];
-               hsmci_readResp(resp, 4);
-               LOG_INFOB(dump("CSD", resp, 4););
-               sd_decodeCsd(&(sd->csd), resp, 4);
-       }
-
-       return 0;
-}
-
-int sd_getRelativeAddr(Sd *sd)
-{
-       ASSERT(sd);
-       if (hsmci_sendCmd(3, 0, HSMCI_CMDR_RSPTYP_48_BIT))
-       {
-               LOG_ERR("RCA: %lx\n", HSMCI_SR);
-               return -1;
-       }
-
-       hsmci_readResp(&sd->addr, 1);
-       sd->addr = sd->addr >> 16;
-
-       LOG_INFOB(dump("RCA", &sd->addr, 1););
-
-       return 0;
-}
-
-int sd_appStatus(Sd *sd)
-{
-       ASSERT(sd);
-       LOG_INFO("Send to RCA: %lx\n", SD_ADDR_TO_RCA(sd->addr));
-       if (hsmci_sendCmd(13, SD_ADDR_TO_RCA(sd->addr), HSMCI_CMDR_RSPTYP_48_BIT))
-       {
-               LOG_ERR("STATUS: %lx\n", HSMCI_SR);
-               return -1;
-       }
-
-       hsmci_readResp(&(sd->status), 1);
-       LOG_INFOB(dump("STATUS", &(sd->status), 1););
-
-       LOG_INFO("State[%d]\n", SD_GET_STATE(sd->status));
-
-       if (sd->status & SD_STATUS_READY)
-               return 0;
-
-       return -1;
-}
-
-
-INLINE int sd_cardSelection(Sd *sd, uint32_t rca)
-{
-       ASSERT(sd);
-       LOG_INFO("Select RCA: %lx\n", rca);
-       if (hsmci_sendCmd(7, rca, HSMCI_CMDR_RSPTYP_R1B))
-       {
-               LOG_ERR("SELECT_SD: %lx\n", HSMCI_SR);
-               return -1;
-       }
-
-       HSMCI_CHECK_BUSY();
-       hsmci_readResp(&(sd->status), 1);
-       LOG_INFOB(dump("SELECT_SD", &(sd->status), 1););
-
-       LOG_INFO("State[%d]\n", SD_GET_STATE(sd->status));
-
-       if (sd->status & SD_STATUS_READY)
-               return 0;
-
-       return -1;
-}
-
-int sd_selectCard(Sd *sd)
-{
-       ASSERT(sd);
-       uint32_t rca = SD_ADDR_TO_RCA(sd->addr);
-       LOG_INFO("Select RCA: %lx\n", rca);
-       if (hsmci_sendCmd(7, rca, HSMCI_CMDR_RSPTYP_R1B))
-       {
-               LOG_ERR("SELECT_SD: %lx\n", HSMCI_SR);
-               return -1;
-       }
-
-       HSMCI_CHECK_BUSY();
-       hsmci_readResp(&(sd->status), 1);
-
-       LOG_INFOB(dump("SELECT_SD", &(sd->status), 1););
-       LOG_INFO("State[%d]\n", SD_GET_STATE(sd->status));
-
-       if (sd->status & SD_STATUS_READY)
-               return 0;
-
-       return -1;
-}
-
-int sd_deSelectCard(Sd *sd)
-{
-       ASSERT(sd);
-
-       uint32_t rca = 0;
-       if (!sd->addr)
-               rca = SD_ADDR_TO_RCA(sd->addr + 1);
-
-       LOG_INFO("Select RCA: %lx\n", rca);
-
-       if (hsmci_sendCmd(7, rca, HSMCI_CMDR_RSPTYP_NORESP))
-       {
-               LOG_ERR("DESELECT_SD: %lx\n", HSMCI_SR);
-               return -1;
-       }
-
-       return 0;
-
-}
-
-int sd_setBusWidth(Sd *sd, size_t len)
-{
-       ASSERT(sd);
-
-       if (hsmci_sendCmd(55, SD_ADDR_TO_RCA(sd->addr), HSMCI_CMDR_RSPTYP_48_BIT))
-       {
-               LOG_ERR("APP_CMD %lx\n", HSMCI_SR);
-               return -1;
-       }
-
-       hsmci_readResp(&(sd->status), 1);
-       if ((sd->status) & (SD_STATUS_APP_CMD | SD_STATUS_READY))
-       {
-               hsmci_setBusWidth(len);
-
-               uint8_t arg = 0;
-               if (len == 4)
-                       arg = 2;
-
-               if (hsmci_sendCmd(6, arg, HSMCI_CMDR_RSPTYP_48_BIT))
-               {
-                       LOG_ERR("SET_BUS_WIDTH CMD: %lx\n", HSMCI_SR);
-                       return -1;
-               }
-
-               hsmci_readResp(&(sd->status), 1);
-
-               LOG_INFOB(dump("SET_BUS_WIDTH", &(sd->status), 1););
-               LOG_INFO("State[%d]\n", SD_GET_STATE(sd->status));
-
-               if (sd->status & SD_STATUS_READY)
-                       return 0;
-       }
-
-       LOG_ERR("SET_BUS_WIDTH REP %lx\n", (sd->status));
-       return -1;
-}
-
-
-int sd_set_BlockLen(Sd *sd, size_t len)
-{
-       ASSERT(sd);
-
-       if (hsmci_sendCmd(16, len, HSMCI_CMDR_RSPTYP_48_BIT))
-       {
-               LOG_ERR("SET_BLK_LEN: %lx\n", HSMCI_SR);
-               return -1;
-       }
-
-       hsmci_readResp(&(sd->status), 1);
-
-       LOG_INFOB(dump("SET_BLK_LEN", &(sd->status), 1););
-       LOG_INFO("State[%d]\n", SD_GET_STATE(sd->status));
-
-       sd->csd.blk_len = len;
-
-       if (sd->status & SD_STATUS_READY)
-               return 0;
-
-       return -1;
-}
-
-int sd_getStatus(Sd *sd, uint32_t *buf, size_t words)
-{
-       ASSERT(sd);
-
-       // Status reply with 512bit data, so the block size in byte is 64
-       hsmci_prgRxDMA(buf, words, 64);
-
-       if (hsmci_sendCmd(55, SD_ADDR_TO_RCA(sd->addr), HSMCI_CMDR_RSPTYP_48_BIT))
-       {
-               LOG_ERR("APP_CMD %lx\n", HSMCI_SR);
-               return -1;
-       }
-
-       uint32_t status = HSMCI_RSPR;
-       if (status & (SD_STATUS_APP_CMD | SD_STATUS_READY))
-       {
-               if (hsmci_sendCmd(13, 0, HSMCI_CMDR_RSPTYP_48_BIT |
-                               BV(HSMCI_CMDR_TRDIR) | HSMCI_CMDR_TRCMD_START_DATA | HSMCI_CMDR_TRTYP_SINGLE))
-               {
-                       LOG_ERR("STATUS CMD: %lx\n", HSMCI_SR);
-                       return -1;
-               }
-
-               hsmci_readResp(&(sd->status), 1);
-               LOG_INFOB(dump("STATUS", &(sd->status), 1););
-               LOG_INFO("State[%d]\n", SD_GET_STATE(sd->status));
-
-               if (sd->status & SD_STATUS_READY)
-               {
-                       hsmci_waitTransfer();
-
-                       LOG_INFOB(dump("STATUS", buf, words););
-                       memset(&(sd->ssr), 0, sizeof(SDssr));
-
-                       sd->ssr.bus_width  = UNSTUFF_BITS(buf, 510, 2);
-                       sd->ssr.card_type  = UNSTUFF_BITS(buf, 480, 16);
-                       sd->ssr.au_size  = UNSTUFF_BITS(buf, 432, 8);
-                       sd->ssr.speed_class  = UNSTUFF_BITS(buf, 440, 8);
-                       sd->ssr.erase_size = UNSTUFF_BITS(buf, 408, 24);
-
-                       return 0;
-               }
-       }
-
-       return -1;
-}
-
-
-void sd_setHightSpeed(Sd *sd)
-{
-       (void)sd;
-       hsmci_setSpeed(2100000, true);
-}
-
-#endif
-
-
-#define SD_START_DELAY  10
-#define SD_INIT_TIMEOUT ms_to_ticks(2000)
-#define SD_IDLE_RETRIES 4
-
-#if CPU_CM3_SAM3X8
-
-static size_t sd_SdReadDirect(struct KBlock *b, block_idx_t idx, void *buf, size_t offset, size_t size)
-{
-       ASSERT(buf);
-       Sd *sd = SD_CAST(b);
-       LOG_INFO("reading from block %ld, offset %d, size %d\n", idx, offset, size);
-
-       if (sd_selectCard(sd) < 0)
-               return -1;
-
-       hsmci_prgRxDMA(buf, size / 4, sd->csd.blk_len);
-
-       if (hsmci_sendCmd(17, idx * sd->csd.blk_len + offset, HSMCI_CMDR_RSPTYP_48_BIT |
-                       BV(HSMCI_CMDR_TRDIR) | HSMCI_CMDR_TRCMD_START_DATA | HSMCI_CMDR_TRTYP_SINGLE))
-       {
-               LOG_ERR("SIGLE_BLK_READ: %lx\n", HSMCI_SR);
-               sd_deSelectCard(sd);
-               return -1;
-       }
-
-       hsmci_readResp(&(sd->status), 1);
-
-       LOG_INFOB(dump("SIGLE_BLK_READ", &(sd->status), 1););
-       LOG_INFO("State[%d]\n", SD_GET_STATE(sd->status));
-
-       if (sd->status & SD_STATUS_READY)
-       {
-               hsmci_waitTransfer();
-               sd_deSelectCard(sd);
-               return size;
-       }
-
-       sd_deSelectCard(sd);
-       return -1;
-}
-
-static size_t sd_SdWriteDirect(KBlock *b, block_idx_t idx, const void *buf, size_t offset, size_t size)
-{
-       ASSERT(buf);
-       Sd *sd = SD_CAST(b);
-       const uint32_t *_buf = (const uint32_t *)buf;
-       LOG_INFO("reading from block %ld, offset %d, size %d\n", idx, offset, size);
-
-       if (sd_selectCard(sd) < 0)
-               return 0;
-
-       hsmci_prgTxDMA(_buf, size / 4, sd->csd.blk_len);
-
-       if (hsmci_sendCmd(24, idx * sd->csd.blk_len + offset, HSMCI_CMDR_RSPTYP_48_BIT |
-                                               HSMCI_CMDR_TRCMD_START_DATA | HSMCI_CMDR_TRTYP_SINGLE))
-       {
-               LOG_ERR("SIGLE_BLK_WRITE: %lx\n", HSMCI_SR);
-               sd_deSelectCard(sd);
-               return -1;
-       }
-
-       hsmci_readResp(&(sd->status), 1);
-
-       LOG_INFOB(dump("SIGLE_BLK_WR", &(sd->status), 1););
-       LOG_INFO("State[%d]\n", SD_GET_STATE(sd->status));
-
-       if (sd->status & SD_STATUS_READY)
-       {
-               hsmci_waitTransfer();
-               sd_deSelectCard(sd);
-               return size;
-       }
-
-       sd_deSelectCard(sd);
-       return -1;
-}
-
-
-static int sd_SdError(KBlock *b)
-{
-       Sd *sd = SD_CAST(b);
-       return 0;//sd->status;
-}
-
-static void sd_SdClearerr(KBlock *b)
-{
-       Sd *sd = SD_CAST(b);
-       sd->status = 0;
-}
-
-
-
-static bool sd_SdBlockInit(Sd *sd)
-{
-       /* Wait a few moments for supply voltage to stabilize */
-       timer_delay(SD_START_DELAY);
-
-       sd_sendInit();
-       sd_goIdle();
-
-       sd_sendIfCond(sd);
-
-       ticks_t start = timer_clock();
-       bool sd_power_on = false;
-       do
-       {
-               if (!sd_sendAppOpCond(sd))
-               {
-                       sd_power_on = true;
-                       break;
-               }
-               cpu_relax();
-       }
-       while (timer_clock() - start < SD_INIT_TIMEOUT);
-
-
-       if (sd_power_on)
-       {
-
-               if(sd_getCid(sd, 0, SD_SEND_ALL_CID) < 0)
-                       return false;
-               else
-               {
-                       sd_dumpCid(sd);
-               }
-
-               if (sd_getRelativeAddr(sd) < 0)
-                       return false;
-               else
-               {
-                       LOG_INFO("RCA: %0lx\n", sd->addr);
-               }
-
-
-               if (sd_getCsd(sd) < 0)
-                       return false;
-               else
-               {
-                       sd_dumpCsd(sd);
-               }
-
-               if (sd_appStatus(sd) < 0)
-               {
-                       LOG_INFO("STATUS: %ld\n", sd->status);
-                       return false;
-               }
-
-               if (sd->status & SD_CARD_IS_LOCKED)
-               {
-                       LOG_INFO("SD is locked!\n");
-                       return false;
-               }
-
-               if (sd->status & SD_READY_FOR_DATA)
-               {
-                       sd_selectCard(sd);
-                       sd_set_BlockLen(sd, SD_DEFAULT_BLOCKLEN);
-                       sd_setBus4bit(sd);
-                       sd_setHightSpeed(sd);
-                       sd_deSelectCard(sd);
-
-                       sd->b.blk_size = SD_DEFAULT_BLOCKLEN;
-                       sd->b.blk_cnt = sd->csd.blk_num * (sd->csd.blk_len / SD_DEFAULT_BLOCKLEN);
-                       LOG_INFO("blk_size %d, blk_cnt %ld\n", sd->b.blk_size, sd->b.blk_cnt);
-
-                       return true;
-               }
-       }
-
-       return false;
-}
-
-#else
-
-#define SD_READ_SINGLEBLOCK 0x51
-
-static size_t sd_SpiReadDirect(struct KBlock *b, block_idx_t idx, void *buf, size_t offset, size_t size)
-{
-
-       Sd *sd = SD_CAST(b);
-       LOG_INFO("reading from block %ld, offset %d, size %d\n", idx, offset, size);
-
-       if (sd->tranfer_len != size)
-       {
-               if ((sd->r1 = sd_setBlockLen(sd, size)))
-               {
-                       LOG_ERR("setBlockLen failed: %04X\n", sd->r1);
-                       return 0;
-               }
-               sd->tranfer_len = size;
-       }
-
-       SD_SELECT(sd);
-
-       sd->r1 = sd_sendCommand(sd, SD_READ_SINGLEBLOCK, idx * SD_DEFAULT_BLOCKLEN + offset, 0);
-
-       if (sd->r1)
-       {
-               LOG_ERR("read single block failed: %04X\n", sd->r1);
-               sd_select(sd, false);
-               return 0;
-       }
-
-       bool res = sd_getBlock(sd, buf, size);
-       sd_select(sd, false);
-       if (!res)
-       {
-               LOG_ERR("read single block failed reading data\n");
-               return 0;
-       }
-       else
-               return size;
-}
-
-#define SD_WRITE_SINGLEBLOCK 0x58
-#define SD_DATA_ACCEPTED     0x05
-
-static size_t sd_SpiWriteDirect(KBlock *b, block_idx_t idx, const void *buf, size_t offset, size_t size)
-{
-       Sd *sd = SD_CAST(b);
-       KFile *fd = sd->ch;
-       ASSERT(offset == 0);
-       ASSERT(size == SD_DEFAULT_BLOCKLEN);
-
-       LOG_INFO("writing block %ld\n", idx);
-       if (sd->tranfer_len != SD_DEFAULT_BLOCKLEN)
-       {
-               if ((sd->r1 = sd_setBlockLen(sd, SD_DEFAULT_BLOCKLEN)))
-               {
-                       LOG_ERR("setBlockLen failed: %04X\n", sd->r1);
-                       return 0;
-               }
-               sd->tranfer_len = SD_DEFAULT_BLOCKLEN;
-       }
-
-       SD_SELECT(sd);
-
-       sd->r1 = sd_sendCommand(sd, SD_WRITE_SINGLEBLOCK, idx * SD_DEFAULT_BLOCKLEN, 0);
-
-       if (sd->r1)
-       {
-               LOG_ERR("write single block failed: %04X\n", sd->r1);
-               sd_select(sd, false);
-               return 0;
-       }
-
-       kfile_putc(SD_STARTTOKEN, fd);
-       kfile_write(fd, buf, SD_DEFAULT_BLOCKLEN);
-       /* send fake crc */
-       kfile_putc(0, fd);
-       kfile_putc(0, fd);
-
-       uint8_t dataresp = kfile_getc(fd);
-       sd_select(sd, false);
-
-       if ((dataresp & 0x1f) != SD_DATA_ACCEPTED)
-       {
-               LOG_ERR("write block %ld failed: %02X\n", idx, dataresp);
-               return EOF;
-       }
-
-       return SD_DEFAULT_BLOCKLEN;
-}
-
-static int sd_SpiError(KBlock *b)
-{
-       Sd *sd = SD_CAST(b);
-       return sd->r1;
-}
-
-static void sd_SpiClearerr(KBlock *b)
-{
-       Sd *sd = SD_CAST(b);
-       sd->r1 = 0;
-}
-
-
-
-#define SD_GO_IDLE_STATE     0x40
-#define SD_GO_IDLE_STATE_CRC 0x95
-#define SD_SEND_OP_COND      0x41
-#define SD_SEND_OP_COND_CRC  0xF9
-
-static bool sd_SpiBlockInit(Sd *sd, KFile *ch)
-{
-       sd->ch = ch;
-
-       SD_CS_INIT();
-       SD_CS_OFF();
-
-       /* Wait a few moments for supply voltage to stabilize */
-       timer_delay(SD_START_DELAY);
-
-       /* Give 80 clk pulses to wake up the card */
-       for (int i = 0; i < 10; i++)
-               kfile_putc(0xff, ch);
-       kfile_flush(ch);
-
-       for (int i = 0; i < SD_IDLE_RETRIES; i++)
-       {
-               SD_SELECT(sd);
-               sd->r1 = sd_sendCommand(sd, SD_GO_IDLE_STATE, 0, SD_GO_IDLE_STATE_CRC);
-               sd_select(sd, false);
-
-               if (sd->r1 == SD_IN_IDLE)
-                       break;
-       }
-
-       if (sd->r1 != SD_IN_IDLE)
-       {
-               LOG_ERR("go_idle_state failed: %04X\n", sd->r1);
-               return false;
-       }
-
-       ticks_t start = timer_clock();
-
-       /* Wait for card to start */
-       do
-       {
-               SD_SELECT(sd);
-               sd->r1 = sd_sendCommand(sd, SD_SEND_OP_COND, 0, SD_SEND_OP_COND_CRC);
-               sd_select(sd, false);
-               cpu_relax();
-       }
-       while (sd->r1 != 0 && timer_clock() - start < SD_INIT_TIMEOUT);
-
-       if (sd->r1)
-       {
-               LOG_ERR("send_op_cond failed: %04X\n", sd->r1);
-               return false;
-       }
-
-       sd->r1 = sd_setBlockLen(sd, SD_DEFAULT_BLOCKLEN);
-       sd->tranfer_len = SD_DEFAULT_BLOCKLEN;
-
-       if (sd->r1)
-       {
-               LOG_ERR("setBlockLen failed: %04X\n", sd->r1);
-               return false;
-       }
-
-       /* Avoid warning for uninitialized csd use (gcc bug?) */
-       CardCSD csd = csd;
-
-       sd->r1 = sd_getCSD(sd, &csd);
-
-       if (sd->r1)
-       {
-               LOG_ERR("getCSD failed: %04X\n", sd->r1);
-               return false;
-       }
-
-       sd->b.blk_size = SD_DEFAULT_BLOCKLEN;
-       sd->b.blk_cnt = csd.block_num * (csd.block_len / SD_DEFAULT_BLOCKLEN);
-       LOG_INFO("blk_size %d, blk_cnt %ld\n", sd->b.blk_size, sd->b.blk_cnt);
-       return true;
-}
-#endif
-
-
-static bool sd_blockInit(Sd *sd, KFile *ch)
-{
-       ASSERT(sd);
-       ASSERT(ch);
-       memset(sd, 0, sizeof(*sd));
-       DB(sd->b.priv.type = KBT_SD);
-
-#if CPU_CM3_SAM3X8
-       if (!sd_SdBlockInit(sd))
-               return false;
-#else
-       if (!sd_SpiBlockInit(sd, ch))
-               return false;
-#endif
-
-#if CONFIG_SD_AUTOASSIGN_FAT
-       disk_assignDrive(&sd->b, 0);
-#endif
-
-       return true;
-}
-
-#if CPU_CM3_SAM3X8
-#define sd_writeDirect     sd_SdWriteDirect
-#define sd_readDirect      sd_SdReadDirect
-#define sd_error           sd_SdError
-#define sd_clearerr        sd_SdClearerr
-
-#else
-#define sd_writeDirect     sd_SpiWriteDirect
-#define sd_readDirect      sd_SpiReadDirect
-#define sd_error           sd_SpiError
-#define sd_clearerr        sd_SpiClearerr
-
-#endif
-
-static const KBlockVTable sd_unbuffered_vt =
-{
-       .readDirect = sd_readDirect,
-       .writeDirect = sd_writeDirect,
-
-       .error = sd_error,
-       .clearerr = sd_clearerr,
-};
-
-static const KBlockVTable sd_buffered_vt =
-{
-       .readDirect = sd_readDirect,
-       .writeDirect = sd_writeDirect,
-
-       .readBuf = kblock_swReadBuf,
-       .writeBuf = kblock_swWriteBuf,
-       .load = kblock_swLoad,
-       .store = kblock_swStore,
-
-       .error = sd_error,
-       .clearerr = sd_clearerr,
-};
-
-bool sd_initUnbuf(Sd *sd, KFile *ch)
-{
-       if (sd_blockInit(sd, ch))
-       {
-               sd->b.priv.vt = &sd_unbuffered_vt;
-               return true;
-       }
-       else
-               return false;
-}
-
-static uint8_t sd_buf[SD_DEFAULT_BLOCKLEN];
-
-bool sd_initBuf(Sd *sd, KFile *ch)
-{
-       if (sd_blockInit(sd, ch))
-       {
-               sd->b.priv.buf = sd_buf;
-               sd->b.priv.flags |= KB_BUFFERED | KB_PARTIAL_WRITE;
-               sd->b.priv.vt = &sd_buffered_vt;
-               sd->b.priv.vt->load(&sd->b, 0);
-               return true;
-       }
-       else
-               return false;
-}
+#include <io/kblock.h>
 
+#include <string.h>
 
 void sd_writeTest(Sd *sd)
 {
@@ -1206,16 +54,15 @@ void sd_writeTest(Sd *sd)
 
        for (block_idx_t i = 0; i < sd->b.blk_cnt; i++)
        {
-               LOG_INFO("writing block %ld: %s\n", i, (sd_writeDirect(&sd->b, i, buf, 0, SD_DEFAULT_BLOCKLEN) == SD_DEFAULT_BLOCKLEN) ? "OK" : "FAIL");
+               LOG_INFO("writing block %ld: %s\n", i, (kblock_read(&sd->b, i, buf, 0, SD_DEFAULT_BLOCKLEN) == SD_DEFAULT_BLOCKLEN) ? "OK" : "FAIL");
        }
 }
 
-
 bool sd_test(Sd *sd)
 {
        uint8_t buf[SD_DEFAULT_BLOCKLEN];
 
-       if (sd_readDirect(&sd->b, 0, buf, 0, sd->b.blk_size) != sd->b.blk_size)
+       if (kblock_read(&sd->b, 0, buf, 0, sd->b.blk_size) != sd->b.blk_size)
                return false;
 
        kputchar('\n');
@@ -1227,11 +74,11 @@ bool sd_test(Sd *sd)
                        kputchar('\n');
        }
 
-       if (sd_writeDirect(&sd->b, 0, buf, 0, SD_DEFAULT_BLOCKLEN) != SD_DEFAULT_BLOCKLEN)
+       if (kblock_write(&sd->b, 0, buf, 0, SD_DEFAULT_BLOCKLEN) != SD_DEFAULT_BLOCKLEN)
                return false;
 
        memset(buf, 0, sizeof(buf));
-       if (sd_readDirect(&sd->b, 0, buf, 0, sd->b.blk_size) != sd->b.blk_size)
+       if (kblock_read(&sd->b, 0, buf, 0, sd->b.blk_size) != sd->b.blk_size)
                return false;
 
        kputchar('\n');
index 19628691e82ab9e57c7aa7efa72571153c448836..d01b56f131582e8360f0e99902e8d379614108a9 100644 (file)
@@ -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"
  */
@@ -99,6 +99,18 @@ typedef struct SDssr
 
 #endif
 
+#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.
 
@@ -123,9 +135,11 @@ typedef struct Sd
 
 } 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);
 
 #if CPU_CM3_SAM3X8
 
@@ -187,7 +201,11 @@ INLINE int sd_setBus1bit(Sd *sd)
         *
         * \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
 
@@ -203,7 +221,11 @@ INLINE int sd_setBus1bit(Sd *sd)
         *
         * \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
 
diff --git a/bertos/drv/sd_spi.c b/bertos/drv/sd_spi.c
new file mode 100644 (file)
index 0000000..98cb650
--- /dev/null
@@ -0,0 +1,484 @@
+/**
+ * \file
+ * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2007 Develer S.r.l. (http://www.develer.com/)
+ * -->
+ *
+ * \brief Function library for secure digital memory.
+ *
+ * \author Francesco Sacchi <batt@develer.com>
+ */
+
+
+#include "hw/hw_sd.h"
+#include "cfg/cfg_sd.h"
+
+#include <io/kfile.h>
+#include <io/kblock.h>
+
+#include <drv/sd.h>
+#include <drv/timer.h>
+
+#include <fs/fat.h>
+
+#define LOG_LEVEL  SD_LOG_LEVEL
+#define LOG_FORMAT SD_LOG_FORMAT
+#include <cfg/log.h>
+#include <cpu/power.h>
+
+#include <string.h> /* memset */
+
+/**
+ * Card Specific Data
+ * read directly from the card.
+ */
+typedef struct CardCSD
+{
+       uint16_t block_len;  ///< Length of a block
+       uint32_t block_num;  ///< Number of block on the card
+       uint16_t capacity;   ///< Card capacity in MB
+} CardCSD;
+
+#define SD_IN_IDLE    0x01
+#define SD_STARTTOKEN 0xFE
+
+#define TIMEOUT_NAC   16384
+#define SD_BUSY_TIMEOUT ms_to_ticks(200)
+
+static bool sd_select(Sd *sd, bool state)
+{
+       KFile *fd = sd->ch;
+
+       if (state)
+       {
+               SD_CS_ON();
+
+               ticks_t start = timer_clock();
+               do
+               {
+                       if (kfile_getc(fd) == 0xff)
+                               return true;
+
+                       cpu_relax();
+               }
+               while (timer_clock() - start < SD_BUSY_TIMEOUT);
+
+               SD_CS_OFF();
+               LOG_ERR("sd_select timeout\n");
+               return false;
+       }
+       else
+       {
+               kfile_putc(0xff, fd);
+               kfile_flush(fd);
+               SD_CS_OFF();
+               return true;
+       }
+}
+
+static int16_t sd_waitR1(Sd *sd)
+{
+       uint8_t datain;
+
+       for (int i = 0; i < TIMEOUT_NAC; i++)
+       {
+               datain = kfile_getc(sd->ch);
+               if (datain != 0xff)
+                       return (int16_t)datain;
+       }
+       LOG_ERR("Timeout waiting R1\n");
+       return EOF;
+}
+
+static int16_t sd_sendCommand(Sd *sd, uint8_t cmd, uint32_t param, uint8_t crc)
+{
+       KFile *fd = sd->ch;
+       /* The 7th bit of command must be a 1 */
+       kfile_putc(cmd | 0x40, fd);
+
+       /* send parameter */
+       kfile_putc((param >> 24) & 0xFF, fd);
+       kfile_putc((param >> 16) & 0xFF, fd);
+       kfile_putc((param >> 8) & 0xFF, fd);
+       kfile_putc((param) & 0xFF, fd);
+
+       kfile_putc(crc, fd);
+
+       return sd_waitR1(sd);
+}
+
+static bool sd_getBlock(Sd *sd, void *buf, size_t len)
+{
+       uint8_t token;
+       uint16_t crc;
+
+       KFile *fd = sd->ch;
+
+       for (int i = 0; i < TIMEOUT_NAC; i++)
+       {
+               token = kfile_getc(fd);
+               if (token != 0xff)
+               {
+                       if (token == SD_STARTTOKEN)
+                       {
+                               if (kfile_read(fd, buf, len) == len)
+                               {
+                                       if (kfile_read(fd, &crc, sizeof(crc)) == sizeof(crc))
+                                               /* check CRC here if needed */
+                                               return true;
+                                       else
+                                               LOG_ERR("get_block error getting crc\n");
+                               }
+                               else
+                                       LOG_ERR("get_block len error: %d\n", (int)len);
+                       }
+                       else
+                               LOG_ERR("get_block token error: %02X\n", token);
+
+                       return false;
+               }
+       }
+
+       LOG_ERR("get_block timeout waiting token\n");
+       return false;
+}
+
+#define SD_SELECT(sd) \
+do \
+{ \
+       if (!sd_select((sd), true)) \
+       { \
+               LOG_ERR("%s failed, card busy\n", __func__); \
+               return EOF; \
+       } \
+} \
+while (0)
+
+#define SD_SETBLOCKLEN 0x50
+
+static int16_t sd_setBlockLen(Sd *sd, uint32_t newlen)
+{
+       SD_SELECT(sd);
+
+       sd->r1 = sd_sendCommand(sd, SD_SETBLOCKLEN, newlen, 0);
+
+       sd_select(sd, false);
+       return sd->r1;
+}
+
+#define SD_SEND_CSD 0x49
+
+static int16_t sd_getCSD(Sd *sd, CardCSD *csd)
+{
+       SD_SELECT(sd);
+
+       int16_t r1 = sd_sendCommand(sd, SD_SEND_CSD, 0, 0);
+
+       if (r1)
+       {
+               LOG_ERR("send_csd failed: %04X\n", sd->r1);
+               sd_select(sd, false);
+               return r1;
+       }
+
+       uint8_t buf[16];
+       bool res = sd_getBlock(sd, buf, sizeof(buf));
+       sd_select(sd, false);
+
+       if (res)
+       {
+               #if LOG_LEVEL >= LOG_LVL_INFO
+                       LOG_INFO("CSD: [");
+                       for (int i = 0; i < 16; i++)
+                               kprintf("%02X ", buf[i]);
+                       kprintf("]\n");
+               #endif
+
+               uint16_t mult = (1L << ((((buf[9] & 0x03) << 1) | ((buf[10] & 0x80) >> 7)) + 2));
+               uint16_t c_size = (((uint16_t)(buf[6] & 0x03)) << 10) | (((uint16_t)buf[7]) << 2) |
+                                 (((uint16_t)(buf[8] & 0xC0)) >> 6);
+
+               csd->block_len = (1L << (buf[5] & 0x0F));
+               csd->block_num = (c_size + 1) * mult;
+               csd->capacity = (csd->block_len * csd->block_num) >> 20; // in MB
+
+               LOG_INFO("block_len %d bytes, block_num %ld, total capacity %dMB\n", csd->block_len, csd->block_num, csd->capacity);
+               return 0;
+       }
+       else
+               return EOF;
+}
+
+#define SD_START_DELAY  10
+#define SD_INIT_TIMEOUT ms_to_ticks(2000)
+#define SD_IDLE_RETRIES 4
+#define SD_READ_SINGLEBLOCK 0x51
+
+static size_t sd_SpiReadDirect(struct KBlock *b, block_idx_t idx, void *buf, size_t offset, size_t size)
+{
+
+       Sd *sd = SD_CAST(b);
+       LOG_INFO("reading from block %ld, offset %d, size %d\n", idx, offset, size);
+
+       if (sd->tranfer_len != size)
+       {
+               if ((sd->r1 = sd_setBlockLen(sd, size)))
+               {
+                       LOG_ERR("setBlockLen failed: %04X\n", sd->r1);
+                       return 0;
+               }
+               sd->tranfer_len = size;
+       }
+
+       SD_SELECT(sd);
+
+       sd->r1 = sd_sendCommand(sd, SD_READ_SINGLEBLOCK, idx * SD_DEFAULT_BLOCKLEN + offset, 0);
+
+       if (sd->r1)
+       {
+               LOG_ERR("read single block failed: %04X\n", sd->r1);
+               sd_select(sd, false);
+               return 0;
+       }
+
+       bool res = sd_getBlock(sd, buf, size);
+       sd_select(sd, false);
+       if (!res)
+       {
+               LOG_ERR("read single block failed reading data\n");
+               return 0;
+       }
+       else
+               return size;
+}
+
+#define SD_WRITE_SINGLEBLOCK 0x58
+#define SD_DATA_ACCEPTED     0x05
+
+static size_t sd_SpiWriteDirect(KBlock *b, block_idx_t idx, const void *buf, size_t offset, size_t size)
+{
+       Sd *sd = SD_CAST(b);
+       KFile *fd = sd->ch;
+       ASSERT(offset == 0);
+       ASSERT(size == SD_DEFAULT_BLOCKLEN);
+
+       LOG_INFO("writing block %ld\n", idx);
+       if (sd->tranfer_len != SD_DEFAULT_BLOCKLEN)
+       {
+               if ((sd->r1 = sd_setBlockLen(sd, SD_DEFAULT_BLOCKLEN)))
+               {
+                       LOG_ERR("setBlockLen failed: %04X\n", sd->r1);
+                       return 0;
+               }
+               sd->tranfer_len = SD_DEFAULT_BLOCKLEN;
+       }
+
+       SD_SELECT(sd);
+
+       sd->r1 = sd_sendCommand(sd, SD_WRITE_SINGLEBLOCK, idx * SD_DEFAULT_BLOCKLEN, 0);
+
+       if (sd->r1)
+       {
+               LOG_ERR("write single block failed: %04X\n", sd->r1);
+               sd_select(sd, false);
+               return 0;
+       }
+
+       kfile_putc(SD_STARTTOKEN, fd);
+       kfile_write(fd, buf, SD_DEFAULT_BLOCKLEN);
+       /* send fake crc */
+       kfile_putc(0, fd);
+       kfile_putc(0, fd);
+
+       uint8_t dataresp = kfile_getc(fd);
+       sd_select(sd, false);
+
+       if ((dataresp & 0x1f) != SD_DATA_ACCEPTED)
+       {
+               LOG_ERR("write block %ld failed: %02X\n", idx, dataresp);
+               return EOF;
+       }
+
+       return SD_DEFAULT_BLOCKLEN;
+}
+
+static int sd_SpiError(KBlock *b)
+{
+       Sd *sd = SD_CAST(b);
+       return sd->r1;
+}
+
+static void sd_SpiClearerr(KBlock *b)
+{
+       Sd *sd = SD_CAST(b);
+       sd->r1 = 0;
+}
+
+
+
+#define SD_GO_IDLE_STATE     0x40
+#define SD_GO_IDLE_STATE_CRC 0x95
+#define SD_SEND_OP_COND      0x41
+#define SD_SEND_OP_COND_CRC  0xF9
+
+static bool sd_blockInit(Sd *sd, KFile *ch)
+{
+       ASSERT(sd);
+       ASSERT(ch);
+       memset(sd, 0, sizeof(*sd));
+       DB(sd->b.priv.type = KBT_SD);
+
+       sd->ch = ch;
+
+       SD_CS_INIT();
+       SD_CS_OFF();
+
+       /* Wait a few moments for supply voltage to stabilize */
+       timer_delay(SD_START_DELAY);
+
+       /* Give 80 clk pulses to wake up the card */
+       for (int i = 0; i < 10; i++)
+               kfile_putc(0xff, ch);
+       kfile_flush(ch);
+
+       for (int i = 0; i < SD_IDLE_RETRIES; i++)
+       {
+               SD_SELECT(sd);
+               sd->r1 = sd_sendCommand(sd, SD_GO_IDLE_STATE, 0, SD_GO_IDLE_STATE_CRC);
+               sd_select(sd, false);
+
+               if (sd->r1 == SD_IN_IDLE)
+                       break;
+       }
+
+       if (sd->r1 != SD_IN_IDLE)
+       {
+               LOG_ERR("go_idle_state failed: %04X\n", sd->r1);
+               return false;
+       }
+
+       ticks_t start = timer_clock();
+
+       /* Wait for card to start */
+       do
+       {
+               SD_SELECT(sd);
+               sd->r1 = sd_sendCommand(sd, SD_SEND_OP_COND, 0, SD_SEND_OP_COND_CRC);
+               sd_select(sd, false);
+               cpu_relax();
+       }
+       while (sd->r1 != 0 && timer_clock() - start < SD_INIT_TIMEOUT);
+
+       if (sd->r1)
+       {
+               LOG_ERR("send_op_cond failed: %04X\n", sd->r1);
+               return false;
+       }
+
+       sd->r1 = sd_setBlockLen(sd, SD_DEFAULT_BLOCKLEN);
+       sd->tranfer_len = SD_DEFAULT_BLOCKLEN;
+
+       if (sd->r1)
+       {
+               LOG_ERR("setBlockLen failed: %04X\n", sd->r1);
+               return false;
+       }
+
+       /* Avoid warning for uninitialized csd use (gcc bug?) */
+       CardCSD csd = csd;
+
+       sd->r1 = sd_getCSD(sd, &csd);
+
+       if (sd->r1)
+       {
+               LOG_ERR("getCSD failed: %04X\n", sd->r1);
+               return false;
+       }
+
+       sd->b.blk_size = SD_DEFAULT_BLOCKLEN;
+       sd->b.blk_cnt = csd.block_num * (csd.block_len / SD_DEFAULT_BLOCKLEN);
+       LOG_INFO("blk_size %d, blk_cnt %ld\n", sd->b.blk_size, sd->b.blk_cnt);
+
+#if CONFIG_SD_AUTOASSIGN_FAT
+       disk_assignDrive(&sd->b, 0);
+#endif
+
+       return true;
+}
+
+static const KBlockVTable sd_unbuffered_vt =
+{
+       .readDirect = sd_SpiReadDirect,
+       .writeDirect = sd_SpiWriteDirect,
+
+       .error = sd_SpiError,
+       .clearerr = sd_SpiClearerr,
+};
+
+static const KBlockVTable sd_buffered_vt =
+{
+       .readDirect = sd_SpiReadDirect,
+       .writeDirect = sd_SpiWriteDirect,
+
+       .readBuf = kblock_swReadBuf,
+       .writeBuf = kblock_swWriteBuf,
+       .load = kblock_swLoad,
+       .store = kblock_swStore,
+
+       .error = sd_SpiError,
+       .clearerr = sd_SpiClearerr,
+};
+
+bool sd_spi_initUnbuf(Sd *sd, KFile *ch)
+{
+       if (sd_blockInit(sd, ch))
+       {
+               sd->b.priv.vt = &sd_unbuffered_vt;
+               return true;
+       }
+       else
+               return false;
+}
+
+static uint8_t sd_buf[SD_DEFAULT_BLOCKLEN];
+
+bool sd_spi_initBuf(Sd *sd, KFile *ch)
+{
+       if (sd_blockInit(sd, ch))
+       {
+               sd->b.priv.buf = sd_buf;
+               sd->b.priv.flags |= KB_BUFFERED | KB_PARTIAL_WRITE;
+               sd->b.priv.vt = &sd_buffered_vt;
+               sd->b.priv.vt->load(&sd->b, 0);
+               return true;
+       }
+       else
+               return false;
+}
+
+