nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

validate full area was read from file

Browse Source
This commit is contained in:
John
2021-11-20 17:51:56 +01:00
parent 803c2542f2
commit 420f70ace3
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tools/ebuspicloader.cpp
+16
View File
@@ -676,12 +676,15 @@ int calcFileChecksum(uint8_t* storeFirstBlock = nullptr) {
} }
unsigned long blockStart = END_BOOT_BYTES; unsigned long blockStart = END_BOOT_BYTES;
uint16_t checkSum = 0; uint16_t checkSum = 0;
uint16_t skipped = 0;
while (blockStart < END_FLASH_BYTES && nextAddr < END_FLASH_BYTES) { while (blockStart < END_FLASH_BYTES && nextAddr < END_FLASH_BYTES) {
for (int pos = 0; pos < WRITE_FLASH_BLOCKSIZE; pos++, nextAddr++) { for (int pos = 0; pos < WRITE_FLASH_BLOCKSIZE; pos++, nextAddr++) {
unsigned long addr = ih.currentAddress(); unsigned long addr = ih.currentAddress();
uint8_t value = (pos&0x1) == 1 ? 0x3f : 0xff; uint8_t value = (pos&0x1) == 1 ? 0x3f : 0xff;
if (addr == nextAddr && ih.getData(&value)) { if (addr == nextAddr && ih.getData(&value)) {
ih.incrementAddress(); ih.incrementAddress();
} else {
skipped++;
} }
if (storeFirstBlock && nextAddr < END_BOOT_BYTES+0x10) { if (storeFirstBlock && nextAddr < END_BOOT_BYTES+0x10) {
storeFirstBlock[pos] = value; storeFirstBlock[pos] = value;
@@ -690,12 +693,19 @@ int calcFileChecksum(uint8_t* storeFirstBlock = nullptr) {
} }
blockStart += WRITE_FLASH_BLOCKSIZE; blockStart += WRITE_FLASH_BLOCKSIZE;
} }
if (nextAddr-END_BOOT_BYTES != ih.size()+skipped) {
std::cout << "unable to fully read file." << std::endl;
return -1;
}
return checkSum; return checkSum;
} }
void printFileChecksum() { void printFileChecksum() {
uint8_t data[0x10]; uint8_t data[0x10];
int checkSum = calcFileChecksum(data); int checkSum = calcFileChecksum(data);
if (checkSum < 0) {
return;
}
int newFirmwareVersion = -1; int newFirmwareVersion = -1;
if (data[0x2*2] == 0xae && data[0x2*2+1] == 0x34 && data[0x3*2+1] == 0x34) { if (data[0x2*2] == 0xae && data[0x2*2+1] == 0x34 && data[0x3*2+1] == 0x34) {
newFirmwareVersion = data[0x3*2]; newFirmwareVersion = data[0x3*2];
@@ -754,6 +764,7 @@ bool flashPic(int fd) {
} }
unsigned long blockStart = END_BOOT_BYTES; unsigned long blockStart = END_BOOT_BYTES;
uint16_t checkSum = 0; uint16_t checkSum = 0;
uint16_t skipped = 0;
int eraseRes = eraseFlash(fd, blockStart/2, (endAddr-blockStart)/2); int eraseRes = eraseFlash(fd, blockStart/2, (endAddr-blockStart)/2);
if (eraseRes != 0) { if (eraseRes != 0) {
std::cerr << "erasing flash failed: " << static_cast<signed>(-eraseRes-1) << std::endl; std::cerr << "erasing flash failed: " << static_cast<signed>(-eraseRes-1) << std::endl;
@@ -771,6 +782,8 @@ bool flashPic(int fd) {
if (addr == nextAddr && ih.getData(&value)) { if (addr == nextAddr && ih.getData(&value)) {
ih.incrementAddress(); ih.incrementAddress();
blank = false; blank = false;
} else {
skipped++;
} }
buf[pos] = value; buf[pos] = value;
checkSum += ((uint16_t)value) << ((pos&0x1)*8); checkSum += ((uint16_t)value) << ((pos&0x1)*8);
@@ -797,6 +810,9 @@ bool flashPic(int fd) {
blockStart += WRITE_FLASH_BLOCKSIZE; blockStart += WRITE_FLASH_BLOCKSIZE;
} }
std::cout << std::endl << "flashing finished." << std::endl; std::cout << std::endl << "flashing finished." << std::endl;
if (nextAddr-END_BOOT_BYTES != ih.size()+skipped) {
std::cout << "unable to fully read file." << std::endl;
}
int picSum = calcChecksum(fd, startAddr/2, blockStart-startAddr); int picSum = calcChecksum(fd, startAddr/2, blockStart-startAddr);
if (picSum < 0) { if (picSum < 0) {
std::cout << "unable to read checksum." << std::endl; std::cout << "unable to read checksum." << std::endl;