From owner-p4-projects@FreeBSD.ORG  Thu Apr 16 18:43:43 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1EA5F106566C; Thu, 16 Apr 2009 18:43:43 +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 D2B42106564A
	for <perforce@FreeBSD.org>; Thu, 16 Apr 2009 18:43:42 +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 C0E108FC12
	for <perforce@FreeBSD.org>; Thu, 16 Apr 2009 18:43:42 +0000 (UTC)
	(envelope-from hselasky@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 n3GIhg9M056912
	for <perforce@FreeBSD.org>; Thu, 16 Apr 2009 18:43:42 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3GIhgZJ056910
	for perforce@freebsd.org; Thu, 16 Apr 2009 18:43:42 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Thu, 16 Apr 2009 18:43:42 GMT
Message-Id: <200904161843.n3GIhgZJ056910@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 160708 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: Thu, 16 Apr 2009 18:43:44 -0000

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

Change 160708 by hselasky@hselasky_laptop001 on 2009/04/16 18:43:15

	
	USB controller (ATMEGADCI):
	
	 - bugfix: Need to check Read/Write allowed before
	 writing any data for non-control transfers.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#18 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.h#6 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#18 (text+ko) ====

@@ -458,6 +458,12 @@
 		/* cannot write any data */
 		goto not_complete;
 	}
+	if (!(temp & ATMEGA_UEINTX_RWAL)) {
+		if (!td->control_xfr) {
+			/* cannot write any data */
+			goto not_complete;
+		}
+	}
 	count = td->max_packet_size;
 	if (td->remainder < count) {
 		/* we have a short packet */
@@ -1979,6 +1985,7 @@
 	uint32_t ntd;
 	uint32_t n;
 	uint8_t ep_no;
+	uint8_t is_control;
 
 	sc = ATMEGA_BUS2SC(parm->udev->bus);
 	xfer = parm->curr_xfer;
@@ -1997,7 +2004,8 @@
 	/*
 	 * compute maximum number of TDs
 	 */
-	if ((xfer->pipe->edesc->bmAttributes & UE_XFERTYPE) == UE_CONTROL) {
+	is_control = ((xfer->pipe->edesc->bmAttributes & UE_XFERTYPE) == UE_CONTROL);
+	if (is_control) {
 
 		ntd = xfer->nframes + 1 /* STATUS */ + 1 /* SYNC 1 */
 		    + 1 /* SYNC 2 */ ;
@@ -2041,6 +2049,8 @@
 			td = USB_ADD_BYTES(parm->buf, parm->size[0]);
 
 			/* init TD */
+			if (is_control)
+				td->control_xfr = 1;
 			td->max_packet_size = xfer->max_packet_size;
 			td->ep_no = ep_no;
 			if (pf->support_multi_buffer) {

==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.h#6 (text+ko) ====

@@ -189,6 +189,7 @@
 	uint8_t	short_pkt:1;
 	uint8_t	support_multi_buffer:1;
 	uint8_t	did_stall:1;
+	uint8_t	control_xfr:1;
 	uint8_t	ep_no:3;
 };