summaryrefslogtreecommitdiff
path: root/components/drivers/include
diff options
context:
space:
mode:
authorBernard Xiong <[email protected]>2017-07-04 07:19:44 +0800
committerGitHub <[email protected]>2017-07-04 07:19:44 +0800
commite47515d876b69b6b4c83c92ef427b299339c8f41 (patch)
treea46065d7ef106892ecb20aa44a51a4c73702e367 /components/drivers/include
parent315a616436abd71b7e45ad6ed917b956b4a72077 (diff)
parent465fdfc2fff22abc6444b6d700e10621bc622d77 (diff)
Merge pull request #758 from JianRuiqian/master
[DeviceDrivers] improve sdio
Diffstat (limited to 'components/drivers/include')
-rw-r--r--components/drivers/include/drivers/mmcsd_card.h2
-rw-r--r--components/drivers/include/drivers/mmcsd_host.h2
-rw-r--r--components/drivers/include/drivers/sdio.h2
3 files changed, 5 insertions, 1 deletions
diff --git a/components/drivers/include/drivers/mmcsd_card.h b/components/drivers/include/drivers/mmcsd_card.h
index 4a82bc58f5..18470a5ea9 100644
--- a/components/drivers/include/drivers/mmcsd_card.h
+++ b/components/drivers/include/drivers/mmcsd_card.h
@@ -135,6 +135,8 @@ struct rt_sdio_function {
rt_uint32_t enable_timeout_val; /* max enable timeout in msec */
struct rt_sdio_function_tuple *tuples;
+
+ void *priv;
};
#define SDIO_MAX_FUNCTIONS 7
diff --git a/components/drivers/include/drivers/mmcsd_host.h b/components/drivers/include/drivers/mmcsd_host.h
index 3b68058ba4..877a04d8e0 100644
--- a/components/drivers/include/drivers/mmcsd_host.h
+++ b/components/drivers/include/drivers/mmcsd_host.h
@@ -111,7 +111,7 @@ struct rt_mmcsd_host {
rt_uint32_t max_blk_count; /* maximum block count */
rt_uint32_t spi_use_crc;
- struct rt_semaphore bus_lock;
+ struct rt_mutex bus_lock;
struct rt_semaphore sem_ack;
rt_uint32_t sdio_irq_num;
diff --git a/components/drivers/include/drivers/sdio.h b/components/drivers/include/drivers/sdio.h
index 5f65882952..2cd1c7dfd1 100644
--- a/components/drivers/include/drivers/sdio.h
+++ b/components/drivers/include/drivers/sdio.h
@@ -229,6 +229,8 @@ rt_int32_t sdio_detach_irq(struct rt_sdio_function *func);
void sdio_irq_wakeup(struct rt_mmcsd_host *host);
rt_int32_t sdio_enable_func(struct rt_sdio_function *func);
rt_int32_t sdio_disable_func(struct rt_sdio_function *func);
+void sdio_set_drvdata(struct rt_sdio_function *func, void *data);
+void* sdio_get_drvdata(struct rt_sdio_function *func);
rt_int32_t sdio_set_block_size(struct rt_sdio_function *func,
rt_uint32_t blksize);
rt_int32_t sdio_register_driver(struct rt_sdio_driver *driver);