From owner-svn-src-head@FreeBSD.ORG  Sat Nov 22 21:22:53 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C99A11065670;
	Sat, 22 Nov 2008 21:22:53 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C46C38FC1A;
	Sat, 22 Nov 2008 21:22:53 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mAMLMr8I029596;
	Sat, 22 Nov 2008 21:22:53 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAMLMrCP029595;
	Sat, 22 Nov 2008 21:22:53 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <200811222122.mAMLMrCP029595@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sat, 22 Nov 2008 21:22:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r185187 - head/sys/dev/uart
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Nov 2008 21:22:53 -0000

Author: marcel
Date: Sat Nov 22 21:22:53 2008
New Revision: 185187
URL: http://svn.freebsd.org/changeset/base/185187

Log:
  Cast to uintptr_t before casting to void*. This allows the
  QUICC backend to be built on LP64 platforms. This makes it
  possible to include the QUICC backend in the kernel module.
  
  PR:		127120

Modified:
  head/sys/dev/uart/uart_dev_quicc.c

Modified: head/sys/dev/uart/uart_dev_quicc.c
==============================================================================
--- head/sys/dev/uart/uart_dev_quicc.c	Sat Nov 22 21:12:47 2008	(r185186)
+++ head/sys/dev/uart/uart_dev_quicc.c	Sat Nov 22 21:22:53 2008	(r185187)
@@ -218,7 +218,7 @@ quicc_getc(struct uart_bas *bas, struct 
 		uart_lock(hwmtx);
 	}
 
-	buf = (void *)quicc_read4(bas, rb + 4);
+	buf = (void *)(uintptr_t)quicc_read4(bas, rb + 4);
 	c = *buf;
 	quicc_write2(bas, rb, sc | 0x8000);
 
@@ -433,7 +433,7 @@ quicc_bus_receive(struct uart_softc *sc)
 	uart_lock(sc->sc_hwmtx);
 	rb = quicc_read2(bas, QUICC_PRAM_SCC_RBASE(bas->chan - 1));
 	st = quicc_read2(bas, rb);
-	buf = (void *)quicc_read4(bas, rb + 4);
+	buf = (void *)(uintptr_t)quicc_read4(bas, rb + 4);
 	uart_rx_put(sc, *buf);
 	quicc_write2(bas, rb, st | 0x9000);
 	uart_unlock(sc->sc_hwmtx);
@@ -477,7 +477,7 @@ quicc_bus_transmit(struct uart_softc *sc
 	uart_lock(sc->sc_hwmtx);
 	tb = quicc_read2(bas, QUICC_PRAM_SCC_TBASE(bas->chan - 1));
 	st = quicc_read2(bas, tb);
-	buf = (void *)quicc_read4(bas, tb + 4);
+	buf = (void *)(uintptr_t)quicc_read4(bas, tb + 4);
 	*buf = sc->sc_txbuf[0];
 	quicc_write2(bas, tb + 2, 1);
 	quicc_write2(bas, tb, st | 0x9000);