diff options
| author | eeh <eeh@NetBSD.org> | 1998-08-13 02:10:37 +0000 |
|---|---|---|
| committer | eeh <eeh@NetBSD.org> | 1998-08-13 02:10:37 +0000 |
| commit | a2dd74ed791b6de71af4e5878486b5613375cb4e (patch) | |
| tree | aa2625388cc5681096b3c307d42be0f08b784f07 /sys/dev/tc | |
| parent | c987d231462ae4d94029c65fe37a562d67fdf4ee (diff) | |
Merge paddr_t changes into the main branch.
Diffstat (limited to 'sys/dev/tc')
| -rw-r--r-- | sys/dev/tc/asc.c | 4 | ||||
| -rw-r--r-- | sys/dev/tc/asc_ioasic.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/tc/asc.c b/sys/dev/tc/asc.c index cb5b59d442a..0bc02df72ad 100644 --- a/sys/dev/tc/asc.c +++ b/sys/dev/tc/asc.c @@ -1,4 +1,4 @@ -/* $NetBSD: asc.c,v 1.46 1998/05/08 15:39:01 mhitch Exp $ */ +/* $NetBSD: asc.c,v 1.47 1998/08/13 02:10:56 eeh Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -1413,7 +1413,7 @@ asc_end(asc, status, ss, ir) ss->byte2 = sc_link->lun << 5; ss->length = sizeof(struct scsipi_sense_data); state->cmdlen = sizeof(*ss); - state->buf = (vm_offset_t)&scsicmd->sense; + state->buf = (vaddr_t)&scsicmd->sense; state->buflen = sizeof(struct scsipi_sense_data); state->flags |= CHECK_SENSE; MachFlushDCache(state->buf, state->buflen); diff --git a/sys/dev/tc/asc_ioasic.c b/sys/dev/tc/asc_ioasic.c index f9f1d5a6200..4c867c689a9 100644 --- a/sys/dev/tc/asc_ioasic.c +++ b/sys/dev/tc/asc_ioasic.c @@ -1,4 +1,4 @@ -/* $NetBSD: asc_ioasic.c,v 1.13 1998/05/27 04:30:07 thorpej Exp $ */ +/* $NetBSD: asc_ioasic.c,v 1.14 1998/08/13 02:10:56 eeh Exp $ */ /* * Copyright 1996 The Board of Trustees of The Leland Stanford @@ -37,7 +37,7 @@ #include <pmax/pmax/pmaxtype.h> extern int pmax_boardtype; -extern vm_offset_t kvtophys __P((vm_offset_t)); +extern paddr_t kvtophys __P((vaddr_t)); extern tc_addr_t ioasic_base; /* XXX */ @@ -185,16 +185,16 @@ asic_dma_start(asc, state, cp, flag, len, off) /* If R4K, writeback and invalidate the buffer */ if (CPUISMIPS3) - mips3_HitFlushDCache((vm_offset_t)cp, len); + mips3_HitFlushDCache((vaddr_t)cp, len); /* Get physical address of buffer start, no next phys addr */ - phys = (u_int)kvtophys((vm_offset_t)cp); + phys = (u_int)kvtophys((vaddr_t)cp); nphys = -1; /* Compute 2nd DMA pointer only if next page is part of this I/O */ if ((NBPG - (phys & (NBPG - 1))) < len) { cp = (caddr_t)mips_trunc_page(cp + NBPG); - nphys = (u_int)kvtophys((vm_offset_t)cp); + nphys = (u_int)kvtophys((vaddr_t)cp); } /* If not R4K, need to invalidate cache lines for both physical segments */ @@ -217,7 +217,7 @@ asic_dma_start(asc, state, cp, flag, len, off) #ifdef MIPS3 /* If R4K, need to writeback the bounce buffer */ if (CPUISMIPS3) - mips3_HitFlushDCache((vm_offset_t)cp, len); + mips3_HitFlushDCache((vaddr_t)cp, len); #endif /* MIPS3 */ phys = MIPS_KSEG0_TO_PHYS(cp); cp = (caddr_t)mips_trunc_page(cp + NBPG); |
