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

Update SDCARD driver for generic target

Browse source 
remove enabled PG paramter
This commit is contained in:
MJ666 2018-10-03 00:34:15 +02:00
parent 5b91ec41e3
commit b380a343a6
5 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/drivers/sdcard_sdio_baremetal.c
View file

@ -189,7 +189,7 @@ static bool sdcard_checkInitDone(void)
*/ */
void sdcard_init(const sdcardConfig_t *config) void sdcard_init(const sdcardConfig_t *config)
{ {
sdcard.enabled = config->enabled; sdcard.enabled = config->mode;
if (!sdcard.enabled) { if (!sdcard.enabled) {
sdcard.state = SDCARD_STATE_NOT_PRESENT; sdcard.state = SDCARD_STATE_NOT_PRESENT;
return; return;

2
src/main/drivers/sdcard_spi.c
View file

@ -473,7 +473,7 @@ static bool sdcard_checkInitDone(void)
*/ */
void sdcard_init(const sdcardConfig_t *config) void sdcard_init(const sdcardConfig_t *config)
{ {
sdcard.enabled = config->enabled; sdcard.enabled = config->mode;
if (!sdcard.enabled) { if (!sdcard.enabled) {
sdcard.state = SDCARD_STATE_NOT_PRESENT; sdcard.state = SDCARD_STATE_NOT_PRESENT;
return; return;

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

@ -635,7 +635,7 @@ void init(void)
#ifdef USE_SDCARD #ifdef USE_SDCARD
if (blackboxConfig()->device == BLACKBOX_DEVICE_SDCARD) { if (blackboxConfig()->device == BLACKBOX_DEVICE_SDCARD) {
if (sdcardConfig()->enabled) { if (sdcardConfig()->mode) {
sdcardInsertionDetectInit(); sdcardInsertionDetectInit();
sdcard_init(sdcardConfig()); sdcard_init(sdcardConfig());
afatfs_init(); afatfs_init();

5
src/main/pg/sdcard.c
View file

@ -33,12 +33,11 @@
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/dma.h" #include "drivers/dma.h"
PG_REGISTER_WITH_RESET_FN(sdcardConfig_t, sdcardConfig, PG_SDCARD_CONFIG, 0); PG_REGISTER_WITH_RESET_FN(sdcardConfig_t, sdcardConfig, PG_SDCARD_CONFIG, 1);
void pgResetFn_sdcardConfig(sdcardConfig_t *config) void pgResetFn_sdcardConfig(sdcardConfig_t *config)
{ {
config->useDma = false; config->useDma = false;
config->enabled = 0;
config->device = SPI_DEV_TO_CFG(SPIINVALID); config->device = SPI_DEV_TO_CFG(SPIINVALID);
config->mode = SDCARD_MODE_NONE; config->mode = SDCARD_MODE_NONE;
@ -47,7 +46,6 @@ void pgResetFn_sdcardConfig(sdcardConfig_t *config)
#ifdef USE_SDCARD_SDIO #ifdef USE_SDCARD_SDIO
config->mode = SDCARD_MODE_SDIO; config->mode = SDCARD_MODE_SDIO;
config->enabled = 1;
#endif #endif
#ifdef USE_SDCARD_SPI #ifdef USE_SDCARD_SPI
@ -56,7 +54,6 @@ void pgResetFn_sdcardConfig(sdcardConfig_t *config)
config->chipSelectTag = IO_TAG(SDCARD_SPI_CS_PIN); config->chipSelectTag = IO_TAG(SDCARD_SPI_CS_PIN);
if (spidevice != SPIINVALID && config->chipSelectTag) { if (spidevice != SPIINVALID && config->chipSelectTag) {
config->enabled = 1;
config->mode = SDCARD_MODE_SPI; config->mode = SDCARD_MODE_SPI;
} }
#endif #endif

1
src/main/pg/sdcard.h
View file

@ -31,7 +31,6 @@ typedef enum {
typedef struct sdcardConfig_s { typedef struct sdcardConfig_s {
uint8_t useDma; uint8_t useDma;
uint8_t enabled;
int8_t device; int8_t device;
ioTag_t cardDetectTag; ioTag_t cardDetectTag;
ioTag_t chipSelectTag; ioTag_t chipSelectTag;