mirror of
https://github.com/armel/uv-k1-k5v3-firmware-custom.git
synced 2026-10-02 03:15:37 +00:00
Extract SETTINGS_LoadEepromDtmf to file scope to drop the GCC nested-function extension
This commit is contained in:
1 parent
8051605c16
commit
874e5aac4b
1 file changed
+17
-10
+17
-10
@@ -30,6 +30,23 @@
|
||||
|
||||
EEPROM_Config_t gEeprom = { 0 };
|
||||
|
||||
// Load a DTMF code from EEPROM, falling back to default_val if invalid.
|
||||
static void SETTINGS_LoadEepromDtmf(uint32_t addr, char *dest, size_t size, const char *default_val)
|
||||
{
|
||||
uint8_t buf[16];
|
||||
|
||||
if (size > sizeof(buf))
|
||||
size = sizeof(buf);
|
||||
|
||||
PY25Q16_ReadBuffer(addr, buf, size);
|
||||
|
||||
if (DTMF_ValidateCodes((char *)buf, size)) {
|
||||
memcpy(dest, buf, size);
|
||||
} else {
|
||||
strcpy(dest, default_val);
|
||||
}
|
||||
}
|
||||
|
||||
void SETTINGS_InitEEPROM(void)
|
||||
{
|
||||
uint8_t Data[16] = {0};
|
||||
@@ -298,16 +315,6 @@ gEeprom.FreqChannel[1] = IS_FREQ_CHANNEL(Data16[5]) ? Data16[5] : (FREQ_CHANNE
|
||||
gEeprom.DTMF_CODE_PERSIST_TIME = (Data[0] < 101) ? Data[0] * 10 : 100;
|
||||
gEeprom.DTMF_CODE_INTERVAL_TIME = (Data[1] < 101) ? Data[1] * 10 : 100;
|
||||
|
||||
void SETTINGS_LoadEepromDtmf(uint32_t addr, char *dest, size_t size, const char *default_val) {
|
||||
PY25Q16_ReadBuffer(addr, Data, size);
|
||||
|
||||
if (DTMF_ValidateCodes((char *)Data, size)) {
|
||||
memcpy(dest, Data, size);
|
||||
} else {
|
||||
strcpy(dest, default_val);
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef ENABLE_DTMF_CALLING
|
||||
gEeprom.PERMIT_REMOTE_KILL = (Data[2] < 2) ? Data[2] : true;
|
||||
|
||||
|
||||
Reference in new issue
Block a user