diff options
Diffstat (limited to 'sys/arch/hppa/stand')
| -rw-r--r-- | sys/arch/hppa/stand/boot/srt0.S | 7 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/libsa/itecons.c | 6 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/libsa/pdc.c | 20 |
3 files changed, 17 insertions, 16 deletions
diff --git a/sys/arch/hppa/stand/boot/srt0.S b/sys/arch/hppa/stand/boot/srt0.S index 11073d524d7..9244481c72e 100644 --- a/sys/arch/hppa/stand/boot/srt0.S +++ b/sys/arch/hppa/stand/boot/srt0.S @@ -1,4 +1,4 @@ -/* $OpenBSD: srt0.S,v 1.9 2004/04/07 18:24:20 mickey Exp $ */ +/* $OpenBSD: srt0.S,v 1.10 2005/04/07 00:21:51 mickey Exp $ */ /* * Copyright (c) 1998-2004 Michael Shalayeff @@ -60,8 +60,9 @@ ; #define _LOCORE -#include <machine/iomod.h> #include <machine/asm.h> +#include <machine/cpu.h> +#include <machine/iomod.h> /* * This is the ending of the begin @@ -145,7 +146,7 @@ start * rtt - restart the box */ LEAF_ENTRY(_rtt) - ldil L%LBCAST_ADDR, %r25 + ldil L%HPPA_LBCAST, %r25 ldi CMD_RESET, %r26 stw %r26,R%iomod_command(%r25) forever ; Loop until bus reset takes effect. diff --git a/sys/arch/hppa/stand/libsa/itecons.c b/sys/arch/hppa/stand/libsa/itecons.c index 9e7514e41dc..5bee2a704a2 100644 --- a/sys/arch/hppa/stand/libsa/itecons.c +++ b/sys/arch/hppa/stand/libsa/itecons.c @@ -1,4 +1,4 @@ -/* $OpenBSD: itecons.c,v 1.8 2004/04/07 18:24:20 mickey Exp $ */ +/* $OpenBSD: itecons.c,v 1.9 2005/04/07 00:21:51 mickey Exp $ */ /* * Copyright (c) 1998-2004 Michael Shalayeff @@ -133,8 +133,8 @@ ite_init(cn) sizeof(struct pz_device)); } - cons_pzdev->pz_iodc_io = cniodc; - kbd_pzdev->pz_iodc_io = kyiodc; + cons_pzdev->pz_iodc_io = (u_int)cniodc; + kbd_pzdev->pz_iodc_io = (u_int)kyiodc; #ifdef DEBUG if (!kyiodc) printf("ite_init: no kbd\n"); diff --git a/sys/arch/hppa/stand/libsa/pdc.c b/sys/arch/hppa/stand/libsa/pdc.c index 172a7388d02..7c4b51123aa 100644 --- a/sys/arch/hppa/stand/libsa/pdc.c +++ b/sys/arch/hppa/stand/libsa/pdc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pdc.c,v 1.18 2004/04/07 18:24:20 mickey Exp $ */ +/* $OpenBSD: pdc.c,v 1.19 2005/04/07 00:21:51 mickey Exp $ */ /* * Copyright (c) 1998-2004 Michael Shalayeff @@ -155,7 +155,7 @@ iodcstrategy(devdata, rw, blk, size, buf, rsize) if (debug) printf("iodc: rewind "); #endif - if ((ret = (pzdev->pz_iodc_io)(pzdev->pz_hpa, + if ((ret = ((iodcio_t)pzdev->pz_iodc_io)(pzdev->pz_hpa, IODC_IO_READ, pzdev->pz_spa, pzdev->pz_layers, pdcbuf, 0, dp->buf, 0, 0)) < 0) { #ifdef DEBUG @@ -177,7 +177,7 @@ iodcstrategy(devdata, rw, blk, size, buf, rsize) dp->last_read = ret) { twiddle(); dp->last_blk += dp->last_read; - if ((ret = (pzdev->pz_iodc_io)(pzdev->pz_hpa, + if ((ret = ((iodcio_t)pzdev->pz_iodc_io)(pzdev->pz_hpa, IODC_IO_READ, pzdev->pz_spa, pzdev->pz_layers, pdcbuf, dp->last_blk, dp->buf, IODC_IOSIZ, IODC_IOSIZ)) < 0) { @@ -222,7 +222,7 @@ iodcstrategy(devdata, rw, blk, size, buf, rsize) */ for (; size; size -= ret, buf += ret, blk += ret, xfer += ret) { offset = blk & IOPGOFSET; - if ((ret = (pzdev->pz_iodc_io)(pzdev->pz_hpa, + if ((ret = ((iodcio_t)pzdev->pz_iodc_io)(pzdev->pz_hpa, (rw == F_READ? IODC_IO_READ: IODC_IO_WRITE), pzdev->pz_spa, pzdev->pz_layers, pdcbuf, blk - offset, dp->buf, IODC_IOSIZ, IODC_IOSIZ)) < 0) { @@ -279,7 +279,7 @@ pdc_findev(unit, class) printf("pdc_finddev(%d, %x)\n", unit, class); #endif iodc = (iodcio_t)(PAGE0->mem_free + IODC_MAXSIZE); - io = PAGE0->mem_boot.pz_hpa; + io = (struct iomod *)PAGE0->mem_boot.pz_hpa; /* quick hack for boot device */ if (PAGE0->mem_boot.pz_class == class && @@ -337,8 +337,8 @@ pdc_findev(unit, class) stp = IODC_INIT_FIRST; do { - if ((err = (iodc)(io, stp, io->io_spa, layers, - pdcbuf, 0, 0, 0, 0)) < 0) { + if ((err = (iodc)((u_int)io, stp, io->io_spa, + layers, pdcbuf, 0, 0, 0, 0)) < 0) { #ifdef DEBUG if (debug && err != PDC_ERR_EOD) printf("IODC_INIT_%s: %d\n", @@ -368,7 +368,7 @@ pdc_findev(unit, class) if (err >= 0) { /* init device */ - if (0 && (err = (iodc)(io, IODC_INIT_DEV, io->io_spa, + if (0 && (err = (iodc)((u_int)io, IODC_INIT_DEV, io->io_spa, layers, pdcbuf, 0, 0, 0, 0)) < 0) { #ifdef DEBUG if (debug) @@ -389,9 +389,9 @@ pdc_findev(unit, class) pz.pz_flags = 0; bcopy(layers, pz.pz_layers, sizeof(pz.pz_layers)); - pz.pz_hpa = io; + pz.pz_hpa = (u_int)io; /* XXX pz.pz_spa = io->io_spa; */ - pz.pz_iodc_io = iodc; + pz.pz_iodc_io = (u_int)iodc; pz.pz_class = class; return &pz; |