Merge branch 'wip/libusb-1.0' of http://gnuradio.org/git/jcorgan into master

This merge adds support for libusb1.0 in the usrp component.  To enable,
you must add --with-fusb-tech=libusb1 to your configure command line.

Existing support for libusb0.1 is retained, no changes are needed.

Most of the work was done here by Thomas Tsou.

* 'wip/libusb-1.0' of http://gnuradio.org/git/jcorgan: (32 commits)
  Cleanup in preparation for merge
  Add required include directory for new header organization
  Added config.h headers to fix win32 build
  Consolidate conditional headers into libusb_types.h, use automake
  Change write_internal_ram in usrp_prims to print signed error code
  Allow fusb_sysconfig to build on non-linux libusb-0.12 impls
  Comments for usrp_prims
  Removed internal functions from external header file
  Moved to single generated fusb.h, headers now generated out of lib directory
  Added copyright header
  Removed preprocessor declrs out of fusb.h and created separate fusb_libusb1_base.h
  Fixed libusb1 configure bug, libusb1 updates for previous usrp_prims integration
  Commonized more usrp_prims code and renamed libusb-0.12 files to libusb0
  Fixed bug usb_control_transfer bug
  Combined additiona usrp_prims code
  Fix glitch from previous commit
  changes to build on windows / cygwin
  Re-added non pkgconfig support for libusb
  Autoconf support for checking the required version of libusb based on fusb-tech
  Use default arguments instead of overloaded virtual constructors for cleaner interface
  ...

1 files changed, 202 insertions, 0 deletions

diff --git a/usrp/host/lib/usrp_prims_libusb1.cc b/usrp/host/lib/usrp_prims_libusb1.cc
new file mode 100644
index 000000000..cf1f8fe07
--- /dev/null
+++ b/usrp/host/lib/usrp_prims_libusb1.cc
@@ -0,0 +1,202 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2003,2004,2006,2009 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "usrp_primsi.h"
+#include "usrp_commands.h"
+#include <libusb-1.0/libusb.h>
+#include <errno.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <ad9862.h>
+#include <assert.h>
+
+extern "C" {
+#include "md5.h"
+};
+
+using namespace ad9862;
+
+/*
+ * libusb 0.12 / 1.0 compatibility
+ */
+
+struct libusb_device *
+_get_usb_device (struct libusb_device_handle *udh)
+{
+  return libusb_get_device (udh);
+}
+
+struct libusb_device_descriptor
+_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);
+
+  return desc;
+}
+
+int
+_get_usb_string_descriptor (struct libusb_device_handle *udh, int index,
+                           unsigned char* data, int length)
+{
+  return libusb_get_string_descriptor_ascii (udh, (uint8_t) index, data, length);
+}
+
+int
+_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);
+}
+
+
+// ----------------------------------------------------------------
+
+
+void
+usrp_one_time_init (libusb_context **ctx)
+{
+  int ret;
+
+  if ((ret = libusb_init (ctx)) < 0)
+    fprintf (stderr, "usrp: libusb_init failed %i\n", ret);
+}
+
+void
+usrp_rescan ()
+{
+  // nop
+}
+
+
+struct libusb_device *
+usrp_find_device (int nth, bool fx2_ok_p, libusb_context *ctx)
+{
+  libusb_device **list;
+
+  struct libusb_device *q;
+  int	 n_found = 0;
+
+  // Make sure not operating on default context. There are cases where operating
+  // with a single global (NULL) context may be preferable, so this check can be
+  // skipped if you know what you're doing.
+  assert (ctx != NULL);
+
+  size_t cnt = libusb_get_device_list(ctx, &list);
+  size_t i = 0;
+
+  if (cnt < 0)
+    fprintf(stderr, "usrp: libusb_get_device_list failed %d\n", cnt);
+
+  for (i = 0; i < cnt; i++) {
+    q = list[i];
+    if (usrp_usrp_p (q) || (fx2_ok_p && usrp_fx2_p (q))) {
+	if (n_found == nth)	// return this one
+	  return q;
+	n_found++;		// keep looking
+    }
+  }
+
+  // The list needs to be freed. Right now just release it if nothing is found.
+  libusb_free_device_list(list, 1);
+
+  return 0;	// not found
+}
+
+struct libusb_device_handle *
+usrp_open_interface (libusb_device *dev, int interface, int altinterface)
+{
+  libusb_device_handle *udh;
+  int ret;
+
+  if (libusb_open (dev, &udh) < 0)
+    return 0;
+
+  if (dev != libusb_get_device (udh)){
+    fprintf (stderr, "%s:%d: internal error!\n", __FILE__, __LINE__);
+    abort ();
+  }
+
+  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);
+    libusb_close (udh);
+    return 0;
+  }
+
+  if ((ret = libusb_set_interface_alt_setting (udh, interface,
+                                                   altinterface)) < 0) {
+    fprintf (stderr, "%s:usb_set_alt_interface: failed\n", __FUNCTION__);
+    fprintf (stderr, "%d\n", ret);
+    libusb_release_interface (udh, interface);
+    libusb_close (udh);
+    return 0;
+  }
+
+  return udh;
+}
+
+bool
+usrp_close_interface (libusb_device_handle *udh)
+{
+  // returns void
+  libusb_close(udh);
+  return 0;
+}
+
+
+// ----------------------------------------------------------------
+// write vendor extension command to USRP
+
+
+int
+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 r = libusb_control_transfer(udh, requesttype, request, value, index,
+                                  (unsigned char *) bytes, len, 1000);
+
+  if (r < 0){
+    // we get EPIPE if the firmware stalls the endpoint.
+    if (r != LIBUSB_ERROR_PIPE) {
+      fprintf (stderr, "libusb_control_transfer failed: %i\n", r);
+    }
+  }
+
+  return r;
+}
+