PERFORCE change 146705 for review

[Hans Petter Selasky]

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

Change 146705 by hselasky at 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