From owner-p4-projects@FreeBSD.ORG  Sun Sep 23 15:18:14 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 869A916A4C1; Sun, 23 Sep 2007 15:18:14 +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 2B02416A47C
	for <perforce@FreeBSD.org>; Sun, 23 Sep 2007 15:18:14 +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 071C413C46E
	for <perforce@FreeBSD.org>; Sun, 23 Sep 2007 15:18:14 +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 l8NFID5f091372
	for <perforce@FreeBSD.org>; Sun, 23 Sep 2007 15:18:13 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8NFIDmx091369
	for perforce@freebsd.org; Sun, 23 Sep 2007 15:18:13 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sun, 23 Sep 2007 15:18:13 GMT
Message-Id: <200709231518.l8NFIDmx091369@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 126740 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, 23 Sep 2007 15:18:14 -0000

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

Change 126740 by hselasky@hselasky_laptop001 on 2007/09/23 15:17:12

	
	FYI; The comments follow the P4 diff from top to bottom.
	
	- we now need "sys/sx.h" included by default.
	
	- update "USBD_CHECK_STATUS()" macro to use the bit-field
	  version instead of the masked version of USBD_XXX flags.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_port.h#16 edit

Differences ...

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

@@ -60,6 +60,7 @@
 #   include <sys/lockmgr.h>
 #   include <sys/module.h>
 #   include <sys/mutex.h>
+#   include <sys/sx.h>
 #   include <sys/rman.h> 
 #   include <sys/selinfo.h>
 #   include <sys/sysctl.h> /* SYSCTL_XXX() */
@@ -233,18 +234,12 @@
 #define PRINTFN(n,x)
 #endif
 
-#define USBD_CHECK_STATUS(xfer)			\
-{ if((xfer)->flags & USBD_DEV_TRANSFERRING)	\
-  {						\
-     (xfer)->flags &= ~USBD_DEV_TRANSFERRING;	\
-     if( (xfer)->error )			\
-     { goto tr_error; }				\
-     else					\
-     { goto tr_transferred; }			\
-  }						\
-  else						\
-  { goto tr_setup; }				\
-}						\
+#define USBD_CHECK_STATUS(xfer)	do {			\
+    if (!(xfer)->flags_int.transferring) goto tr_setup;	\
+    (xfer)->flags_int.transferring = 0;			\
+    if ((xfer)->error) goto tr_error;			\
+    goto tr_transferred;				\
+} while (0)
 /**/
 
 #define _MAKE_ENUM(enum,value,arg...)		\