PERFORCE change 166012 for review

[Sylvestre Gallon]

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

Change 166012 by syl at syl_pablo on 2009/07/13 15:27:42

	factorise ctrl/bulk/intr code.

Affected files ...

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

Differences ...

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

@@ -160,111 +160,49 @@
 }
 
 /*
- * s3c24xxdci ctrl support
+ * s3c24xxdci ctrl/bulk/intr support
  */
 
 static void
-s3c24dci_device_ctrl_open(struct usb_xfer *xfer)
+s3c24dci_device_dummy(struct usb_xfer *xfer)
 {
 	return ;
 }
 
 static void
-s3c24dci_device_ctrl_close(struct usb_xfer *xfer)
+s3c24dci_device_xxx_start(struct usb_xfer *xfer)
 {
-	s3c24dci_device_done(xfer, USB_ERR_CANCELLED);
+	s3c24dci_setup_standard_chain(xfer);
+	s3c24dci_start_standard_chain(xfer);
 	return ;
 }
 
 static void
-s3c24dci_device_ctrl_start(struct usb_xfer *xfer)
+s3c24dci_device_xxx_close(struct usb_xfer *xfer)
 {
+	s3c24dci_device_done(xfer, USB_ERR_CANCELLED);
 	return ;
 }
 
-static void
-s3c24dci_device_ctrl_enter(struct usb_xfer *xfer)
-{
-	return ;
-}
-
 struct usb_pipe_methods s3c24dci_device_ctrl_methods = {
-	.open = s3c24dci_device_ctrl_open,
-	.close = s3c24dci_device_ctrl_close,
-	.enter = s3c24dci_device_ctrl_enter,
-	.start = s3c24dci_device_ctrl_start,
+	.open = s3c24dci_device_dummy,
+	.enter = s3c24dci_device_dummy,
+	.close = s3c24dci_device_xxx_close,
+	.start = s3c24dci_device_xxx_start,
 };
 
-/*
- * s3c24xxdci bulk support
- */
-
-static void
-s3c24dci_device_bulk_open(struct usb_xfer *xfer)
-{
-	return ;
-}
-
-static void
-s3c24dci_device_bulk_close(struct usb_xfer *xfer)
-{
-	s3c24dci_device_done(xfer, USB_ERR_CANCELLED);
-	return ;
-}
-
-static void
-s3c24dci_device_bulk_start(struct usb_xfer *xfer)
-{
-	return ;
-}
-
-static void
-s3c24dci_device_bulk_enter(struct usb_xfer *xfer)
-{
-	return ;
-}
-
 struct usb_pipe_methods s3c24dci_device_bulk_methods = {
-	.open = s3c24dci_device_bulk_open,
-	.close = s3c24dci_device_bulk_close,
-	.enter = s3c24dci_device_bulk_enter,
-	.start = s3c24dci_device_bulk_start,
+	.open = s3c24dci_device_dummy,
+	.enter = s3c24dci_device_dummy,
+	.close = s3c24dci_device_xxx_close,
+	.start = s3c24dci_device_xxx_start,
 };
 
-/*
- * s3c24xxdci interrupt support
- */
-
-static void
-s3c24dci_device_intr_open(struct usb_xfer *xfer)
-{
-	return ;
-}
-
-static void
-s3c24dci_device_intr_close(struct usb_xfer *xfer)
-{
-	s3c24dci_device_done(xfer, USB_ERR_CANCELLED);
-	return ;
-}
-
-static void
-s3c24dci_device_intr_start(struct usb_xfer *xfer)
-{
-	return ;
-}
-
-static void
-s3c24dci_device_intr_enter(struct usb_xfer *xfer)
-{
-	return ;
-}
-
 struct usb_pipe_methods s3c24dci_device_bulk_methods = {
-	.open = s3c24dci_device_intr_open,
-	.close = s3c24dci_device_intr_close,
-	.enter = s3c24dci_device_intr_enter,
-	.start = s3c24dci_device_intr_start,
+	.open = s3c24dci_device_dummy,
+	.enter = s3c24dci_device_dummy,
+	.close = s3c24dci_device_xxx_close,
+	.start = s3c24dci_device_xxx_start,
 };
 
 /*