sravan/system76-embedded-controller
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use sizeof(CONFIG_SIGNATURE) to calculate offset of keymap

Browse Source
This commit is contained in:
Jeremy Soller
2020-10-01 10:49:59 -06:00
committed by Jeremy Soller
parent 916a6f87f3
commit f980257086
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/board/system76/common/keymap.c
View File

@ -37,7 +37,7 @@ bool keymap_load_config(void) {
if (flash_read_u16(CONFIG_ADDR) != CONFIG_SIGNATURE) return false; if (flash_read_u16(CONFIG_ADDR) != CONFIG_SIGNATURE) return false;
// Read the keymap if signature is valid // Read the keymap if signature is valid
flash_read(CONFIG_ADDR + 2, (uint8_t *)DYNAMIC_KEYMAP, sizeof(DYNAMIC_KEYMAP)); flash_read(CONFIG_ADDR + sizeof(CONFIG_SIGNATURE), (uint8_t *)DYNAMIC_KEYMAP, sizeof(DYNAMIC_KEYMAP));
return true; return true;
} }
@ -46,7 +46,7 @@ bool keymap_save_config(void) {
if (!keymap_erase_config()) return false; if (!keymap_erase_config()) return false;
// Write the keymap // Write the keymap
flash_write(CONFIG_ADDR + 2, (uint8_t *)DYNAMIC_KEYMAP, sizeof(DYNAMIC_KEYMAP)); flash_write(CONFIG_ADDR + sizeof(CONFIG_SIGNATURE), (uint8_t *)DYNAMIC_KEYMAP, sizeof(DYNAMIC_KEYMAP));
// Write the length of the keymap, as a signature // Write the length of the keymap, as a signature
flash_write_u16(CONFIG_ADDR, CONFIG_SIGNATURE); flash_write_u16(CONFIG_ADDR, CONFIG_SIGNATURE);