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

Use rad1o's PID

Browse Source
This commit is contained in:
Dominic Spill
2015-07-21 16:42:24 +01:00
parent 0b7f04c527
commit 8cd0cf1b0e
6 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
host/libhackrf/53-hackrf.rules
View File

@ -1,3 +1,4 @@
ATTR{idVendor}=="1d50", ATTR{idProduct}=="604b", SYMLINK+="hackrf-jawbreaker-%k", MODE="660", GROUP="plugdev" ATTR{idVendor}=="1d50", ATTR{idProduct}=="604b", SYMLINK+="hackrf-jawbreaker-%k", MODE="660", GROUP="plugdev"
ATTR{idVendor}=="1d50", ATTR{idProduct}=="6089", SYMLINK+="hackrf-one-%k", MODE="660", GROUP="plugdev" ATTR{idVendor}=="1d50", ATTR{idProduct}=="6089", SYMLINK+="hackrf-one-%k", MODE="660", GROUP="plugdev"
ATTR{idVendor}=="1d50", ATTR{idProduct}=="cc15", SYMLINK+="rad1o-%k", MODE="660", GROUP="plugdev"
ATTR{idVendor}=="1fc9", ATTR{idProduct}=="000c", SYMLINK+="nxp-dfu-%k", MODE="660", GROUP="plugdev" ATTR{idVendor}=="1fc9", ATTR{idProduct}=="000c", SYMLINK+="nxp-dfu-%k", MODE="660", GROUP="plugdev"

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

@ -122,6 +122,7 @@ volatile bool do_exit = false;
static const uint16_t hackrf_usb_vid = 0x1d50; static const uint16_t hackrf_usb_vid = 0x1d50;
static const uint16_t hackrf_jawbreaker_usb_pid = 0x604b; static const uint16_t hackrf_jawbreaker_usb_pid = 0x604b;
static const uint16_t hackrf_one_usb_pid = 0x6089; static const uint16_t hackrf_one_usb_pid = 0x6089;
static const uint16_t rad1o_usb_pid = 0xcc15;
static libusb_context* g_libusb_context = NULL; static libusb_context* g_libusb_context = NULL;
@ -362,7 +363,9 @@ hackrf_device_list_t* ADDCALL hackrf_device_list()
libusb_get_device_descriptor(list->usb_devices[i], &device_descriptor); libusb_get_device_descriptor(list->usb_devices[i], &device_descriptor);
if( device_descriptor.idVendor == hackrf_usb_vid ) { if( device_descriptor.idVendor == hackrf_usb_vid ) {
if( (device_descriptor.idProduct == hackrf_one_usb_pid) || (device_descriptor.idProduct == hackrf_jawbreaker_usb_pid) ) { if((device_descriptor.idProduct == hackrf_one_usb_pid) ||
(device_descriptor.idProduct == hackrf_jawbreaker_usb_pid) ||
(device_descriptor.idProduct == rad1o_usb_pid)) {
int idx = list->devicecount++; int idx = list->devicecount++;
list->usb_board_ids[idx] = device_descriptor.idProduct; list->usb_board_ids[idx] = device_descriptor.idProduct;
list->usb_device_index[idx] = i; list->usb_device_index[idx] = i;
@ -431,7 +434,9 @@ libusb_device_handle* hackrf_open_usb(const char* const desired_serial_number)
libusb_get_device_descriptor(devices[i], &device_descriptor); libusb_get_device_descriptor(devices[i], &device_descriptor);
if( device_descriptor.idVendor == hackrf_usb_vid ) { if( device_descriptor.idVendor == hackrf_usb_vid ) {
if( (device_descriptor.idProduct == hackrf_one_usb_pid) || (device_descriptor.idProduct == hackrf_jawbreaker_usb_pid) ) { if((device_descriptor.idProduct == hackrf_one_usb_pid) ||
(device_descriptor.idProduct == hackrf_jawbreaker_usb_pid) ||
(device_descriptor.idProduct == rad1o_usb_pid)) {
printf("USB device %4x:%4x:", device_descriptor.idVendor, device_descriptor.idProduct); printf("USB device %4x:%4x:", device_descriptor.idVendor, device_descriptor.idProduct);
if( desired_serial_number != NULL ) { if( desired_serial_number != NULL ) {
@ -548,6 +553,11 @@ int ADDCALL hackrf_open(hackrf_device** device)
usb_device = libusb_open_device_with_vid_pid(g_libusb_context, hackrf_usb_vid, hackrf_jawbreaker_usb_pid); usb_device = libusb_open_device_with_vid_pid(g_libusb_context, hackrf_usb_vid, hackrf_jawbreaker_usb_pid);
} }
if( usb_device == NULL )
{
usb_device = libusb_open_device_with_vid_pid(g_libusb_context, hackrf_usb_vid, rad1o_usb_pid);
}
if( usb_device == NULL ) if( usb_device == NULL )
{ {
return HACKRF_ERROR_NOT_FOUND; return HACKRF_ERROR_NOT_FOUND;

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

@ -72,6 +72,7 @@ enum hackrf_board_id {
enum hackrf_usb_board_id { enum hackrf_usb_board_id {
USB_BOARD_ID_JAWBREAKER = 0x604B, USB_BOARD_ID_JAWBREAKER = 0x604B,
USB_BOARD_ID_HACKRF_ONE = 0x6089, USB_BOARD_ID_HACKRF_ONE = 0x6089,
USB_BOARD_ID_RAD1O = 0xCC15,
USB_BOARD_ID_INVALID = 0xFFFF, USB_BOARD_ID_INVALID = 0xFFFF,
}; };

2
host/misc/udev/53-hackrf.rules.in
View File

@ -2,5 +2,7 @@
ATTR{idVendor}=="1d50", ATTR{idProduct}=="604b", SYMLINK+="hackrf-jawbreaker-%k", MODE="660", GROUP="@HACKRF_GROUP@" ATTR{idVendor}=="1d50", ATTR{idProduct}=="604b", SYMLINK+="hackrf-jawbreaker-%k", MODE="660", GROUP="@HACKRF_GROUP@"
# HackRF One # HackRF One
ATTR{idVendor}=="1d50", ATTR{idProduct}=="6089", SYMLINK+="hackrf-one-%k", MODE="660", GROUP="@HACKRF_GROUP@" ATTR{idVendor}=="1d50", ATTR{idProduct}=="6089", SYMLINK+="hackrf-one-%k", MODE="660", GROUP="@HACKRF_GROUP@"
# HackRF One
ATTR{idVendor}=="1d50", ATTR{idProduct}=="CC15", SYMLINK+="rad1o-%k", MODE="660", GROUP="@HACKRF_GROUP@"
# HackRF DFU # HackRF DFU
ATTR{idVendor}=="1fc9", ATTR{idProduct}=="000c", SYMLINK+="nxp-dfu-%k", MODE="660", GROUP="@HACKRF_GROUP@" ATTR{idVendor}=="1fc9", ATTR{idProduct}=="000c", SYMLINK+="nxp-dfu-%k", MODE="660", GROUP="@HACKRF_GROUP@"

4
host/python/max2837_dump.py
View File

@ -32,6 +32,10 @@ else:
if device: if device:
print 'Find: HackRF One' print 'Find: HackRF One'
else: else:
device = usb.core.find(idVendor=0x1d50, idProduct=0xCC15)
if device:
print 'Find: Rad1o'
else:
print 'Not find any HackRF device.' print 'Not find any HackRF device.'
sys.exit() sys.exit()
device.set_configuration() device.set_configuration()

8
host/python/set_transceiver_mode.py
View File

@ -31,8 +31,12 @@ else:
if device: if device:
print 'Find: HackRF One' print 'Find: HackRF One'
else: else:
print 'Not find any HackRF device.' device = usb.core.find(idVendor=0x1d50, idProduct=0xCC15)
sys.exit() if device:
print 'Find: Rad1o'
else:
print 'Not find any HackRF device.'
sys.exit()
device.set_configuration() device.set_configuration()
def set_rx(): def set_rx():