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.
This commit is contained in:
@ -351,6 +351,7 @@ static int prepare_transfers(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
device->transfers_setup = true;
|
device->transfers_setup = true;
|
||||||
|
device->streaming = true;
|
||||||
return HACKRF_SUCCESS;
|
return HACKRF_SUCCESS;
|
||||||
} else {
|
} else {
|
||||||
// This shouldn't happen.
|
// This shouldn't happen.
|
||||||
@ -1813,27 +1814,16 @@ static int prepare_setup_transfers(hackrf_device* device,
|
|||||||
const uint8_t endpoint_address,
|
const uint8_t endpoint_address,
|
||||||
hackrf_sample_block_cb_fn callback)
|
hackrf_sample_block_cb_fn callback)
|
||||||
{
|
{
|
||||||
int result;
|
|
||||||
|
|
||||||
if( device->transfers_setup == true )
|
if( device->transfers_setup == true )
|
||||||
{
|
{
|
||||||
return HACKRF_ERROR_BUSY;
|
return HACKRF_ERROR_BUSY;
|
||||||
}
|
}
|
||||||
|
|
||||||
device->callback = callback;
|
device->callback = callback;
|
||||||
result = prepare_transfers(
|
return prepare_transfers(
|
||||||
device, endpoint_address,
|
device, endpoint_address,
|
||||||
hackrf_libusb_transfer_callback
|
hackrf_libusb_transfer_callback
|
||||||
);
|
);
|
||||||
|
|
||||||
if( result != HACKRF_SUCCESS )
|
|
||||||
{
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
device->streaming = true;
|
|
||||||
|
|
||||||
return HACKRF_SUCCESS;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int create_transfer_thread(hackrf_device* device)
|
static int create_transfer_thread(hackrf_device* device)
|
||||||
|
Reference in New Issue
Block a user