From owner-p4-projects@FreeBSD.ORG  Sat Nov 17 18:42:50 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8769516A468; Sat, 17 Nov 2007 18:42:50 +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 25A5C16A41B
	for <perforce@FreeBSD.org>; Sat, 17 Nov 2007 18:42:50 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1670613C47E
	for <perforce@FreeBSD.org>; Sat, 17 Nov 2007 18:42:50 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAHIgnO8020088
	for <perforce@FreeBSD.org>; Sat, 17 Nov 2007 18:42:49 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAHIgnrB020085
	for perforce@freebsd.org; Sat, 17 Nov 2007 18:42:49 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 17 Nov 2007 18:42:49 GMT
Message-Id: <200711171842.lAHIgnrB020085@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 129168 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: Sat, 17 Nov 2007 18:42:51 -0000

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

Change 129168 by hselasky@hselasky_laptop001 on 2007/11/17 18:42:01

	
	The first step into fully supporting loading
	of virtual buffers directly into DMA memory.
	
	Hence the BUS-DMA framework does not support
	any form of memory load cancel we need to keep
	track of the BUS-DMA state in the USB transfer.
	
	This commit adds the necessary states.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#52 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#52 (text+ko) ====

@@ -72,12 +72,28 @@
 
 #define	USBD_GET_STATE(xfer) ((xfer)->usb_state)
 
+/* USB transfer states */
+
 enum {
 	USBD_ST_SETUP,
 	USBD_ST_TRANSFERRED,
 	USBD_ST_ERROR,
 };
 
+/*
+ * USB BUS-DMA transfer states
+ *
+ * Hence the BUS-DMA framework does not support DMA load abort we need
+ * to keep track of the BUS-DMA state in the USB transfer.
+ */
+
+enum {
+	USBD_BDMA_ST_IDLE,
+	USBD_BDMA_ST_LOADING,
+	USBD_BDMA_ST_CANCELLING,
+	USBD_BDMA_ST_CANCEL_AND_LOAD,
+};
+
 struct usbd_xfer;
 struct usbd_pipe;
 struct usbd_bus;
@@ -343,6 +359,11 @@
 	uint8_t	ext_buffer:1;		/* uses external DMA buffer */
 	uint8_t	manual_status:1;	/* non automatic status stage on
 					 * control transfers */
+	uint8_t	bdma_enable:1;		/* setting this flag allows you to
+					 * load buffers directly into DMA for
+					 * the USB transfer the flag belongs
+					 * to. The flag can not be changed
+					 * during operation. */
 };
 
 struct usbd_xfer_flags_int {
@@ -360,6 +381,7 @@
 
 	uint8_t	short_frames_ok:1;	/* filtered version */
 	uint8_t	short_xfer_ok:1;	/* filtered version */
+	uint8_t	bdma_state:2;		/* BUS-DMA state */
 };
 
 struct usbd_config {