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

Clear streaming flag in transfer_finished().

Browse Source 
Since we always do these together, move it into the function.
This commit is contained in:
Martin Ling
2022-03-18 01:12:29 +00:00
parent 6bd9cb0553
commit 54e00de167
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1704,6 +1704,9 @@ static void transfer_finished(struct hackrf_device* device, struct libusb_transf
int i; int i;
bool all_finished = true; bool all_finished = true;
// If a transfer finished for any reason, we're shutting down.
device->streaming = false;
for (i = 0; i < TRANSFER_COUNT; i++) { for (i = 0; i < TRANSFER_COUNT; i++) {
if (device->transfers[i] == finished_transfer) { if (device->transfers[i] == finished_transfer) {
device->transfer_finished[i] = true; device->transfer_finished[i] = true;
@ -1754,22 +1757,18 @@ static void LIBUSB_CALL hackrf_libusb_transfer_callback(struct libusb_transfer*
if (!resubmit || result < 0) { if (!resubmit || result < 0) {
transfer_finished(device, usb_transfer); transfer_finished(device, usb_transfer);
device->streaming = false;
} }
} else { } else {
transfer_finished(device, usb_transfer); transfer_finished(device, usb_transfer);
device->streaming = false;
} }
} else if(usb_transfer->status == LIBUSB_TRANSFER_CANCELLED) { } else if(usb_transfer->status == LIBUSB_TRANSFER_CANCELLED) {
transfer_finished(device, usb_transfer); transfer_finished(device, usb_transfer);
device->streaming = false;
} else { } else {
/* Other cases LIBUSB_TRANSFER_NO_DEVICE /* Other cases LIBUSB_TRANSFER_NO_DEVICE
LIBUSB_TRANSFER_ERROR, LIBUSB_TRANSFER_TIMED_OUT LIBUSB_TRANSFER_ERROR, LIBUSB_TRANSFER_TIMED_OUT
LIBUSB_TRANSFER_STALL, LIBUSB_TRANSFER_OVERFLOW .... LIBUSB_TRANSFER_STALL, LIBUSB_TRANSFER_OVERFLOW ....
*/ */
transfer_finished(device, usb_transfer); transfer_finished(device, usb_transfer);
device->streaming = false;
} }
} }