From owner-p4-projects@FreeBSD.ORG  Fri Jul  4 15:23:50 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8BF991065672; Fri,  4 Jul 2008 15:23:50 +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 4FA6D106564A
	for <perforce@FreeBSD.org>; Fri,  4 Jul 2008 15:23:50 +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 3D7EB8FC15
	for <perforce@FreeBSD.org>; Fri,  4 Jul 2008 15:23:50 +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 m64FNoun025825
	for <perforce@FreeBSD.org>; Fri, 4 Jul 2008 15:23:50 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m64FNoJv025823
	for perforce@freebsd.org; Fri, 4 Jul 2008 15:23:50 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Fri, 4 Jul 2008 15:23:50 GMT
Message-Id: <200807041523.m64FNoJv025823@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 144633 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: Fri, 04 Jul 2008 15:23:50 -0000

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

Change 144633 by hselasky@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);