From c4789df44cf143304fa00bcef8ad000cc2ff13f3 Mon Sep 17 00:00:00 2001 From: Martin Ling Date: Fri, 18 Mar 2022 01:46:17 +0000 Subject: [PATCH] Set streaming flag in prepare_transfers(). This simplifies prepare_setup_transfers(), which was just setting the flag if prepare_transfers() returned success, and passing on its return value. --- host/libhackrf/src/hackrf.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/host/libhackrf/src/hackrf.c b/host/libhackrf/src/hackrf.c index 89f86a9f..0868c22b 100644 --- a/host/libhackrf/src/hackrf.c +++ b/host/libhackrf/src/hackrf.c @@ -351,6 +351,7 @@ static int prepare_transfers( } } device->transfers_setup = true; + device->streaming = true; return HACKRF_SUCCESS; } else { // This shouldn't happen. @@ -1813,27 +1814,16 @@ static int prepare_setup_transfers(hackrf_device* device, const uint8_t endpoint_address, hackrf_sample_block_cb_fn callback) { - int result; - if( device->transfers_setup == true ) { return HACKRF_ERROR_BUSY; } device->callback = callback; - result = prepare_transfers( + return prepare_transfers( device, endpoint_address, hackrf_libusb_transfer_callback ); - - if( result != HACKRF_SUCCESS ) - { - return result; - } - - device->streaming = true; - - return HACKRF_SUCCESS; } static int create_transfer_thread(hackrf_device* device)