neil/blisp
1
0
Fork 0
mirror of https://github.com/pine64/blisp.git synced 2025-03-13 10:28:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update dfu_file.c

Browse Source
This commit is contained in:
Ben V. Brown 2023-08-01 18:49:14 +10:00
parent c63883bfa7
commit ec44c2358b
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/blisp/src/file_parsers/dfu/dfu_file.c
View File

@ -200,7 +200,7 @@ struct dfu_file parse_dfu_suffix(const uint8_t* file_contents,
if (file_contents_length < DFU_SUFFIX_LENGTH) { if (file_contents_length < DFU_SUFFIX_LENGTH) {
reason = "File too short for DFU suffix"; reason = "File too short for DFU suffix";
missing_suffix = 1; missing_suffix = 1;
goto checked; goto file_checked;
} }
dfu_suffix = file_contents + file_contents_length - DFU_SUFFIX_LENGTH; dfu_suffix = file_contents + file_contents_length - DFU_SUFFIX_LENGTH;
@ -208,7 +208,7 @@ struct dfu_file parse_dfu_suffix(const uint8_t* file_contents,
if (dfu_suffix[10] != 'D' || dfu_suffix[9] != 'F' || dfu_suffix[8] != 'U') { if (dfu_suffix[10] != 'D' || dfu_suffix[9] != 'F' || dfu_suffix[8] != 'U') {
reason = "Invalid DFU suffix signature"; reason = "Invalid DFU suffix signature";
missing_suffix = 1; missing_suffix = 1;
goto checked; goto file_checked;
} }
// Calculate contents CRC32 // Calculate contents CRC32
for (int i = 0; i < file_contents_length - 4; i++) { for (int i = 0; i < file_contents_length - 4; i++) {
@ -221,7 +221,7 @@ struct dfu_file parse_dfu_suffix(const uint8_t* file_contents,
if (output.dwCRC != crc) { if (output.dwCRC != crc) {
reason = "DFU suffix CRC does not match"; reason = "DFU suffix CRC does not match";
missing_suffix = 1; missing_suffix = 1;
goto checked; goto file_checked;
} }
/* At this point we believe we have a DFU suffix /* At this point we believe we have a DFU suffix
@ -243,8 +243,9 @@ struct dfu_file parse_dfu_suffix(const uint8_t* file_contents,
output.idProduct = (dfu_suffix[3] << 8) + dfu_suffix[2]; output.idProduct = (dfu_suffix[3] << 8) + dfu_suffix[2];
output.bcdDevice = (dfu_suffix[1] << 8) + dfu_suffix[0]; output.bcdDevice = (dfu_suffix[1] << 8) + dfu_suffix[0];
checked: file_checked:
int res = probe_prefix(&output);
const int res = probe_prefix(&output);
if (output.size.prefix) { if (output.size.prefix) {
const uint8_t* data = file_contents; const uint8_t* data = file_contents;