From owner-p4-projects@FreeBSD.ORG  Sun Aug  2 13:43:30 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1715E1065673; Sun,  2 Aug 2009 13:43:30 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CB836106564A
	for <perforce@FreeBSD.org>; Sun,  2 Aug 2009 13:43:29 +0000 (UTC)
	(envelope-from syl@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9F9B78FC18
	for <perforce@FreeBSD.org>; Sun,  2 Aug 2009 13:43:29 +0000 (UTC)
	(envelope-from syl@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n72DhT6v005395
	for <perforce@FreeBSD.org>; Sun, 2 Aug 2009 13:43:29 GMT
	(envelope-from syl@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n72DhTkJ005393
	for perforce@freebsd.org; Sun, 2 Aug 2009 13:43:29 GMT
	(envelope-from syl@FreeBSD.org)
Date: Sun, 2 Aug 2009 13:43:29 GMT
Message-Id: <200908021343.n72DhTkJ005393@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	syl@FreeBSD.org using -f
From: Sylvestre Gallon <syl@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 166929 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 02 Aug 2009 13:43:30 -0000

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

Change 166929 by syl@syl_rincewind on 2009/08/02 13:43:09

	 Factorise pipe methods for avr32dci.

Affected files ...

.. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/avr32dci.c#7 edit

Differences ...

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

@@ -1307,58 +1307,29 @@
 	USB_BUS_UNLOCK(&sc->sc_bus);
 }
 
-/*------------------------------------------------------------------------*
- * at91dci bulk support
- * at91dci control support
- * at91dci interrupt support
- *------------------------------------------------------------------------*/
-static void
-avr32dci_device_non_isoc_open(struct usb_xfer *xfer)
-{
-	return;
-}
+/*
+ * atmegadci ctl/bulk/intr support
+ */
 
 static void
-avr32dci_device_non_isoc_close(struct usb_xfer *xfer)
+avr32dci_device_dummy(struct usb_xfer *xfer)
 {
-	avr32dci_device_done(xfer, USB_ERR_CANCELLED);
+	return ;
 }
 
 static void
-avr32dci_device_non_isoc_enter(struct usb_xfer *xfer)
+avr32dci_device_xxx_start(struct usb_xfer *xfer)
 {
-	return;
-}
-
-static void
-avr32dci_device_non_isoc_start(struct usb_xfer *xfer)
-{
-	/* setup TDs */
 	avr32dci_setup_standard_chain(xfer);
 	avr32dci_start_standard_chain(xfer);
+	return ;
 }
 
-struct usb_pipe_methods avr32dci_device_non_isoc_methods =
-{
-	.open = avr32dci_device_non_isoc_open,
-	.close = avr32dci_device_non_isoc_close,
-	.enter = avr32dci_device_non_isoc_enter,
-	.start = avr32dci_device_non_isoc_start,
-};
-
-/*------------------------------------------------------------------------*
- * at91dci full speed isochronous support
- *------------------------------------------------------------------------*/
 static void
-avr32dci_device_isoc_fs_open(struct usb_xfer *xfer)
+avr32dci_device_xxx_close(struct usb_xfer *xfer)
 {
-	return;
-}
-
-static void
-avr32dci_device_isoc_fs_close(struct usb_xfer *xfer)
-{
 	avr32dci_device_done(xfer, USB_ERR_CANCELLED);
+	return ;
 }
 
 static void
@@ -1423,10 +1394,18 @@
 	avr32dci_start_standard_chain(xfer);
 }
 
+struct usb_pipe_methods avr32dci_device_non_isoc_methods =
+{
+	.open = avr32dci_device_dummy,
+	.enter = avr32dci_device_dummy,
+	.start = avr32dci_device_xxx_start,
+	.close = avr32dci_device_xxx_close,
+};
+
 struct usb_pipe_methods avr32dci_device_isoc_fs_methods =
 {
-	.open = avr32dci_device_isoc_fs_open,
-	.close = avr32dci_device_isoc_fs_close,
+	.open = avr32dci_device_dummy,
+	.close = avr32dci_device_xxx_close,
 	.enter = avr32dci_device_isoc_fs_enter,
 	.start = avr32dci_device_isoc_fs_start,
 };