summaryrefslogtreecommitdiff
path: root/usrp/host
diff options
context:
space:
mode:
Diffstat (limited to 'usrp/host')
-rw-r--r--usrp/host/apps/Makefile.am4
-rw-r--r--usrp/host/lib/usrp_prims_common.cc12
-rw-r--r--usrp/host/lib/usrp_prims_libusb0.cc21
-rw-r--r--usrp/host/lib/usrp_prims_libusb1.cc105
4 files changed, 114 insertions, 28 deletions
diff --git a/usrp/host/apps/Makefile.am b/usrp/host/apps/Makefile.am
index b0c21d55f..8aa361b22 100644
--- a/usrp/host/apps/Makefile.am
+++ b/usrp/host/apps/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2003,2006,2008 Free Software Foundation, Inc.
+# Copyright 2003,2006,2008,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -22,7 +22,7 @@
include $(top_srcdir)/Makefile.common
AM_CPPFLAGS = $(USRP_INCLUDES) $(BOOST_CPPFLAGS) $(CPPUNIT_INCLUDES) \
- $(WITH_INCLUDES)
+ $(USB_INCLUDES) $(WITH_INCLUDES)
bin_PROGRAMS = \
usrper \
diff --git a/usrp/host/lib/usrp_prims_common.cc b/usrp/host/lib/usrp_prims_common.cc
index 70e90d7fe..2d8a0fa2a 100644
--- a/usrp/host/lib/usrp_prims_common.cc
+++ b/usrp/host/lib/usrp_prims_common.cc
@@ -215,7 +215,7 @@ write_internal_ram (libusb_device_handle *udh, unsigned char *buf,
(unsigned char*)(buf + (addr - start_addr)), n, 1000);
if (a < 0){
- fprintf(stderr,"write_internal_ram failed: %i\n", a);
+ fprintf(stderr,"write_internal_ram failed\n");
return false;
}
}
@@ -297,7 +297,7 @@ _usrp_load_firmware (libusb_device_handle *udh, const char *filename,
break;
}
else if (type == 0x02){
- fprintf(stderr, "Extended address: whatever I do with it?\n");
+ fprintf (stderr, "Extended address: whatever I do with it?\n");
fprintf (stderr, "%s: invalid line: \"%s\"\n", filename, s);
goto fail;
}
@@ -419,6 +419,10 @@ usrp_set_hash (libusb_device_handle *udh, int which,
// we use the Cypress firmware down load command to jam it in.
int r = _usb_control_transfer (udh, 0x40, 0xa0, hash_slot_addr[which], 0,
(unsigned char *) hash, USRP_HASH_SIZE, 1000);
+
+ if (r < 0)
+ fprintf (stderr, "usrp: failed to set hash\n");
+
return r == USRP_HASH_SIZE;
}
@@ -431,6 +435,10 @@ usrp_get_hash (libusb_device_handle *udh, int which,
// we use the Cypress firmware upload command to fetch it.
int r = _usb_control_transfer (udh, 0xc0, 0xa0, hash_slot_addr[which], 0,
(unsigned char *) hash, USRP_HASH_SIZE, 1000);
+
+ if (r < 0)
+ fprintf (stderr, "usrp: failed to get hash\n");
+
return r == USRP_HASH_SIZE;
}
diff --git a/usrp/host/lib/usrp_prims_libusb0.cc b/usrp/host/lib/usrp_prims_libusb0.cc
index 7a82eabfa..35e397adb 100644
--- a/usrp/host/lib/usrp_prims_libusb0.cc
+++ b/usrp/host/lib/usrp_prims_libusb0.cc
@@ -57,11 +57,18 @@ _get_usb_device_descriptor (struct usb_device *q)
{
return q->descriptor;
}
+
int
_get_usb_string_descriptor (struct usb_dev_handle *udh, int index,
unsigned char* data, int length)
{
- return usb_get_string_simple (udh, index, (char*) data, length);
+ int ret;
+ ret = usb_get_string_simple (udh, index, (char*) data, length);
+
+ if (ret < 0) {
+ fprintf (stderr, "usrp: usb_get_string_descriptor failed: %s\n",
+ usb_strerror());
+ }
}
int
@@ -69,8 +76,12 @@ _usb_control_transfer (struct usb_dev_handle *udh, int request_type,
int request, int value, int index,
unsigned char *data, int length, unsigned int timeout)
{
- return usb_control_msg (udh, request_type,request, value, index,
- (char*) data, length, (int) timeout);
+ int ret;
+
+ 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());
}
@@ -198,8 +209,10 @@ write_cmd (struct usb_dev_handle *udh,
(char *) bytes, len, 1000);
if (r < 0){
// we get EPIPE if the firmware stalls the endpoint.
- if (errno != EPIPE)
+ if (errno != EPIPE) {
fprintf (stderr, "usb_control_msg failed: %s\n", usb_strerror ());
+ fprintf (stderr, "write_cmd failed\n");
+ }
}
return r;
diff --git a/usrp/host/lib/usrp_prims_libusb1.cc b/usrp/host/lib/usrp_prims_libusb1.cc
index cf1f8fe07..49d1a7282 100644
--- a/usrp/host/lib/usrp_prims_libusb1.cc
+++ b/usrp/host/lib/usrp_prims_libusb1.cc
@@ -42,10 +42,49 @@ extern "C" {
using namespace ad9862;
+static const int LIBUSB1_DEBUG = 0;
+
/*
* libusb 0.12 / 1.0 compatibility
*/
+static const char *
+_get_usb_error_str (int usb_err)
+{
+ switch (usb_err) {
+ case LIBUSB_SUCCESS:
+ return "Success (no error)";
+ case LIBUSB_ERROR_IO:
+ return "Input/output error";
+ case LIBUSB_ERROR_INVALID_PARAM:
+ return "Invalid parameter";
+ case LIBUSB_ERROR_ACCESS:
+ return "Access denied (insufficient permissions";
+ case LIBUSB_ERROR_NO_DEVICE:
+ return "No such device (it may have been disconnected)";
+ case LIBUSB_ERROR_NOT_FOUND:
+ return "Entity not found";
+ case LIBUSB_ERROR_BUSY:
+ return "Resource busy";
+ case LIBUSB_ERROR_TIMEOUT:
+ return "Operation timed out";
+ case LIBUSB_ERROR_OVERFLOW:
+ return "Overflow";
+ case LIBUSB_ERROR_PIPE:
+ return "Pipe error";
+ case LIBUSB_ERROR_INTERRUPTED:
+ return "System call interrupted (perhaps due to signal)";
+ case LIBUSB_ERROR_NO_MEM:
+ return "Insufficient memory";
+ case LIBUSB_ERROR_NOT_SUPPORTED:
+ return "Operation not supported or unimplemented on this platform";
+ case LIBUSB_ERROR_OTHER:
+ return "Unknown error";
+ }
+
+ return "Unknown error";
+}
+
struct libusb_device *
_get_usb_device (struct libusb_device_handle *udh)
{
@@ -58,17 +97,27 @@ _get_usb_device_descriptor(struct libusb_device *q)
int ret;
struct libusb_device_descriptor desc;
- if ((ret = libusb_get_device_descriptor(q, &desc)) < 0)
- fprintf (stderr, "usrp: libusb_get_device_descriptor failed %d\n", ret);
+ ret = libusb_get_device_descriptor(q, &desc);
+ if (ret < 0) {
+ fprintf (stderr, "usrp: libusb_get_device_descriptor failed: %s\n",
+ _get_usb_error_str(ret));
+ }
return desc;
}
int
_get_usb_string_descriptor (struct libusb_device_handle *udh, int index,
- unsigned char* data, int length)
+ unsigned char* data, int length)
{
- return libusb_get_string_descriptor_ascii (udh, (uint8_t) index, data, length);
+ int ret;
+ ret = libusb_get_string_descriptor_ascii (udh, (uint8_t) index, data, length);
+
+ if (ret < 0) {
+ fprintf (stderr, "usrp: libusb_get_string_descriptor_ascii failed: %s\n",
+ _get_usb_error_str(ret));
+ }
+ return ret;
}
int
@@ -76,11 +125,16 @@ _usb_control_transfer (struct libusb_device_handle *udh, int request_type,
int request, int value, int index,
unsigned char *data, int length, unsigned int timeout)
{
- return libusb_control_transfer (udh, request_type, request, value, index,
- data, length, timeout);
+ int ret;
+ ret = libusb_control_transfer (udh, request_type, request, value, index,
+ data, length, timeout);
+ if (ret < 0) {
+ fprintf (stderr, "usrp: libusb_control_transfer failed: %s\n",
+ _get_usb_error_str(ret));
+ }
+ return ret;
}
-
// ----------------------------------------------------------------
@@ -90,7 +144,14 @@ usrp_one_time_init (libusb_context **ctx)
int ret;
if ((ret = libusb_init (ctx)) < 0)
- fprintf (stderr, "usrp: libusb_init failed %i\n", ret);
+ fprintf (stderr, "usrp: libusb_init failed: %s\n", _get_usb_error_str(ret));
+
+ // Enable debug verbosity if requested. This will only work if the debug
+ // option is compiled into libusb and may produce a generous amount of output
+ // on stdout. If debug output is not compiled into libusb, this call does
+ // nothing.
+ if (LIBUSB1_DEBUG)
+ libusb_set_debug(*ctx, 3);
}
void
@@ -117,7 +178,8 @@ usrp_find_device (int nth, bool fx2_ok_p, libusb_context *ctx)
size_t i = 0;
if (cnt < 0)
- fprintf(stderr, "usrp: libusb_get_device_list failed %d\n", cnt);
+ fprintf(stderr, "usrp: libusb_get_device_list failed: %s\n",
+ _get_usb_error_str(cnt));
for (i = 0; i < cnt; i++) {
q = list[i];
@@ -149,16 +211,17 @@ usrp_open_interface (libusb_device *dev, int interface, int altinterface)
}
if ((ret = libusb_claim_interface (udh, interface)) < 0) {
- fprintf (stderr, "%s:usb_claim_interface: failed interface %d\n", __FUNCTION__,interface);
- fprintf (stderr, "%d\n", ret);
+ fprintf (stderr, "%s:usb_claim_interface: failed interface %d\n",
+ __FUNCTION__, interface);
+ fprintf (stderr, "%s\n", _get_usb_error_str(ret));
libusb_close (udh);
return 0;
}
if ((ret = libusb_set_interface_alt_setting (udh, interface,
- altinterface)) < 0) {
+ altinterface)) < 0) {
fprintf (stderr, "%s:usb_set_alt_interface: failed\n", __FUNCTION__);
- fprintf (stderr, "%d\n", ret);
+ fprintf (stderr, "%s\n", _get_usb_error_str(ret));
libusb_release_interface (udh, interface);
libusb_close (udh);
return 0;
@@ -185,18 +248,20 @@ write_cmd (struct libusb_device_handle *udh,
int request, int value, int index,
unsigned char *bytes, int len)
{
- int requesttype = (request & 0x80) ? VRT_VENDOR_IN : VRT_VENDOR_OUT;
+ int requesttype = (request & 0x80) ? VRT_VENDOR_IN : VRT_VENDOR_OUT;
- int r = libusb_control_transfer(udh, requesttype, request, value, index,
- (unsigned char *) bytes, len, 1000);
+ int ret = libusb_control_transfer(udh, requesttype, request, value, index,
+ bytes, len, 1000);
- if (r < 0){
+ if (ret < 0) {
// we get EPIPE if the firmware stalls the endpoint.
- if (r != LIBUSB_ERROR_PIPE) {
- fprintf (stderr, "libusb_control_transfer failed: %i\n", r);
+ if (ret != LIBUSB_ERROR_PIPE) {
+ fprintf (stderr, "usrp: libusb_control_transfer failed: %s\n",
+ _get_usb_error_str(ret));
+ fprintf (stderr, "usrp: write_cmd failed\n");
}
}
- return r;
+ return ret;
}
generated by cgit (git 2.34.1) at 2025-01-10 14:47:15 +0000