Sojus07/hackrf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix issue with rad1o compatibility check string

Browse Source
This commit is contained in:
Dominic Spill
2017-08-11 08:00:01 +01:00
parent 46945205f2
commit fb24c389a4
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
host/hackrf-tools/src/hackrf_spiflash.c
View File

@ -59,6 +59,11 @@ static struct option long_options[] = {
{ 0, 0, 0, 0 }, { 0, 0, 0, 0 },
}; };
/* Check for USB product string descriptor text in firmware file
* It should match the appropriate one for the BOARD_ID
* If you're already running firmware that reports the wrong ID
* I can't help you, but you can use the -i optionto ignore (or DFU)
*/
int compatibility_check(uint8_t* data, int length, hackrf_device* device) int compatibility_check(uint8_t* data, int length, hackrf_device* device)
{ {
int str_len, i,j; int str_len, i,j;
@ -77,18 +82,16 @@ int compatibility_check(uint8_t* data, int length, hackrf_device* device)
str_len = 10; str_len = 10;
break; break;
case BOARD_ID_RAD1O: case BOARD_ID_RAD1O:
//This is somewhat problematic, dev_str = "rad1o";
// it's a substring of the others str_len = 5;
dev_str = "HackRF";
str_len = 6;
break; break;
default: default:
printf("Unknown Board ID"); printf("Unknown Board ID");
return 1; return 1;
} }
// Search for dev_str in uint8_t array of bytes that we're flashing
for(i=0; i<length-str_len; i++){ for(i=0; i<length-str_len; i++){
if(data[i] == dev_str[0]) { if(data[i] == dev_str[0]) {
// Test rest of string
match = true; match = true;
for(j=1; j<str_len; j++) { for(j=1; j<str_len; j++) {
if((data[i+j*2] != dev_str[j]) || if((data[i+j*2] != dev_str[j]) ||