diff --git a/.config b/.config
index 68c95a8..734edb1 100644
--- a/.config
+++ b/.config
@@ -199,7 +199,13 @@ CONFIG_RT_MMCSD_STACK_SIZE=1024
CONFIG_RT_MMCSD_THREAD_PREORITY=22
CONFIG_RT_MMCSD_MAX_PARTITION=16
# CONFIG_RT_SDIO_DEBUG is not set
-# CONFIG_RT_USING_SPI is not set
+CONFIG_RT_USING_SPI=y
+# CONFIG_RT_USING_SPI_BITOPS is not set
+CONFIG_RT_USING_QSPI=y
+CONFIG_RT_USING_SPI_MSD=y
+# CONFIG_RT_USING_SFUD is not set
+# CONFIG_RT_USING_ENC28J60 is not set
+# CONFIG_RT_USING_SPI_WIFI is not set
# CONFIG_RT_USING_WDT is not set
# CONFIG_RT_USING_AUDIO is not set
# CONFIG_RT_USING_SENSOR is not set
@@ -245,7 +251,17 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0
#
# POSIX (Portable Operating System Interface) layer
#
-# CONFIG_RT_USING_POSIX_FS is not set
+CONFIG_RT_USING_POSIX_FS=y
+# CONFIG_RT_USING_POSIX_DEVIO is not set
+# CONFIG_RT_USING_POSIX_STDIO is not set
+# CONFIG_RT_USING_POSIX_POLL is not set
+# CONFIG_RT_USING_POSIX_SELECT is not set
+# CONFIG_RT_USING_POSIX_EVENTFD is not set
+# CONFIG_RT_USING_POSIX_TIMERFD is not set
+# CONFIG_RT_USING_POSIX_SOCKET is not set
+# CONFIG_RT_USING_POSIX_TERMIOS is not set
+# CONFIG_RT_USING_POSIX_AIO is not set
+# CONFIG_RT_USING_POSIX_MMAN is not set
# CONFIG_RT_USING_POSIX_DELAY is not set
# CONFIG_RT_USING_POSIX_CLOCK is not set
# CONFIG_RT_USING_POSIX_TIMER is not set
diff --git a/.cproject b/.cproject
index 2045407..93f4e29 100644
--- a/.cproject
+++ b/.cproject
@@ -79,6 +79,7 @@
+
@@ -131,7 +132,10 @@
-
+
@@ -187,6 +191,7 @@
+
@@ -206,7 +211,7 @@
-
+
@@ -225,7 +230,7 @@
-
+
diff --git a/.project b/.project
index f059ea4..350c330 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
- 828F
+ project
diff --git a/.settings/.rtmenus b/.settings/.rtmenus
index 4b5f689..d882761 100644
Binary files a/.settings/.rtmenus and b/.settings/.rtmenus differ
diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml
index 19e7647..e4498f1 100644
--- a/.settings/language.settings.xml
+++ b/.settings/language.settings.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/.settings/local_temp_storage.prefs b/.settings/local_temp_storage.prefs
new file mode 100644
index 0000000..ee6a09d
--- /dev/null
+++ b/.settings/local_temp_storage.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+temp.toolchain.exec.path=C\:\\RT-ThreadStudio\\repo\\Extract\\ToolChain_Support_Packages\\ARM\\GNU_Tools_for_ARM_Embedded_Processors\\13.3/bin
diff --git a/applications/SDIO_elmfatfs.c b/applications/SDIO_elmfatfs.c
new file mode 100644
index 0000000..86dfe73
--- /dev/null
+++ b/applications/SDIO_elmfatfs.c
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2006-2021, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date Author Notes
+ * 2021-07-29 andy the first version
+ */
+#include
+#include "dfs_fs.h"
+
+
+#define DBG_TAG "mount_fs"
+#define DBG_LVL DBG_LOG
+#include
+
+rt_sem_t mount_sem = RT_NULL;
+
+void sd_mount(void *parameter)
+{
+ LOG_I("SD mount thread started, waiting for SD card...");
+ int retry = 0;
+ while (retry<10)
+ {
+ if (rt_device_find("sd") != RT_NULL)
+ {
+ if (dfs_mount("sd", "/", "elm", 0, NULL) == RT_EOK)
+ {
+ LOG_I("SD card mounted to '/' successfully");
+ // 挂载成功，释放信号量
+ if (mount_sem != RT_NULL)
+ {
+ rt_sem_release(mount_sem);
+ }
+ break; // 退出线程循环
+ }
+ else
+ {
+ LOG_W("SD card mount failed, retrying...");
+ }
+ }
+ else
+ {
+ LOG_D("SD device 'sd' not found, retrying...");
+ }
+
+ // 避免空转，延时 100ms 再试
+ rt_thread_mdelay(500);
+ retry++;
+ }
+}
+
+int stm32_sdcard_mount(void)
+{
+ rt_thread_t tid;
+ rt_thread_mdelay(1000);
+ // 删除旧的信号量（如果存在）
+ if (mount_sem != RT_NULL)
+ {
+ rt_sem_delete(mount_sem);
+ }
+
+ // 创建计数信号量，初始值为 0
+ mount_sem = rt_sem_create("sd_mount", 0, RT_IPC_FLAG_FIFO);
+ if (mount_sem == RT_NULL)
+ {
+ LOG_E("Failed to create semaphore for SD mount!");
+ return -RT_ENOMEM;
+ }
+
+ tid = rt_thread_create("sd_mount",
+ sd_mount,
+ RT_NULL,
+ 1024*6, // 避免溢出
+ RT_THREAD_PRIORITY_MAX - 2,
+ 20);
+ if (tid != RT_NULL)
+ {
+ rt_thread_startup(tid);
+ LOG_I("SD mount thread created and started");
+ }
+ else
+ {
+ LOG_E("Failed to create SD mount thread!");
+ rt_sem_delete(mount_sem);
+ mount_sem = RT_NULL;
+ return -RT_ERROR;
+ }
+
+ return RT_EOK;
+}
+// 使用 INIT_COMPONENTS_INIT 或 INIT_APP_EXPORT 自动启动
+//INIT_COMPONENTS_INIT(stm32_sdcard_mount); // 在组件初始化阶段运行
+INIT_APP_EXPORT(stm32_sdcard_mount);
diff --git a/applications/main.c b/applications/main.c
index f6307d0..d82c948 100644
--- a/applications/main.c
+++ b/applications/main.c
@@ -15,8 +15,12 @@
#define DBG_LVL DBG_LOG
#include
+extern rt_sem_t mount_sem; // 引用上面SD挂载线程定义的信号量
+
int main(void)
{
+ rt_sem_take(mount_sem, rt_tick_from_millisecond(5000)); // 等待挂载完成，最多等待 5 秒
+ rt_thread_mdelay(500);
thread_RUN_LED();//运行指示灯线程
return RT_EOK;
diff --git a/drivers/board.h b/drivers/board.h
index 3b523b2..568ba92 100644
--- a/drivers/board.h
+++ b/drivers/board.h
@@ -295,7 +295,8 @@ extern "C"
*/
/*#define BSP_USING_SDIO*/
-
+#define BSP_USING_SDIO
+#define BSP_USING_SDIO1
/*-------------------------- SDIO CONFIG END --------------------------*/
/*-------------------------- ETH CONFIG BEGIN --------------------------*/
diff --git a/drivers/drv_sdio.c b/drivers/drv_sdio.c
index 95555f7..29dca87 100644
--- a/drivers/drv_sdio.c
+++ b/drivers/drv_sdio.c
@@ -1,35 +1,35 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2020, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
* Change Logs:
* Date Author Notes
- * 2018-06-22 tyx first
- * 2018-12-12 balanceTWK first version
- * 2019-06-11 WillianChan Add SD card hot plug detection
+ * 2020-05-23 liuduanfei first version
*/
-
#include "board.h"
-#include "drv_sdio.h"
-#include "drv_config.h"
-#include
-#include
-#ifdef BSP_USING_SDIO
+#ifdef RT_USING_SDIO
-//#define DRV_DEBUG
-#define LOG_TAG "drv.sdio"
-#include
+#if !defined(BSP_USING_SDIO1) && !defined(BSP_USING_SDIO2)
+ #error "Please define at least one BSP_USING_SDIOx"
+#endif
-static struct stm32_sdio_config sdio_config = SDIO_BUS_CONFIG;
-static struct stm32_sdio_class sdio_obj;
-static struct rt_mmcsd_host *host;
+#include "drv_sdio.h"
+
+//#define DRV_DEBUG
+#define DBG_TAG "drv.sdio"
+#ifdef DRV_DEBUG
+#define DBG_LVL DBG_LOG
+#else
+#define DBG_LVL DBG_INFO
+#endif /* DRV_DEBUG */
+#include
-#define SDIO_TX_RX_COMPLETE_TIMEOUT_LOOPS (100000)
+static struct rt_mmcsd_host *host1;
+static struct rt_mmcsd_host *host2;
-#define RTHW_SDIO_LOCK(_sdio) rt_mutex_take(&_sdio->mutex, RT_WAITING_FOREVER)
-#define RTHW_SDIO_UNLOCK(_sdio) rt_mutex_release(&_sdio->mutex);
+#define SDIO_TX_RX_COMPLETE_TIMEOUT_LOOPS (1000000)
struct sdio_pkg
{
@@ -43,22 +43,17 @@ struct rthw_sdio
struct rt_mmcsd_host *host;
struct stm32_sdio_des sdio_des;
struct rt_event event;
- struct rt_mutex mutex;
struct sdio_pkg *pkg;
};
-
-ALIGN(SDIO_ALIGN_LEN)
-static rt_uint8_t cache_buf[SDIO_BUFF_SIZE];
-
-static rt_uint32_t stm32_sdio_clk_get(struct stm32_sdio *hw_sdio)
-{
- return SDIO_CLOCK_FREQ;
-}
-
+#ifndef ALIGN
+#define ALIGN(SDIO_ALIGN_LEN) __attribute__((aligned(SDIO_ALIGN_LEN)))
+//ALIGN(SDIO_ALIGN_LEN)
+static __attribute__((section(".ram_d1"))) rt_uint8_t cache_buf[SDIO_BUFF_SIZE] __attribute__((aligned(32)));
+//static rt_uint8_t cache_buf[SDIO_BUFF_SIZE];
/**
* @brief This function get order from sdio.
* @param data
- * @retval sdio order
+ * @retval sdio order
*/
static int get_order(rt_uint32_t data)
{
@@ -115,43 +110,39 @@ static int get_order(rt_uint32_t data)
order = 0;
break;
}
-
return order;
}
/**
- * @brief This function wait sdio completed.
- * @param sdio rthw_sdio
+ * @brief This function wait sdio cmd completed.
+ * @param sdio rthw_sdio
* @retval None
*/
static void rthw_sdio_wait_completed(struct rthw_sdio *sdio)
{
rt_uint32_t status;
struct rt_mmcsd_cmd *cmd = sdio->pkg->cmd;
- struct rt_mmcsd_data *data = cmd->data;
struct stm32_sdio *hw_sdio = sdio->sdio_des.hw_sdio;
if (rt_event_recv(&sdio->event, 0xffffffff, RT_EVENT_FLAG_OR | RT_EVENT_FLAG_CLEAR,
rt_tick_from_millisecond(5000), &status) != RT_EOK)
{
- LOG_E("wait completed timeout");
+ LOG_E("wait cmd completed timeout");
cmd->err = -RT_ETIMEOUT;
return;
}
- if (sdio->pkg == RT_NULL)
+ cmd->resp[0] = hw_sdio->resp1;
+ if (resp_type(cmd) == RESP_R2)
{
- return;
+ cmd->resp[1] = hw_sdio->resp2;
+ cmd->resp[2] = hw_sdio->resp3;
+ cmd->resp[3] = hw_sdio->resp4;
}
- cmd->resp[0] = hw_sdio->resp1;
- cmd->resp[1] = hw_sdio->resp2;
- cmd->resp[2] = hw_sdio->resp3;
- cmd->resp[3] = hw_sdio->resp4;
-
- if (status & HW_SDIO_ERRORS)
+ if (status & SDIO_ERRORS)
{
- if ((status & HW_SDIO_IT_CCRCFAIL) && (resp_type(cmd) & (RESP_R3 | RESP_R4)))
+ if ((status & SDMMC_STA_CCRCFAIL) && (resp_type(cmd) & (RESP_R3 | RESP_R4)))
{
cmd->err = RT_EOK;
}
@@ -159,103 +150,27 @@ static void rthw_sdio_wait_completed(struct rthw_sdio *sdio)
{
cmd->err = -RT_ERROR;
}
-
- if (status & HW_SDIO_IT_CTIMEOUT)
- {
- cmd->err = -RT_ETIMEOUT;
- }
-
- if (status & HW_SDIO_IT_DCRCFAIL)
- {
- data->err = -RT_ERROR;
- }
-
- if (status & HW_SDIO_IT_DTIMEOUT)
- {
- data->err = -RT_ETIMEOUT;
- }
-
- if (cmd->err == RT_EOK)
- {
- LOG_D("sta:0x%08X [%08X %08X %08X %08X]", status, cmd->resp[0], cmd->resp[1], cmd->resp[2], cmd->resp[3]);
- }
- else
- {
- LOG_D("err:0x%08x, %s%s%s%s%s%s%s cmd:%d arg:0x%08x rw:%c len:%d blksize:%d",
- status,
- status & HW_SDIO_IT_CCRCFAIL ? "CCRCFAIL " : "",
- status & HW_SDIO_IT_DCRCFAIL ? "DCRCFAIL " : "",
- status & HW_SDIO_IT_CTIMEOUT ? "CTIMEOUT " : "",
- status & HW_SDIO_IT_DTIMEOUT ? "DTIMEOUT " : "",
- status & HW_SDIO_IT_TXUNDERR ? "TXUNDERR " : "",
- status & HW_SDIO_IT_RXOVERR ? "RXOVERR " : "",
- status == 0 ? "NULL" : "",
- cmd->cmd_code,
- cmd->arg,
- data ? (data->flags & DATA_DIR_WRITE ? 'w' : 'r') : '-',
- data ? data->blks * data->blksize : 0,
- data ? data->blksize : 0
- );
- }
}
else
{
cmd->err = RT_EOK;
- LOG_D("sta:0x%08X [%08X %08X %08X %08X]", status, cmd->resp[0], cmd->resp[1], cmd->resp[2], cmd->resp[3]);
}
-}
-/**
- * @brief This function transfer data by dma.
- * @param sdio rthw_sdio
- * @param pkg sdio package
- * @retval None
- */
-static void rthw_sdio_transfer_by_dma(struct rthw_sdio *sdio, struct sdio_pkg *pkg)
-{
- struct rt_mmcsd_data *data;
- int size;
- void *buff;
- struct stm32_sdio *hw_sdio;
- if ((RT_NULL == pkg) || (RT_NULL == sdio))
+ if (cmd->err == RT_EOK)
{
- LOG_E("rthw_sdio_transfer_by_dma invalid args");
- return;
- }
-
- data = pkg->cmd->data;
- if (RT_NULL == data)
- {
- LOG_E("rthw_sdio_transfer_by_dma invalid args");
- return;
- }
-
- buff = pkg->buff;
- if (RT_NULL == buff)
- {
- LOG_E("rthw_sdio_transfer_by_dma invalid args");
- return;
- }
- hw_sdio = sdio->sdio_des.hw_sdio;
- size = data->blks * data->blksize;
-
- if (data->flags & DATA_DIR_WRITE)
- {
- sdio->sdio_des.txconfig((rt_uint32_t *)buff, (rt_uint32_t *)&hw_sdio->fifo, size);
- hw_sdio->dctrl |= HW_SDIO_DMA_ENABLE;
+ LOG_D("sta:0x%08X [%08X %08X %08X %08X]", status, cmd->resp[0], cmd->resp[1], cmd->resp[2], cmd->resp[3]);
}
- else if (data->flags & DATA_DIR_READ)
+ else
{
- sdio->sdio_des.rxconfig((rt_uint32_t *)&hw_sdio->fifo, (rt_uint32_t *)buff, size);
- hw_sdio->dctrl |= HW_SDIO_DMA_ENABLE | HW_SDIO_DPSM_ENABLE;
+ LOG_D("send command error = %d", cmd->err);
}
}
/**
* @brief This function send command.
- * @param sdio rthw_sdio
- * @param pkg sdio package
+ * @param sdio rthw_sdio
+ * @param pkg sdio package
* @retval None
*/
static void rthw_sdio_send_command(struct rthw_sdio *sdio, struct sdio_pkg *pkg)
@@ -265,10 +180,11 @@ static void rthw_sdio_send_command(struct rthw_sdio *sdio, struct sdio_pkg *pkg)
struct stm32_sdio *hw_sdio = sdio->sdio_des.hw_sdio;
rt_uint32_t reg_cmd;
+ rt_event_control(&sdio->event,RT_IPC_CMD_RESET,RT_NULL);
/* save pkg */
sdio->pkg = pkg;
- LOG_D("CMD:%d ARG:0x%08x RES:%s%s%s%s%s%s%s%s%s rw:%c len:%d blksize:%d",
+ LOG_D("CMD:%d ARG:0x%08x RES:%s%s%s%s%s%s%s%s%s rw:%c len:%d blksize:%d\n",
cmd->cmd_code,
cmd->arg,
resp_type(cmd) == RESP_NONE ? "NONE" : "",
@@ -285,47 +201,30 @@ static void rthw_sdio_send_command(struct rthw_sdio *sdio, struct sdio_pkg *pkg)
data ? data->blksize : 0
);
- /* config cmd reg */
- reg_cmd = cmd->cmd_code | HW_SDIO_CPSM_ENABLE;
- if (resp_type(cmd) == RESP_NONE)
- reg_cmd |= HW_SDIO_RESPONSE_NO;
- else if (resp_type(cmd) == RESP_R2)
- reg_cmd |= HW_SDIO_RESPONSE_LONG;
- else
- reg_cmd |= HW_SDIO_RESPONSE_SHORT;
+ hw_sdio->mask |= SDIO_MASKR_ALL;
+ reg_cmd = cmd->cmd_code | SDMMC_CMD_CPSMEN;
- /* config data reg */
+ /* data pre configuration */
if (data != RT_NULL)
{
- rt_uint32_t dir = 0;
- rt_uint32_t size = data->blks * data->blksize;
- int order;
+ SCB_CleanInvalidateDCache();
- hw_sdio->dctrl = 0;
+ reg_cmd |= SDMMC_CMD_CMDTRANS;
+ hw_sdio->mask &= ~(SDMMC_MASK_CMDRENDIE | SDMMC_MASK_CMDSENTIE);
hw_sdio->dtimer = HW_SDIO_DATATIMEOUT;
- hw_sdio->dlen = size;
- order = get_order(data->blksize);
- dir = (data->flags & DATA_DIR_READ) ? HW_SDIO_TO_HOST : 0;
- hw_sdio->dctrl = HW_SDIO_IO_ENABLE | (order << 4) | dir;
+ hw_sdio->dlen = data->blks * data->blksize;
+ hw_sdio->dctrl = (get_order(data->blksize)<<4) | (data->flags & DATA_DIR_READ ? SDMMC_DCTRL_DTDIR : 0);
+ hw_sdio->idmabase0r = (rt_uint32_t)cache_buf;
+ hw_sdio->idmatrlr = SDMMC_IDMA_IDMAEN;
}
- /* transfer config */
- if (data != RT_NULL)
- {
- rthw_sdio_transfer_by_dma(sdio, pkg);
- }
+ if (resp_type(cmd) == RESP_R2)
+ reg_cmd |= SDMMC_CMD_WAITRESP;
+ else if(resp_type(cmd) != RESP_NONE)
+ reg_cmd |= SDMMC_CMD_WAITRESP_0;
- /* open irq */
- hw_sdio->mask |= HW_SDIO_IT_CMDSENT | HW_SDIO_IT_CMDREND | HW_SDIO_ERRORS;
- if (data != RT_NULL)
- {
- hw_sdio->mask |= HW_SDIO_IT_DATAEND;
- }
-
- /* send cmd */
hw_sdio->arg = cmd->arg;
hw_sdio->cmd = reg_cmd;
-
/* wait completed */
rthw_sdio_wait_completed(sdio);
@@ -334,22 +233,26 @@ static void rthw_sdio_send_command(struct rthw_sdio *sdio, struct sdio_pkg *pkg)
{
volatile rt_uint32_t count = SDIO_TX_RX_COMPLETE_TIMEOUT_LOOPS;
- while (count && (hw_sdio->sta & (HW_SDIO_IT_TXACT | HW_SDIO_IT_RXACT)))
+ while (count && (hw_sdio->sta & SDMMC_STA_DPSMACT))
{
count--;
}
-
- if ((count == 0) || (hw_sdio->sta & HW_SDIO_ERRORS))
+ if ((count == 0) || (hw_sdio->sta & SDIO_ERRORS))
{
cmd->err = -RT_ERROR;
}
}
- /* close irq, keep sdio irq */
- hw_sdio->mask = hw_sdio->mask & HW_SDIO_IT_SDIOIT ? HW_SDIO_IT_SDIOIT : 0x00;
+ /* data post configuration */
+ if (data != RT_NULL)
+ {
+ if (data->flags & DATA_DIR_READ)
+ {
+ rt_memcpy(data->buf, cache_buf, data->blks * data->blksize);
+ SCB_CleanInvalidateDCache();
- /* clear pkg */
- sdio->pkg = RT_NULL;
+ }
+ }
}
/**
@@ -364,11 +267,9 @@ static void rthw_sdio_request(struct rt_mmcsd_host *host, struct rt_mmcsd_req *r
struct rthw_sdio *sdio = host->private_data;
struct rt_mmcsd_data *data;
- RTHW_SDIO_LOCK(sdio);
-
if (req->cmd != RT_NULL)
{
- memset(&pkg, 0, sizeof(pkg));
+ rt_memset(&pkg, 0, sizeof(pkg));
data = req->cmd->data;
pkg.cmd = req->cmd;
@@ -378,37 +279,43 @@ static void rthw_sdio_request(struct rt_mmcsd_host *host, struct rt_mmcsd_req *r
RT_ASSERT(size <= SDIO_BUFF_SIZE);
- pkg.buff = data->buf;
- if ((rt_uint32_t)data->buf & (SDIO_ALIGN_LEN - 1))
+ if (data->flags & DATA_DIR_WRITE)
{
- pkg.buff = cache_buf;
- if (data->flags & DATA_DIR_WRITE)
- {
- memcpy(cache_buf, data->buf, size);
- }
+ rt_memcpy(cache_buf, data->buf, size);
}
}
rthw_sdio_send_command(sdio, &pkg);
-
- if ((data != RT_NULL) && (data->flags & DATA_DIR_READ) && ((rt_uint32_t)data->buf & (SDIO_ALIGN_LEN - 1)))
- {
- memcpy(data->buf, cache_buf, data->blksize * data->blks);
- }
}
if (req->stop != RT_NULL)
{
- memset(&pkg, 0, sizeof(pkg));
+ rt_memset(&pkg, 0, sizeof(pkg));
pkg.cmd = req->stop;
rthw_sdio_send_command(sdio, &pkg);
}
- RTHW_SDIO_UNLOCK(sdio);
-
mmcsd_req_complete(sdio->host);
}
+
+/**
+ * @brief This function interrupt process function.
+ * @param host rt_mmcsd_host
+ * @retval None
+ */
+void rthw_sdio_irq_process(struct rt_mmcsd_host *host)
+{
+ struct rthw_sdio *sdio = host->private_data;
+ struct stm32_sdio *hw_sdio = sdio->sdio_des.hw_sdio;
+ rt_uint32_t intstatus = hw_sdio->sta;
+
+ /* clear irq flag*/
+ hw_sdio->icr = intstatus;
+
+ rt_event_send(&sdio->event, intstatus);
+}
+
/**
* @brief This function config sdio.
* @param host rt_mmcsd_host
@@ -417,28 +324,13 @@ static void rthw_sdio_request(struct rt_mmcsd_host *host, struct rt_mmcsd_req *r
*/
static void rthw_sdio_iocfg(struct rt_mmcsd_host *host, struct rt_mmcsd_io_cfg *io_cfg)
{
- rt_uint32_t clkcr, div, clk_src;
+ rt_uint32_t temp, clk_src;
rt_uint32_t clk = io_cfg->clock;
struct rthw_sdio *sdio = host->private_data;
struct stm32_sdio *hw_sdio = sdio->sdio_des.hw_sdio;
- clk_src = sdio->sdio_des.clk_get(sdio->sdio_des.hw_sdio);
- if (clk_src < 400 * 1000)
- {
- LOG_E("The clock rate is too low! rata:%d", clk_src);
- return;
- }
-
- if (clk > host->freq_max) clk = host->freq_max;
-
- if (clk > clk_src)
- {
- LOG_W("Setting rate is greater than clock source rate.");
- clk = clk_src;
- }
-
- LOG_D("clk:%d width:%s%s%s power:%s%s%s",
- clk,
+ LOG_D("clk:%dK width:%s%s%s power:%s%s%s",
+ clk/1000,
io_cfg->bus_width == MMCSD_BUS_WIDTH_8 ? "8" : "",
io_cfg->bus_width == MMCSD_BUS_WIDTH_4 ? "4" : "",
io_cfg->bus_width == MMCSD_BUS_WIDTH_1 ? "1" : "",
@@ -447,172 +339,39 @@ static void rthw_sdio_iocfg(struct rt_mmcsd_host *host, struct rt_mmcsd_io_cfg *
io_cfg->power_mode == MMCSD_POWER_ON ? "ON" : ""
);
- RTHW_SDIO_LOCK(sdio);
+ clk_src = SDIO_CLOCK_FREQ;
- div = clk_src / clk;
- if ((clk == 0) || (div == 0))
+ if (clk > 0)
{
- clkcr = 0;
- }
- else
- {
- if (div < 2)
- {
- div = 2;
- }
- else if (div > 0xFF)
- {
- div = 0xFF;
- }
- div -= 2;
- clkcr = div | HW_SDIO_CLK_ENABLE;
+ if (clk > host->freq_max)
+ clk = host->freq_max;
+ temp = DIV_ROUND_UP(clk_src, 2 * clk);
+ if (temp > 0x3FF)
+ temp = 0x3FF;
}
- if (io_cfg->bus_width == MMCSD_BUS_WIDTH_8)
- {
- clkcr |= HW_SDIO_BUSWIDE_8B;
- }
- else if (io_cfg->bus_width == MMCSD_BUS_WIDTH_4)
- {
- clkcr |= HW_SDIO_BUSWIDE_4B;
- }
- else
- {
- clkcr |= HW_SDIO_BUSWIDE_1B;
- }
+ if (io_cfg->bus_width == MMCSD_BUS_WIDTH_4)
+ temp |= SDMMC_CLKCR_WIDBUS_0;
+ else if (io_cfg->bus_width == MMCSD_BUS_WIDTH_8)
+ temp |= SDMMC_CLKCR_WIDBUS_1;
- hw_sdio->clkcr = clkcr;
+ hw_sdio->clkcr = temp;
- switch (io_cfg->power_mode)
- {
- case MMCSD_POWER_OFF:
- hw_sdio->power = HW_SDIO_POWER_OFF;
- break;
- case MMCSD_POWER_UP:
- hw_sdio->power = HW_SDIO_POWER_UP;
- break;
- case MMCSD_POWER_ON:
- hw_sdio->power = HW_SDIO_POWER_ON;
- break;
- default:
- LOG_W("unknown power_mode %d", io_cfg->power_mode);
- break;
- }
-
- RTHW_SDIO_UNLOCK(sdio);
-}
-
-/**
- * @brief This function update sdio interrupt.
- * @param host rt_mmcsd_host
- * @param enable
- * @retval None
- */
-void rthw_sdio_irq_update(struct rt_mmcsd_host *host, rt_int32_t enable)
-{
- struct rthw_sdio *sdio = host->private_data;
- struct stm32_sdio *hw_sdio = sdio->sdio_des.hw_sdio;
-
- if (enable)
- {
- LOG_D("enable sdio irq");
- hw_sdio->mask |= HW_SDIO_IT_SDIOIT;
- }
- else
- {
- LOG_D("disable sdio irq");
- hw_sdio->mask &= ~HW_SDIO_IT_SDIOIT;
- }
-}
-
-/**
- * @brief This function delect sdcard.
- * @param host rt_mmcsd_host
- * @retval 0x01
- */
-static rt_int32_t rthw_sd_delect(struct rt_mmcsd_host *host)
-{
- LOG_D("try to detect device");
- return 0x01;
-}
-
-/**
- * @brief This function interrupt process function.
- * @param host rt_mmcsd_host
- * @retval None
- */
-void rthw_sdio_irq_process(struct rt_mmcsd_host *host)
-{
- int complete = 0;
- struct rthw_sdio *sdio = host->private_data;
- struct stm32_sdio *hw_sdio = sdio->sdio_des.hw_sdio;
- rt_uint32_t intstatus = hw_sdio->sta;
-
- if (intstatus & HW_SDIO_ERRORS)
- {
- hw_sdio->icr = HW_SDIO_ERRORS;
- complete = 1;
- }
- else
- {
- if (intstatus & HW_SDIO_IT_CMDREND)
- {
- hw_sdio->icr = HW_SDIO_IT_CMDREND;
-
- if (sdio->pkg != RT_NULL)
- {
- if (!sdio->pkg->cmd->data)
- {
- complete = 1;
- }
- else if ((sdio->pkg->cmd->data->flags & DATA_DIR_WRITE))
- {
- hw_sdio->dctrl |= HW_SDIO_DPSM_ENABLE;
- }
- }
- }
-
- if (intstatus & HW_SDIO_IT_CMDSENT)
- {
- hw_sdio->icr = HW_SDIO_IT_CMDSENT;
-
- if (resp_type(sdio->pkg->cmd) == RESP_NONE)
- {
- complete = 1;
- }
- }
-
- if (intstatus & HW_SDIO_IT_DATAEND)
- {
- hw_sdio->icr = HW_SDIO_IT_DATAEND;
- complete = 1;
- }
- }
-
- if ((intstatus & HW_SDIO_IT_SDIOIT) && (hw_sdio->mask & HW_SDIO_IT_SDIOIT))
- {
- hw_sdio->icr = HW_SDIO_IT_SDIOIT;
- sdio_irq_wakeup(host);
- }
-
- if (complete)
- {
- hw_sdio->mask &= ~HW_SDIO_ERRORS;
- rt_event_send(&sdio->event, intstatus);
- }
+ if (io_cfg->power_mode == MMCSD_POWER_ON)
+ hw_sdio->power |= SDMMC_POWER_PWRCTRL;
}
static const struct rt_mmcsd_host_ops ops =
{
rthw_sdio_request,
rthw_sdio_iocfg,
- rthw_sd_delect,
- rthw_sdio_irq_update,
+ RT_NULL,
+ RT_NULL,
};
/**
* @brief This function create mmcsd host.
- * @param sdio_des stm32_sdio_des
+ * @param sdio_des stm32_sdio_des
* @retval rt_mmcsd_host
*/
struct rt_mmcsd_host *sdio_host_create(struct stm32_sdio_des *sdio_des)
@@ -620,20 +379,15 @@ struct rt_mmcsd_host *sdio_host_create(struct stm32_sdio_des *sdio_des)
struct rt_mmcsd_host *host;
struct rthw_sdio *sdio = RT_NULL;
- if ((sdio_des == RT_NULL) || (sdio_des->txconfig == RT_NULL) || (sdio_des->rxconfig == RT_NULL))
+ if (sdio_des == RT_NULL)
{
- LOG_E("L:%d F:%s %s %s %s",
- (sdio_des == RT_NULL ? "sdio_des is NULL" : ""),
- (sdio_des ? (sdio_des->txconfig ? "txconfig is NULL" : "") : ""),
- (sdio_des ? (sdio_des->rxconfig ? "rxconfig is NULL" : "") : "")
- );
return RT_NULL;
}
sdio = rt_malloc(sizeof(struct rthw_sdio));
if (sdio == RT_NULL)
{
- LOG_E("L:%d F:%s malloc rthw_sdio fail");
+ LOG_E("malloc rthw_sdio fail");
return RT_NULL;
}
rt_memset(sdio, 0, sizeof(struct rthw_sdio));
@@ -641,28 +395,33 @@ struct rt_mmcsd_host *sdio_host_create(struct stm32_sdio_des *sdio_des)
host = mmcsd_alloc_host();
if (host == RT_NULL)
{
- LOG_E("L:%d F:%s mmcsd alloc host fail");
- rt_free(sdio);
- return RT_NULL;
+ LOG_E("alloc host fail");
+ goto err;
}
rt_memcpy(&sdio->sdio_des, sdio_des, sizeof(struct stm32_sdio_des));
- sdio->sdio_des.hw_sdio = (sdio_des->hw_sdio == RT_NULL ? (struct stm32_sdio *)SDIO_BASE_ADDRESS : sdio_des->hw_sdio);
- sdio->sdio_des.clk_get = (sdio_des->clk_get == RT_NULL ? stm32_sdio_clk_get : sdio_des->clk_get);
- rt_event_init(&sdio->event, "sdio", RT_IPC_FLAG_FIFO);
- rt_mutex_init(&sdio->mutex, "sdio", RT_IPC_FLAG_FIFO);
+ if(sdio_des->hsd.Instance == SDMMC1){
+ sdio->sdio_des.hw_sdio = (struct stm32_sdio *)SDIO1_BASE_ADDRESS;
+ rt_event_init(&sdio->event, "sdio", RT_IPC_FLAG_FIFO);
+ }
+
+ if(sdio_des->hsd.Instance == SDMMC2){
+ sdio->sdio_des.hw_sdio = (struct stm32_sdio *)SDIO2_BASE_ADDRESS;
+ rt_event_init(&sdio->event, "sdio2", RT_IPC_FLAG_FIFO);
+ }
- /* set host defautl attributes */
+ /* set host default attributes */
host->ops = &ops;
host->freq_min = 400 * 1000;
host->freq_max = SDIO_MAX_FREQ;
- host->valid_ocr = 0X00FFFF80;/* The voltage range supported is 1.65v-3.6v */
-#ifndef SDIO_USING_1_BIT
- host->flags = MMCSD_BUSWIDTH_4 | MMCSD_MUTBLKWRITE | MMCSD_SUP_SDIO_IRQ;
-#else
- host->flags = MMCSD_MUTBLKWRITE | MMCSD_SUP_SDIO_IRQ;
-#endif
+ host->valid_ocr = VDD_32_33 | VDD_33_34;/* The voltage range supported is 3.2v-3.4v */
+//#ifndef SDIO_USING_1_BIT
+ host->flags = MMCSD_BUSWIDTH_4 | MMCSD_MUTBLKWRITE | MMCSD_SUP_HIGHSPEED;
+//#else
+// host->flags = MMCSD_MUTBLKWRITE | MMCSD_SUP_HIGHSPEED;
+//#endif
+
host->max_seg_size = SDIO_BUFF_SIZE;
host->max_dma_segs = 1;
host->max_blk_size = 512;
@@ -672,218 +431,75 @@ struct rt_mmcsd_host *sdio_host_create(struct stm32_sdio_des *sdio_des)
sdio->host = host;
host->private_data = sdio;
- rthw_sdio_irq_update(host, 1);
-
/* ready to change */
mmcsd_change(host);
return host;
-}
-/**
- * @brief This function configures the DMATX.
- * @param BufferSRC: pointer to the source buffer
- * @param BufferSize: buffer size
- * @retval None
- */
-void SD_LowLevel_DMA_TxConfig(uint32_t *src, uint32_t *dst, uint32_t BufferSize)
-{
-#if defined(SOC_SERIES_STM32F1)
- static uint32_t size = 0;
- size += BufferSize * 4;
- sdio_obj.cfg = &sdio_config;
- sdio_obj.dma.handle_tx.Instance = sdio_config.dma_tx.Instance;
- sdio_obj.dma.handle_tx.Init.Direction = DMA_MEMORY_TO_PERIPH;
- sdio_obj.dma.handle_tx.Init.MemDataAlignment = DMA_MDATAALIGN_WORD;
- sdio_obj.dma.handle_tx.Init.MemInc = DMA_MINC_ENABLE;
- sdio_obj.dma.handle_tx.Init.PeriphDataAlignment = DMA_PDATAALIGN_WORD;
- sdio_obj.dma.handle_tx.Init.PeriphInc = DMA_PINC_DISABLE;
- sdio_obj.dma.handle_tx.Init.Priority = DMA_PRIORITY_MEDIUM;
- /* DMA_PFCTRL */
- HAL_DMA_DeInit(&sdio_obj.dma.handle_tx);
- HAL_DMA_Init(&sdio_obj.dma.handle_tx);
-
- HAL_DMA_Start(&sdio_obj.dma.handle_tx, (uint32_t)src, (uint32_t)dst, BufferSize);
-
-#elif defined(SOC_SERIES_STM32L4)
- static uint32_t size = 0;
- size += BufferSize * 4;
- sdio_obj.cfg = &sdio_config;
- sdio_obj.dma.handle_tx.Instance = sdio_config.dma_tx.Instance;
- sdio_obj.dma.handle_tx.Init.Request = sdio_config.dma_tx.request;
- sdio_obj.dma.handle_tx.Init.Direction = DMA_MEMORY_TO_PERIPH;
- sdio_obj.dma.handle_tx.Init.PeriphInc = DMA_PINC_DISABLE;
- sdio_obj.dma.handle_tx.Init.MemInc = DMA_MINC_ENABLE;
- sdio_obj.dma.handle_tx.Init.PeriphDataAlignment = DMA_PDATAALIGN_WORD;
- sdio_obj.dma.handle_tx.Init.MemDataAlignment = DMA_MDATAALIGN_WORD;
- sdio_obj.dma.handle_tx.Init.Mode = DMA_NORMAL;
- sdio_obj.dma.handle_tx.Init.Priority = DMA_PRIORITY_MEDIUM;
-
- HAL_DMA_DeInit(&sdio_obj.dma.handle_tx);
- HAL_DMA_Init(&sdio_obj.dma.handle_tx);
-
- HAL_DMA_Start(&sdio_obj.dma.handle_tx, (uint32_t)src, (uint32_t)dst, BufferSize);
-#else
- static uint32_t size = 0;
- size += BufferSize * 4;
- sdio_obj.cfg = &sdio_config;
- sdio_obj.dma.handle_tx.Instance = sdio_config.dma_tx.Instance;
- sdio_obj.dma.handle_tx.Init.Channel = sdio_config.dma_tx.channel;
- sdio_obj.dma.handle_tx.Init.Direction = DMA_MEMORY_TO_PERIPH;
- sdio_obj.dma.handle_tx.Init.PeriphInc = DMA_PINC_DISABLE;
- sdio_obj.dma.handle_tx.Init.MemInc = DMA_MINC_ENABLE;
- sdio_obj.dma.handle_tx.Init.PeriphDataAlignment = DMA_PDATAALIGN_WORD;
- sdio_obj.dma.handle_tx.Init.MemDataAlignment = DMA_MDATAALIGN_WORD;
- sdio_obj.dma.handle_tx.Init.Mode = DMA_PFCTRL;
- sdio_obj.dma.handle_tx.Init.Priority = DMA_PRIORITY_MEDIUM;
- sdio_obj.dma.handle_tx.Init.FIFOMode = DMA_FIFOMODE_ENABLE;
- sdio_obj.dma.handle_tx.Init.FIFOThreshold = DMA_FIFO_THRESHOLD_FULL;
- sdio_obj.dma.handle_tx.Init.MemBurst = DMA_MBURST_INC4;
- sdio_obj.dma.handle_tx.Init.PeriphBurst = DMA_PBURST_INC4;
- /* DMA_PFCTRL */
- HAL_DMA_DeInit(&sdio_obj.dma.handle_tx);
- HAL_DMA_Init(&sdio_obj.dma.handle_tx);
-
- HAL_DMA_Start(&sdio_obj.dma.handle_tx, (uint32_t)src, (uint32_t)dst, BufferSize);
-#endif
-}
+err:
+ if (sdio) rt_free(sdio);
-/**
- * @brief This function configures the DMARX.
- * @param BufferDST: pointer to the destination buffer
- * @param BufferSize: buffer size
- * @retval None
- */
-void SD_LowLevel_DMA_RxConfig(uint32_t *src, uint32_t *dst, uint32_t BufferSize)
-{
-#if defined(SOC_SERIES_STM32F1)
- sdio_obj.cfg = &sdio_config;
- sdio_obj.dma.handle_rx.Instance = sdio_config.dma_tx.Instance;
- sdio_obj.dma.handle_rx.Init.Direction = DMA_PERIPH_TO_MEMORY;
- sdio_obj.dma.handle_rx.Init.MemDataAlignment = DMA_MDATAALIGN_WORD;
- sdio_obj.dma.handle_rx.Init.MemInc = DMA_MINC_ENABLE;
- sdio_obj.dma.handle_rx.Init.PeriphDataAlignment = DMA_PDATAALIGN_WORD;
- sdio_obj.dma.handle_rx.Init.PeriphInc = DMA_PINC_DISABLE;
- sdio_obj.dma.handle_rx.Init.Priority = DMA_PRIORITY_MEDIUM;
-
- HAL_DMA_DeInit(&sdio_obj.dma.handle_rx);
- HAL_DMA_Init(&sdio_obj.dma.handle_rx);
-
- HAL_DMA_Start(&sdio_obj.dma.handle_rx, (uint32_t)src, (uint32_t)dst, BufferSize);
-#elif defined(SOC_SERIES_STM32L4)
- sdio_obj.cfg = &sdio_config;
- sdio_obj.dma.handle_rx.Instance = sdio_config.dma_tx.Instance;
- sdio_obj.dma.handle_rx.Init.Request = sdio_config.dma_tx.request;
- sdio_obj.dma.handle_rx.Init.Direction = DMA_PERIPH_TO_MEMORY;
- sdio_obj.dma.handle_rx.Init.PeriphInc = DMA_PINC_DISABLE;
- sdio_obj.dma.handle_rx.Init.MemInc = DMA_MINC_ENABLE;
- sdio_obj.dma.handle_rx.Init.PeriphDataAlignment = DMA_PDATAALIGN_WORD;
- sdio_obj.dma.handle_rx.Init.MemDataAlignment = DMA_MDATAALIGN_WORD;
- sdio_obj.dma.handle_rx.Init.Mode = DMA_NORMAL;
- sdio_obj.dma.handle_rx.Init.Priority = DMA_PRIORITY_LOW;
-
- HAL_DMA_DeInit(&sdio_obj.dma.handle_rx);
- HAL_DMA_Init(&sdio_obj.dma.handle_rx);
-
- HAL_DMA_Start(&sdio_obj.dma.handle_rx, (uint32_t)src, (uint32_t)dst, BufferSize);
-#else
- sdio_obj.cfg = &sdio_config;
- sdio_obj.dma.handle_rx.Instance = sdio_config.dma_tx.Instance;
- sdio_obj.dma.handle_rx.Init.Channel = sdio_config.dma_tx.channel;
- sdio_obj.dma.handle_rx.Init.Direction = DMA_PERIPH_TO_MEMORY;
- sdio_obj.dma.handle_rx.Init.PeriphInc = DMA_PINC_DISABLE;
- sdio_obj.dma.handle_rx.Init.MemInc = DMA_MINC_ENABLE;
- sdio_obj.dma.handle_rx.Init.PeriphDataAlignment = DMA_PDATAALIGN_WORD;
- sdio_obj.dma.handle_rx.Init.MemDataAlignment = DMA_MDATAALIGN_WORD;
- sdio_obj.dma.handle_rx.Init.Mode = DMA_PFCTRL;
- sdio_obj.dma.handle_rx.Init.Priority = DMA_PRIORITY_MEDIUM;
- sdio_obj.dma.handle_rx.Init.FIFOMode = DMA_FIFOMODE_ENABLE;
- sdio_obj.dma.handle_rx.Init.FIFOThreshold = DMA_FIFO_THRESHOLD_FULL;
- sdio_obj.dma.handle_rx.Init.MemBurst = DMA_MBURST_INC4;
- sdio_obj.dma.handle_rx.Init.PeriphBurst = DMA_PBURST_INC4;
-
- HAL_DMA_DeInit(&sdio_obj.dma.handle_rx);
- HAL_DMA_Init(&sdio_obj.dma.handle_rx);
-
- HAL_DMA_Start(&sdio_obj.dma.handle_rx, (uint32_t)src, (uint32_t)dst, BufferSize);
-#endif
-
-}
-
-/**
- * @brief This function get stm32 sdio clock.
- * @param hw_sdio: stm32_sdio
- * @retval PCLK2Freq
- */
-static rt_uint32_t stm32_sdio_clock_get(struct stm32_sdio *hw_sdio)
-{
- return HAL_RCC_GetPCLK2Freq();
+ return RT_NULL;
}
-static rt_err_t DMA_TxConfig(rt_uint32_t *src, rt_uint32_t *dst, int Size)
+void SDMMC1_IRQHandler(void)
{
- SD_LowLevel_DMA_TxConfig((uint32_t *)src, (uint32_t *)dst, Size / 4);
- return RT_EOK;
-}
-
-static rt_err_t DMA_RxConfig(rt_uint32_t *src, rt_uint32_t *dst, int Size)
-{
- SD_LowLevel_DMA_RxConfig((uint32_t *)src, (uint32_t *)dst, Size / 4);
- return RT_EOK;
+ /* enter interrupt */
+ rt_interrupt_enter();
+ /* Process All SDIO Interrupt Sources */
+ if (host1) rthw_sdio_irq_process(host1);
+ /* leave interrupt */
+ rt_interrupt_leave();
}
-void SDIO_IRQHandler(void)
+void SDMMC2_IRQHandler(void)
{
/* enter interrupt */
rt_interrupt_enter();
/* Process All SDIO Interrupt Sources */
- rthw_sdio_irq_process(host);
-
+ if (host2) rthw_sdio_irq_process(host2);
/* leave interrupt */
rt_interrupt_leave();
}
int rt_hw_sdio_init(void)
{
- struct stm32_sdio_des sdio_des;
- SD_HandleTypeDef hsd;
- hsd.Instance = SDCARD_INSTANCE;
+#ifdef BSP_USING_SDIO1
+ struct stm32_sdio_des sdio_des1;
+ sdio_des1.hsd.Instance = SDMMC1;
+ HAL_SD_MspInit(&sdio_des1.hsd);
+
+ host1 = sdio_host_create(&sdio_des1);
+ if (host1 == RT_NULL)
{
- rt_uint32_t tmpreg = 0x00U;
-#if defined(SOC_SERIES_STM32F1)
- /* enable DMA clock && Delay after an RCC peripheral clock enabling*/
- SET_BIT(RCC->AHBENR, sdio_config.dma_rx.dma_rcc);
- tmpreg = READ_BIT(RCC->AHBENR, sdio_config.dma_rx.dma_rcc);
-#elif defined(SOC_SERIES_STM32F4) || defined(SOC_SERIES_STM32F7) || defined(SOC_SERIES_STM32L4)
- SET_BIT(RCC->AHB1ENR, sdio_config.dma_rx.dma_rcc);
- /* Delay after an RCC peripheral clock enabling */
- tmpreg = READ_BIT(RCC->AHB1ENR, sdio_config.dma_rx.dma_rcc);
-#endif
- UNUSED(tmpreg); /* To avoid compiler warnings */
+ LOG_E("host create fail");
+ return RT_NULL;
}
- HAL_NVIC_SetPriority(SDIO_IRQn, 2, 0);
- HAL_NVIC_EnableIRQ(SDIO_IRQn);
- HAL_SD_MspInit(&hsd);
+#endif
- sdio_des.clk_get = stm32_sdio_clock_get;
- sdio_des.hw_sdio = (struct stm32_sdio *)SDCARD_INSTANCE;
- sdio_des.rxconfig = DMA_RxConfig;
- sdio_des.txconfig = DMA_TxConfig;
+#ifdef BSP_USING_SDIO2
+ //sdmmc2 wifi
+ struct stm32_sdio_des sdio_des2;
+ sdio_des2.hsd.Instance = SDMMC2;
+ HAL_SD_MspInit(&sdio_des2.hsd);
- host = sdio_host_create(&sdio_des);
- if (host == RT_NULL)
+ host2 = sdio_host_create(&sdio_des2);
+ if (host2 == RT_NULL)
{
- LOG_E("host create fail");
- return -1;
+ LOG_E("host2 create fail");
+ return RT_NULL;
}
+#endif
return 0;
}
INIT_DEVICE_EXPORT(rt_hw_sdio_init);
-void stm32_mmcsd_change(void)
+void sdcard_change(void)
{
- mmcsd_change(host);
+ mmcsd_change(host1);
}
+#endif /* RT_USING_SDIO */
+
#endif
diff --git a/drivers/include/drv_sdio.h b/drivers/include/drv_sdio.h
index b25c753..35862eb 100644
--- a/drivers/include/drv_sdio.h
+++ b/drivers/include/drv_sdio.h
@@ -1,52 +1,38 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2020, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
* Change Logs:
* Date Author Notes
- * 2018-12-13 BalanceTWK first version
- * 2019-06-11 WillianChan Add SD card hot plug detection
+ * 2020-05-23 liuduanfei first version
+ * 2020-08-25 wanghaijing add sdmmmc2
*/
-#ifndef _DRV_SDIO_H
-#define _DRV_SDIO_H
+#ifndef __DRV_SDIO_H__
+#define __DRV_SDIO_H__
+
#include
#include "rtdevice.h"
#include
#include
-#include "drv_dma.h"
#include
#include
#include
-#ifdef BSP_USING_SDIO
-
-#if defined(SOC_SERIES_STM32F1) || defined(SOC_SERIES_STM32F2) || defined(SOC_SERIES_STM32F4)
-#define SDCARD_INSTANCE_TYPE SDIO_TypeDef
-#elif defined(SOC_SERIES_STM32L4) || defined(SOC_SERIES_STM32F7)
-#define SDCARD_INSTANCE_TYPE SDMMC_TypeDef
-#endif /* defined(SOC_SERIES_STM32F1) || defined(SOC_SERIES_STM32F4) */
-
-#if defined(SOC_SERIES_STM32F1) || defined(SOC_SERIES_STM32F2) || defined(SOC_SERIES_STM32F4)
-#define SDCARD_INSTANCE SDIO
-#elif defined(SOC_SERIES_STM32L4) || defined(SOC_SERIES_STM32F7)
-#define SDCARD_INSTANCE SDMMC1
-#endif /* defined(SOC_SERIES_STM32F1) || defined(SOC_SERIES_STM32F4) */
-
#define SDIO_BUFF_SIZE 4096
#define SDIO_ALIGN_LEN 32
-#ifndef SDIO_MAX_FREQ
-#define SDIO_MAX_FREQ (1000000)
+#ifndef SDIO1_BASE_ADDRESS
+#define SDIO1_BASE_ADDRESS (0x52007000)
#endif
-#ifndef SDIO_BASE_ADDRESS
-#define SDIO_BASE_ADDRESS (0x40012800U)
+#ifndef SDIO2_BASE_ADDRESS
+#define SDIO2_BASE_ADDRESS (0x48022400)
#endif
#ifndef SDIO_CLOCK_FREQ
-#define SDIO_CLOCK_FREQ (48U * 1000 * 1000)
+#define SDIO_CLOCK_FREQ (150U * 1000 * 1000)
#endif
#ifndef SDIO_BUFF_SIZE
@@ -58,126 +44,59 @@
#endif
#ifndef SDIO_MAX_FREQ
-#define SDIO_MAX_FREQ (24 * 1000 * 1000)
+#define SDIO_MAX_FREQ (25 * 1000 * 1000)
#endif
-#define HW_SDIO_IT_CCRCFAIL (0x01U << 0)
-#define HW_SDIO_IT_DCRCFAIL (0x01U << 1)
-#define HW_SDIO_IT_CTIMEOUT (0x01U << 2)
-#define HW_SDIO_IT_DTIMEOUT (0x01U << 3)
-#define HW_SDIO_IT_TXUNDERR (0x01U << 4)
-#define HW_SDIO_IT_RXOVERR (0x01U << 5)
-#define HW_SDIO_IT_CMDREND (0x01U << 6)
-#define HW_SDIO_IT_CMDSENT (0x01U << 7)
-#define HW_SDIO_IT_DATAEND (0x01U << 8)
-#define HW_SDIO_IT_STBITERR (0x01U << 9)
-#define HW_SDIO_IT_DBCKEND (0x01U << 10)
-#define HW_SDIO_IT_CMDACT (0x01U << 11)
-#define HW_SDIO_IT_TXACT (0x01U << 12)
-#define HW_SDIO_IT_RXACT (0x01U << 13)
-#define HW_SDIO_IT_TXFIFOHE (0x01U << 14)
-#define HW_SDIO_IT_RXFIFOHF (0x01U << 15)
-#define HW_SDIO_IT_TXFIFOF (0x01U << 16)
-#define HW_SDIO_IT_RXFIFOF (0x01U << 17)
-#define HW_SDIO_IT_TXFIFOE (0x01U << 18)
-#define HW_SDIO_IT_RXFIFOE (0x01U << 19)
-#define HW_SDIO_IT_TXDAVL (0x01U << 20)
-#define HW_SDIO_IT_RXDAVL (0x01U << 21)
-#define HW_SDIO_IT_SDIOIT (0x01U << 22)
-
-#define HW_SDIO_ERRORS \
- (HW_SDIO_IT_CCRCFAIL | HW_SDIO_IT_CTIMEOUT | \
- HW_SDIO_IT_DCRCFAIL | HW_SDIO_IT_DTIMEOUT | \
- HW_SDIO_IT_RXOVERR | HW_SDIO_IT_TXUNDERR)
-
-#define HW_SDIO_POWER_OFF (0x00U)
-#define HW_SDIO_POWER_UP (0x02U)
-#define HW_SDIO_POWER_ON (0x03U)
-
-#define HW_SDIO_FLOW_ENABLE (0x01U << 14)
-#define HW_SDIO_BUSWIDE_1B (0x00U << 11)
-#define HW_SDIO_BUSWIDE_4B (0x01U << 11)
-#define HW_SDIO_BUSWIDE_8B (0x02U << 11)
-#define HW_SDIO_BYPASS_ENABLE (0x01U << 10)
-#define HW_SDIO_IDLE_ENABLE (0x01U << 9)
-#define HW_SDIO_CLK_ENABLE (0x01U << 8)
-
-#define HW_SDIO_SUSPEND_CMD (0x01U << 11)
-#define HW_SDIO_CPSM_ENABLE (0x01U << 10)
-#define HW_SDIO_WAIT_END (0x01U << 9)
-#define HW_SDIO_WAIT_INT (0x01U << 8)
-#define HW_SDIO_RESPONSE_NO (0x00U << 6)
-#define HW_SDIO_RESPONSE_SHORT (0x01U << 6)
-#define HW_SDIO_RESPONSE_LONG (0x03U << 6)
-
-#define HW_SDIO_DATA_LEN_MASK (0x01FFFFFFU)
-
-#define HW_SDIO_IO_ENABLE (0x01U << 11)
-#define HW_SDIO_RWMOD_CK (0x01U << 10)
-#define HW_SDIO_RWSTOP_ENABLE (0x01U << 9)
-#define HW_SDIO_RWSTART_ENABLE (0x01U << 8)
-#define HW_SDIO_DBLOCKSIZE_1 (0x00U << 4)
-#define HW_SDIO_DBLOCKSIZE_2 (0x01U << 4)
-#define HW_SDIO_DBLOCKSIZE_4 (0x02U << 4)
-#define HW_SDIO_DBLOCKSIZE_8 (0x03U << 4)
-#define HW_SDIO_DBLOCKSIZE_16 (0x04U << 4)
-#define HW_SDIO_DBLOCKSIZE_32 (0x05U << 4)
-#define HW_SDIO_DBLOCKSIZE_64 (0x06U << 4)
-#define HW_SDIO_DBLOCKSIZE_128 (0x07U << 4)
-#define HW_SDIO_DBLOCKSIZE_256 (0x08U << 4)
-#define HW_SDIO_DBLOCKSIZE_512 (0x09U << 4)
-#define HW_SDIO_DBLOCKSIZE_1024 (0x0AU << 4)
-#define HW_SDIO_DBLOCKSIZE_2048 (0x0BU << 4)
-#define HW_SDIO_DBLOCKSIZE_4096 (0x0CU << 4)
-#define HW_SDIO_DBLOCKSIZE_8192 (0x0DU << 4)
-#define HW_SDIO_DBLOCKSIZE_16384 (0x0EU << 4)
-#define HW_SDIO_DMA_ENABLE (0x01U << 3)
-#define HW_SDIO_STREAM_ENABLE (0x01U << 2)
-#define HW_SDIO_TO_HOST (0x01U << 1)
-#define HW_SDIO_DPSM_ENABLE (0x01U << 0)
-
-#define HW_SDIO_DATATIMEOUT (0xF0000000U)
+#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
+
+#define SDIO_ERRORS \
+ (SDMMC_STA_IDMATE | SDMMC_STA_ACKTIMEOUT | \
+ SDMMC_STA_RXOVERR | SDMMC_STA_TXUNDERR | \
+ SDMMC_STA_DTIMEOUT | SDMMC_STA_CTIMEOUT | \
+ SDMMC_STA_DCRCFAIL | SDMMC_STA_CCRCFAIL)
+
+#define SDIO_MASKR_ALL \
+ (SDMMC_MASK_CCRCFAILIE | SDMMC_MASK_DCRCFAILIE | SDMMC_MASK_CTIMEOUTIE | \
+ SDMMC_MASK_TXUNDERRIE | SDMMC_MASK_RXOVERRIE | SDMMC_MASK_CMDRENDIE | \
+ SDMMC_MASK_CMDSENTIE | SDMMC_MASK_DATAENDIE | SDMMC_MASK_ACKTIMEOUTIE)
+
+#define HW_SDIO_DATATIMEOUT (0xFFFFFFFFU)
struct stm32_sdio
{
- volatile rt_uint32_t power;
- volatile rt_uint32_t clkcr;
- volatile rt_uint32_t arg;
- volatile rt_uint32_t cmd;
- volatile rt_uint32_t respcmd;
- volatile rt_uint32_t resp1;
- volatile rt_uint32_t resp2;
- volatile rt_uint32_t resp3;
- volatile rt_uint32_t resp4;
- volatile rt_uint32_t dtimer;
- volatile rt_uint32_t dlen;
- volatile rt_uint32_t dctrl;
- volatile rt_uint32_t dcount;
- volatile rt_uint32_t sta;
- volatile rt_uint32_t icr;
- volatile rt_uint32_t mask;
- volatile rt_uint32_t reserved0[2];
- volatile rt_uint32_t fifocnt;
- volatile rt_uint32_t reserved1[13];
- volatile rt_uint32_t fifo;
+ volatile rt_uint32_t power; /* offset 0x00 */
+ volatile rt_uint32_t clkcr; /* offset 0x04 */
+ volatile rt_uint32_t arg; /* offset 0x08 */
+ volatile rt_uint32_t cmd; /* offset 0x0C */
+ volatile rt_uint32_t respcmd; /* offset 0x10 */
+ volatile rt_uint32_t resp1; /* offset 0x14 */
+ volatile rt_uint32_t resp2; /* offset 0x18 */
+ volatile rt_uint32_t resp3; /* offset 0x1C */
+ volatile rt_uint32_t resp4; /* offset 0x20 */
+ volatile rt_uint32_t dtimer; /* offset 0x24 */
+ volatile rt_uint32_t dlen; /* offset 0x28 */
+ volatile rt_uint32_t dctrl; /* offset 0x2C */
+ volatile rt_uint32_t dcount; /* offset 0x30 */
+ volatile rt_uint32_t sta; /* offset 0x34 */
+ volatile rt_uint32_t icr; /* offset 0x38 */
+ volatile rt_uint32_t mask; /* offset 0x3C */
+ volatile rt_uint32_t acktimer; /* offset 0x40 */
+ volatile rt_uint32_t reserved0[3]; /* offset 0x44 ~ 0x4C */
+ volatile rt_uint32_t idmatrlr; /* offset 0x50 */
+ volatile rt_uint32_t idmabsizer; /* offset 0x54 */
+ volatile rt_uint32_t idmabase0r; /* offset 0x58 */
+ volatile rt_uint32_t idmabase1r; /* offset 0x5C */
+ volatile rt_uint32_t reserved1[8]; /* offset 0x60 ~ 7C */
+ volatile rt_uint32_t fifo; /* offset 0x80 */
};
-typedef rt_err_t (*dma_txconfig)(rt_uint32_t *src, rt_uint32_t *dst, int size);
-typedef rt_err_t (*dma_rxconfig)(rt_uint32_t *src, rt_uint32_t *dst, int size);
typedef rt_uint32_t (*sdio_clk_get)(struct stm32_sdio *hw_sdio);
struct stm32_sdio_des
{
struct stm32_sdio *hw_sdio;
- dma_txconfig txconfig;
- dma_rxconfig rxconfig;
sdio_clk_get clk_get;
-};
-
-struct stm32_sdio_config
-{
- SDCARD_INSTANCE_TYPE *Instance;
- struct dma_config dma_rx, dma_tx;
+ SD_HandleTypeDef hsd;
};
/* stm32 sdio dirver class */
@@ -186,15 +105,8 @@ struct stm32_sdio_class
struct stm32_sdio_des *des;
const struct stm32_sdio_config *cfg;
struct rt_mmcsd_host host;
- struct
- {
- DMA_HandleTypeDef handle_rx;
- DMA_HandleTypeDef handle_tx;
- } dma;
};
-extern void stm32_mmcsd_change(void);
-
-#endif
+extern void sdcard_change(void);
-#endif /* BSP_USING_SDIO */
+#endif /* __DRV_SDIO_H__ */
diff --git a/rtconfig.h b/rtconfig.h
index d7269ab..f55fdca 100644
--- a/rtconfig.h
+++ b/rtconfig.h
@@ -122,6 +122,9 @@
#define RT_MMCSD_STACK_SIZE 1024
#define RT_MMCSD_THREAD_PREORITY 22
#define RT_MMCSD_MAX_PARTITION 16
+#define RT_USING_SPI
+#define RT_USING_QSPI
+#define RT_USING_SPI_MSD
#define RT_USING_PIN
/* Using USB */
@@ -144,6 +147,7 @@
/* POSIX (Portable Operating System Interface) layer */
+#define RT_USING_POSIX_FS
/* Interprocess Communication (IPC) */