CVS commit: [itohy-usb1] src/sys/dev/usb

[Masao Uebayashi]

Module Name:    src
Committed By:   uebayasi
Date:           Thu Nov 12 07:55:42 UTC 2009

Modified Files:
        src/sys/dev/usb [itohy-usb1]: usbdi.c

Log Message:
Sort functions to reduce the diff.  Put a comment about a backward-incompatible
API change.


To generate a diff of this commit:
cvs rdiff -u -r1.119.12.6 -r1.119.12.7 src/sys/dev/usb/usbdi.c

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.c
diff -u src/sys/dev/usb/usbdi.c:1.119.12.6 src/sys/dev/usb/usbdi.c:1.119.12.7
--- src/sys/dev/usb/usbdi.c:1.119.12.6	Wed May 21 05:04:03 2008
+++ src/sys/dev/usb/usbdi.c	Thu Nov 12 07:55:42 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: usbdi.c,v 1.119.12.6 2008/05/21 05:04:03 itohy Exp $	*/
+/*	$NetBSD: usbdi.c,v 1.119.12.7 2009/11/12 07:55:42 uebayasi Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usbdi.c,v 1.99 2006/11/27 18:39:02 marius Exp $	*/
 
 /*-
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.119.12.6 2008/05/21 05:04:03 itohy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.119.12.7 2009/11/12 07:55:42 uebayasi Exp $");
 /* __FBSDID("$FreeBSD: src/sys/dev/usb/usbdi.c,v 1.99 2006/11/27 18:39:02 marius Exp $"); */
 
 #ifdef __NetBSD__
@@ -503,6 +503,23 @@
 	xfer->rqflags |= URQ_DEV_MAP_BUFFER;
 }
 
+usbd_xfer_handle
+/* XXX API change */
+#if 0
+usbd_alloc_xfer(usbd_device_handle dev)
+#else
+usbd_alloc_xfer(usbd_device_handle dev, usbd_pipe_handle pipe)
+#endif
+{
+	return (usbd_alloc_xfer_flag(dev, pipe, U_WAITOK));
+}
+
+usbd_xfer_handle
+usbd_alloc_default_xfer(usbd_device_handle dev)
+{
+	return (usbd_alloc_xfer_flag(dev, dev->default_pipe, U_WAITOK));
+}
+
 /* Map mbuf(9) chain. */
 usbd_status
 usbd_map_buffer_mbuf(usbd_xfer_handle xfer, struct mbuf *chain)
@@ -571,16 +588,11 @@
 	return (xfer);
 }
 
-usbd_xfer_handle
-usbd_alloc_xfer(usbd_device_handle dev, usbd_pipe_handle pipe)
+usbd_status
+usbd_free_xfer(usbd_xfer_handle xfer)
 {
-	return (usbd_alloc_xfer_flag(dev, pipe, U_WAITOK));
-}
 
-usbd_xfer_handle
-usbd_alloc_default_xfer(usbd_device_handle dev)
-{
-	return (usbd_alloc_xfer_flag(dev, dev->default_pipe, U_WAITOK));
+	return (usbd_free_xfer_flag(xfer, U_WAITOK));
 }
 
 Static usbd_status
@@ -604,13 +616,6 @@
 	return (USBD_NORMAL_COMPLETION);
 }
 
-usbd_status
-usbd_free_xfer(usbd_xfer_handle xfer)
-{
-
-	return (usbd_free_xfer_flag(xfer, U_WAITOK));
-}
-
 void
 usbd_setup_xfer(usbd_xfer_handle xfer, usbd_pipe_handle pipe,
 		usbd_private_handle priv, void *buffer, u_int32_t length,
@@ -733,6 +738,12 @@
 }
 
 usbd_status
+usbd_abort_default_pipe(usbd_device_handle dev)
+{
+	return (usbd_abort_pipe(dev->default_pipe));
+}
+
+usbd_status
 usbd_abort_pipe(usbd_pipe_handle pipe)
 {
 	usbd_status err;
@@ -751,12 +762,6 @@
 }
 
 usbd_status
-usbd_abort_default_pipe(usbd_device_handle dev)
-{
-	return (usbd_abort_pipe(dev->default_pipe));
-}
-
-usbd_status
 usbd_clear_endpoint_stall(usbd_pipe_handle pipe)
 {
 	usbd_device_handle dev = pipe->device;