piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(sdcard): use init marker in initialised BSS segment (#2517)

Browse Source 
`g_FATFS_Obj` is located in `__DMA` section, which is not initialised, so that testing `sdMounted()` at boot relies on the fact that the bootloader linker script declares BSS in internal SRAM and not in CCM, as the firmware linker script does.
This commit is contained in:
Raphael Coeffic
2022-10-12 12:51:09 +10:00
committed by GitHub
parent 655965d7a6
commit 26b34a4820
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/targets/horus/board.cpp
-4
View File
@@ -182,10 +182,6 @@ void boardInit()
audioInit();
// we need to initialize g_FATFS_Obj here, because it is in .ram section (because of DMA access)
// and this section is un-initialized
memset(&g_FATFS_Obj, 0, sizeof(g_FATFS_Obj));
keysInit();
rotaryEncoderInit();
radio/src/targets/horus/diskio.cpp
+4 -2
View File
@@ -311,7 +311,8 @@ DRESULT disk_ioctl (
// TODO everything here should not be in the driver layer ...
FATFS g_FATFS_Obj __DMA; // initialized in boardInit()
bool _g_FATFS_init = false;
FATFS g_FATFS_Obj __DMA; // this is in uninitialised section !!!
#if defined(LOG_TELEMETRY)
FIL g_telemetryFile = {};
@@ -349,6 +350,7 @@ void sdMount()
if (f_mount(&g_FATFS_Obj, "", 1) == FR_OK) {
// call sdGetFreeSectors() now because f_getfree() takes a long time first time it's called
_g_FATFS_init = true;
sdGetFreeSectors();
#if defined(LOG_TELEMETRY)
@@ -392,7 +394,7 @@ void sdDone()
uint32_t sdMounted()
{
return g_FATFS_Obj.fs_type != 0;
return _g_FATFS_init && (g_FATFS_Obj.fs_type != 0);
}
uint32_t sdIsHC()
radio/src/targets/taranis/diskio.cpp
+4 -2
View File
@@ -954,7 +954,8 @@ void sdPoll10ms()
// TODO everything here should not be in the driver layer ...
FATFS g_FATFS_Obj __DMA;
bool _g_FATFS_init = false;
FATFS g_FATFS_Obj __DMA; // this is in uninitialised section !!!
#if defined(LOG_TELEMETRY)
FIL g_telemetryFile = {};
@@ -985,6 +986,7 @@ void sdMount()
TRACE("sdMount");
if (f_mount(&g_FATFS_Obj, "", 1) == FR_OK) {
// call sdGetFreeSectors() now because f_getfree() takes a long time first time it's called
_g_FATFS_init = true;
sdGetFreeSectors();
#if defined(LOG_TELEMETRY)
@@ -1020,7 +1022,7 @@ void sdDone()
uint32_t sdMounted()
{
return g_FATFS_Obj.fs_type != 0;
return _g_FATFS_init && (g_FATFS_Obj.fs_type != 0);
}
uint32_t sdIsHC()