PERFORCE change 144633 for review

[Hans Petter Selasky]

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

Change 144633 by hselasky at hselasky_laptop001 on 2008/07/04 15:23:40

	
	Compile fixes for Sparc64 target architecture.

Affected files ...

.. //depot/projects/usb/src/sys/compat/ndis/ntoskrnl_var.h#4 edit
.. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#10 edit
.. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#4 edit

Differences ...

==== //depot/projects/usb/src/sys/compat/ndis/ntoskrnl_var.h#4 (text+ko) ====

@@ -117,6 +117,7 @@
 
 /* Note: assumes x86 page size of 4K. */
 
+#ifndef PAGE_SHIFT
 #if PAGE_SIZE == 4096
 #define PAGE_SHIFT	12
 #elif PAGE_SIZE == 8192
@@ -124,6 +125,7 @@
 #else
 #error PAGE_SHIFT undefined!
 #endif
+#endif
 
 #define SPAN_PAGES(ptr, len)					\
 	((uint32_t)((((uintptr_t)(ptr) & (PAGE_SIZE - 1)) +	\

==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#10 (text+ko) ====

@@ -1165,7 +1165,7 @@
 		/* the size of the SETUP structure is hardcoded ! */
 
 		if (xfer->frlengths[0] != sizeof(struct usb2_device_request)) {
-			DPRINTF(-1, "Wrong framelength %u != %u\n",
+			DPRINTF(-1, "Wrong framelength %u != %zu\n",
 			    xfer->frlengths[0], sizeof(struct
 			    usb2_device_request));
 			goto error;

==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#4 (text+ko) ====

@@ -1273,7 +1273,7 @@
 		ural_tx_freem(m);
 		return;
 	}
-	DPRINTF(0, " %u %u (out)\n", sizeof(sc->sc_tx_desc), m->m_pkthdr.len);
+	DPRINTF(0, " %zu %u (out)\n", sizeof(sc->sc_tx_desc), m->m_pkthdr.len);
 
 	bcopy(&(sc->sc_tx_desc), mm->m_data, sizeof(sc->sc_tx_desc));
 	mm->m_len = sizeof(sc->sc_tx_desc);