From owner-p4-projects@FreeBSD.ORG  Tue Aug  5 15:15:36 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0CE6A1065673; Tue,  5 Aug 2008 15:15:36 +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 C4BDE1065671
	for <perforce@FreeBSD.org>; Tue,  5 Aug 2008 15:15:35 +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 B40ED8FC0C
	for <perforce@FreeBSD.org>; Tue,  5 Aug 2008 15:15:35 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m75FFZ3V009801
	for <perforce@FreeBSD.org>; Tue, 5 Aug 2008 15:15:35 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m75FFZ3W009799
	for perforce@freebsd.org; Tue, 5 Aug 2008 15:15:35 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Tue, 5 Aug 2008 15:15:35 GMT
Message-Id: <200808051515.m75FFZ3W009799@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 146705 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: Tue, 05 Aug 2008 15:15:36 -0000

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

Change 146705 by hselasky@hselasky_laptop001 on 2008/08/05 15:14:42

	
	Some minor changes.
	
	1) s/__volatile__/volatile/
	
	2) Allow USB_DEBUG to be overwritten by 
	another value at compile time.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.c#7 edit
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.h#14 edit
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_debug.h#4 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.c#7 (text+ko) ====

@@ -766,7 +766,7 @@
 {
 	uint8_t nframes;
 	uint32_t *plen = xfer->frlengths;
-	__volatile__ uint16_t *olen;
+	volatile uint16_t *olen;
 	uint16_t len = 0;
 	ohci_itd_t *td = xfer->td_transfer_first;
 

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.h#14 (text+ko) ====

@@ -90,8 +90,6 @@
 					 * data packet */
 #define	USB_VERBOSE
 
-#define	USB_DEBUG
-
 #define	USB_HUB_MAX_DEPTH 5
 
 /* USB transfer states */

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_debug.h#4 (text+ko) ====

@@ -36,12 +36,12 @@
 
 /* Force debugging until further */
 #ifndef USB_DEBUG
-#define	USB_DEBUG
+#define	USB_DEBUG 1
 #endif
 
 /* Check if USB debugging is enabled. */
 #ifdef USB_DEBUG_VAR
-#ifdef USB_DEBUG
+#if (USB_DEBUG != 0)
 #define	DPRINTFN(n,fmt,...) do {				\
   if ((USB_DEBUG_VAR) >= (n)) {				\
     printf("%s:%u: " fmt,				\
@@ -50,8 +50,8 @@
 } while (0)
 #define	DPRINTF(...)	DPRINTFN(1, __VA_ARGS__)
 #else
-#define	DPRINTF(fmt,...) do { } while (0)
-#define	DPRINTFN(n,fmt,...) do { } while (0)
+#define	DPRINTF(...) do { } while (0)
+#define	DPRINTFN(...) do { } while (0)
 #endif
 #endif