diff -r cf101610be7c -r 9f4a6f531294 components/libusb-1/patches/libusb.patch --- a/components/libusb-1/patches/libusb.patch Tue Apr 26 14:10:22 2016 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1451 +0,0 @@ -Solaris support for libusb 1.0, see upstream bug https://github.com/libusb/libusb/issues/169 - -diff -Naur libusb-1.0.20/configure.ac libusb-1.0.20.new/configure.ac ---- libusb-1.0.20/configure.ac 2015-09-05 10:20:40.000000000 -0700 -+++ libusb-1.0.20.new/configure.ac 2016-03-10 00:35:25.712129055 -0800 -@@ -95,6 +95,12 @@ - backend="haiku" - threads="posix" - ;; -+*-solaris*) -+ AC_MSG_RESULT([SunOS]) -+ backend="sunos" -+ threads="posix" -+ ;; -+ - *) - AC_MSG_ERROR([unsupported operating system]) - esac -@@ -157,6 +163,16 @@ - AC_CHECK_HEADERS([poll.h]) - AC_DEFINE([POLL_NFDS_TYPE],[nfds_t],[type of second poll() argument]) - ;; -+ -+sunos) -+ AC_DEFINE(OS_SUNOS, 1, [SunOS backend]) -+ AC_SUBST(OS_SUNOS) -+ THREAD_CFLAGS="-pthread" -+ LIBS="-pthread -ldevinfo" -+ AC_CHECK_HEADERS([poll.h]) -+ AC_DEFINE([POLL_NFDS_TYPE],[nfds_t],[type of second poll() argument]) -+ ;; -+ - netbsd) - AC_DEFINE(OS_NETBSD, 1, [NetBSD backend]) - AC_SUBST(OS_NETBSD) -@@ -187,6 +203,7 @@ - AM_CONDITIONAL(OS_LINUX, test "x$backend" = xlinux) - AM_CONDITIONAL(OS_DARWIN, test "x$backend" = xdarwin) - AM_CONDITIONAL(OS_OPENBSD, test "x$backend" = xopenbsd) -+AM_CONDITIONAL(OS_SUNOS, test "x$backend" = xsunos) - AM_CONDITIONAL(OS_NETBSD, test "x$backend" = xnetbsd) - AM_CONDITIONAL(OS_WINDOWS, test "x$backend" = xwindows) - AM_CONDITIONAL(OS_HAIKU, test "x$backend" = xhaiku) -diff -Naur libusb-1.0.20/libusb/Makefile.am libusb-1.0.20.new/libusb/Makefile.am ---- libusb-1.0.20/libusb/Makefile.am 2015-09-05 10:20:40.000000000 -0700 -+++ libusb-1.0.20.new/libusb/Makefile.am 2016-03-10 00:19:22.549380102 -0800 -@@ -9,6 +9,7 @@ - DARWIN_USB_SRC = os/darwin_usb.c - OPENBSD_USB_SRC = os/openbsd_usb.c - NETBSD_USB_SRC = os/netbsd_usb.c -+SUNOS_USB_SRC = os/sunos_usb.c os/sunos_usb.h - WINDOWS_USB_SRC = os/poll_windows.c os/windows_usb.c libusb-1.0.rc libusb-1.0.def - WINCE_USB_SRC = os/wince_usb.c os/wince_usb.h - -@@ -49,6 +50,10 @@ - OS_SRC = $(NETBSD_USB_SRC) $(POSIX_POLL_SRC) - endif - -+if OS_SUNOS -+OS_SRC = $(SUNOS_USB_SRC) $(POSIX_POLL_SRC) -+endif -+ - if OS_HAIKU - OS_SRC = $(POSIX_POLL_SRC) - SUBDIRS = os/haiku -diff -Naur libusb-1.0.20/libusb/core.c libusb-1.0.20.new/libusb/core.c ---- libusb-1.0.20/libusb/core.c 2015-09-05 10:30:43.000000000 -0700 -+++ libusb-1.0.20.new/libusb/core.c 2016-03-10 00:20:40.154945235 -0800 -@@ -58,6 +58,8 @@ - const struct usbi_os_backend * const usbi_backend = &wince_backend; - #elif defined(OS_HAIKU) - const struct usbi_os_backend * const usbi_backend = &haiku_usb_raw_backend; -+#elif defined(OS_SUNOS) -+const struct usbi_os_backend * const usbi_backend = &sunos_backend; - #else - #error "Unsupported OS" - #endif -diff -Naur libusb-1.0.20/libusb/libusbi.h libusb-1.0.20.new/libusb/libusbi.h ---- libusb-1.0.20/libusb/libusbi.h 2015-09-13 17:36:19.000000000 -0700 -+++ libusb-1.0.20.new/libusb/libusbi.h 2016-03-10 00:23:08.647355689 -0800 -@@ -493,7 +493,8 @@ - int usbi_clear_event(struct libusb_context *ctx); - - /* Internal abstraction for poll (needs struct usbi_transfer on Windows) */ --#if defined(OS_LINUX) || defined(OS_DARWIN) || defined(OS_OPENBSD) || defined(OS_NETBSD) || defined(OS_HAIKU) -+#if defined(OS_LINUX) || defined(OS_DARWIN) || defined(OS_OPENBSD) || defined(OS_NETBSD) || \ -+ defined(OS_HAIKU) || defined(OS_SUNOS) - #include - #include "os/poll_posix.h" - #elif defined(OS_WINDOWS) || defined(OS_WINCE) -@@ -1091,6 +1092,7 @@ - extern const struct usbi_os_backend windows_backend; - extern const struct usbi_os_backend wince_backend; - extern const struct usbi_os_backend haiku_usb_raw_backend; -+extern const struct usbi_os_backend sunos_backend; - - extern struct list_head active_contexts_list; - extern usbi_mutex_static_t active_contexts_lock; -diff -Naur libusb-1.0.20/libusb/os/sunos_usb.c libusb-1.0.20.new/libusb/os/sunos_usb.c ---- libusb-1.0.20/libusb/os/sunos_usb.c 1969-12-31 16:00:00.000000000 -0800 -+++ libusb-1.0.20.new/libusb/os/sunos_usb.c 2016-03-10 00:24:36.641449583 -0800 -@@ -0,0 +1,1259 @@ -+/* -+ * -+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library 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 -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -+ */ -+ -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "libusbi.h" -+#include "sunos_usb.h" -+ -+/* -+ * Backend functions -+ */ -+static int sunos_init(struct libusb_context *); -+static void sunos_exit(void); -+static int sunos_get_device_list(struct libusb_context *, -+ struct discovered_devs **); -+static int sunos_open(struct libusb_device_handle *); -+static void sunos_close(struct libusb_device_handle *); -+static int sunos_get_device_descriptor(struct libusb_device *, -+ uint8_t*, int *); -+static int sunos_get_active_config_descriptor(struct libusb_device *, -+ uint8_t*, size_t, int *); -+static int sunos_get_config_descriptor(struct libusb_device *, uint8_t, -+ uint8_t*, size_t, int *); -+static int sunos_get_configuration(struct libusb_device_handle *, int *); -+static int sunos_set_configuration(struct libusb_device_handle *, int); -+static int sunos_claim_interface(struct libusb_device_handle *, int); -+static int sunos_release_interface(struct libusb_device_handle *, int); -+static int sunos_set_interface_altsetting(struct libusb_device_handle *, -+ int, int); -+static int sunos_clear_halt(struct libusb_device_handle *, uint8_t); -+static int sunos_reset_device(struct libusb_device_handle *); -+static void sunos_destroy_device(struct libusb_device *); -+static int sunos_submit_transfer(struct usbi_transfer *); -+static int sunos_cancel_transfer(struct usbi_transfer *); -+static void sunos_clear_transfer_priv(struct usbi_transfer *); -+static int sunos_handle_transfer_completion(struct usbi_transfer *); -+static int sunos_clock_gettime(int, struct timespec *); -+ -+/* -+ * Private functions -+ */ -+static int _errno_to_libusb(int); -+static int sunos_usb_get_status(int fd); -+ -+static int sunos_init(struct libusb_context *ctx) -+{ -+ return (LIBUSB_SUCCESS); -+} -+ -+static void sunos_exit(void) -+{ -+ usbi_dbg(""); -+} -+ -+static int -+sunos_fill_in_dev_info(di_node_t node, struct libusb_device *dev) -+{ -+ int proplen; -+ int n, *addr, *port_prop; -+ char *phypath; -+ uint8_t *rdata; -+ struct libusb_device_descriptor *descr; -+ sunos_dev_priv_t *dpriv = (sunos_dev_priv_t *)dev->os_priv; -+ -+ /* Device descriptors */ -+ proplen = di_prop_lookup_bytes(DDI_DEV_T_ANY, node, -+ "usb-dev-descriptor", &rdata); -+ if (proplen <= 0) { -+ -+ return (LIBUSB_ERROR_IO); -+ } -+ -+ descr = (struct libusb_device_descriptor *)rdata; -+ bcopy(descr, &dpriv->dev_descr, LIBUSB_DT_DEVICE_SIZE); -+ dpriv->dev_descr.bcdUSB = libusb_cpu_to_le16(descr->bcdUSB); -+ dpriv->dev_descr.idVendor = libusb_cpu_to_le16(descr->idVendor); -+ dpriv->dev_descr.idProduct = libusb_cpu_to_le16(descr->idProduct); -+ dpriv->dev_descr.bcdDevice = libusb_cpu_to_le16(descr->bcdDevice); -+ -+ /* Raw configuration descriptors */ -+ proplen = di_prop_lookup_bytes(DDI_DEV_T_ANY, node, -+ "usb-raw-cfg-descriptors", &rdata); -+ if (proplen <= 0) { -+ usbi_dbg("can't find raw config descriptors"); -+ -+ return (LIBUSB_ERROR_IO); -+ } -+ dpriv->raw_cfgdescr = calloc(1, proplen); -+ if (dpriv->raw_cfgdescr == NULL) { -+ return (LIBUSB_ERROR_NO_MEM); -+ } else { -+ bcopy(rdata, dpriv->raw_cfgdescr, proplen); -+ } -+ -+ n = di_prop_lookup_ints(DDI_DEV_T_ANY, node, "reg", &port_prop); -+ -+ if ((n != 1) || (*port_prop <= 0)) { -+ return (LIBUSB_ERROR_IO); -+ } -+ dev->port_number = *port_prop; -+ -+ /* device physical path */ -+ phypath = di_devfs_path(node); -+ if (phypath) { -+ dpriv->phypath = strdup(phypath); -+ di_devfs_path_free(phypath); -+ } else { -+ free(dpriv->raw_cfgdescr); -+ -+ return (LIBUSB_ERROR_IO); -+ } -+ -+ /* address */ -+ n = di_prop_lookup_ints(DDI_DEV_T_ANY, node, "assigned-address", &addr); -+ if (n != 1 || *addr == 0) { -+ usbi_dbg("can't get address"); -+ } else { -+ dev->device_address = *addr; -+ } -+ -+ /* speed */ -+ if (di_prop_exists(DDI_DEV_T_ANY, node, "low-speed") == 1) { -+ dev->speed = LIBUSB_SPEED_LOW; -+ } else if (di_prop_exists(DDI_DEV_T_ANY, node, "high-speed") == 1) { -+ dev->speed = LIBUSB_SPEED_HIGH; -+ } else if (di_prop_exists(DDI_DEV_T_ANY, node, "full-speed") == 1) { -+ dev->speed = LIBUSB_SPEED_FULL; -+ } else if (di_prop_exists(DDI_DEV_T_ANY, node, "super-speed") == 1) { -+ dev->speed = LIBUSB_SPEED_SUPER; -+ } -+ -+ usbi_dbg("vid=%x pid=%x, path=%s, bus_nmber=0x%x, port_number=%d, " -+ "speed=%d", dpriv->dev_descr.idVendor, dpriv->dev_descr.idProduct, -+ dpriv->phypath, dev->bus_number, dev->port_number, dev->speed); -+ -+ return (LIBUSB_SUCCESS); -+} -+ -+ -+static int -+sunos_add_devices(di_devlink_t link, void *arg) -+{ -+ struct devlink_cbarg *largs = (struct devlink_cbarg *)arg; -+ struct node_args *nargs; -+ di_node_t myself, pnode; -+ uint64_t session_id = 0; -+ uint16_t bdf = 0; -+ struct libusb_device *dev; -+ sunos_dev_priv_t *devpriv; -+ const char *path, *newpath; -+ int n, i; -+ int *addr_prop; -+ uint8_t bus_number = 0; -+ -+ nargs = (struct node_args *)largs->nargs; -+ myself = largs->myself; -+ if (nargs->last_ugenpath) { -+ /* the same node's links */ -+ return (DI_WALK_CONTINUE); -+ } -+ -+ /* -+ * Construct session ID. -+ * session ID = ...parent hub addr|hub addr|dev addr. -+ */ -+ pnode = myself; -+ i = 0; -+ while (pnode != DI_NODE_NIL) { -+ if (di_prop_exists(DDI_DEV_T_ANY, pnode, "root-hub") == 1) { -+ /* walk to root */ -+ uint32_t *regbuf = NULL; -+ uint32_t reg; -+ -+ n = di_prop_lookup_ints(DDI_DEV_T_ANY, pnode, "reg", -+ (int **)®buf); -+ reg = regbuf[0]; -+ bdf = (PCI_REG_BUS_G(reg) << 8) | -+ (PCI_REG_DEV_G(reg) << 3) | PCI_REG_FUNC_G(reg); -+ session_id |= (bdf << i * 8); -+ -+ /* same as 'unit-address' property */ -+ bus_number = -+ (PCI_REG_DEV_G(reg) << 3) | PCI_REG_FUNC_G(reg); -+ -+ usbi_dbg("device bus address=%s:%x", -+ di_bus_addr(pnode), bus_number); -+ -+ break; -+ } -+ -+ /* usb_addr */ -+ n = di_prop_lookup_ints(DDI_DEV_T_ANY, pnode, -+ "assigned-address", &addr_prop); -+ if ((n != 1) || (addr_prop[0] == 0)) { -+ usbi_dbg("cannot get valid usb_addr"); -+ -+ return (DI_WALK_CONTINUE); -+ } -+ -+ session_id |= ((addr_prop[0] & 0xff) << i * 8); -+ if (++i > 7) -+ break; -+ -+ pnode = di_parent_node(pnode); -+ } -+ -+ path = di_devlink_path(link); -+ dev = usbi_get_device_by_session_id(nargs->ctx, session_id); -+ if (dev == NULL) { -+ dev = usbi_alloc_device(nargs->ctx, session_id); -+ if (dev == NULL) { -+ usbi_dbg("can't alloc device"); -+ -+ return (DI_WALK_TERMINATE); -+ } -+ devpriv = (sunos_dev_priv_t *)dev->os_priv; -+ if ((newpath = strrchr(path, '/')) == NULL) { -+ libusb_unref_device(dev); -+ -+ return (DI_WALK_TERMINATE); -+ } -+ devpriv->ugenpath = strndup(path, strlen(path) - -+ strlen(newpath)); -+ dev->bus_number = bus_number; -+ -+ if (sunos_fill_in_dev_info(myself, dev) != LIBUSB_SUCCESS) { -+ libusb_unref_device(dev); -+ -+ return (DI_WALK_TERMINATE); -+ } -+ if (usbi_sanitize_device(dev) < 0) { -+ libusb_unref_device(dev); -+ usbi_dbg("sanatize failed: "); -+ return (DI_WALK_TERMINATE); -+ } -+ } else { -+ usbi_dbg("Dev %s exists", path); -+ } -+ -+ devpriv = (sunos_dev_priv_t *)dev->os_priv; -+ if (nargs->last_ugenpath == NULL) { -+ /* first device */ -+ nargs->last_ugenpath = devpriv->ugenpath; -+ -+ if (discovered_devs_append(*(nargs->discdevs), dev) == NULL) { -+ usbi_dbg("cannot append device"); -+ } -+ -+ /* -+ * we alloc and hence ref this dev. We don't need to ref it -+ * hereafter. Front end or app should take care of their ref. -+ */ -+ libusb_unref_device(dev); -+ } -+ -+ usbi_dbg("Device %s %s id=0x%llx, devcount:%d, bdf=%x", -+ devpriv->ugenpath, path, (uint64_t)session_id, -+ (*nargs->discdevs)->len, bdf); -+ -+ return (DI_WALK_CONTINUE); -+} -+ -+static int -+sunos_walk_minor_node_link(di_node_t node, void *args) -+{ -+ di_minor_t minor = DI_MINOR_NIL; -+ char *minor_path; -+ struct devlink_cbarg arg; -+ struct node_args *nargs = (struct node_args *)args; -+ di_devlink_handle_t devlink_hdl = nargs->dlink_hdl; -+ -+ /* walk each minor to find ugen devices */ -+ while ((minor = di_minor_next(node, minor)) != DI_MINOR_NIL) { -+ minor_path = di_devfs_minor_path(minor); -+ arg.nargs = args; -+ arg.myself = node; -+ arg.minor = minor; -+ (void) di_devlink_walk(devlink_hdl, -+ "^usb/[0-9a-f]+[.][0-9a-f]+", minor_path, -+ DI_PRIMARY_LINK, (void *)&arg, sunos_add_devices); -+ di_devfs_path_free(minor_path); -+ } -+ -+ /* switch to a different node */ -+ nargs->last_ugenpath = NULL; -+ -+ return (DI_WALK_CONTINUE); -+} -+ -+int -+sunos_get_device_list(struct libusb_context * ctx, -+ struct discovered_devs **discdevs) -+{ -+ di_node_t root_node; -+ struct node_args args; -+ di_devlink_handle_t devlink_hdl; -+ -+ args.ctx = ctx; -+ args.discdevs = discdevs; -+ args.last_ugenpath = NULL; -+ if ((root_node = di_init("/", DINFOCPYALL)) == DI_NODE_NIL) { -+ usbi_dbg("di_int() failed: %s", strerror(errno)); -+ return (LIBUSB_ERROR_IO); -+ } -+ -+ if ((devlink_hdl = di_devlink_init(NULL, 0)) == NULL) { -+ di_fini(root_node); -+ usbi_dbg("di_devlink_init() failed: %s", strerror(errno)); -+ -+ return (LIBUSB_ERROR_IO); -+ } -+ args.dlink_hdl = devlink_hdl; -+ -+ /* walk each node to find USB devices */ -+ if (di_walk_node(root_node, DI_WALK_SIBFIRST, &args, -+ sunos_walk_minor_node_link) == -1) { -+ usbi_dbg("di_walk_node() failed: %s", strerror(errno)); -+ di_fini(root_node); -+ -+ return (LIBUSB_ERROR_IO); -+ } -+ -+ di_fini(root_node); -+ di_devlink_fini(&devlink_hdl); -+ -+ usbi_dbg("%d devices", (*discdevs)->len); -+ -+ return ((*discdevs)->len); -+} -+ -+static int -+sunos_usb_open_ep0(sunos_dev_handle_priv_t *hpriv, sunos_dev_priv_t *dpriv) -+{ -+ char filename[PATH_MAX + 1]; -+ -+ if (hpriv->eps[0].datafd > 0) { -+ -+ return (LIBUSB_SUCCESS); -+ } -+ snprintf(filename, PATH_MAX, "%s/cntrl0", dpriv->ugenpath); -+ -+ usbi_dbg("opening %s", filename); -+ hpriv->eps[0].datafd = open(filename, O_RDWR); -+ if (hpriv->eps[0].datafd < 0) { -+ return(_errno_to_libusb(errno)); -+ } -+ -+ snprintf(filename, PATH_MAX, "%s/cntrl0stat", dpriv->ugenpath); -+ hpriv->eps[0].statfd = open(filename, O_RDONLY); -+ if (hpriv->eps[0].statfd < 0) { -+ close(hpriv->eps[0].datafd); -+ hpriv->eps[0].datafd = -1; -+ -+ return(_errno_to_libusb(errno)); -+ } -+ -+ return (LIBUSB_SUCCESS); -+} -+ -+static void -+sunos_usb_close_all_eps(sunos_dev_handle_priv_t *hdev) -+{ -+ int i; -+ -+ /* not close ep0 */ -+ for (i = 1; i < USB_MAXENDPOINTS; i++) { -+ if (hdev->eps[i].datafd != -1) { -+ (void) close(hdev->eps[i].datafd); -+ hdev->eps[i].datafd = -1; -+ } -+ if (hdev->eps[i].statfd != -1) { -+ (void) close(hdev->eps[i].statfd); -+ hdev->eps[i].statfd = -1; -+ } -+ } -+} -+ -+static void -+sunos_usb_close_ep0(sunos_dev_handle_priv_t *hdev, sunos_dev_priv_t *dpriv) -+{ -+ if (hdev->eps[0].datafd >= 0) { -+ close(hdev->eps[0].datafd); -+ close(hdev->eps[0].statfd); -+ hdev->eps[0].datafd = -1; -+ hdev->eps[0].statfd = -1; -+ } -+} -+ -+static uchar_t -+sunos_usb_ep_index(uint8_t ep_addr) -+{ -+ return ((ep_addr & LIBUSB_ENDPOINT_ADDRESS_MASK) + -+ ((ep_addr & LIBUSB_ENDPOINT_DIR_MASK) ? 16 : 0)); -+} -+ -+static int -+sunos_find_interface(struct libusb_device_handle *hdev, -+ uint8_t endpoint, uint8_t *interface) -+{ -+ struct libusb_config_descriptor *config; -+ int r; -+ int iface_idx; -+ -+ r = libusb_get_active_config_descriptor(hdev->dev, &config); -+ if (r < 0) { -+ return (LIBUSB_ERROR_INVALID_PARAM); -+ } -+ -+ for (iface_idx = 0; iface_idx < config->bNumInterfaces; iface_idx++) { -+ const struct libusb_interface *iface = -+ &config->interface[iface_idx]; -+ int altsetting_idx; -+ -+ for (altsetting_idx = 0; altsetting_idx < iface->num_altsetting; -+ altsetting_idx++) { -+ const struct libusb_interface_descriptor *altsetting = -+ &iface->altsetting[altsetting_idx]; -+ int ep_idx; -+ -+ for (ep_idx = 0; ep_idx < altsetting->bNumEndpoints; -+ ep_idx++) { -+ const struct libusb_endpoint_descriptor *ep = -+ &altsetting->endpoint[ep_idx]; -+ if (ep->bEndpointAddress == endpoint) { -+ *interface = iface_idx; -+ libusb_free_config_descriptor(config); -+ -+ return (LIBUSB_SUCCESS); -+ } -+ } -+ } -+ } -+ libusb_free_config_descriptor(config); -+ -+ return (LIBUSB_ERROR_INVALID_PARAM); -+} -+ -+static int -+sunos_check_device_and_status_open(struct libusb_device_handle *hdl, -+ uint8_t ep_addr, int ep_type) -+{ -+ char filename[PATH_MAX + 1], statfilename[PATH_MAX + 1]; -+ char cfg_num[16], alt_num[16]; -+ int fd, fdstat, mode; -+ uint8_t ifc = 0; -+ uint8_t ep_index; -+ sunos_dev_handle_priv_t *hpriv; -+ -+ usbi_dbg("open ep 0x%02x", ep_addr); -+ hpriv = (sunos_dev_handle_priv_t *)hdl->os_priv; -+ ep_index = sunos_usb_ep_index(ep_addr); -+ /* ep already opened */ -+ if ((hpriv->eps[ep_index].datafd > 0) && -+ (hpriv->eps[ep_index].statfd > 0)) { -+ usbi_dbg("ep 0x%02x already opened, return success", -+ ep_addr); -+ -+ return (0); -+ } -+ -+ if (sunos_find_interface(hdl, ep_addr, &ifc) < 0) { -+ usbi_dbg("can't find interface for endpoint 0x%02x", -+ ep_addr); -+ -+ return (LIBUSB_ERROR_ACCESS); -+ } -+ -+ /* create filename */ -+ if (hpriv->config_index > 0) { -+ (void) snprintf(cfg_num, sizeof (cfg_num), "cfg%d", -+ hpriv->config_index + 1); -+ } else { -+ bzero(cfg_num, sizeof (cfg_num)); -+ } -+ -+ if (hpriv->altsetting[ifc] > 0) { -+ (void) snprintf(alt_num, sizeof (alt_num), ".%d", -+ hpriv->altsetting[ifc]); -+ } else { -+ bzero(alt_num, sizeof (alt_num)); -+ } -+ -+ (void) snprintf(filename, PATH_MAX, "%s/%sif%d%s%s%d", -+ hpriv->dpriv->ugenpath, cfg_num, ifc, alt_num, -+ (ep_addr & LIBUSB_ENDPOINT_DIR_MASK) ? "in" : -+ "out", (ep_addr & LIBUSB_ENDPOINT_ADDRESS_MASK)); -+ (void) snprintf(statfilename, PATH_MAX, "%sstat", filename); -+ -+ /* -+ * for interrupt IN endpoints, we need to enable one xfer -+ * mode before opening the endpoint -+ */ -+ if ((ep_type == LIBUSB_TRANSFER_TYPE_INTERRUPT) && -+ (ep_addr & LIBUSB_ENDPOINT_IN)) { -+ char control = USB_EP_INTR_ONE_XFER; -+ int count; -+ -+ /* open the status device node for the ep first RDWR */ -+ if ((fdstat = open(statfilename, O_RDWR)) == -1) { -+ usbi_dbg("can't open %s RDWR: %d", -+ statfilename, errno); -+ } else { -+ count = write(fdstat, &control, sizeof (control)); -+ if (count != 1) { -+ /* this should have worked */ -+ usbi_dbg("can't write to %s: %d", -+ statfilename, errno); -+ (void) close(fdstat); -+ -+ return (errno); -+ } -+ /* close status node and open xfer node first */ -+ close (fdstat); -+ } -+ } -+ -+ /* open the xfer node first in case alt needs to be changed */ -+ if (ep_type == LIBUSB_TRANSFER_TYPE_ISOCHRONOUS) { -+ mode = O_RDWR; -+ } else if (ep_addr & LIBUSB_ENDPOINT_IN) { -+ mode = O_RDONLY; -+ } else { -+ mode = O_WRONLY; -+ } -+ -+ /* -+ * IMPORTANT: must open data xfer node first and then open stat node -+ * Otherwise, it will fail on multi-config or multi-altsetting devices -+ * with "Device Busy" error. See ugen_epxs_switch_cfg_alt() and -+ * ugen_epxs_check_alt_switch() in ugen driver source code. -+ */ -+ if ((fd = open(filename, mode)) == -1) { -+ usbi_dbg("can't open %s: %d(%s)", filename, errno, -+ strerror(errno)); -+ -+ return (errno); -+ } -+ /* open the status node */ -+ if ((fdstat = open(statfilename, O_RDONLY)) == -1) { -+ usbi_dbg("can't open %s: %d", statfilename, errno); -+ -+ (void) close(fd); -+ -+ return (errno); -+ } -+ -+ hpriv->eps[ep_index].datafd = fd; -+ hpriv->eps[ep_index].statfd = fdstat; -+ usbi_dbg("ep=0x%02x datafd=%d, statfd=%d", ep_addr, fd, fdstat); -+ -+ return (0); -+} -+ -+int -+sunos_open(struct libusb_device_handle *handle) -+{ -+ sunos_dev_handle_priv_t *hpriv; -+ sunos_dev_priv_t *dpriv; -+ int i; -+ int ret; -+ -+ hpriv = (sunos_dev_handle_priv_t *)handle->os_priv; -+ dpriv = (sunos_dev_priv_t *)handle->dev->os_priv; -+ hpriv->dpriv = dpriv; -+ -+ /* set all file descriptors to "closed" */ -+ for (i = 0; i < USB_MAXENDPOINTS; i++) { -+ hpriv->eps[i].datafd = -1; -+ hpriv->eps[i].statfd = -1; -+ } -+ -+ if ((ret = sunos_usb_open_ep0(hpriv, dpriv)) != LIBUSB_SUCCESS) { -+ usbi_dbg("fail: %d", ret); -+ return (ret); -+ } -+ -+ return (LIBUSB_SUCCESS); -+} -+ -+void -+sunos_close(struct libusb_device_handle *handle) -+{ -+ sunos_dev_handle_priv_t *hpriv; -+ sunos_dev_priv_t *dpriv; -+ -+ usbi_dbg(""); -+ if (!handle) { -+ return; -+ } -+ -+ hpriv = (sunos_dev_handle_priv_t *)handle->os_priv; -+ if (!hpriv) { -+ return; -+ } -+ dpriv = (sunos_dev_priv_t *)handle->dev->os_priv; -+ if (!dpriv) { -+ return; -+ } -+ -+ sunos_usb_close_all_eps(hpriv); -+ sunos_usb_close_ep0(hpriv, dpriv); -+} -+ -+int -+sunos_get_device_descriptor(struct libusb_device *dev, uint8_t *buf, -+ int *host_endian) -+{ -+ sunos_dev_priv_t *dpriv = (sunos_dev_priv_t *)dev->os_priv; -+ -+ memcpy(buf, &dpriv->dev_descr, LIBUSB_DT_DEVICE_SIZE); -+ *host_endian = 0; -+ -+ return (LIBUSB_SUCCESS); -+} -+ -+int -+sunos_get_active_config_descriptor(struct libusb_device *dev, -+ uint8_t *buf, size_t len, int *host_endian) -+{ -+ sunos_dev_priv_t *dpriv = (sunos_dev_priv_t *)dev->os_priv; -+ struct libusb_config_descriptor *cfg; -+ -+ cfg = (struct libusb_config_descriptor *)dpriv->raw_cfgdescr; -+ len = MIN(len, libusb_le16_to_cpu(cfg->wTotalLength)); -+ memcpy(buf, dpriv->raw_cfgdescr, len); -+ *host_endian = 0; -+ usbi_dbg("len %d", len); -+ -+ return (len); -+} -+ -+int -+sunos_get_config_descriptor(struct libusb_device *dev, uint8_t idx, -+ uint8_t *buf, size_t len, int *host_endian) -+{ -+ /* XXX */ -+ return(sunos_get_active_config_descriptor(dev, buf, len, host_endian)); -+} -+ -+int -+sunos_get_configuration(struct libusb_device_handle *handle, int *config) -+{ -+ sunos_dev_priv_t *dpriv = (sunos_dev_priv_t *)handle->dev->os_priv; -+ -+ *config = dpriv->cfgvalue; -+ -+ usbi_dbg("bConfigurationValue %d", *config); -+ -+ return (LIBUSB_SUCCESS); -+} -+ -+int -+sunos_set_configuration(struct libusb_device_handle *handle, int config) -+{ -+ sunos_dev_priv_t *dpriv = (sunos_dev_priv_t *)handle->dev->os_priv; -+ usbi_dbg("bConfigurationValue %d", config); -+ -+ if (dpriv->ugenpath == NULL) -+ return (LIBUSB_ERROR_NOT_SUPPORTED); -+ -+ if (config < 1 || config > dpriv->dev_descr.bNumConfigurations) -+ return (LIBUSB_ERROR_INVALID_PARAM); -+ -+ dpriv->cfgvalue = config; -+ -+ return (LIBUSB_SUCCESS); -+} -+ -+int -+sunos_claim_interface(struct libusb_device_handle *handle, int iface) -+{ -+ usbi_dbg("iface %d", iface); -+ if (iface < 0) { -+ return (LIBUSB_ERROR_INVALID_PARAM); -+ } -+ -+ return (LIBUSB_SUCCESS); -+} -+ -+int -+sunos_release_interface(struct libusb_device_handle *handle, int iface) -+{ -+ sunos_dev_handle_priv_t *hpriv = -+ (sunos_dev_handle_priv_t *)handle->os_priv; -+ -+ usbi_dbg("iface %d", iface); -+ if (iface < 0) { -+ return (LIBUSB_ERROR_INVALID_PARAM); -+ } -+ -+ /* XXX: can we release it? */ -+ hpriv->altsetting[iface] = 0; -+ -+ return (LIBUSB_SUCCESS); -+} -+ -+int -+sunos_set_interface_altsetting(struct libusb_device_handle *handle, int iface, -+ int altsetting) -+{ -+ sunos_dev_priv_t *dpriv = (sunos_dev_priv_t *)handle->dev->os_priv; -+ sunos_dev_handle_priv_t *hpriv = -+ (sunos_dev_handle_priv_t *)handle->os_priv; -+ -+ usbi_dbg("iface %d, setting %d", iface, altsetting); -+ -+ if (iface < 0 || altsetting < 0) { -+ return (LIBUSB_ERROR_INVALID_PARAM); -+ } -+ if (dpriv->ugenpath == NULL) -+ return (LIBUSB_ERROR_NOT_FOUND); -+ -+ /* XXX: can we switch altsetting? */ -+ hpriv->altsetting[iface] = altsetting; -+ -+ return (LIBUSB_SUCCESS); -+} -+ -+static void -+usb_dump_data(unsigned char *data, size_t size) -+{ -+ int i; -+ -+ if (getenv("LIBUSB_DEBUG") == NULL) { -+ return; -+ } -+ -+ (void) fprintf(stderr, "data dump:"); -+ for (i = 0; i < size; i++) { -+ if (i % 16 == 0) { -+ (void) fprintf(stderr, "\n%08x ", i); -+ } -+ (void) fprintf(stderr, "%02x ", (uchar_t)data[i]); -+ } -+ (void) fprintf(stderr, "\n"); -+} -+ -+static void -+sunos_async_callback(union sigval arg) -+{ -+ struct sunos_transfer_priv *tpriv = -+ (struct sunos_transfer_priv *)arg.sival_ptr; -+ struct libusb_transfer *xfer = tpriv->transfer; -+ struct aiocb *aiocb = &tpriv->aiocb; -+ int ret; -+ sunos_dev_handle_priv_t *hpriv; -+ uint8_t ep; -+ -+ hpriv = (sunos_dev_handle_priv_t *)xfer->dev_handle->os_priv; -+ ep = sunos_usb_ep_index(xfer->endpoint); -+ -+ ret = aio_error(aiocb); -+ if (ret != 0) { -+ xfer->status = sunos_usb_get_status(hpriv->eps[ep].statfd); -+ } else { -+ xfer->actual_length = -+ LIBUSB_TRANSFER_TO_USBI_TRANSFER(xfer)->transferred = -+ aio_return(aiocb); -+ } -+ -+ usb_dump_data(xfer->buffer, xfer->actual_length); -+ -+ usbi_dbg("ret=%d, len=%d, actual_len=%d", ret, xfer->length, -+ xfer->actual_length); -+ -+ /* async notification */ -+ usbi_signal_transfer_completion(LIBUSB_TRANSFER_TO_USBI_TRANSFER(xfer)); -+ free(aiocb); -+} -+ -+static int -+sunos_do_async_io(struct libusb_transfer *transfer) -+{ -+ int ret = -1; -+ struct aiocb *aiocb; -+ sunos_dev_handle_priv_t *hpriv; -+ uint8_t ep; -+ struct sunos_transfer_priv *tpriv; -+ -+ usbi_dbg(""); -+ -+ tpriv = usbi_transfer_get_os_priv(LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer)); -+ hpriv = (sunos_dev_handle_priv_t *)transfer->dev_handle->os_priv; -+ ep = sunos_usb_ep_index(transfer->endpoint); -+ -+ tpriv->transfer = transfer; -+ aiocb = &tpriv->aiocb; -+ bzero(aiocb, sizeof (*aiocb)); -+ aiocb->aio_fildes = hpriv->eps[ep].datafd; -+ aiocb->aio_buf = transfer->buffer; -+ aiocb->aio_nbytes = transfer->length; -+ aiocb->aio_lio_opcode = -+ ((transfer->endpoint & LIBUSB_ENDPOINT_DIR_MASK) == -+ LIBUSB_ENDPOINT_IN) ? LIO_READ:LIO_WRITE; -+ aiocb->aio_sigevent.sigev_notify = SIGEV_THREAD; -+ aiocb->aio_sigevent.sigev_value.sival_ptr = tpriv; -+ aiocb->aio_sigevent.sigev_notify_function = sunos_async_callback; -+ -+ if (aiocb->aio_lio_opcode == LIO_READ) { -+ ret = aio_read(aiocb); -+ } else { -+ ret = aio_write(aiocb); -+ } -+ -+ return (ret); -+} -+ -+/* return the number of bytes read/written */ -+static int -+usb_do_io(int fd, int stat_fd, char *data, size_t size, int flag, int *status) -+{ -+ int error; -+ int ret = -1; -+ -+ usbi_dbg("usb_do_io(): datafd=%d statfd=%d size=0x%x flag=%s", -+ fd, stat_fd, size, flag? "WRITE":"READ"); -+ -+ switch (flag) { -+ case READ: -+ errno = 0; -+ ret = read(fd, data, size); -+ usb_dump_data(data, size); -+ break; -+ case WRITE: -+ usb_dump_data(data, size); -+ errno = 0; -+ ret = write(fd, data, size); -+ break; -+ } -+ -+ usbi_dbg("usb_do_io(): amount=%d", ret); -+ -+ if (ret < 0) { -+ int save_errno = errno; -+ -+ usbi_dbg("TID=%x io %s errno=%d(%s) ret=%d", pthread_self(), -+ flag?"WRITE":"READ", errno, strerror(errno), ret); -+ -+ /* sunos_usb_get_status will do a read and overwrite errno */ -+ error = sunos_usb_get_status(stat_fd); -+ usbi_dbg("io status=%d errno=%d(%s)", error, -+ save_errno, strerror(save_errno)); -+ -+ if (status) { -+ *status = save_errno; -+ } -+ -+ return (save_errno); -+ -+ } else if (status) { -+ *status = 0; -+ } -+ -+ return (ret); -+} -+ -+static int -+solaris_submit_ctrl_on_default(struct libusb_transfer *transfer) -+{ -+ int ret = -1, setup_ret; -+ int status; -+ sunos_dev_handle_priv_t *hpriv; -+ struct libusb_device_handle *hdl = transfer->dev_handle; -+ uint16_t wLength; -+ uint8_t *data = transfer->buffer; -+ -+ hpriv = (sunos_dev_handle_priv_t *)hdl->os_priv; -+ wLength = transfer->length - LIBUSB_CONTROL_SETUP_SIZE; -+ -+ if (hpriv->eps[0].datafd == -1) { -+ usbi_dbg("ep0 not opened"); -+ -+ return (LIBUSB_ERROR_NOT_FOUND); -+ } -+ -+ if ((data[0] & LIBUSB_ENDPOINT_DIR_MASK) == LIBUSB_ENDPOINT_IN) { -+ usbi_dbg("IN request"); -+ ret = usb_do_io(hpriv->eps[0].datafd, -+ hpriv->eps[0].statfd, (char *)data, LIBUSB_CONTROL_SETUP_SIZE, -+ WRITE, (int *)&status); -+ } else { -+ usbi_dbg("OUT request"); -+ ret = usb_do_io(hpriv->eps[0].datafd, hpriv->eps[0].statfd, -+ transfer->buffer, transfer->length, WRITE, -+ (int *)&transfer->status); -+ } -+ -+ setup_ret = ret; -+ if (ret < LIBUSB_CONTROL_SETUP_SIZE) { -+ usbi_dbg("error sending control msg: %d", ret); -+ -+ return (LIBUSB_ERROR_IO); -+ } -+ -+ ret = transfer->length - LIBUSB_CONTROL_SETUP_SIZE; -+ -+ /* Read the remaining bytes for IN request */ -+ if ((wLength) && ((data[0] & LIBUSB_ENDPOINT_DIR_MASK) == -+ LIBUSB_ENDPOINT_IN)) { -+ usbi_dbg("DATA: %d", transfer->length - setup_ret); -+ ret = usb_do_io(hpriv->eps[0].datafd, -+ hpriv->eps[0].statfd, -+ (char *)transfer->buffer + LIBUSB_CONTROL_SETUP_SIZE, -+ wLength, READ, (int *)&transfer->status); -+ } -+ -+ if (ret >= 0) { -+ transfer->actual_length = ret; -+ LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer)->transferred = ret; -+ } -+ usbi_dbg("Done: ctrl data bytes %d", ret); -+ -+ /* sync transfer handling */ -+ ret = usbi_handle_transfer_completion(LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer), -+ transfer->status); -+ -+ return (ret); -+} -+ -+int -+sunos_clear_halt(struct libusb_device_handle *handle, uint8_t endpoint) -+{ -+ int ret; -+ -+ usbi_dbg("endpoint=0x%02x", endpoint); -+ -+ ret = libusb_control_transfer(handle, LIBUSB_ENDPOINT_OUT | -+ LIBUSB_RECIPIENT_ENDPOINT | LIBUSB_REQUEST_TYPE_STANDARD, -+ LIBUSB_REQUEST_CLEAR_FEATURE, 0, endpoint, NULL, 0, 1000); -+ -+ usbi_dbg("ret=%d", ret); -+ -+ return (ret); -+} -+ -+int -+sunos_reset_device(struct libusb_device_handle *handle) -+{ -+ usbi_dbg(""); -+ -+ return (LIBUSB_ERROR_NOT_SUPPORTED); -+} -+ -+void -+sunos_destroy_device(struct libusb_device *dev) -+{ -+ sunos_dev_priv_t *dpriv = (sunos_dev_priv_t *)dev->os_priv; -+ -+ usbi_dbg(""); -+ -+ free(dpriv->raw_cfgdescr); -+ free(dpriv->ugenpath); -+ free(dpriv->phypath); -+} -+ -+int -+sunos_submit_transfer(struct usbi_transfer *itransfer) -+{ -+ struct libusb_transfer *transfer; -+ struct libusb_device_handle *hdl; -+ int err = 0; -+ -+ transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); -+ hdl = transfer->dev_handle; -+ -+ err = sunos_check_device_and_status_open(hdl, -+ transfer->endpoint, transfer->type); -+ if (err < 0) { -+ -+ return (_errno_to_libusb(err)); -+ } -+ -+ switch (transfer->type) { -+ case LIBUSB_TRANSFER_TYPE_CONTROL: -+ /* sync transfer */ -+ usbi_dbg("CTRL transfer: %d", transfer->length); -+ err = solaris_submit_ctrl_on_default(transfer); -+ break; -+ -+ case LIBUSB_TRANSFER_TYPE_BULK: -+ /* fallthru */ -+ case LIBUSB_TRANSFER_TYPE_INTERRUPT: -+ if (transfer->type == LIBUSB_TRANSFER_TYPE_BULK) -+ usbi_dbg("BULK transfer: %d", transfer->length); -+ else -+ usbi_dbg("INTR transfer: %d", transfer->length); -+ err = sunos_do_async_io(transfer); -+ break; -+ -+ case LIBUSB_TRANSFER_TYPE_ISOCHRONOUS: -+ /* Isochronous/Stream is not supported */ -+ -+ /* fallthru */ -+ case LIBUSB_TRANSFER_TYPE_BULK_STREAM: -+ if (transfer->type == LIBUSB_TRANSFER_TYPE_ISOCHRONOUS) -+ usbi_dbg("ISOC transfer: %d", transfer->length); -+ else -+ usbi_dbg("BULK STREAM transfer: %d", transfer->length); -+ err = LIBUSB_ERROR_NOT_SUPPORTED; -+ break; -+ } -+ -+ return (err); -+} -+ -+int -+sunos_cancel_transfer(struct usbi_transfer *itransfer) -+{ -+ sunos_xfer_priv_t *tpriv; -+ sunos_dev_handle_priv_t *hpriv; -+ struct libusb_transfer *transfer; -+ struct aiocb *aiocb; -+ uint8_t ep; -+ int ret; -+ -+ tpriv = usbi_transfer_get_os_priv(itransfer); -+ aiocb = &tpriv->aiocb; -+ transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); -+ hpriv = (sunos_dev_handle_priv_t *)transfer->dev_handle->os_priv; -+ ep = sunos_usb_ep_index(transfer->endpoint); -+ -+ ret = aio_cancel(hpriv->eps[ep].datafd, aiocb); -+ -+ usbi_dbg("aio->fd=%d fd=%d ret = %d, %s", aiocb->aio_fildes, -+ hpriv->eps[ep].datafd, ret, (ret == AIO_CANCELED)? -+ strerror(0):strerror(errno)); -+ -+ if (ret != AIO_CANCELED) { -+ ret = _errno_to_libusb(errno); -+ } else { -+ /* -+ * we don't need to call usbi_handle_transfer_cancellation(), -+ * because we'll handle everything in sunos_async_callback. -+ */ -+ ret = LIBUSB_SUCCESS; -+ } -+ -+ return (ret); -+} -+ -+void -+sunos_clear_transfer_priv(struct usbi_transfer *itransfer) -+{ -+ usbi_dbg(""); -+ -+ /* Nothing to do */ -+} -+ -+int -+sunos_handle_transfer_completion(struct usbi_transfer *itransfer) -+{ -+ return usbi_handle_transfer_completion(itransfer, LIBUSB_TRANSFER_COMPLETED); -+} -+ -+int -+sunos_clock_gettime(int clkid, struct timespec *tp) -+{ -+ usbi_dbg("clock %d", clkid); -+ -+ if (clkid == USBI_CLOCK_REALTIME) -+ return clock_gettime(CLOCK_REALTIME, tp); -+ -+ if (clkid == USBI_CLOCK_MONOTONIC) -+ return clock_gettime(CLOCK_MONOTONIC, tp); -+ -+ return (LIBUSB_ERROR_INVALID_PARAM); -+} -+ -+int -+_errno_to_libusb(int err) -+{ -+ usbi_dbg("error: %s (%d)", strerror(err), err); -+ -+ switch (err) { -+ case EIO: -+ return (LIBUSB_ERROR_IO); -+ case EACCES: -+ return (LIBUSB_ERROR_ACCESS); -+ case ENOENT: -+ return (LIBUSB_ERROR_NO_DEVICE); -+ case ENOMEM: -+ return (LIBUSB_ERROR_NO_MEM); -+ case ETIMEDOUT: -+ return (LIBUSB_ERROR_TIMEOUT); -+ } -+ -+ return (LIBUSB_ERROR_OTHER); -+} -+ -+/* -+ * sunos_usb_get_status: -+ * gets status of endpoint -+ * -+ * Returns: ugen's last cmd status -+ */ -+static int -+sunos_usb_get_status(int fd) -+{ -+ int status, ret; -+ -+ usbi_dbg("sunos_usb_get_status(): fd=%d", fd); -+ -+ ret = read(fd, &status, sizeof (status)); -+ if (ret == sizeof (status)) { -+ switch (status) { -+ case USB_LC_STAT_NOERROR: -+ usbi_dbg("No Error"); -+ break; -+ case USB_LC_STAT_CRC: -+ usbi_dbg("CRC Timeout Detected\n"); -+ break; -+ case USB_LC_STAT_BITSTUFFING: -+ usbi_dbg("Bit Stuffing Violation\n"); -+ break; -+ case USB_LC_STAT_DATA_TOGGLE_MM: -+ usbi_dbg("Data Toggle Mismatch\n"); -+ break; -+ case USB_LC_STAT_STALL: -+ usbi_dbg("End Point Stalled\n"); -+ break; -+ case USB_LC_STAT_DEV_NOT_RESP: -+ usbi_dbg("Device is Not Responding\n"); -+ break; -+ case USB_LC_STAT_PID_CHECKFAILURE: -+ usbi_dbg("PID Check Failure\n"); -+ break; -+ case USB_LC_STAT_UNEXP_PID: -+ usbi_dbg("Unexpected PID\n"); -+ break; -+ case USB_LC_STAT_DATA_OVERRUN: -+ usbi_dbg("Data Exceeded Size\n"); -+ break; -+ case USB_LC_STAT_DATA_UNDERRUN: -+ usbi_dbg("Less data received\n"); -+ break; -+ case USB_LC_STAT_BUFFER_OVERRUN: -+ usbi_dbg("Buffer Size Exceeded\n"); -+ break; -+ case USB_LC_STAT_BUFFER_UNDERRUN: -+ usbi_dbg("Buffer Underrun\n"); -+ break; -+ case USB_LC_STAT_TIMEOUT: -+ usbi_dbg("Command Timed Out\n"); -+ break; -+ case USB_LC_STAT_NOT_ACCESSED: -+ usbi_dbg("Not Accessed by h/w\n"); -+ break; -+ case USB_LC_STAT_UNSPECIFIED_ERR: -+ usbi_dbg("Unspecified Error\n"); -+ break; -+ case USB_LC_STAT_NO_BANDWIDTH: -+ usbi_dbg("No Bandwidth\n"); -+ break; -+ case USB_LC_STAT_HW_ERR: -+ usbi_dbg("Host Controller h/w Error\n"); -+ break; -+ case USB_LC_STAT_SUSPENDED: -+ usbi_dbg("Device was Suspended\n"); -+ break; -+ case USB_LC_STAT_DISCONNECTED: -+ usbi_dbg("Device was Disconnected\n"); -+ break; -+ case USB_LC_STAT_INTR_BUF_FULL: -+ usbi_dbg("Interrupt buffer was full\n"); -+ break; -+ case USB_LC_STAT_INVALID_REQ: -+ usbi_dbg("Request was Invalid\n"); -+ break; -+ case USB_LC_STAT_INTERRUPTED: -+ usbi_dbg("Request was Interrupted\n"); -+ break; -+ case USB_LC_STAT_NO_RESOURCES: -+ usbi_dbg("No resources available for " -+ "request\n"); -+ break; -+ case USB_LC_STAT_INTR_POLLING_FAILED: -+ usbi_dbg("Failed to Restart Poll"); -+ break; -+ default: -+ usbi_dbg("Error Not Determined %d\n", -+ status); -+ break; -+ } -+ } else { -+ usbi_dbg("read stat error: %s",strerror(errno)); -+ status = -1; -+ } -+ -+ return (status); -+} -+ -+const struct usbi_os_backend sunos_backend = { -+ .name = "Solaris", -+ .caps = 0, -+ .init = sunos_init, -+ .exit = sunos_exit, -+ .get_device_list = sunos_get_device_list, -+ .get_device_descriptor = sunos_get_device_descriptor, -+ .get_active_config_descriptor = sunos_get_active_config_descriptor, -+ .get_config_descriptor = sunos_get_config_descriptor, -+ .hotplug_poll = NULL, -+ .open = sunos_open, -+ .close = sunos_close, -+ .get_configuration = sunos_get_configuration, -+ .set_configuration = sunos_set_configuration, -+ -+ .claim_interface = sunos_claim_interface, -+ .release_interface = sunos_release_interface, -+ .set_interface_altsetting = sunos_set_interface_altsetting, -+ .clear_halt = sunos_clear_halt, -+ .reset_device = sunos_reset_device, /* TODO */ -+ .alloc_streams = NULL, -+ .free_streams = NULL, -+ .kernel_driver_active = NULL, -+ .detach_kernel_driver = NULL, -+ .attach_kernel_driver = NULL, -+ .destroy_device = sunos_destroy_device, -+ .submit_transfer = sunos_submit_transfer, -+ .cancel_transfer = sunos_cancel_transfer, -+ .handle_events = NULL, -+ .clear_transfer_priv = sunos_clear_transfer_priv, -+ .handle_transfer_completion = sunos_handle_transfer_completion, -+ .clock_gettime = sunos_clock_gettime, -+ .device_priv_size = sizeof(sunos_dev_priv_t), -+ .device_handle_priv_size = sizeof(sunos_dev_handle_priv_t), -+ .transfer_priv_size = sizeof(sunos_xfer_priv_t), -+}; -diff -Naur libusb-1.0.20/libusb/os/sunos_usb.h libusb-1.0.20.new/libusb/os/sunos_usb.h ---- libusb-1.0.20/libusb/os/sunos_usb.h 1969-12-31 16:00:00.000000000 -0800 -+++ libusb-1.0.20.new/libusb/os/sunos_usb.h 2016-03-10 00:24:37.910437590 -0800 -@@ -0,0 +1,74 @@ -+/* -+ * -+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library 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 -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -+ */ -+ -+#ifndef __SUNOS_H__ -+#define __SUNOS_H__ -+ -+#include -+#include -+#include "libusbi.h" -+ -+#define READ 0 -+#define WRITE 1 -+ -+typedef struct sunos_device_priv { -+ uint8_t cfgvalue; /* active config value */ -+ uint8_t *raw_cfgdescr; /* active config descriptor */ -+ struct libusb_device_descriptor dev_descr; /* usb device descriptor */ -+ char *ugenpath; /* name of the ugen(4) node */ -+ char *phypath; /* physical path */ -+} sunos_dev_priv_t; -+ -+typedef struct endpoint { -+ int datafd; /* data file */ -+ int statfd; /* state file */ -+} sunos_ep_priv_t; -+ -+typedef struct sunos_device_handle_priv { -+ uint8_t altsetting[USB_MAXINTERFACES]; /* a interface's alt */ -+ uint8_t config_index; -+ sunos_ep_priv_t eps[USB_MAXENDPOINTS]; -+ sunos_dev_priv_t *dpriv; /* device private */ -+} sunos_dev_handle_priv_t; -+ -+typedef struct sunos_transfer_priv { -+ struct aiocb aiocb; -+ struct libusb_transfer *transfer; -+} sunos_xfer_priv_t; -+ -+struct node_args { -+ struct libusb_context *ctx; -+ struct discovered_devs **discdevs; -+ const char *last_ugenpath; -+ di_devlink_handle_t dlink_hdl; -+}; -+ -+struct devlink_cbarg { -+ struct node_args *nargs; /* di node walk arguments */ -+ di_node_t myself; /* the di node */ -+ di_minor_t minor; -+}; -+ -+/* AIO callback args */ -+struct aio_callback_args{ -+ struct libusb_transfer *transfer; -+ struct aiocb aiocb; -+}; -+ -+#endif /* __SUNOS_H__ */ -diff -Naur libusb-1.0.20/libusb-1.0.pc.in libusb-1.0.20.new/libusb-1.0.pc.in ---- libusb-1.0.20/libusb-1.0.pc.in 2015-07-28 22:18:38.000000000 -0700 -+++ libusb-1.0.20.new/libusb-1.0.pc.in 2016-03-10 00:17:29.567059098 -0800 -@@ -4,7 +4,7 @@ - includedir=@includedir@ - - Name: libusb-1.0 --Description: C API for USB device access from Linux, Mac OS X, Windows and OpenBSD/NetBSD userspace -+Description: C API for USB device access from Linux, Mac OS X, Windows, OpenBSD/NetBSD and Solaris userspace - Version: @VERSION@ - Libs: -L${libdir} -lusb-1.0 - Libs.private: @LIBS@