avr/bootloader
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Implement writing flash memory

Browse Source
This commit is contained in:
BlackMark 2020-04-12 00:15:26 +02:00
parent 289e66160e
commit 6f9d8bae42
1 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
stk500v2/main.cpp
View File

@ -153,6 +153,16 @@ static inline bool isChipEraseIsp(const Message &msg)
return false; return false;
} }
static inline bool isProgramFlashIsp(const Message &msg)
{
if (msg.body[0] == CMD_PROGRAM_FLASH_ISP) {
const auto dataSize = static_cast<uint16_t>(msg.body[1]) << 8 | msg.body[2];
if (msg.size == (dataSize + 10) && dataSize == SPM_PAGESIZE)
return true;
}
return false;
}
static inline bool isProgramEepromIsp(const Message &msg) static inline bool isProgramEepromIsp(const Message &msg)
{ {
if (msg.body[0] == CMD_PROGRAM_EEPROM_ISP) { if (msg.body[0] == CMD_PROGRAM_EEPROM_ISP) {
@ -330,6 +340,24 @@ void writeEepromByte(uint8_t *addr, uint8_t value)
EECR |= (1 << EEPE); EECR |= (1 << EEPE);
} }
//////////////////////////////////////////////////////////////////////////
void writeFlashPage(uint32_t pageAddress, const uint8_t *data)
{
boot_page_erase(pageAddress);
boot_spm_busy_wait();
for (uint16_t i = 0; i < SPM_PAGESIZE; i += 2) {
uint16_t dataWord = *data++;
dataWord |= (*data++) << 8;
boot_page_fill(pageAddress + i, dataWord);
}
boot_page_write(pageAddress);
boot_spm_busy_wait();
boot_rww_enable();
}
} // namespace } // namespace
static inline uint16_t getBootloaderSize() static inline uint16_t getBootloaderSize()
@ -407,6 +435,19 @@ static inline void formatReadEepromIspAnswer(Message &msg, uint32_t &addr)
msg.checksum = calcChecksum(msg); msg.checksum = calcChecksum(msg);
} }
static inline void formatProgramFlashIspAnswer(Message &msg, uint32_t &addr)
{
if (addr < getFlashSize())
writeFlashPage(addr, msg.body + 10);
const uint16_t numBytes = static_cast<uint16_t>(msg.body[1]) << 8 | msg.body[2];
addr += numBytes;
msg.size = 2;
msg.body[1] = STATUS_CMD_OK;
msg.checksum = calcChecksum(msg);
}
static inline void formatProgramEepromIspAnswer(Message &msg, uint32_t &addr) static inline void formatProgramEepromIspAnswer(Message &msg, uint32_t &addr)
{ {
const uint16_t numBytes = static_cast<uint16_t>(msg.body[1]) << 8 | msg.body[2]; const uint16_t numBytes = static_cast<uint16_t>(msg.body[1]) << 8 | msg.body[2];
@ -485,7 +526,9 @@ static inline void handleMessage(Message &msg, uint32_t &addr, ChipEraseState &c
else if (isChipEraseIsp(msg)) { else if (isChipEraseIsp(msg)) {
chipEraseFlag = ChipEraseState::REQUEST; chipEraseFlag = ChipEraseState::REQUEST;
formatChipEraseIspAnswer(msg); formatChipEraseIspAnswer(msg);
} else if (isProgramEepromIsp(msg)) } else if (isProgramFlashIsp(msg))
formatProgramFlashIspAnswer(msg, addr);
else if (isProgramEepromIsp(msg))
formatProgramEepromIspAnswer(msg, addr); formatProgramEepromIspAnswer(msg, addr);
else if (isLeaveProgmodeIsp(msg)) { else if (isLeaveProgmodeIsp(msg)) {
chipEraseFlag |= ChipEraseState::RESPONSE; chipEraseFlag |= ChipEraseState::RESPONSE;