PERFORCE change 166930 for review

[Sylvestre Gallon]

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

Change 166930 by syl at syl_rincewind on 2009/08/02 13:50:10

	Factorise pipe methods for musb_otg.

Affected files ...

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

Differences ...

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

@@ -1883,133 +1883,32 @@
 	USB_BUS_UNLOCK(&sc->sc_bus);
 }
 
-/*------------------------------------------------------------------------*
- * musbotg bulk support
- *------------------------------------------------------------------------*/
-static void
-musbotg_device_bulk_open(struct usb_xfer *xfer)
-{
-	return;
-}
+/*
+ * musbotg ctl/bulk/intr support
+ */
 
 static void
-musbotg_device_bulk_close(struct usb_xfer *xfer)
+musbotg_device_dummy(struct usb_xfer *xfer)
 {
-	musbotg_device_done(xfer, USB_ERR_CANCELLED);
+	return ;
 }
 
 static void
-musbotg_device_bulk_enter(struct usb_xfer *xfer)
+musbotg_device_xxx_start(struct usb_xfer *xfer)
 {
-	return;
-}
-
-static void
-musbotg_device_bulk_start(struct usb_xfer *xfer)
-{
-	/* setup TDs */
 	musbotg_setup_standard_chain(xfer);
 	musbotg_start_standard_chain(xfer);
+	return ;
 }
 
-struct usb_pipe_methods musbotg_device_bulk_methods =
-{
-	.open = musbotg_device_bulk_open,
-	.close = musbotg_device_bulk_close,
-	.enter = musbotg_device_bulk_enter,
-	.start = musbotg_device_bulk_start,
-};
-
-/*------------------------------------------------------------------------*
- * musbotg control support
- *------------------------------------------------------------------------*/
 static void
-musbotg_device_ctrl_open(struct usb_xfer *xfer)
-{
-	return;
-}
-
-static void
-musbotg_device_ctrl_close(struct usb_xfer *xfer)
+musbotg_device_xxx_close(struct usb_xfer *xfer)
 {
 	musbotg_device_done(xfer, USB_ERR_CANCELLED);
+	return ;
 }
 
 static void
-musbotg_device_ctrl_enter(struct usb_xfer *xfer)
-{
-	return;
-}
-
-static void
-musbotg_device_ctrl_start(struct usb_xfer *xfer)
-{
-	/* setup TDs */
-	musbotg_setup_standard_chain(xfer);
-	musbotg_start_standard_chain(xfer);
-}
-
-struct usb_pipe_methods musbotg_device_ctrl_methods =
-{
-	.open = musbotg_device_ctrl_open,
-	.close = musbotg_device_ctrl_close,
-	.enter = musbotg_device_ctrl_enter,
-	.start = musbotg_device_ctrl_start,
-};
-
-/*------------------------------------------------------------------------*
- * musbotg interrupt support
- *------------------------------------------------------------------------*/
-static void
-musbotg_device_intr_open(struct usb_xfer *xfer)
-{
-	return;
-}
-
-static void
-musbotg_device_intr_close(struct usb_xfer *xfer)
-{
-	musbotg_device_done(xfer, USB_ERR_CANCELLED);
-}
-
-static void
-musbotg_device_intr_enter(struct usb_xfer *xfer)
-{
-	return;
-}
-
-static void
-musbotg_device_intr_start(struct usb_xfer *xfer)
-{
-	/* setup TDs */
-	musbotg_setup_standard_chain(xfer);
-	musbotg_start_standard_chain(xfer);
-}
-
-struct usb_pipe_methods musbotg_device_intr_methods =
-{
-	.open = musbotg_device_intr_open,
-	.close = musbotg_device_intr_close,
-	.enter = musbotg_device_intr_enter,
-	.start = musbotg_device_intr_start,
-};
-
-/*------------------------------------------------------------------------*
- * musbotg full speed isochronous support
- *------------------------------------------------------------------------*/
-static void
-musbotg_device_isoc_open(struct usb_xfer *xfer)
-{
-	return;
-}
-
-static void
-musbotg_device_isoc_close(struct usb_xfer *xfer)
-{
-	musbotg_device_done(xfer, USB_ERR_CANCELLED);
-}
-
-static void
 musbotg_device_isoc_enter(struct usb_xfer *xfer)
 {
 	struct musbotg_softc *sc = MUSBOTG_BUS2SC(xfer->xroot->bus);
@@ -2075,10 +1974,34 @@
 	musbotg_start_standard_chain(xfer);
 }
 
+struct usb_pipe_methods musbotg_device_bulk_methods =
+{
+	.open = musbotg_device_dummy,
+	.enter = musbotg_device_dummy,
+	.close = musbotg_device_xxx_close,
+	.start = musbotg_device_xxx_start,
+};
+
+struct usb_pipe_methods musbotg_device_ctrl_methods =
+{
+	.open = musbotg_device_dummy,
+	.enter = musbotg_device_dummy,
+	.close = musbotg_device_ctrl_close,
+	.start = musbotg_device_ctrl_start,
+};
+
+struct usb_pipe_methods musbotg_device_intr_methods =
+{
+	.open = musbotg_device_dummy,
+	.enter = musbotg_device_dummy,
+	.close = musbotg_device_xxx_close,
+	.start = musbotg_device_xxx_start,
+};
+
 struct usb_pipe_methods musbotg_device_isoc_methods =
 {
-	.open = musbotg_device_isoc_open,
-	.close = musbotg_device_isoc_close,
+	.open = musbotg_device_dummy,
+	.close = musbotg_device_xxx_close,
 	.enter = musbotg_device_isoc_enter,
 	.start = musbotg_device_isoc_start,
 };