Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 2 Aug 2009 13:56:44 GMT
From:      Sylvestre Gallon <syl@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 166931 for review
Message-ID:  <200908021356.n72Duicp006348@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=166931

Change 166931 by syl@syl_rincewind on 2009/08/02 13:56:11

	Factorise pipe methods for uss820dci.
	Fix a typo in comment.

Affected files ...

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

Differences ...

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

@@ -1526,133 +1526,32 @@
 	USB_BUS_UNLOCK(&sc->sc_bus);
 }
 
-/*------------------------------------------------------------------------*
- * at91dci bulk support
- *------------------------------------------------------------------------*/
-static void
-uss820dci_device_bulk_open(struct usb_xfer *xfer)
-{
-	return;
-}
+/*
+ * uss820dci ctl/bulk/intr support
+ */
 
 static void
-uss820dci_device_bulk_close(struct usb_xfer *xfer)
+uss820dci_device_dummy(struct usb_xfer *xfer)
 {
-	uss820dci_device_done(xfer, USB_ERR_CANCELLED);
+	return ;
 }
 
 static void
-uss820dci_device_bulk_enter(struct usb_xfer *xfer)
-{
-	return;
-}
-
-static void
-uss820dci_device_bulk_start(struct usb_xfer *xfer)
+uss820dci_device_xxx_start(struct usb_xfer *xfer)
 {
-	/* setup TDs */
 	uss820dci_setup_standard_chain(xfer);
 	uss820dci_start_standard_chain(xfer);
+	return ;
 }
 
-struct usb_pipe_methods uss820dci_device_bulk_methods =
-{
-	.open = uss820dci_device_bulk_open,
-	.close = uss820dci_device_bulk_close,
-	.enter = uss820dci_device_bulk_enter,
-	.start = uss820dci_device_bulk_start,
-};
-
-/*------------------------------------------------------------------------*
- * at91dci control support
- *------------------------------------------------------------------------*/
 static void
-uss820dci_device_ctrl_open(struct usb_xfer *xfer)
+uss820dci_device_xxx_close(struct usb_xfer *xfer)
 {
-	return;
-}
-
-static void
-uss820dci_device_ctrl_close(struct usb_xfer *xfer)
-{
 	uss820dci_device_done(xfer, USB_ERR_CANCELLED);
+	return ;
 }
 
 static void
-uss820dci_device_ctrl_enter(struct usb_xfer *xfer)
-{
-	return;
-}
-
-static void
-uss820dci_device_ctrl_start(struct usb_xfer *xfer)
-{
-	/* setup TDs */
-	uss820dci_setup_standard_chain(xfer);
-	uss820dci_start_standard_chain(xfer);
-}
-
-struct usb_pipe_methods uss820dci_device_ctrl_methods =
-{
-	.open = uss820dci_device_ctrl_open,
-	.close = uss820dci_device_ctrl_close,
-	.enter = uss820dci_device_ctrl_enter,
-	.start = uss820dci_device_ctrl_start,
-};
-
-/*------------------------------------------------------------------------*
- * at91dci interrupt support
- *------------------------------------------------------------------------*/
-static void
-uss820dci_device_intr_open(struct usb_xfer *xfer)
-{
-	return;
-}
-
-static void
-uss820dci_device_intr_close(struct usb_xfer *xfer)
-{
-	uss820dci_device_done(xfer, USB_ERR_CANCELLED);
-}
-
-static void
-uss820dci_device_intr_enter(struct usb_xfer *xfer)
-{
-	return;
-}
-
-static void
-uss820dci_device_intr_start(struct usb_xfer *xfer)
-{
-	/* setup TDs */
-	uss820dci_setup_standard_chain(xfer);
-	uss820dci_start_standard_chain(xfer);
-}
-
-struct usb_pipe_methods uss820dci_device_intr_methods =
-{
-	.open = uss820dci_device_intr_open,
-	.close = uss820dci_device_intr_close,
-	.enter = uss820dci_device_intr_enter,
-	.start = uss820dci_device_intr_start,
-};
-
-/*------------------------------------------------------------------------*
- * at91dci full speed isochronous support
- *------------------------------------------------------------------------*/
-static void
-uss820dci_device_isoc_fs_open(struct usb_xfer *xfer)
-{
-	return;
-}
-
-static void
-uss820dci_device_isoc_fs_close(struct usb_xfer *xfer)
-{
-	uss820dci_device_done(xfer, USB_ERR_CANCELLED);
-}
-
-static void
 uss820dci_device_isoc_fs_enter(struct usb_xfer *xfer)
 {
 	struct uss820dci_softc *sc = USS820_DCI_BUS2SC(xfer->xroot->bus);
@@ -1711,16 +1610,40 @@
 	uss820dci_start_standard_chain(xfer);
 }
 
+struct usb_pipe_methods uss820dci_device_bulk_methods =
+{
+	.open = uss820dci_device_dummy,
+	.enter = uss820dci_device_dummy,
+	.close = uss820dci_device_xxx_close,
+	.start = uss820dci_device_xxx_start,
+};
+
+struct usb_pipe_methods uss820dci_device_ctrl_methods =
+{
+	.open = uss820dci_device_dummy,
+	.enter = uss820dci_device_dummy,
+	.close = uss820dci_device_xxx_close,
+	.start = uss820dci_device_xxx_start,
+};
+
+struct usb_pipe_methods uss820dci_device_intr_methods =
+{
+	.open = uss820dci_device_dummy,
+	.enter = uss820dci_device_dummy,
+	.close = uss820dci_device_xxx_close,
+	.start = uss820dci_device_xxx_start,
+};
+
 struct usb_pipe_methods uss820dci_device_isoc_fs_methods =
 {
-	.open = uss820dci_device_isoc_fs_open,
-	.close = uss820dci_device_isoc_fs_close,
+	.open = uss820dci_device_dummy,
+	.close = uss820dci_device_xxx_close,
 	.enter = uss820dci_device_isoc_fs_enter,
 	.start = uss820dci_device_isoc_fs_start,
 };
 
 /*------------------------------------------------------------------------*
- * at91dci root control support
+ * uss820dci root control support
  *------------------------------------------------------------------------*
  * Simulate a hardware HUB by handling all the necessary requests.
  *------------------------------------------------------------------------*/



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200908021356.n72Duicp006348>