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

Use more early returns to further simplify callbacks.

Browse Source
This commit is contained in:
Martin Ling
2022-08-07 17:30:30 +01:00
parent bcaebc00c3
commit 85a86b8baa
1 changed files with 38 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
host/hackrf-tools/src/hackrf_transfer.c
View File

@ -439,7 +439,18 @@ int rx_callback(hackrf_transfer* transfer)
transfer->buffer[i] ^= (uint8_t) 0x80; transfer->buffer[i] ^= (uint8_t) 0x80;
} }
} }
if (stream_size > 0) {
if (stream_size == 0) {
bytes_written = fwrite(transfer->buffer, 1, bytes_to_write, file);
if ((bytes_written != bytes_to_write) ||
(limit_num_samples && (bytes_to_xfer == 0))) {
stop_main_loop();
return -1;
} else {
return 0;
}
}
#ifndef _WIN32 #ifndef _WIN32
if ((stream_size - 1 + stream_head - stream_tail) % stream_size < if ((stream_size - 1 + stream_head - stream_tail) % stream_size <
bytes_to_write) { bytes_to_write) {
@ -464,16 +475,6 @@ int rx_callback(hackrf_transfer* transfer)
} }
#endif #endif
return 0; return 0;
} else {
bytes_written = fwrite(transfer->buffer, 1, bytes_to_write, file);
if ((bytes_written != bytes_to_write) ||
(limit_num_samples && (bytes_to_xfer == 0))) {
stop_main_loop();
return -1;
} else {
return 0;
}
}
} }
int tx_callback(hackrf_transfer* transfer) int tx_callback(hackrf_transfer* transfer)
@ -527,23 +528,20 @@ int tx_callback(hackrf_transfer* transfer)
stop_main_loop(); stop_main_loop();
return -1; return -1;
} }
if (bytes_read != bytes_to_read) {
if (bytes_read == bytes_to_read) {
return 0;
}
if (repeat) { if (repeat) {
fprintf(stderr, "Input file end reached. Rewind to beginning.\n"); fprintf(stderr, "Input file end reached. Rewind to beginning.\n");
rewind(file); rewind(file);
fread(transfer->buffer + bytes_read, fread(transfer->buffer + bytes_read, 1, bytes_to_read - bytes_read, file);
1,
bytes_to_read - bytes_read,
file);
return 0; return 0;
} else { } else {
stop_main_loop(); stop_main_loop();
return -1; /* not repeat mode, end of file */ return -1; /* not repeat mode, end of file */
} }
} else {
return 0;
}
} }
static int update_stats(hackrf_device* device, hackrf_m0_state* state, stats_t* stats) static int update_stats(hackrf_device* device, hackrf_m0_state* state, stats_t* stats)