diff options
Diffstat (limited to 'os/hal')
| -rw-r--r-- | os/hal/include/mmc_spi.h | 22 | ||||
| -rw-r--r-- | os/hal/src/mmc_spi.c | 25 |
2 files changed, 9 insertions, 38 deletions
diff --git a/os/hal/include/mmc_spi.h b/os/hal/include/mmc_spi.h index fd2850576..760ab3ad1 100644 --- a/os/hal/include/mmc_spi.h +++ b/os/hal/include/mmc_spi.h @@ -102,13 +102,6 @@ typedef enum { } mmcstate_t;
/**
- * @brief Function used to query some hardware status bits.
- *
- * @return The status.
- */
-typedef bool_t (*mmcquery_t)(void);
-
-/**
* @brief Driver configuration structure.
* @note Not required in the current implementation.
*/
@@ -147,14 +140,6 @@ typedef struct { */
const SPIConfig *hscfg;
/**
- * @brief Write protect status query function.
- */
- mmcquery_t is_protected;
- /**
- * @brief Insertion status query function.
- */
- mmcquery_t is_inserted;
- /**
* @brief Card insertion event source.
*/
EventSource inserted_event;
@@ -204,7 +189,7 @@ typedef struct { *
* @api
*/
-#define mmcIsWriteProtected(mmcp) ((mmcp)->is_protected())
+#define mmcIsWriteProtected(mmcp) mmc_lld_is_write_protected(mmcp)
/** @} */
/*===========================================================================*/
@@ -216,8 +201,7 @@ extern "C" { #endif
void mmcInit(void);
void mmcObjectInit(MMCDriver *mmcp, SPIDriver *spip,
- const SPIConfig *lscfg, const SPIConfig *hscfg,
- mmcquery_t is_protected, mmcquery_t is_inserted);
+ const SPIConfig *lscfg, const SPIConfig *hscfg);
void mmcStart(MMCDriver *mmcp, const MMCConfig *config);
void mmcStop(MMCDriver *mmcp);
bool_t mmcConnect(MMCDriver *mmcp);
@@ -230,6 +214,8 @@ extern "C" { bool_t mmcStopSequentialWrite(MMCDriver *mmcp);
bool_t mmcSync(MMCDriver *mmcp);
bool_t mmcGetInfo(MMCDriver *mmcp, BlockDeviceInfo *bdip);
+ bool_t mmc_lld_is_card_inserted(MMCDriver *mmcp);
+ bool_t mmc_lld_is_write_protected(MMCDriver *mmcp);
#ifdef __cplusplus
}
#endif
diff --git a/os/hal/src/mmc_spi.c b/os/hal/src/mmc_spi.c index 4fdec3f12..97f4f271d 100644 --- a/os/hal/src/mmc_spi.c +++ b/os/hal/src/mmc_spi.c @@ -49,8 +49,6 @@ /*===========================================================================*/
/* Forward declarations required by mmc_vmt.*/
-bool_t mmc_is_inserted(void *instance);
-bool_t mmc_is_protected(void *instance);
bool_t mmc_read(void *instance, uint32_t startblk,
uint8_t *buffer, uint32_t n);
bool_t mmc_write(void *instance, uint32_t startblk,
@@ -60,8 +58,8 @@ bool_t mmc_write(void *instance, uint32_t startblk, * @brief Virtual methods table.
*/
static const struct MMCSDBlockDeviceVMT mmc_vmt = {
- mmc_is_inserted,
- mmc_is_protected,
+ (bool_t (*)(void *))mmc_lld_is_card_inserted,
+ (bool_t (*)(void *))mmc_lld_is_write_protected,
(bool_t (*)(void *))mmcConnect,
(bool_t (*)(void *))mmcDisconnect,
mmc_read,
@@ -102,16 +100,6 @@ static const uint8_t crc7_lookup_table[256] = { /* Driver local functions. */
/*===========================================================================*/
-bool_t mmc_is_inserted(void *instance) {
-
- return ((MMCDriver *)instance)->is_inserted();
-}
-
-bool_t mmc_is_protected(void *instance) {
-
- return ((MMCDriver *)instance)->is_protected();
-}
-
bool_t mmc_read(void *instance, uint32_t startblk,
uint8_t *buffer, uint32_t n) {
@@ -171,7 +159,7 @@ static void tmrfunc(void *p) { chSysLockFromIsr();
if (mmcp->cnt > 0) {
- if (mmcp->is_inserted()) {
+ if (mmc_lld_is_card_inserted(mmcp)) {
if (--mmcp->cnt == 0) {
mmcp->state = MMC_INSERTED;
chEvtBroadcastI(&mmcp->inserted_event);
@@ -181,7 +169,7 @@ static void tmrfunc(void *p) { mmcp->cnt = MMC_POLLING_INTERVAL;
}
else {
- if (!mmcp->is_inserted()) {
+ if (!mmc_lld_is_card_inserted(mmcp)) {
mmcp->state = MMC_WAIT;
mmcp->cnt = MMC_POLLING_INTERVAL;
chEvtBroadcastI(&mmcp->removed_event);
@@ -382,8 +370,7 @@ void mmcInit(void) { * @init
*/
void mmcObjectInit(MMCDriver *mmcp, SPIDriver *spip,
- const SPIConfig *lscfg, const SPIConfig *hscfg,
- mmcquery_t is_protected, mmcquery_t is_inserted) {
+ const SPIConfig *lscfg, const SPIConfig *hscfg) {
mmcp->vmt = &mmc_vmt;
mmcp->state = MMC_STOP;
@@ -391,8 +378,6 @@ void mmcObjectInit(MMCDriver *mmcp, SPIDriver *spip, mmcp->spip = spip;
mmcp->lscfg = lscfg;
mmcp->hscfg = hscfg;
- mmcp->is_protected = is_protected;
- mmcp->is_inserted = is_inserted;
mmcp->block_addresses = FALSE;
chEvtInit(&mmcp->inserted_event);
chEvtInit(&mmcp->removed_event);
|