Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-15 20:35:33 +03:00
Code Issues Wiki Activity

Refactored SD card initialisation to contain SD card detection initialisation.

Browse source
This commit is contained in:
mikeller 2019-07-14 17:09:35 +12:00
parent 7e6a890e47
commit da93c07432
4 changed files with 3 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/main/drivers/sdcard.c
View file

@ -67,15 +67,7 @@ sdcard_t sdcard;
STATIC_ASSERT(sizeof(sdcardCSD_t) == 16, sdcard_csd_bitfields_didnt_pack_properly); STATIC_ASSERT(sizeof(sdcardCSD_t) == 16, sdcard_csd_bitfields_didnt_pack_properly);
void sdcardInsertionDetectDeinit(void) static void sdcardInsertionDetectInit(const sdcardConfig_t *config)
{
if (sdcard.cardDetectPin) {
IOInit(sdcard.cardDetectPin, OWNER_FREE, 0);
IOConfigGPIO(sdcard.cardDetectPin, IOCFG_IN_FLOATING);
}
}
void sdcardInsertionDetectInit(const sdcardConfig_t *config)
{ {
if (config->cardDetectTag) { if (config->cardDetectTag) {
sdcard.cardDetectPin = IOGetByTag(config->cardDetectTag); sdcard.cardDetectPin = IOGetByTag(config->cardDetectTag);
@ -122,6 +114,8 @@ void sdcard_preInit(const sdcardConfig_t *config)
void sdcard_init(const sdcardConfig_t *config) void sdcard_init(const sdcardConfig_t *config)
{ {
sdcardInsertionDetectInit(config);
switch (config->mode) { switch (config->mode) {
#ifdef USE_SDCARD_SPI #ifdef USE_SDCARD_SPI
case SDCARD_MODE_SPI: case SDCARD_MODE_SPI:

3
src/main/drivers/sdcard.h
View file

@ -65,9 +65,6 @@ bool sdcard_readBlock(uint32_t blockIndex, uint8_t *buffer, sdcard_operationComp
sdcardOperationStatus_e sdcard_beginWriteBlocks(uint32_t blockIndex, uint32_t blockCount); sdcardOperationStatus_e sdcard_beginWriteBlocks(uint32_t blockIndex, uint32_t blockCount);
sdcardOperationStatus_e sdcard_writeBlock(uint32_t blockIndex, uint8_t *buffer, sdcard_operationCompleteCallback_c callback, uint32_t callbackData); sdcardOperationStatus_e sdcard_writeBlock(uint32_t blockIndex, uint8_t *buffer, sdcard_operationCompleteCallback_c callback, uint32_t callbackData);
void sdcardInsertionDetectDeinit(void);
void sdcardInsertionDetectInit(const sdcardConfig_t *config);
bool sdcard_isInserted(void); bool sdcard_isInserted(void);
bool sdcard_isInitialized(void); bool sdcard_isInitialized(void);
bool sdcard_isFunctional(void); bool sdcard_isFunctional(void);

2
src/main/drivers/sdcard_impl.h
View file

@ -107,8 +107,6 @@ extern sdcard_t sdcard;
STATIC_ASSERT(sizeof(sdcardCSD_t) == 16, sdcard_csd_bitfields_didnt_pack_properly); STATIC_ASSERT(sizeof(sdcardCSD_t) == 16, sdcard_csd_bitfields_didnt_pack_properly);
void sdcardInsertionDetectInit(const sdcardConfig_t *config);
void sdcardInsertionDetectDeinit(void);
bool sdcard_isInserted(void); bool sdcard_isInserted(void);
typedef struct sdcardVTable_s { typedef struct sdcardVTable_s {

1
src/main/fc/init.c
View file

@ -252,7 +252,6 @@ static void configureSPIAndQuadSPI(void)
void sdCardAndFSInit() void sdCardAndFSInit()
{ {
sdcardInsertionDetectInit(sdcardConfig());
sdcard_init(sdcardConfig()); sdcard_init(sdcardConfig());
afatfs_init(); afatfs_init();
} }