Skip to content

Commit e3c5451

Browse files
committed
[DEVICE/SDIO] port to the block
1. remove gpt. 2. remove block device custom. Signed-off-by: GuEe-GUI <[email protected]>
1 parent 01cc2ae commit e3c5451

File tree

8 files changed

+96
-1322
lines changed

8 files changed

+96
-1322
lines changed

components/drivers/include/drivers/dev_gpt.h

-132
This file was deleted.

components/drivers/include/drivers/dev_mmcsd_core.h

-2
Original file line numberDiff line numberDiff line change
@@ -249,8 +249,6 @@ struct rt_mmcsd_host *mmcsd_alloc_host(void);
249249
void mmcsd_free_host(struct rt_mmcsd_host *host);
250250
int rt_mmcsd_core_init(void);
251251

252-
int rt_mmcsd_blk_init(void);
253-
rt_int32_t read_lba(struct rt_mmcsd_card *card, size_t lba, uint8_t *buffer, size_t count);
254252
rt_int32_t rt_mmcsd_blk_probe(struct rt_mmcsd_card *card);
255253
void rt_mmcsd_blk_remove(struct rt_mmcsd_card *card);
256254

components/drivers/include/drivers/mmcsd_card.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ struct rt_mmcsd_card {
218218
struct rt_sdio_cccr cccr; /* common card info */
219219
struct rt_sdio_cis cis; /* common tuple info */
220220
struct rt_sdio_function *sdio_function[SDIO_MAX_FUNCTIONS + 1]; /* SDIO functions (devices) */
221-
rt_list_t blk_devices; /* for block device list */
221+
void *blk_dev;
222222

223223
struct rt_mmc_ext_csd ext_csd;
224224
};

components/drivers/include/drivers/mmcsd_host.h

+1
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ struct rt_mmcsd_host
134134
#define MMCSD_SUP_HS200_1V2 (1 << 10)
135135
#define MMCSD_SUP_HS200 (MMCSD_SUP_HS200_1V2 | MMCSD_SUP_HS200_1V8) /* hs200 sdr */
136136
#define MMCSD_SUP_NONREMOVABLE (1 << 11)
137+
#define controller_is_removable(host) (!(host->flags & MMCSD_SUP_NONREMOVABLE))
137138
#define MMCSD_SUP_HS400_1V8 (1 << 12)
138139
#define MMCSD_SUP_HS400_1V2 (1 << 13)
139140
#define MMCSD_SUP_HS400 (MMCSD_SUP_HS400_1V2 | MMCSD_SUP_HS400_1V8) /* hs400 ddr */

components/drivers/sdio/Kconfig

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
config RT_USING_SDIO
22
bool "Using SD/MMC device drivers"
3+
select RT_USING_BLK
34
default n
45

56
if RT_USING_SDIO

components/drivers/sdio/SConscript

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ dev_block.c
77
dev_mmcsd_core.c
88
dev_sd.c
99
dev_sdio.c
10-
dev_gpt.c
1110
dev_mmc.c
1211
""")
1312

0 commit comments

Comments
 (0)