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

Merge pull request #437 from gvz/master

Browse Source 
libhackrf: counts the open devices, prevents exit if not all closed
This commit is contained in:
Michael Ossmann
2018-02-02 15:03:46 -07:00
committed by GitHub
parent 3447863a8b 73ca8c09dd
commit 6da3593781
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,6 +150,7 @@ static const uint16_t hackrf_usb_vid = 0x1d50;
static const uint16_t hackrf_jawbreaker_usb_pid = 0x604b;
static const uint16_t hackrf_one_usb_pid = 0x6089;
static const uint16_t rad1o_usb_pid = 0xcc15;
static uint16_t open_devices = 0;
static libusb_context* g_libusb_context = NULL;
int last_libusb_error = LIBUSB_SUCCESS;
@ -347,6 +348,7 @@ extern "C"
int ADDCALL hackrf_init(void)
{
int libusb_error;
open_devices++;
if (g_libusb_context != NULL) {
return HACKRF_SUCCESS;
}
@ -355,6 +357,7 @@ int ADDCALL hackrf_init(void)
if( libusb_error != 0 )
{
last_libusb_error = libusb_error;
open_devices--;
return HACKRF_ERROR_LIBUSB;
} else {
return HACKRF_SUCCESS;
@ -362,6 +365,9 @@ int ADDCALL hackrf_init(void)
}
int ADDCALL hackrf_exit(void)
{
if( open_devices == 0)
{
if( g_libusb_context != NULL )
{
@ -370,6 +376,9 @@ int ADDCALL hackrf_exit(void)
}
return HACKRF_SUCCESS;
} else {
return HACKRF_ERROR_NOT_LAST_DEVICE;
}
}
#ifndef LIBRARY_VERSION
@ -1674,6 +1683,7 @@ int ADDCALL hackrf_close(hackrf_device* device)
free(device);
}
open_devices--;
if (result2 != HACKRF_SUCCESS)
{
@ -1726,6 +1736,9 @@ const char* ADDCALL hackrf_error_name(enum hackrf_error errcode)
case HACKRF_ERROR_USB_API_VERSION:
return "feature not supported by installed firmware";
case HACKRF_ERROR_NOT_LAST_DEVICE:
return "some hackrf is sill in use";
case HACKRF_ERROR_OTHER:
return "unspecified error";

1
host/libhackrf/src/hackrf.h
View File

@ -64,6 +64,7 @@ enum hackrf_error {
HACKRF_ERROR_STREAMING_STOPPED = -1003,
HACKRF_ERROR_STREAMING_EXIT_CALLED = -1004,
HACKRF_ERROR_USB_API_VERSION = -1005,
HACKRF_ERROR_NOT_LAST_DEVICE = -2000,
HACKRF_ERROR_OTHER = -9999,
};