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

Merge branch 'master' into sweep-csv

Browse Source
This commit is contained in:
Michael Ossmann
2017-02-07 14:11:22 -07:00
parent e1b1dbd647 baafa0597c
commit 5c196eab4d
7 changed files with 54 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
host/hackrf-tools/src/hackrf_cpldjtag.c
View File

@ -120,13 +120,6 @@ int main(int argc, char** argv)
usage();
return EXIT_FAILURE;
}
if (result != HACKRF_SUCCESS) {
fprintf(stderr, "argument error: %s (%d)\n",
hackrf_error_name(result), result);
usage();
return EXIT_FAILURE;
}
}
if (path == NULL) {

19
host/hackrf-tools/src/hackrf_max2837.c
View File

@ -199,13 +199,28 @@ int main(int argc, char** argv) {
if(write) {
result = write_register(device, register_number, register_value);
if(result) {
printf("dump_registers() failed: %s (%d)\n",
hackrf_error_name(result), result);
return EXIT_FAILURE;
}
}
if(read) {
if(register_number == REGISTER_INVALID) {
result = dump_registers(device);
} else {
result = dump_register(device, register_number);
if(result) {
printf("dump_registers() failed: %s (%d)\n",
hackrf_error_name(result), result);
return EXIT_FAILURE;
}
}
} else {
result = dump_register(device, register_number);
if(result) {
printf("dump_registers() failed: %s (%d)\n",
hackrf_error_name(result), result);
return EXIT_FAILURE;
}
}

5
host/hackrf-tools/src/hackrf_operacake.c
View File

@ -112,11 +112,6 @@ int main(int argc, char** argv) {
usage();
return EXIT_FAILURE;
}
if( result != HACKRF_SUCCESS ) {
printf("argument error: %s (%d)\n", hackrf_error_name(result), result);
break;
}
}
if(!(list || set_ports)) {

15
host/hackrf-tools/src/hackrf_rffc5071.c
View File

@ -196,13 +196,28 @@ int main(int argc, char** argv) {
if(write) {
result = write_register(device, register_number, register_value);
if(result) {
printf("dump_registers() failed: %s (%d)\n",
hackrf_error_name(result), result);
return EXIT_FAILURE;
}
}
if(read) {
if(register_number == REGISTER_INVALID) {
result = dump_registers(device);
if(result) {
printf("dump_registers() failed: %s (%d)\n",
hackrf_error_name(result), result);
return EXIT_FAILURE;
}
} else {
result = dump_register(device, register_number);
if(result) {
printf("dump_registers() failed: %s (%d)\n",
hackrf_error_name(result), result);
return EXIT_FAILURE;
}
}
}

17
host/hackrf-tools/src/hackrf_si5351c.c
View File

@ -292,16 +292,29 @@ int main(int argc, char** argv) {
}
if(write) {
if( result == HACKRF_SUCCESS ) {
result = write_register(device, register_number, register_value);
result = write_register(device, register_number, register_value);
if(result) {
printf("dump_registers() failed: %s (%d)\n",
hackrf_error_name(result), result);
return EXIT_FAILURE;
}
}
if(read) {
if( register_number == REGISTER_INVALID ) {
result = dump_registers(device);
if(result) {
printf("dump_registers() failed: %s (%d)\n",
hackrf_error_name(result), result);
return EXIT_FAILURE;
}
} else {
result = dump_register(device, register_number);
if(result) {
printf("dump_registers() failed: %s (%d)\n",
hackrf_error_name(result), result);
return EXIT_FAILURE;
}
}
}

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

@ -226,11 +226,6 @@ int main(int argc, char** argv)
}
}
if((read || write) && (fd == NULL)) {
fprintf(stderr, "Failed to open file: %s\n", path);
return EXIT_FAILURE;
}
result = hackrf_init();
if (result != HACKRF_SUCCESS) {
fprintf(stderr, "hackrf_init() failed: %s (%d)\n",

12
host/libhackrf/src/hackrf.c
View File

@ -1438,12 +1438,12 @@ static void hackrf_libusb_transfer_callback(struct libusb_transfer* usb_transfer
if(usb_transfer->status == LIBUSB_TRANSFER_COMPLETED)
{
hackrf_transfer transfer = {
transfer.device = device,
transfer.buffer = usb_transfer->buffer,
transfer.buffer_length = usb_transfer->length,
transfer.valid_length = usb_transfer->actual_length,
transfer.rx_ctx = device->rx_ctx,
transfer.tx_ctx = device->tx_ctx
.device = device,
.buffer = usb_transfer->buffer,
.buffer_length = usb_transfer->length,
.valid_length = usb_transfer->actual_length,
.rx_ctx = device->rx_ctx,
.tx_ctx = device->tx_ctx
};
if( device->callback(&transfer) == 0 )