CVS commit: src/sys/dev/usb

[Nick Hudson]

Module Name:    src
Committed By:   skrll
Date:           Fri Mar 27 12:46:51 UTC 2015

Modified Files:
        src/sys/dev/usb: usbdi_util.c usbdi_util.h

Log Message:
Add usbd_get_bos_desc{,_full} from Takahiro HAYASHI


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/usb/usbdi_util.c
cvs rdiff -u -r1.45 -r1.46 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 src/sys/dev/usb/usbdi_util.c:1.64
--- src/sys/dev/usb/usbdi_util.c:1.63	Fri Sep 12 16:40:38 2014
+++ src/sys/dev/usb/usbdi_util.c	Fri Mar 27 12:46:51 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: usbdi_util.c,v 1.63 2014/09/12 16:40:38 skrll Exp $	*/
+/*	$NetBSD: usbdi_util.c,v 1.64 2015/03/27 12:46:51 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 2014/09/12 16:40:38 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi_util.c,v 1.64 2015/03/27 12:46:51 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -105,6 +105,33 @@ usbd_get_config_desc_full(usbd_device_ha
 }
 
 usbd_status
+usbd_get_bos_desc(usbd_device_handle dev, int confidx,
+		     usb_bos_descriptor_t *d)
+{
+	usbd_status err;
+
+	DPRINTFN(3,("usbd_get_bos_desc: confidx=%d\n", confidx));
+	err = usbd_get_desc(dev, UDESC_BOS, confidx,
+			    USB_BOS_DESCRIPTOR_SIZE, d);
+	if (err)
+		return (err);
+	if (d->bDescriptorType != UDESC_BOS) {
+		DPRINTFN(-1,("usbd_get_bos_desc: confidx=%d, bad desc "
+			     "len=%d type=%d\n",
+			     confidx, d->bLength, d->bDescriptorType));
+		return (USBD_INVAL);
+	}
+	return (USBD_NORMAL_COMPLETION);
+}
+
+usbd_status
+usbd_get_bos_desc_full(usbd_device_handle dev, int conf, void *d, int size)
+{
+	DPRINTFN(3,("usbd_get_bos_desc_full: conf=%d\n", conf));
+	return (usbd_get_desc(dev, UDESC_BOS, conf, size, d));
+}
+
+usbd_status
 usbd_get_device_desc(usbd_device_handle dev, usb_device_descriptor_t *d)
 {
 	DPRINTFN(3,("usbd_get_device_desc:\n"));

Index: src/sys/dev/usb/usbdi_util.h
diff -u src/sys/dev/usb/usbdi_util.h:1.45 src/sys/dev/usb/usbdi_util.h:1.46
--- src/sys/dev/usb/usbdi_util.h:1.45	Thu Sep 26 07:25:31 2013
+++ src/sys/dev/usb/usbdi_util.h	Fri Mar 27 12:46:51 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: usbdi_util.h,v 1.45 2013/09/26 07:25:31 skrll Exp $	*/
+/*	$NetBSD: usbdi_util.h,v 1.46 2015/03/27 12:46:51 skrll Exp $	*/
 
 /*
  * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -40,6 +40,9 @@ usbd_status	usbd_get_desc(usbd_device_ha
 usbd_status	usbd_get_config_desc(usbd_device_handle, int,
 				     usb_config_descriptor_t *);
 usbd_status	usbd_get_config_desc_full(usbd_device_handle, int, void *, int);
+usbd_status	usbd_get_bos_desc(usbd_device_handle, int,
+				     usb_bos_descriptor_t *);
+usbd_status	usbd_get_bos_desc_full(usbd_device_handle, int, void *, int);
 usbd_status	usbd_get_device_desc(usbd_device_handle dev,
 				     usb_device_descriptor_t *d);
 usbd_status	usbd_set_address(usbd_device_handle dev, int addr);