aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/uart
diff options
context:
space:
mode:
authorMarcel Moolenaar <marcel@FreeBSD.org>2008-11-22 21:22:53 +0000
committerMarcel Moolenaar <marcel@FreeBSD.org>2008-11-22 21:22:53 +0000
commit437f63ab5f680b45b1b9549956b5e2dbcf633f30 (patch)
tree214e5c1fd2fcf62f38389daa3dc642f18ca30645 /sys/dev/uart
parent2880daeb7772a607c9466806f1e7f31f309609ab (diff)
downloadsrc-437f63ab5f680b45b1b9549956b5e2dbcf633f30.tar.gz
src-437f63ab5f680b45b1b9549956b5e2dbcf633f30.zip
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
Notes
Notes: svn path=/head/; revision=185187
Diffstat (limited to 'sys/dev/uart')
-rw-r--r--sys/dev/uart/uart_dev_quicc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/uart/uart_dev_quicc.c b/sys/dev/uart/uart_dev_quicc.c
index 3a4abc6b04bd..df327a84a8c5 100644
--- a/sys/dev/uart/uart_dev_quicc.c
+++ b/sys/dev/uart/uart_dev_quicc.c
@@ -218,7 +218,7 @@ quicc_getc(struct uart_bas *bas, struct mtx *hwmtx)
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);