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

Add reading of eeprom

Browse Source
This commit is contained in:
BlackMark 2020-04-11 17:48:13 +02:00
parent c46ba6bbb3
commit 9c24c32f3d
1 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
stk500v2/main.cpp
View File

@ -4,6 +4,7 @@
#include <avr/boot.h> #include <avr/boot.h>
#include <avr/interrupt.h> #include <avr/interrupt.h>
#include <avr/io.h>
#include <avr/pgmspace.h> #include <avr/pgmspace.h>
#include "command.hpp" #include "command.hpp"
@ -126,6 +127,13 @@ static inline bool isReadFlashIsp(const Message &msg)
return false; return false;
} }
static inline bool isReadEepromIsp(const Message &msg)
{
if (msg.size == 4 && msg.body[0] == CMD_READ_EEPROM_ISP)
return true;
return false;
}
static inline bool isLeaveProgmodeIsp(const Message &msg) static inline bool isLeaveProgmodeIsp(const Message &msg)
{ {
if (msg.size == 3 && msg.body[0] == CMD_LEAVE_PROGMODE_ISP) if (msg.size == 3 && msg.body[0] == CMD_LEAVE_PROGMODE_ISP)
@ -264,6 +272,43 @@ static inline void formatReadFlashIspAnswer(Message &msg, uint32_t &addr)
msg.checksum = calcChecksum(msg); msg.checksum = calcChecksum(msg);
} }
namespace {
bool isEepromReady()
{
return (EECR & (1 << EEPE)) ? false : true;
}
void waitEepromReady()
{
while (!isEepromReady())
;
}
uint8_t readEepromByte(const uint8_t *addr)
{
EEAR = reinterpret_cast<uint16_t>(addr);
EECR |= (1 << EERE);
return EEDR;
}
} // namespace
static inline void formatReadEepromIspAnswer(Message &msg, uint32_t &addr)
{
const uint16_t numBytes = static_cast<uint16_t>(msg.body[1]) << 8 | msg.body[2];
msg.size = 3 + numBytes;
msg.body[1] = STATUS_CMD_OK;
waitEepromReady();
for (uint16_t i = 0; i < numBytes; ++i) {
msg.body[i + 2] = readEepromByte(reinterpret_cast<const uint8_t *>(addr + i));
}
addr += numBytes;
msg.body[numBytes + 2] = STATUS_CMD_OK;
msg.checksum = calcChecksum(msg);
}
static inline void formatLeaveProgmodeIspAnswer(Message &msg) static inline void formatLeaveProgmodeIspAnswer(Message &msg)
{ {
msg.size = 2; msg.size = 2;
@ -307,6 +352,8 @@ static inline void handleMessage(Message &msg)
formatLoadAddressAnswer(msg); formatLoadAddressAnswer(msg);
} else if (isReadFlashIsp(msg)) } else if (isReadFlashIsp(msg))
formatReadFlashIspAnswer(msg, s_address); formatReadFlashIspAnswer(msg, s_address);
else if (isReadEepromIsp(msg))
formatReadEepromIspAnswer(msg, s_address);
else if (isLeaveProgmodeIsp(msg)) else if (isLeaveProgmodeIsp(msg))
formatLeaveProgmodeIspAnswer(msg); formatLeaveProgmodeIspAnswer(msg);
else else