github.com/mist-devel.mist-firmware
1
0
Fork 0
mirror of https://github.com/mist-devel/mist-firmware.git synced 2026-02-03 14:53:05 +00:00
Code Releases Activity

firmware: update the same precheck methods as the upgrade

Browse Source 
...so the firmware upgrade should fail in precheck, not when the flash is erased
This commit is contained in:
Gyorgy Szombathelyi
2023-12-14 13:57:48 +01:00
parent 19095c25eb
commit 84aefe48da
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
firmware.c
View File

@@ -26,6 +26,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "fat_compat.h"
#include "firmware.h"
static DWORD clmt[99];
unsigned long CalculateCRC32(unsigned long crc, unsigned char *pBuffer, unsigned long nSize) {
int i, j;
unsigned long byte, mask;
@@ -60,7 +62,10 @@ unsigned char CheckFirmware(char *name)
if (f_size(&file) >= sizeof(UPGRADE))
{
FileReadBlock(&file, sector_buffer);
clmt[0] = 99;
file.cltbl = clmt;
if (f_lseek(&file, CREATE_LINKMAP) == FR_OK) {
FileReadNextBlock(&file, sector_buffer);
crc = ~CalculateCRC32(-1, sector_buffer, sizeof(UPGRADE) - 4);
iprintf("Upgrade ROM size : %lu\r", pUpgrade->rom.size);
iprintf("Upgrade header CRC : %08lX\r", pUpgrade->crc);
@@ -83,7 +88,7 @@ unsigned char CheckFirmware(char *name)
else
read_size = size;
FileReadBlock(&file, sector_buffer);
FileReadNextBlock(&file, sector_buffer);
crc = CalculateCRC32(crc, sector_buffer, read_size);
size -= read_size;
}
@@ -102,6 +107,8 @@ unsigned char CheckFirmware(char *name)
else iprintf("Invalid upgrade file header!\r");
}
else iprintf("Header CRC mismatch! from header: %08lX, calculated: %08lX\r", pUpgrade->crc, crc);
}
else iprintf("Error creating linkmap\r");
}
else iprintf("Upgrade file size too small: %llu\r", f_size(&file));
f_close(&file);
@@ -141,7 +148,6 @@ RAMFUNC void WriteFirmware(char *name)
unsigned long *pDst;
FSIZE_t size;
FIL file;
static DWORD clmt[99];
// Since the file may have changed in the meantime, it needs to be