hugovil/emu8051
1
0
Fork 0
mirror of http://git.hugovil.com/git/emu8051.git synced 2025-10-14 02:48:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor hex loading code

Browse Source 
Merged two identical code portions that validated the checksum.

Also added better debug messages.
This commit is contained in:
Hugo Villeneuve
2014-01-26 17:52:21 -05:00
parent fc904031c8
commit 1f9c51e5df
1 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/common/hexfile.c
View File

@@ -140,36 +140,35 @@ LoadHexFile(const char *filename)
i += 2;
Checksum += RecType;
if (RecType == 1) {
Checksum += Ascii2Hex(&line[i], 2);
Checksum &= 0x000000FF;
if (Checksum) {
log_err("hexfile invalid format");
goto close_file;
} else {
/* OK */
goto close_file;
if (RecType == 0) {
for (j = 0; j < RecLength; j++) {
Data = Ascii2Hex(&line[i], 2);
memory_write8(PGM_MEM_ID,
(unsigned int)(LoadOffset + j),
(unsigned char)Data);
i += 2;
Checksum += Data;
}
}
for (j = 0; j < RecLength; j++) {
Data = Ascii2Hex(&line[i], 2);
memory_write8(PGM_MEM_ID,
(unsigned int)(LoadOffset + j),
(unsigned char)Data);
i += 2;
Checksum += Data;
}
RecType = Ascii2Hex(&line[i], 2);
Checksum += RecType;
/* Read and add checksum value */
Checksum += Ascii2Hex(&line[i], 2);
Checksum &= 0x000000FF;
/* Make sure line checksum is valid */
if (Checksum) {
log_err("hexfile checksum mismatch");
goto close_file;
}
if (RecType == 0) {
log_debug("hex record: data");
} else if (RecType == 1) {
log_debug("hex record: End Of File");
goto close_file;
} else {
log_warn("hex record: Unsupported ($%02X)", RecType);
}
}
close_file: