PERFORCE change 166927 for review

[Sylvestre Gallon]

http://perforce.freebsd.org/chv.cgi?CH=166927

Change 166927 by syl at syl_rincewind on 2009/08/02 13:37:47

	Factorise pipe methods for atmegadci.

Affected files ...

.. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/atmegadci.c#8 edit

Differences ...

==== //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/atmegadci.c#8 (text+ko) ====

@@ -1372,58 +1372,29 @@
 	USB_BUS_UNLOCK(&sc->sc_bus);
 }
 
-/*------------------------------------------------------------------------*
- * at91dci bulk support
- * at91dci control support
- * at91dci interrupt support
- *------------------------------------------------------------------------*/
-static void
-atmegadci_device_non_isoc_open(struct usb_xfer *xfer)
-{
-	return;
-}
+/*
+ * atmegadci ctl/bulk/intr support
+ */
 
 static void
-atmegadci_device_non_isoc_close(struct usb_xfer *xfer)
+atmegadci_device_dummy(struct usb_xfer *xfer)
 {
-	atmegadci_device_done(xfer, USB_ERR_CANCELLED);
+	return ;
 }
 
 static void
-atmegadci_device_non_isoc_enter(struct usb_xfer *xfer)
+atmegadci_device_xxx_start(struct usb_xfer *xfer)
 {
-	return;
-}
-
-static void
-atmegadci_device_non_isoc_start(struct usb_xfer *xfer)
-{
-	/* setup TDs */
 	atmegadci_setup_standard_chain(xfer);
 	atmegadci_start_standard_chain(xfer);
+	return ;
 }
 
-struct usb_pipe_methods atmegadci_device_non_isoc_methods =
-{
-	.open = atmegadci_device_non_isoc_open,
-	.close = atmegadci_device_non_isoc_close,
-	.enter = atmegadci_device_non_isoc_enter,
-	.start = atmegadci_device_non_isoc_start,
-};
-
-/*------------------------------------------------------------------------*
- * at91dci full speed isochronous support
- *------------------------------------------------------------------------*/
 static void
-atmegadci_device_isoc_fs_open(struct usb_xfer *xfer)
+atmegadci_device_xxx_close(struct usb_xfer *xfer)
 {
-	return;
-}
-
-static void
-atmegadci_device_isoc_fs_close(struct usb_xfer *xfer)
-{
 	atmegadci_device_done(xfer, USB_ERR_CANCELLED);
+	return ;
 }
 
 static void
@@ -1489,10 +1460,18 @@
 	atmegadci_start_standard_chain(xfer);
 }
 
+struct usb_pipe_methods atmegadci_device_non_isoc_methods =
+{
+	.open = atmegadci_device_dummy,
+	.enter = atmegadci_device_dummy,
+	.start = atmegadci_device_xxx_start,
+	.close = atmegadci_device_xxx_close,
+};
+
 struct usb_pipe_methods atmegadci_device_isoc_fs_methods =
 {
-	.open = atmegadci_device_isoc_fs_open,
-	.close = atmegadci_device_isoc_fs_close,
+	.open = atmegadci_device_dummy,
+	.close = atmegadci_device_xxx_close,
 	.enter = atmegadci_device_isoc_fs_enter,
 	.start = atmegadci_device_isoc_fs_start,
 };