Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 16:25:31 +03:00
Code Issues Wiki Activity

Updates to use newly merged SD card code

Browse source
This commit is contained in:
Nicholas Sherlock 2015-11-24 14:23:48 +13:00 • committed by borisbstyle
parent dce49d4abb
commit 6055ab2432
6 changed files with 135 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,6 +24,7 @@
#include "platform.h"
#include "nvic.h"
#include "gpio.h"
#include "drivers/bus_spi.h"
#include "drivers/system.h"
@ -95,6 +96,56 @@ static sdcard_t sdcard;
STATIC_ASSERT(sizeof(sdcardCSD_t) == 16, sdcard_csd_bitfields_didnt_pack_properly);
void sdcardInsertionDetectDeinit(void)
{
#ifdef SDCARD_DETECT_PIN
GPIO_InitTypeDef GPIO_InitStructure;
GPIO_InitStructure.GPIO_Pin = SDCARD_DETECT_PIN;
GPIO_Init(SDCARD_DETECT_GPIO_PORT, &GPIO_InitStructure);
#endif
}
void sdcardInsertionDetectInit(void)
{
#ifdef SDCARD_DETECT_PIN
GPIO_InitTypeDef GPIO_InitStructure;
GPIO_InitStructure.GPIO_Pin = SDCARD_DETECT_PIN;
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IN;
GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP;
GPIO_Init(SDCARD_DETECT_GPIO_PORT, &GPIO_InitStructure);
#endif
}
/**
* @brief Detect if SD card is correctly plugged in the memory slot.
* @param None
* @retval Return if SD is detected or not
*/
bool sdcard_isInserted(void)
{
#ifdef SDCARD_DETECT_PIN
/*!< Check GPIO to detect SD */
if ((GPIO_ReadInputData(SDCARD_DETECT_GPIO_PORT) & SDCARD_DETECT_PIN) != 0)
{
#ifdef SD_DETECT_INVERTED
return false;
#else
return true;
#endif
} else {
#ifdef SD_DETECT_INVERTED
return true;
#else
return false;
#endif
}
#else
return true;
#endif
}
static void sdcard_select()
{
SET_CS_LOW;
@ -759,8 +810,16 @@ bool sdcard_readBlock(uint32_t blockIndex, uint8_t *buffer, sdcard_operationComp
}
}
bool sdcard_isReady() {
return sdcard.state == SDCARD_STATE_READY;
/**
* Returns true if the SD card has successfully completed its startup procedures.
*/
bool sdcard_isInitialized() {
return sdcard.state >= SDCARD_STATE_READY;
}
const sdcardMetadata_t* sdcard_getMetadata()
{
return &sdcard.metadata;
}
#endif