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

Merge branch 'mossmann-master' into multiple_hackrf_stop_rx_issue_463

Browse Source
This commit is contained in:
Dominic Spill
2018-03-21 16:44:07 -06:00
parent 47805d1c3b d7e2068ff1
commit bac06167f1
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hardware/hackrf-one/hackrf-one.net
View File

@ -3456,7 +3456,7 @@
(footprint hackrf:GSG-SOIC8-208) (footprint hackrf:GSG-SOIC8-208)
(fields (fields
(field (name Manufacturer) Winbond) (field (name Manufacturer) Winbond)
(field (name "Part Number") W25Q80BVSSIG) (field (name "Part Number") W25Q80JVSSIQ)
(field (name Description) "IC FLASH 8MBIT 8SOIC")) (field (name Description) "IC FLASH 8MBIT 8SOIC"))
(libsource (lib hackrf) (part W25Q80BV)) (libsource (lib hackrf) (part W25Q80BV))
(sheetpath (names /mcu/usb/power/) (tstamps /5037043E/)) (sheetpath (names /mcu/usb/power/) (tstamps /5037043E/))

4
hardware/hackrf-one/mcu.sch
View File

@ -2088,11 +2088,11 @@ L W25Q80BV U20
U 1 1 4F825D1B U 1 1 4F825D1B
P 9800 1450 P 9800 1450
F 0 "U20" H 9800 1200 60 0000 C CNN F 0 "U20" H 9800 1200 60 0000 C CNN
F 1 "W25Q80BV" H 9800 1700 60 0000 C CNN F 1 "W25Q80JV" H 9800 1700 60 0000 C CNN
F 2 "hackrf:GSG-SOIC8-208" H 9800 1450 60 0001 C CNN F 2 "hackrf:GSG-SOIC8-208" H 9800 1450 60 0001 C CNN
F 3 "" H 9800 1450 60 0001 C CNN F 3 "" H 9800 1450 60 0001 C CNN
F 4 "Winbond" H 9800 1450 60 0001 C CNN "Manufacturer" F 4 "Winbond" H 9800 1450 60 0001 C CNN "Manufacturer"
F 5 "W25Q80BVSSIG" H 9800 1450 60 0001 C CNN "Part Number" F 5 "W25Q80JVSSIQ" H 9800 1450 60 0001 C CNN "Part Number"
F 6 "IC FLASH 8MBIT 8SOIC" H 9800 1450 60 0001 C CNN "Description" F 6 "IC FLASH 8MBIT 8SOIC" H 9800 1450 60 0001 C CNN "Description"
1 9800 1450 1 9800 1450
1 0 0 -1 1 0 0 -1

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

@ -347,7 +347,6 @@ extern "C"
int ADDCALL hackrf_init(void) int ADDCALL hackrf_init(void)
{ {
int libusb_error; int libusb_error;
open_devices++;
if (g_libusb_context != NULL) { if (g_libusb_context != NULL) {
return HACKRF_SUCCESS; return HACKRF_SUCCESS;
} }
@ -356,7 +355,6 @@ int ADDCALL hackrf_init(void)
if( libusb_error != 0 ) if( libusb_error != 0 )
{ {
last_libusb_error = libusb_error; last_libusb_error = libusb_error;
open_devices--;
return HACKRF_ERROR_LIBUSB; return HACKRF_ERROR_LIBUSB;
} else { } else {
return HACKRF_SUCCESS; return HACKRF_SUCCESS;
@ -581,6 +579,7 @@ static int hackrf_open_setup(libusb_device_handle* usb_device, hackrf_device** d
} }
*device = lib_device; *device = lib_device;
open_devices++;
return HACKRF_SUCCESS; return HACKRF_SUCCESS;
} }