summaryrefslogtreecommitdiff
path: root/usrp
diff options
context:
space:
mode:
Diffstat (limited to 'usrp')
-rw-r--r--usrp/firmware/include/usrp_ids.h1
-rw-r--r--usrp/host/lib/db_xcvr2450.cc4
-rw-r--r--usrp/host/lib/usrp_prims_libusb0.cc2
3 files changed, 4 insertions, 3 deletions
diff --git a/usrp/firmware/include/usrp_ids.h b/usrp/firmware/include/usrp_ids.h
index 4f9ac4f9d..dd5daed01 100644
--- a/usrp/firmware/include/usrp_ids.h
+++ b/usrp/firmware/include/usrp_ids.h
@@ -54,6 +54,7 @@
#define USB_PID_FSF_BDALE_7 0x0011 // Bdale Garbee <bdale@gag.com>
#define USB_PID_FSF_BDALE_8 0x0012 // Bdale Garbee <bdale@gag.com>
#define USB_PID_FSF_BDALE_9 0x0013 // Bdale Garbee <bdale@gag.com>
+#define USB_PID_FSF_HPSDR_HERMES 0x0014 // HPSDR Hermes
#define USB_PID_FSF_LBNL_UXO 0x0018 // http://recycle.lbl.gov/~ldoolitt/uxo/
diff --git a/usrp/host/lib/db_xcvr2450.cc b/usrp/host/lib/db_xcvr2450.cc
index 72367286c..ce9d1f4e8 100644
--- a/usrp/host/lib/db_xcvr2450.cc
+++ b/usrp/host/lib/db_xcvr2450.cc
@@ -322,8 +322,8 @@ xcvr2450::set_reg_lpf()
{
d_reg_lpf = (
(d_rssi_hbw<<15) |
- (d_txlpf_bw<<10) |
- (d_rxlpf_bw<<9) |
+ (d_txlpf_bw<<9) |
+ (d_rxlpf_bw<<7) |
(d_rxlpf_fine<<4) | 7);
send_reg(d_reg_lpf);
}
diff --git a/usrp/host/lib/usrp_prims_libusb0.cc b/usrp/host/lib/usrp_prims_libusb0.cc
index 4d1fd78c9..4fbfabea9 100644
--- a/usrp/host/lib/usrp_prims_libusb0.cc
+++ b/usrp/host/lib/usrp_prims_libusb0.cc
@@ -83,7 +83,7 @@ _usb_control_transfer (struct usb_dev_handle *udh, int request_type,
ret = usb_control_msg (udh, request_type,request, value, index,
(char*) data, length, (int) timeout);
if (ret < 0)
- fprintf (stderr, "usrp: usb_claim_interface failed: %s\n", usb_strerror());
+ fprintf (stderr, "usrp: usb_control_msg failed: %s\n", usb_strerror());
return ret;
}