Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-25 17:25:13 +03:00
Code Issues Wiki Activity

Getting rid of sdMountPoll() on ARM

Browse source
This commit is contained in:
Damjan Adamic 2016-09-11 14:24:24 +02:00
parent 183b24086a
commit 6ddb9e414f
5 changed files with 0 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

1
radio/src/main_arm.cpp
View file

@ -391,7 +391,6 @@ void perMain()
#endif #endif
checkSpeakerVolume(); checkSpeakerVolume();
checkEeprom(); checkEeprom();
sdMountPoll();
writeLogs(); writeLogs();
handleUsbConnection(); handleUsbConnection();
checkTrainerSettings(); checkTrainerSettings();

1
radio/src/targets/horus/board.h
View file

@ -122,7 +122,6 @@ void sdInit(void);
void sdMount(void); void sdMount(void);
void sdDone(void); void sdDone(void);
#define sdPoll10ms() #define sdPoll10ms()
#define sdMountPoll()
uint32_t sdMounted(void); uint32_t sdMounted(void);
#else #else
#define SD_IS_HC() (0) #define SD_IS_HC() (0)

1
radio/src/targets/sky9x/board.h
View file

@ -260,7 +260,6 @@ void disable_dsm2(uint32_t port);
#define sdDone() #define sdDone()
#else #else
#define sdPoll10ms() #define sdPoll10ms()
void sdMountPoll();
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {
#endif #endif

67
radio/src/targets/sky9x/diskio.cpp
View file

@ -944,73 +944,6 @@ void sdInit()
uint8_t sdErrorCount = 0; uint8_t sdErrorCount = 0;
FATFS g_FATFS_Obj = { 0 }; FATFS g_FATFS_Obj = { 0 };
void sdMountPoll()
{
#if 0
if (!Card_initialized)
return;
if (!SD_CARD_PRESENT()) {
Card_state = SD_ST_EMPTY;
Sd_rca = 0;
sdErrorCount = 0;
}
switch (Card_state) {
case SD_ST_EMPTY:
if (SD_CARD_PRESENT()) {
Card_state = SD_ST_INIT1;
}
break;
case SD_ST_INIT1:
sdCmd0();
Card_state = SD_ST_INIT2;
break;
case SD_ST_INIT2:
sdCmd8(1);
Card_state = SD_ST_IDLE;
break;
case SD_ST_IDLE:
sdMemInit(1, &Cmd_A41_resp);
Card_state = SD_ST_READY;
break;
case SD_ST_READY:
if (!sdCmd2()) Card_state = SD_ST_IDENT;
break;
case SD_ST_IDENT:
if (!sdCmd3()) Card_state = SD_ST_STBY;
break;
case SD_ST_STBY:
sdCmd9();
sdCmd7(); // Select Card
Card_state = SD_ST_TRAN;
break;
case SD_ST_TRAN:
sdAcmd51();
sdAcmd6(); // Set bus width to 4 bits, and speed to 9 MHz
// Should check the card can do this ****
Card_state = SD_ST_DATA;
break;
case SD_ST_DATA:
if (!usbPlugged() && f_mount(0, &g_FATFS_Obj) == FR_OK) {
Card_state = SD_ST_MOUNTED;
}
break;
case SD_ST_ERR:
break;
}
#endif
}
void sdInit() void sdInit()
{ {
Sd_rca = 0; Sd_rca = 0;

1
radio/src/targets/taranis/board.h
View file

@ -146,7 +146,6 @@ void sdInit(void);
void sdMount(void); void sdMount(void);
void sdDone(void); void sdDone(void);
void sdPoll10ms(void); void sdPoll10ms(void);
#define sdMountPoll()
uint32_t sdMounted(void); uint32_t sdMounted(void);
#define SD_CARD_PRESENT() (~SD_GPIO_PRESENT->IDR & SD_GPIO_PIN_PRESENT) #define SD_CARD_PRESENT() (~SD_GPIO_PRESENT->IDR & SD_GPIO_PIN_PRESENT)
#endif #endif