zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

STM32F1: Align SD EEPROM data for SDIO (#14809)

Browse source
This commit is contained in:
Tanguy Pruvot 2019-08-02 11:12:46 +02:00 committed by Scott Lahteine
parent 70ce4f5b36
commit 3334163e73
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Marlin/src/HAL/HAL_STM32F1/persistent_store_sdcard.cpp
View file

@ -22,6 +22,7 @@
/** /**
* HAL for stm32duino.com based on Libmaple and compatible (STM32F1) * HAL for stm32duino.com based on Libmaple and compatible (STM32F1)
* Implementation of EEPROM settings in SD Card
*/ */
#ifdef __STM32F1__ #ifdef __STM32F1__
@ -37,7 +38,8 @@
#endif #endif
#define HAL_STM32F1_EEPROM_SIZE (E2END + 1) #define HAL_STM32F1_EEPROM_SIZE (E2END + 1)
static char HAL_STM32F1_eeprom_content[HAL_STM32F1_EEPROM_SIZE]; #define _ALIGN(x) __attribute__ ((aligned(x))) // SDIO uint32_t* compat.
static char _ALIGN(4) HAL_STM32F1_eeprom_content[HAL_STM32F1_EEPROM_SIZE];
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
@ -52,7 +54,7 @@ static char HAL_STM32F1_eeprom_content[HAL_STM32F1_EEPROM_SIZE];
if (!file.open(&root, EEPROM_FILENAME, O_RDONLY)) if (!file.open(&root, EEPROM_FILENAME, O_RDONLY))
return false; return false;
int16_t bytes_read = file.read(HAL_STM32F1_eeprom_content, HAL_STM32F1_EEPROM_SIZE); int bytes_read = file.read(HAL_STM32F1_eeprom_content, HAL_STM32F1_EEPROM_SIZE);
if (bytes_read < 0) return false; if (bytes_read < 0) return false;
for (; bytes_read < HAL_STM32F1_EEPROM_SIZE; bytes_read++) for (; bytes_read < HAL_STM32F1_EEPROM_SIZE; bytes_read++)
HAL_STM32F1_eeprom_content[bytes_read] = 0xFF; HAL_STM32F1_eeprom_content[bytes_read] = 0xFF;
@ -64,7 +66,7 @@ static char HAL_STM32F1_eeprom_content[HAL_STM32F1_EEPROM_SIZE];
if (!card.isDetected()) return false; if (!card.isDetected()) return false;
SdFile file, root = card.getroot(); SdFile file, root = card.getroot();
int16_t bytes_written = 0; int bytes_written = 0;
if (file.open(&root, EEPROM_FILENAME, O_CREAT | O_WRITE | O_TRUNC)) { if (file.open(&root, EEPROM_FILENAME, O_CREAT | O_WRITE | O_TRUNC)) {
bytes_written = file.write(HAL_STM32F1_eeprom_content, HAL_STM32F1_EEPROM_SIZE); bytes_written = file.write(HAL_STM32F1_eeprom_content, HAL_STM32F1_EEPROM_SIZE);
file.close(); file.close();