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

Fold transfer_finished function into libusb transfer callback.

Browse Source
This commit is contained in:
Martin Ling
2022-09-22 12:46:42 +01:00
committed by Michael Ossmann
parent 1484b78c05
commit 4810d1f992
1 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1768,26 +1768,6 @@ static void* transfer_threadproc(void* arg)
return NULL; return NULL;
} }
static void transfer_finished(
struct hackrf_device* device,
struct libusb_transfer* finished_transfer)
{
// If a transfer finished for any reason, we're shutting down.
device->streaming = false;
// If this is the last transfer, signal that all are now finished.
pthread_mutex_lock(&device->all_finished_lock);
if (device->active_transfers == 1) {
if (!device->flush) {
device->active_transfers = 0;
pthread_cond_broadcast(&device->all_finished_cv);
}
} else {
device->active_transfers--;
}
pthread_mutex_unlock(&device->all_finished_lock);
}
static void LIBUSB_CALL hackrf_libusb_flush_callback(struct libusb_transfer* usb_transfer) static void LIBUSB_CALL hackrf_libusb_flush_callback(struct libusb_transfer* usb_transfer)
{ {
// TX buffer is now flushed, so proceed with signalling completion. // TX buffer is now flushed, so proceed with signalling completion.
@ -1857,8 +1837,20 @@ hackrf_libusb_transfer_callback(struct libusb_transfer* usb_transfer)
if (resubmit && result == LIBUSB_SUCCESS) if (resubmit && result == LIBUSB_SUCCESS)
return; return;
// Otherwise, a transfer has now finished. // Otherwise, no further calls should be made to the TX callback.
transfer_finished(device, usb_transfer); device->streaming = false;
// If this is the last transfer, signal that all are now finished.
pthread_mutex_lock(&device->all_finished_lock);
if (device->active_transfers == 1) {
if (!device->flush) {
device->active_transfers = 0;
pthread_cond_broadcast(&device->all_finished_cv);
}
} else {
device->active_transfers--;
}
pthread_mutex_unlock(&device->all_finished_lock);
} }
static int kill_transfer_thread(hackrf_device* device) static int kill_transfer_thread(hackrf_device* device)