diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 1998-05-18 00:28:38 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 1998-05-18 00:28:38 +0000 |
| commit | 567b8d71a84ccbfec00fb59d52dfd6867296f64d (patch) | |
| tree | dfcd7958d893ae00faf51af7d859bc02ab0528b1 /sys/arch/pmax/dev/sii_ds.c | |
| parent | d414ee5831ad97169bd77cf57b15b084f79e46f2 (diff) | |
new cpureg.h from NetBSD plus modifications to use the changed macro names
Diffstat (limited to 'sys/arch/pmax/dev/sii_ds.c')
| -rw-r--r-- | sys/arch/pmax/dev/sii_ds.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/pmax/dev/sii_ds.c b/sys/arch/pmax/dev/sii_ds.c index 5d5789bd3c3..53601cda2ba 100644 --- a/sys/arch/pmax/dev/sii_ds.c +++ b/sys/arch/pmax/dev/sii_ds.c @@ -43,7 +43,7 @@ struct cfattach sii_ds_ca = { /* define a safe address in the SCSI buffer for doing status & message DMA */ -#define SII_BUF_ADDR (MACH_PHYS_TO_UNCACHED(KN01_SYS_SII_B_START) \ +#define SII_BUF_ADDR (MIPS_PHYS_TO_KSEG1(KN01_SYS_SII_B_START) \ + SII_MAX_DMA_XFER_LENGTH * 14) /* @@ -64,10 +64,10 @@ sii_ds_match(parent, match, aux) /* XXX check for bad address, untested */ siiaddr = (void *)ca->ca_addr; - if (siiaddr != (void *)MACH_PHYS_TO_UNCACHED(KN01_SYS_SII)) { + if (siiaddr != (void *)MIPS_PHYS_TO_KSEG1(KN01_SYS_SII)) { printf("(siimatch: bad addr %x, substituting %x\n", - ca->ca_addr, MACH_PHYS_TO_UNCACHED(KN01_SYS_SII)); - siiaddr = (void *)MACH_PHYS_TO_UNCACHED(KN01_SYS_SII); + ca->ca_addr, MIPS_PHYS_TO_KSEG1(KN01_SYS_SII)); + siiaddr = (void *)MIPS_PHYS_TO_KSEG1(KN01_SYS_SII); } if (badaddr(siiaddr, 4)) return (0); @@ -83,10 +83,10 @@ sii_ds_attach(parent, self, aux) register struct confargs *ca = aux; register struct siisoftc *sc = (struct siisoftc *) self; - sc->sc_regs = (SIIRegs *)MACH_PHYS_TO_UNCACHED(ca->ca_addr); + sc->sc_regs = (SIIRegs *)MIPS_PHYS_TO_KSEG1(ca->ca_addr); /* set up scsi buffer. XXX Why statically allocated? */ - sc->sc_buf = (void*)(MACH_PHYS_TO_UNCACHED(KN01_SYS_SII_B_START)); + sc->sc_buf = (void*)(MIPS_PHYS_TO_KSEG1(KN01_SYS_SII_B_START)); siiattach(sc); |