CVS commit: [nick-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:    src
Committed By:   skrll
Date:           Sat Jun  6 15:27:38 UTC 2015

Modified Files:
        src/sys/dev/usb [nick-nhusb]: usbdi_util.c usbdi_util.h


To generate a diff of this commit:
cvs rdiff -u -r1.63.2.8 -r1.63.2.9 src/sys/dev/usb/usbdi_util.c
cvs rdiff -u -r1.45.6.6 -r1.45.6.7 src/sys/dev/usb/usbdi_util.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/usb/usbdi_util.c
diff -u src/sys/dev/usb/usbdi_util.c:1.63.2.8 src/sys/dev/usb/usbdi_util.c:1.63.2.9
--- src/sys/dev/usb/usbdi_util.c:1.63.2.8	Mon Apr  6 15:18:14 2015
+++ src/sys/dev/usb/usbdi_util.c	Sat Jun  6 15:27:38 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: usbdi_util.c,v 1.63.2.8 2015/04/06 15:18:14 skrll Exp $	*/
+/*	$NetBSD: usbdi_util.c,v 1.63.2.9 2015/06/06 15:27:38 skrll Exp $	*/
 
 /*
  * Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi_util.c,v 1.63.2.8 2015/04/06 15:18:14 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi_util.c,v 1.63.2.9 2015/06/06 15:27:38 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -243,6 +243,32 @@ usbd_set_port_feature(struct usbd_device
 }
 
 usbd_status
+usbd_set_port_u1_timeout(struct usbd_device *dev, int port, int timeout)
+{
+	usb_device_request_t req;
+
+	req.bmRequestType = UT_WRITE_CLASS_OTHER;
+	req.bRequest = UR_SET_FEATURE;
+	USETW(req.wValue, UHF_PORT_U1_TIMEOUT);
+	USETW2(req.wIndex, timeout, port);
+	USETW(req.wLength, 0);
+	return usbd_do_request(dev, &req, 0);
+}
+
+usbd_status
+usbd_set_port_u2_timeout(struct usbd_device *dev, int port, int timeout)
+{
+	usb_device_request_t req;
+
+	req.bmRequestType = UT_WRITE_CLASS_OTHER;
+	req.bRequest = UR_SET_FEATURE;
+	USETW(req.wValue, UHF_PORT_U2_TIMEOUT);
+	USETW2(req.wIndex, timeout, port);
+	USETW(req.wLength, 0);
+	return usbd_do_request(dev, &req, 0);
+}
+
+usbd_status
 usbd_get_protocol(struct usbd_interface *iface, uint8_t *report)
 {
 	usb_interface_descriptor_t *id = usbd_get_interface_descriptor(iface);

Index: src/sys/dev/usb/usbdi_util.h
diff -u src/sys/dev/usb/usbdi_util.h:1.45.6.6 src/sys/dev/usb/usbdi_util.h:1.45.6.7
--- src/sys/dev/usb/usbdi_util.h:1.45.6.6	Mon Apr  6 15:18:14 2015
+++ src/sys/dev/usb/usbdi_util.h	Sat Jun  6 15:27:38 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: usbdi_util.h,v 1.45.6.6 2015/04/06 15:18:14 skrll Exp $	*/
+/*	$NetBSD: usbdi_util.h,v 1.45.6.7 2015/06/06 15:27:38 skrll Exp $	*/
 
 /*
  * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -52,6 +52,8 @@ usbd_status	usbd_set_hub_feature(struct 
 usbd_status	usbd_clear_hub_feature(struct usbd_device *, int);
 usbd_status	usbd_set_port_feature(struct usbd_device *, int, int);
 usbd_status	usbd_clear_port_feature(struct usbd_device *, int, int);
+usbd_status	usbd_set_port_u1_timeout(struct usbd_device *, int, int);
+usbd_status	usbd_set_port_u2_timeout(struct usbd_device *, int, int);
 usbd_status	usbd_get_device_status(struct usbd_device *, usb_status_t *);
 usbd_status	usbd_get_hub_status(struct usbd_device *, usb_hub_status_t *);
 usbd_status	usbd_get_protocol(struct usbd_interface *, uint8_t *);