diff options
author | Roman Zolotarev <hi@romanzolotarev.com> | 2016-04-26 16:23:10 +0800 |
---|---|---|
committer | Roman Zolotarev <hi@romanzolotarev.com> | 2016-04-26 16:23:10 +0800 |
commit | 28f0b64e31b8c30a842dfd356421356cf0513177 (patch) | |
tree | e5a76f4a2fb747c3599de1e297f46e4dc6fd4f0e /tmk_core/protocol/lufa/LUFA-git/Bootloaders | |
parent | fa2eedb7bd906634b8c500ba0d91638e63eaafed (diff) | |
parent | bf56838fe99aafd37559d560e47b707a83c87588 (diff) |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'tmk_core/protocol/lufa/LUFA-git/Bootloaders')
-rw-r--r-- | tmk_core/protocol/lufa/LUFA-git/Bootloaders/CDC/BootloaderCDC.c | 4 | ||||
-rw-r--r-- | tmk_core/protocol/lufa/LUFA-git/Bootloaders/DFU/BootloaderDFU.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tmk_core/protocol/lufa/LUFA-git/Bootloaders/CDC/BootloaderCDC.c b/tmk_core/protocol/lufa/LUFA-git/Bootloaders/CDC/BootloaderCDC.c index f66a483e6e..58bb338927 100644 --- a/tmk_core/protocol/lufa/LUFA-git/Bootloaders/CDC/BootloaderCDC.c +++ b/tmk_core/protocol/lufa/LUFA-git/Bootloaders/CDC/BootloaderCDC.c @@ -327,7 +327,7 @@ static void ReadWriteMemoryBlock(const uint8_t Command) else { /* Write the next EEPROM byte from the endpoint */ - eeprom_write_byte((uint8_t*)((intptr_t)(CurrAddress >> 1)), FetchNextCommandByte()); + eeprom_update_byte((uint8_t*)((intptr_t)(CurrAddress >> 1)), FetchNextCommandByte()); /* Increment the address counter after use */ CurrAddress += 2; @@ -581,7 +581,7 @@ static void CDC_Task(void) else if (Command == AVR109_COMMAND_WriteEEPROM) { /* Read the byte from the endpoint and write it to the EEPROM */ - eeprom_write_byte((uint8_t*)((intptr_t)(CurrAddress >> 1)), FetchNextCommandByte()); + eeprom_update_byte((uint8_t*)((intptr_t)(CurrAddress >> 1)), FetchNextCommandByte()); /* Increment the address after use */ CurrAddress += 2; diff --git a/tmk_core/protocol/lufa/LUFA-git/Bootloaders/DFU/BootloaderDFU.c b/tmk_core/protocol/lufa/LUFA-git/Bootloaders/DFU/BootloaderDFU.c index 0385bfc497..00e673268a 100644 --- a/tmk_core/protocol/lufa/LUFA-git/Bootloaders/DFU/BootloaderDFU.c +++ b/tmk_core/protocol/lufa/LUFA-git/Bootloaders/DFU/BootloaderDFU.c @@ -370,7 +370,7 @@ void EVENT_USB_Device_ControlRequest(void) } /* Read the byte from the USB interface and write to to the EEPROM */ - eeprom_write_byte((uint8_t*)StartAddr, Endpoint_Read_8()); + eeprom_update_byte((uint8_t*)StartAddr, Endpoint_Read_8()); /* Adjust counters */ StartAddr++; |