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

Merge pull request #1132 from martinling/hackrf-transfer-short-files

Browse Source 
Support repeating short files in `hackrf_transfer`
This commit is contained in:
Michael Ossmann
2022-09-05 10:37:29 -04:00
committed by GitHub
parent e41b4c5116 9b6a0259a7
commit ad5398d92c
1 changed files with 95 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -414,68 +414,67 @@ int rx_callback(hackrf_transfer* transfer)
size_t bytes_written; size_t bytes_written;
unsigned int i; unsigned int i;
if (file != NULL) { if (file == NULL) {
byte_count += transfer->valid_length;
bytes_to_write = transfer->valid_length;
if (limit_num_samples) {
if (bytes_to_write >= bytes_to_xfer) {
bytes_to_write = bytes_to_xfer;
}
bytes_to_xfer -= bytes_to_write;
}
// accumulate stream_amplitude:
for (i = 0; i < bytes_to_write; i++) {
stream_amplitude += abs((signed char) transfer->buffer[i]);
}
if (receive_wav) {
/* convert .wav contents from signed to unsigned */
for (i = 0; i < bytes_to_write; i++) {
transfer->buffer[i] ^= (uint8_t) 0x80;
}
}
if (stream_size > 0) {
#ifndef _WIN32
if ((stream_size - 1 + stream_head - stream_tail) % stream_size <
bytes_to_write) {
stream_drop++;
} else {
if (stream_tail + bytes_to_write <= stream_size) {
memcpy(stream_buf + stream_tail,
transfer->buffer,
bytes_to_write);
} else {
memcpy(stream_buf + stream_tail,
transfer->buffer,
(stream_size - stream_tail));
memcpy(stream_buf,
transfer->buffer +
(stream_size - stream_tail),
bytes_to_write -
(stream_size - stream_tail));
};
__atomic_store_n(
&stream_tail,
(stream_tail + bytes_to_write) % stream_size,
__ATOMIC_RELEASE);
}
#endif
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;
}
}
} else {
stop_main_loop(); stop_main_loop();
return -1; return -1;
} }
byte_count += transfer->valid_length;
bytes_to_write = transfer->valid_length;
if (limit_num_samples) {
if (bytes_to_write >= bytes_to_xfer) {
bytes_to_write = bytes_to_xfer;
}
bytes_to_xfer -= bytes_to_write;
}
// accumulate stream_amplitude:
for (i = 0; i < bytes_to_write; i++) {
stream_amplitude += abs((signed char) transfer->buffer[i]);
}
if (receive_wav) {
/* convert .wav contents from signed to unsigned */
for (i = 0; i < bytes_to_write; i++) {
transfer->buffer[i] ^= (uint8_t) 0x80;
}
}
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
if ((stream_size - 1 + stream_head - stream_tail) % stream_size <
bytes_to_write) {
stream_drop++;
} else {
if (stream_tail + bytes_to_write <= stream_size) {
memcpy(stream_buf + stream_tail,
transfer->buffer,
bytes_to_write);
} else {
memcpy(stream_buf + stream_tail,
transfer->buffer,
(stream_size - stream_tail));
memcpy(stream_buf,
transfer->buffer + (stream_size - stream_tail),
bytes_to_write - (stream_size - stream_tail));
};
__atomic_store_n(
&stream_tail,
(stream_tail + bytes_to_write) % stream_size,
__ATOMIC_RELEASE);
}
#endif
return 0;
} }
int tx_callback(hackrf_transfer* transfer) int tx_callback(hackrf_transfer* transfer)
@ -494,41 +493,7 @@ int tx_callback(hackrf_transfer* transfer)
stream_amplitude += abs((signed char) transfer->buffer[i]); stream_amplitude += abs((signed char) transfer->buffer[i]);
} }
if (file != NULL) { if (file == NULL) { // transceiver_mode == TRANSCEIVER_MODE_SS
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);
if (limit_num_samples && (bytes_to_xfer == 0)) {
stop_main_loop();
return -1;
}
if (bytes_read != bytes_to_read) {
if (repeat) {
fprintf(stderr,
"Input file end reached. Rewind to beginning.\n");
rewind(file);
fread(transfer->buffer + bytes_read,
1,
bytes_to_read - bytes_read,
file);
return 0;
} else {
stop_main_loop();
return -1; /* not repeat mode, end of file */
}
} else {
return 0;
}
} else { // transceiver_mode == TRANSCEIVER_MODE_SS
/* Transmit continuous wave with specific amplitude */ /* Transmit continuous wave with specific amplitude */
if (limit_num_samples) { if (limit_num_samples) {
if (bytes_to_read >= bytes_to_xfer) { if (bytes_to_read >= bytes_to_xfer) {
@ -547,6 +512,42 @@ int tx_callback(hackrf_transfer* transfer)
return 0; return 0;
} }
} }
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);
if (limit_num_samples && (bytes_to_xfer == 0)) {
stop_main_loop();
return -1;
}
if (bytes_read == bytes_to_read) {
return 0;
}
if (!repeat) {
stop_main_loop();
return -1; /* not repeat mode, end of file */
}
while (bytes_read < bytes_to_read) {
rewind(file);
bytes_read +=
fread(transfer->buffer + bytes_read,
1,
bytes_to_read - bytes_read,
file);
}
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)