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

Move duplicated code to one place.

Browse Source
This commit is contained in:
Martin Ling
2022-09-14 15:15:34 +01:00
parent 29787cd291
commit 16f93d9b27
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -497,15 +497,14 @@ int tx_callback(hackrf_transfer* transfer)
stream_power += sum; stream_power += sum;
bytes_to_read = transfer->buffer_length; bytes_to_read = transfer->buffer_length;
if (limit_num_samples) {
if (bytes_to_read >= bytes_to_xfer) {
bytes_to_read = bytes_to_xfer;
}
bytes_to_xfer -= bytes_to_read;
}
if (file == NULL) { // transceiver_mode == TRANSCEIVER_MODE_SS if (file == NULL) { // transceiver_mode == TRANSCEIVER_MODE_SS
/* Transmit continuous wave with specific amplitude */ /* Transmit continuous wave with specific amplitude */
if (limit_num_samples) {
if (bytes_to_read >= bytes_to_xfer) {
bytes_to_read = bytes_to_xfer;
}
bytes_to_xfer -= bytes_to_read;
}
for (i = 0; i < bytes_to_read; i++) for (i = 0; i < bytes_to_read; i++)
transfer->buffer[i] = -(uint8_t) amplitude; transfer->buffer[i] = -(uint8_t) amplitude;
@ -517,16 +516,6 @@ int tx_callback(hackrf_transfer* transfer)
} }
} }
if (limit_num_samples) {
if (bytes_to_read >= bytes_to_xfer) {
/*
* In this condition, we probably tx some of the previous
* buffer contents at the end. :-(
*/
bytes_to_read = bytes_to_xfer;
}
bytes_to_xfer -= bytes_to_read;
}
bytes_read = fread(transfer->buffer, 1, bytes_to_read, file); bytes_read = fread(transfer->buffer, 1, bytes_to_read, file);
if (limit_num_samples && (bytes_to_xfer == 0)) { if (limit_num_samples && (bytes_to_xfer == 0)) {
stop_main_loop(); stop_main_loop();