Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-13 11:29:58 +03:00
Code Issues Wiki Activity

Use opaque struct to define linker symbols for eeprom (#14382)

Browse source 
This way code must be explicit when using linker-defined memory.
This commit is contained in:
Petr Ledvina 2025-05-13 12:02:28 +02:00 • committed by GitHub
parent 37c921cdf0
commit f612b28a86
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/main/config/config_eeprom.c
View file

@ -319,7 +319,7 @@ void initEEPROM(void)
bool isEEPROMVersionValid(void) bool isEEPROMVersionValid(void)
{ {
const uint8_t *p = &__config_start; const uint8_t *p = (const uint8_t*)&__config_start;
const configHeader_t *header = (const configHeader_t *)p; const configHeader_t *header = (const configHeader_t *)p;
if (header->eepromConfigVersion != EEPROM_CONF_VERSION) { if (header->eepromConfigVersion != EEPROM_CONF_VERSION) {
@ -332,7 +332,7 @@ bool isEEPROMVersionValid(void)
// Scan the EEPROM config. Returns true if the config is valid. // Scan the EEPROM config. Returns true if the config is valid.
bool isEEPROMStructureValid(void) bool isEEPROMStructureValid(void)
{ {
const uint8_t *p = &__config_start; const uint8_t *p = (const uint8_t*)&__config_start;
const configHeader_t *header = (const configHeader_t *)p; const configHeader_t *header = (const configHeader_t *)p;
if (header->magic_be != 0xBE) { if (header->magic_be != 0xBE) {
@ -350,7 +350,7 @@ bool isEEPROMStructureValid(void)
// Found the end. Stop scanning. // Found the end. Stop scanning.
break; break;
} }
if (p + record->size >= &__config_end if (p + record->size >= (const uint8_t*)&__config_end
|| record->size < sizeof(*record)) { || record->size < sizeof(*record)) {
// Too big or too small. // Too big or too small.
return false; return false;
@ -370,7 +370,7 @@ bool isEEPROMStructureValid(void)
crc = crc16_ccitt_update(crc, storedCrc, sizeof(*storedCrc)); crc = crc16_ccitt_update(crc, storedCrc, sizeof(*storedCrc));
p += sizeof(storedCrc); p += sizeof(storedCrc);
eepromConfigSize = p - &__config_start; eepromConfigSize = p - (const uint8_t*)&__config_start;
// CRC has the property that if the CRC itself is included in the calculation the resulting CRC will have constant value // CRC has the property that if the CRC itself is included in the calculation the resulting CRC will have constant value
return crc == CRC_CHECK_VALUE; return crc == CRC_CHECK_VALUE;
@ -391,7 +391,7 @@ size_t getEEPROMStorageSize(void)
#ifdef CONFIG_IN_RAM #ifdef CONFIG_IN_RAM
return EEPROM_SIZE; return EEPROM_SIZE;
#else #else
return &__config_end - &__config_start; return (const uint8_t*)&__config_end - (const uint8_t*)&__config_start;
#endif #endif
} }
@ -400,12 +400,12 @@ size_t getEEPROMStorageSize(void)
// this function assumes that EEPROM content is valid // this function assumes that EEPROM content is valid
static const configRecord_t *findEEPROM(const pgRegistry_t *reg, configRecordFlags_e classification) static const configRecord_t *findEEPROM(const pgRegistry_t *reg, configRecordFlags_e classification)
{ {
const uint8_t *p = &__config_start; const uint8_t *p = (const uint8_t*)&__config_start;
p += sizeof(configHeader_t); // skip header p += sizeof(configHeader_t); // skip header
while (true) { while (true) {
const configRecord_t *record = (const configRecord_t *)p; const configRecord_t *record = (const configRecord_t *)p;
if (record->size == 0 if (record->size == 0
|| p + record->size >= &__config_end || p + record->size >= (const uint8_t*)&__config_end
|| record->size < sizeof(*record)) || record->size < sizeof(*record))
break; break;
if (pgN(reg) == record->pgn if (pgN(reg) == record->pgn
@ -462,7 +462,7 @@ static bool writeSettingsToEEPROM(void)
config_streamer_t streamer; config_streamer_t streamer;
config_streamer_init(&streamer); config_streamer_init(&streamer);
config_streamer_start(&streamer, (uintptr_t)&__config_start, &__config_end - &__config_start); config_streamer_start(&streamer, (uintptr_t)&__config_start, (const uint8_t*)&__config_end - (const uint8_t*)&__config_start);
config_streamer_write(&streamer, (uint8_t *)&header, sizeof(header)); config_streamer_write(&streamer, (uint8_t *)&header, sizeof(header));
uint16_t crc = CRC_START_VALUE; uint16_t crc = CRC_START_VALUE;

5
src/main/target/common_post.h
View file

@ -612,8 +612,9 @@ extern uint8_t eepromData[EEPROM_SIZE];
#ifndef CONFIG_IN_FLASH #ifndef CONFIG_IN_FLASH
#define CONFIG_IN_FLASH #define CONFIG_IN_FLASH
#endif #endif
extern uint8_t __config_start; // configured via linker script when building binaries. struct linker_symbol;
extern uint8_t __config_end; extern struct linker_symbol __config_start; // configured via linker script when building binaries.
extern struct linker_symbol __config_end;
#endif #endif
#if defined(USE_EXST) && !defined(RAMBASED) #if defined(USE_EXST) && !defined(RAMBASED)