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 | |
| parent | c987d231462ae4d94029c65fe37a562d67fdf4ee (diff) | |
Merge paddr_t changes into the main branch.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ic/aic7xxx.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/midway.c | 4 | ||||
| -rw-r--r-- | sys/dev/ic/pdqvar.h | 10 | ||||
| -rw-r--r-- | sys/dev/ic/vga.c | 2 | ||||
| -rw-r--r-- | sys/dev/isa/files.isa | 6 | ||||
| -rw-r--r-- | sys/dev/isa/pcdisplay.c | 2 | ||||
| -rw-r--r-- | sys/dev/md.c | 12 | ||||
| -rw-r--r-- | sys/dev/ofisa/ess_ofisa.c | 2 | ||||
| -rw-r--r-- | sys/dev/pci/if_de.c | 8 | ||||
| -rw-r--r-- | sys/dev/pci/if_devar.h | 4 | ||||
| -rw-r--r-- | sys/dev/pci/if_fpa.c | 7 | ||||
| -rw-r--r-- | sys/dev/pci/if_tl.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/ncr.c | 24 | ||||
| -rw-r--r-- | sys/dev/pci/tga.c | 2 | ||||
| -rw-r--r-- | sys/dev/pci/tgavar.h | 20 | ||||
| -rw-r--r-- | sys/dev/pcmcia/pcmcia.c | 4 | ||||
| -rw-r--r-- | sys/dev/sbus/sbusvar.h | 4 | ||||
| -rw-r--r-- | sys/dev/tc/asc.c | 4 | ||||
| -rw-r--r-- | sys/dev/tc/asc_ioasic.c | 12 | ||||
| -rw-r--r-- | sys/dev/wscons/wsdisplayvar.h | 2 |
20 files changed, 72 insertions, 67 deletions
diff --git a/sys/dev/ic/aic7xxx.c b/sys/dev/ic/aic7xxx.c index 0fa43a90880..b7425e1d721 100644 --- a/sys/dev/ic/aic7xxx.c +++ b/sys/dev/ic/aic7xxx.c @@ -1,4 +1,4 @@ -/* $NetBSD: aic7xxx.c,v 1.29 1998/04/16 07:12:43 leo Exp $ */ +/* $NetBSD: aic7xxx.c,v 1.30 1998/08/13 02:10:51 eeh Exp $ */ /* * Generic driver for the aic7xxx based adaptec SCSI controllers @@ -166,9 +166,9 @@ #endif #ifdef alpha /* XXX */ /* XXX XXX NEED REAL DMA MAPPING SUPPORT XXX XXX */ -extern vm_offset_t alpha_XXX_dmamap(vm_offset_t); +extern paddr_t alpha_XXX_dmamap(vaddr_t); #undef vtophys -#define vtophys(va) alpha_XXX_dmamap((vm_offset_t) va) +#define vtophys(va) alpha_XXX_dmamap((vaddr_t) va) #endif /* alpha */ #endif /* defined(__NetBSD__) */ diff --git a/sys/dev/ic/midway.c b/sys/dev/ic/midway.c index 77d75b75d51..2d193835979 100644 --- a/sys/dev/ic/midway.c +++ b/sys/dev/ic/midway.c @@ -1,4 +1,4 @@ -/* $NetBSD: midway.c,v 1.34 1998/08/08 23:51:40 mycroft Exp $ */ +/* $NetBSD: midway.c,v 1.35 1998/08/13 02:10:51 eeh Exp $ */ /* (sync'd to midway.c 1.68) */ /* @@ -159,7 +159,7 @@ #if defined(__alpha__) /* XXX XXX NEED REAL DMA MAPPING SUPPORT XXX XXX */ #undef vtophys -#define vtophys(va) alpha_XXX_dmamap((vm_offset_t)(va)) +#define vtophys(va) alpha_XXX_dmamap((vaddr_t)(va)) #endif #elif defined(__FreeBSD__) #include <machine/cpufunc.h> /* for rdtsc proto for clock.h below */ diff --git a/sys/dev/ic/pdqvar.h b/sys/dev/ic/pdqvar.h index 8760eccd7a6..c3cacdb457d 100644 --- a/sys/dev/ic/pdqvar.h +++ b/sys/dev/ic/pdqvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: pdqvar.h,v 1.21 1998/05/27 01:17:53 matt Exp $ */ +/* $NetBSD: pdqvar.h,v 1.22 1998/08/13 02:10:51 eeh Exp $ */ /*- * Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com> @@ -95,7 +95,7 @@ enum _pdq_type_t { #endif #if !defined(PDQ_BUS_DMA) #if defined(__NetBSD__) && defined(__alpha__) -#define PDQ_OS_VA_TO_BUSPA(pdq, p) (alpha_XXX_dmamap((vm_offset_t)p)) +#define PDQ_OS_VA_TO_BUSPA(pdq, p) (alpha_XXX_dmamap((vaddr_t)p)) #else #define PDQ_OS_VA_TO_BUSPA(pdq, p) vtophys(p) #endif @@ -104,15 +104,15 @@ enum _pdq_type_t { #define PDQ_OS_MEMFREE(p, n) free((void *) p, M_DEVBUF) #ifdef __FreeBSD__ #define PDQ_OS_MEMALLOC_CONTIG(n) vm_page_alloc_contig(n, 0, 0xffffffff, PAGE_SIZE) -#define PDQ_OS_MEMFREE_CONTIG(p, n) kmem_free(kernel_map, (vm_offset_t) p, n) +#define PDQ_OS_MEMFREE_CONTIG(p, n) kmem_free(kernel_map, (vaddr_t) p, n) #else #if !defined(PDQ_BUS_DMA) #if defined(UVM) #define PDQ_OS_MEMALLOC_CONTIG(n) uvm_km_alloc(kernel_map, round_page(n)) -#define PDQ_OS_MEMFREE_CONTIG(p, n) uvm_km_free(kernel_map, (vm_offset_t) p, n) +#define PDQ_OS_MEMFREE_CONTIG(p, n) uvm_km_free(kernel_map, (vaddr_t) p, n) #else #define PDQ_OS_MEMALLOC_CONTIG(n) kmem_alloc(kernel_map, round_page(n)) -#define PDQ_OS_MEMFREE_CONTIG(p, n) kmem_free(kernel_map, (vm_offset_t) p, n) +#define PDQ_OS_MEMFREE_CONTIG(p, n) kmem_free(kernel_map, (vaddr_t) p, n) #endif #endif #endif /* __FreeBSD__ */ diff --git a/sys/dev/ic/vga.c b/sys/dev/ic/vga.c index 5f4d0cba101..d34871dcfe3 100644 --- a/sys/dev/ic/vga.c +++ b/sys/dev/ic/vga.c @@ -1,4 +1,4 @@ -/* $NetBSD: vga.c,v 1.8 1998/07/24 16:20:14 drochner Exp $ */ +/* $NetBSD: vga.c,v 1.9 1998/08/13 02:10:52 eeh Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. diff --git a/sys/dev/isa/files.isa b/sys/dev/isa/files.isa index 3abb9f03dd4..69418ac567d 100644 --- a/sys/dev/isa/files.isa +++ b/sys/dev/isa/files.isa @@ -1,4 +1,4 @@ -# $NetBSD: files.isa,v 1.69 1998/08/12 18:16:36 augustss Exp $ +# $NetBSD: files.isa,v 1.70 1998/08/13 02:10:52 eeh Exp $ # # Config file and device description for machine-independent ISA code. # Included by ports that need it. Requires that the SCSI files be @@ -314,6 +314,10 @@ device aria: audio, mulaw, auconv attach aria at isa file dev/isa/aria.c aria needs-flag +# ESS Technology ES1887/ES888 +device ess: audio, isadma, mulaw, auconv +file dev/isa/ess.c ess needs-flag + # # PlanetConnect satellite receiver driver. # diff --git a/sys/dev/isa/pcdisplay.c b/sys/dev/isa/pcdisplay.c index 0a957c32062..d93bd504f62 100644 --- a/sys/dev/isa/pcdisplay.c +++ b/sys/dev/isa/pcdisplay.c @@ -1,4 +1,4 @@ -/* $NetBSD: pcdisplay.c,v 1.4 1998/07/24 16:22:51 drochner Exp $ */ +/* $NetBSD: pcdisplay.c,v 1.5 1998/08/13 02:10:52 eeh Exp $ */ /* * Copyright (c) 1998 diff --git a/sys/dev/md.c b/sys/dev/md.c index a08e12b644f..0cb7429d047 100644 --- a/sys/dev/md.c +++ b/sys/dev/md.c @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.16 1998/02/10 14:09:18 mrg Exp $ */ +/* $NetBSD: md.c,v 1.17 1998/08/13 02:10:50 eeh Exp $ */ /* * Copyright (c) 1995 Gordon W. Ross, Leo Weppelman. @@ -438,8 +438,8 @@ md_ioctl_kalloc(sc, umd, proc) struct md_conf *umd; struct proc *proc; { - vm_offset_t addr; - vm_size_t size; + vaddr_t addr; + vsize_t size; /* Sanity check the size. */ size = umd->md_size; @@ -470,14 +470,14 @@ md_ioctl_server(sc, umd, proc) struct md_conf *umd; struct proc *proc; { - vm_offset_t end; + vaddr_t end; int error; /* Sanity check addr, size. */ - end = (vm_offset_t) (umd->md_addr + umd->md_size); + end = (vaddr_t) (umd->md_addr + umd->md_size); if ((end >= VM_MAXUSER_ADDRESS) || - (end < ((vm_offset_t) umd->md_addr)) ) + (end < ((vaddr_t) umd->md_addr)) ) return EINVAL; /* This unit is now configured. */ diff --git a/sys/dev/ofisa/ess_ofisa.c b/sys/dev/ofisa/ess_ofisa.c index 0f054e4c15d..2f72f8a6951 100644 --- a/sys/dev/ofisa/ess_ofisa.c +++ b/sys/dev/ofisa/ess_ofisa.c @@ -1,4 +1,4 @@ -/* $NetBSD: ess_ofisa.c,v 1.3 1998/07/31 15:17:18 augustss Exp $ */ +/* $NetBSD: ess_ofisa.c,v 1.4 1998/08/13 02:10:52 eeh Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c index c9885517c43..dea21ad6ade 100644 --- a/sys/dev/pci/if_de.c +++ b/sys/dev/pci/if_de.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_de.c,v 1.72 1998/07/05 06:49:14 jonathan Exp $ */ +/* $NetBSD: if_de.c,v 1.73 1998/08/13 02:10:53 eeh Exp $ */ /*- * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com) @@ -5466,7 +5466,7 @@ tulip_pci_attach( int retval, idx; u_int32_t revinfo, cfdainfo, id; #if !defined(TULIP_IOMAPPED) && defined(__FreeBSD__) - vm_offset_t pa_csrs; + vaddr_t pa_csrs; #endif unsigned csroffset = TULIP_PCI_CSROFFSET; unsigned csrsize = TULIP_PCI_CSRSIZE; @@ -5603,7 +5603,7 @@ tulip_pci_attach( #if defined(TULIP_IOMAPPED) retval = pci_map_port(config_id, PCI_CBIO, &csr_base); #else - retval = pci_map_mem(config_id, PCI_CBMA, (vm_offset_t *) &csr_base, &pa_csrs); + retval = pci_map_mem(config_id, PCI_CBMA, (vaddr_t *) &csr_base, &pa_csrs); #endif if (!retval) { free((caddr_t) sc, M_DEVBUF); @@ -5617,7 +5617,7 @@ tulip_pci_attach( #if defined(TULIP_IOMAPPED) csr_base = ia->ia_iobase; #else - csr_base = (vm_offset_t) mapphys((vm_offset_t) ia->ia_maddr, ia->ia_msize); + csr_base = (vaddr_t) mapphys((vaddr_t) ia->ia_maddr, ia->ia_msize); #endif #endif /* __bsdi__ */ diff --git a/sys/dev/pci/if_devar.h b/sys/dev/pci/if_devar.h index eaa9e7a65c1..6e9fbc779c0 100644 --- a/sys/dev/pci/if_devar.h +++ b/sys/dev/pci/if_devar.h @@ -1,4 +1,4 @@ -/* $NetBSD: if_devar.h,v 1.27 1998/05/25 22:13:28 mark Exp $ */ +/* $NetBSD: if_devar.h,v 1.28 1998/08/13 02:10:53 eeh Exp $ */ /*- * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com) @@ -998,7 +998,7 @@ extern struct cfdriver de_cd; #if !defined(TULIP_BUS_DMA) || defined(TULIP_BUS_DMA_NORX) || defined(TULIP_BUS_DMA_NOTX) #if defined(__alpha__) /* XXX XXX NEED REAL DMA MAPPING SUPPORT XXX XXX */ -#define TULIP_KVATOPHYS(sc, va) alpha_XXX_dmamap((vm_offset_t)(va)) +#define TULIP_KVATOPHYS(sc, va) alpha_XXX_dmamap((vaddr_t)(va)) #endif #endif #endif /* __NetBSD__ */ diff --git a/sys/dev/pci/if_fpa.c b/sys/dev/pci/if_fpa.c index b71188a2456..ad38b371c60 100644 --- a/sys/dev/pci/if_fpa.c +++ b/sys/dev/pci/if_fpa.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_fpa.c,v 1.27 1998/07/05 00:51:23 jonathan Exp $ */ +/* $NetBSD: if_fpa.c,v 1.28 1998/08/13 02:10:53 eeh Exp $ */ /*- * Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com> @@ -192,7 +192,8 @@ pdq_pci_attach( int unit) { pdq_softc_t *sc; - vm_offset_t va_csrs, pa_csrs; + vaddr_t va_csrs; + paddr_t pa_csrs; pdq_uint32_t data; if (unit == NFPA) { @@ -360,7 +361,7 @@ pdq_pci_attach( sc->sc_if.if_unit = sc->sc_dev.dv_unit; sc->sc_if.if_name = "fpa"; sc->sc_if.if_flags = 0; - sc->sc_membase = (pdq_bus_memaddr_t) mapphys((vm_offset_t)ia->ia_maddr, ia->ia_msize); + sc->sc_membase = (pdq_bus_memaddr_t) mapphys((vaddr_t)ia->ia_maddr, ia->ia_msize); sc->sc_pdq = pdq_initialize(PDQ_BUS_PCI, sc->sc_membase, sc->sc_if.if_name, sc->sc_if.if_unit, diff --git a/sys/dev/pci/if_tl.c b/sys/dev/pci/if_tl.c index 9f4dc17cc87..8e6fbfac114 100644 --- a/sys/dev/pci/if_tl.c +++ b/sys/dev/pci/if_tl.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_tl.c,v 1.15 1998/08/11 00:09:26 thorpej Exp $ */ +/* $NetBSD: if_tl.c,v 1.16 1998/08/13 02:10:54 eeh Exp $ */ /* * Copyright (c) 1997 Manuel Bouyer. All rights reserved. @@ -1219,7 +1219,7 @@ tbdinit: break; size += m->m_len; Tx->hw_list.seg[segment].data_addr = - vtophys(mtod(m, vm_offset_t)); + vtophys(mtod(m, vaddr_t)); Tx->hw_list.seg[segment].data_count = m->m_len; segment++; } diff --git a/sys/dev/pci/ncr.c b/sys/dev/pci/ncr.c index 8b55b6a1f6d..5977052ff19 100644 --- a/sys/dev/pci/ncr.c +++ b/sys/dev/pci/ncr.c @@ -1,4 +1,4 @@ -/* $NetBSD: ncr.c,v 1.69 1998/08/10 13:10:33 ross Exp $ */ +/* $NetBSD: ncr.c,v 1.70 1998/08/13 02:10:54 eeh Exp $ */ /************************************************************************** ** @@ -248,7 +248,7 @@ #if defined(__NetBSD__) && defined(__alpha__) /* XXX XXX NEED REAL DMA MAPPING SUPPORT XXX XXX */ #undef vtophys -#define vtophys(va) alpha_XXX_dmamap((vm_offset_t)(va)) +#define vtophys(va) alpha_XXX_dmamap((vaddr_t)(va)) #endif /*========================================================== @@ -1094,11 +1094,11 @@ struct ncb { ** of the 53c810 chip. */ #ifndef __NetBSD__ - vm_offset_t vaddr; - vm_offset_t paddr; + vaddr_t vaddr; + paddr_t paddr; - vm_offset_t vaddr2; - vm_offset_t paddr2; + vaddr_t vaddr2; + paddr_t paddr2; #else bus_addr_t paddr; @@ -1397,8 +1397,8 @@ static void ncb_profile (ncb_p np, ccb_p cp); static void ncr_script_copy_and_bind (ncb_p np, ncrcmd *src, ncrcmd *dst, int len); static void ncr_script_fill (struct script * scr, struct scripth *scrh); -static int ncr_scatter (struct dsb* phys, vm_offset_t vaddr, - vm_size_t datalen); +static int ncr_scatter (struct dsb* phys, vaddr_t vaddr, + vsize_t datalen); static void ncr_setmaxtags (tcb_p tp, u_long usrtags); static void ncr_getsync (ncb_p np, u_char sfac, u_char *fakp, u_char *scntl3p); @@ -1434,7 +1434,7 @@ static void ncr_attach (pcici_t tag, int unit); #if 0 static char ident[] = - "\n$NetBSD: ncr.c,v 1.69 1998/08/10 13:10:33 ross Exp $\n"; + "\n$NetBSD: ncr.c,v 1.70 1998/08/13 02:10:54 eeh Exp $\n"; #endif static const u_long ncr_version = NCR_VERSION * 11 @@ -4603,8 +4603,8 @@ static INT32 ncr_start (struct scsipi_xfer * xp) **---------------------------------------------------- */ - segments = ncr_scatter (&cp->phys, (vm_offset_t) xp->data, - (vm_size_t) xp->datalen); + segments = ncr_scatter (&cp->phys, (vaddr_t) xp->data, + (vsize_t) xp->datalen); if (segments < 0) { xp->error = XS_DRIVER_STUFFUP; @@ -7350,7 +7350,7 @@ static void ncr_opennings (ncb_p np, lcb_p lp, struct scsipi_xfer * xp) */ static int ncr_scatter - (struct dsb* phys, vm_offset_t vaddr, vm_size_t datalen) + (struct dsb* phys, vaddr_t vaddr, vsize_t datalen) { u_long paddr, pnext; diff --git a/sys/dev/pci/tga.c b/sys/dev/pci/tga.c index 529db67edd2..aa88ac8cb41 100644 --- a/sys/dev/pci/tga.c +++ b/sys/dev/pci/tga.c @@ -1,4 +1,4 @@ -/* $NetBSD: tga.c,v 1.6 1998/06/26 21:07:03 drochner Exp $ */ +/* $NetBSD: tga.c,v 1.7 1998/08/13 02:10:54 eeh Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. diff --git a/sys/dev/pci/tgavar.h b/sys/dev/pci/tgavar.h index 9b0bdd8eebb..ab687764229 100644 --- a/sys/dev/pci/tgavar.h +++ b/sys/dev/pci/tgavar.h @@ -1,4 +1,4 @@ -/* $NetBSD: tgavar.h,v 1.1 1998/04/15 20:16:34 drochner Exp $ */ +/* $NetBSD: tgavar.h,v 1.2 1998/08/13 02:10:55 eeh Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -63,16 +63,16 @@ struct tga_conf { const struct tga_ramdac_conf *tgac_ramdac; /* the RAMDAC type; see above */ int tgac_phys_depth; /* physical frame buffer depth */ - vm_size_t tgac_cspace_size; /* core space size */ - vm_size_t tgac_vvbr_units; /* what '1' in the VVBR means */ + vsize_t tgac_cspace_size; /* core space size */ + vsize_t tgac_vvbr_units; /* what '1' in the VVBR means */ int tgac_ndbuf; /* number of display buffers */ - vm_offset_t tgac_dbuf[2]; /* display buffer offsets/addresses */ - vm_size_t tgac_dbufsz[2]; /* display buffer sizes */ + vaddr_t tgac_dbuf[2]; /* display buffer offsets/addresses */ + vsize_t tgac_dbufsz[2]; /* display buffer sizes */ int tgac_nbbuf; /* number of display buffers */ - vm_offset_t tgac_bbuf[2]; /* back buffer offsets/addresses */ - vm_size_t tgac_bbufsz[2]; /* back buffer sizes */ + vaddr_t tgac_bbuf[2]; /* back buffer offsets/addresses */ + vsize_t tgac_bbufsz[2]; /* back buffer sizes */ }; struct tga_devconfig { @@ -87,14 +87,14 @@ struct tga_devconfig { int dc_tga_type; /* the device type; see below */ const struct tga_conf *dc_tgaconf; /* device buffer configuration */ - vm_offset_t dc_vaddr; /* memory space virtual base address */ - vm_offset_t dc_paddr; /* memory space physical base address */ + vaddr_t dc_vaddr; /* memory space virtual base address */ + paddr_t dc_paddr; /* memory space physical base address */ int dc_wid; /* width of frame buffer */ int dc_ht; /* height of frame buffer */ int dc_rowbytes; /* bytes in a FB scan line */ - vm_offset_t dc_videobase; /* base of flat frame buffer */ + vaddr_t dc_videobase; /* base of flat frame buffer */ struct raster dc_raster; /* raster description */ struct rcons dc_rcons; /* raster blitter control info */ diff --git a/sys/dev/pcmcia/pcmcia.c b/sys/dev/pcmcia/pcmcia.c index ba6f9b274d3..faa56c95747 100644 --- a/sys/dev/pcmcia/pcmcia.c +++ b/sys/dev/pcmcia/pcmcia.c @@ -1,4 +1,4 @@ -/* $NetBSD: pcmcia.c,v 1.8 1998/06/09 07:32:57 thorpej Exp $ */ +/* $NetBSD: pcmcia.c,v 1.9 1998/08/13 02:10:55 eeh Exp $ */ #define PCMCIADEBUG @@ -775,7 +775,7 @@ pcmcia_card_intr(arg) printf("%s: intr flags=%x fct=%d physaddr=%lx cor=%02x csr=%02x pin=%02x", sc->dev.dv_xname, pf->pf_flags, pf->number, pmap_extract(pmap_kernel(), - (vm_offset_t) pf->pf_ccrh) + pf->pf_ccr_offset, + (vaddr_t) pf->pf_ccrh) + pf->pf_ccr_offset, pcmcia_ccr_read(pf, PCMCIA_CCR_OPTION), pcmcia_ccr_read(pf, PCMCIA_CCR_STATUS), pcmcia_ccr_read(pf, PCMCIA_CCR_PIN)); diff --git a/sys/dev/sbus/sbusvar.h b/sys/dev/sbus/sbusvar.h index b653cc6657a..1ce75e432be 100644 --- a/sys/dev/sbus/sbusvar.h +++ b/sys/dev/sbus/sbusvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: sbusvar.h,v 1.2 1998/07/29 18:30:20 pk Exp $ */ +/* $NetBSD: sbusvar.h,v 1.3 1998/08/13 02:10:55 eeh Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -132,9 +132,9 @@ struct sbus_softc { struct sbus_range *sc_range; int sc_nrange; int sc_burst; /* burst transfer sizes supported */ + /* machdep stuff follows here */ int *sc_intr2ipl; /* Interrupt level translation */ int *sc_intr_compat; /* `intr' property to sbus compat */ - /* machdep stuff follows here */ }; #endif 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); diff --git a/sys/dev/wscons/wsdisplayvar.h b/sys/dev/wscons/wsdisplayvar.h index dabdf074c53..63bbb3b23cf 100644 --- a/sys/dev/wscons/wsdisplayvar.h +++ b/sys/dev/wscons/wsdisplayvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: wsdisplayvar.h,v 1.6 1998/07/28 22:01:24 augustss Exp $ */ +/* $NetBSD: wsdisplayvar.h,v 1.7 1998/08/13 02:10:56 eeh Exp $ */ /* * Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved. |
