diff options
| author | peter <peter@FreeBSD.org> | 1998-10-14 08:31:27 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1998-10-14 08:31:27 +0000 |
| commit | 5b60e1fc6a748008b830fa7e9eb5274222a74abe (patch) | |
| tree | a8f124a968ca24a3e390494075eb3e3531d52fa0 /sys/dev/de | |
| parent | 5e3acbf57ecc36c62f6b23d1501f02c9717a65d5 (diff) | |
| download | FreeBSD-src-5b60e1fc6a748008b830fa7e9eb5274222a74abe.zip FreeBSD-src-5b60e1fc6a748008b830fa7e9eb5274222a74abe.tar.gz | |
Revert part of previous commit. vaddr_t doesn't exist on FreeBSD. This
didn't affect the x86 kernel due to #ifdefs. It broke FreeBSD/Alpha
kernel compiles though.
Diffstat (limited to 'sys/dev/de')
| -rw-r--r-- | sys/dev/de/if_de.c | 8 | ||||
| -rw-r--r-- | sys/dev/de/if_devar.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c index 297768b..8b74e43 100644 --- a/sys/dev/de/if_de.c +++ b/sys/dev/de/if_de.c @@ -1,5 +1,5 @@ /* $NetBSD: if_de.c,v 1.80 1998/09/25 18:06:53 matt Exp $ */ -/* $Id: if_de.c,v 1.87 1998/10/10 02:44:53 peter Exp $ */ +/* $Id: if_de.c,v 1.88 1998/10/13 09:05:57 peter Exp $ */ /*- * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com) @@ -5580,7 +5580,7 @@ tulip_pci_attach( int retval, idx; u_int32_t revinfo, cfdainfo, id; #if !defined(TULIP_IOMAPPED) && defined(__FreeBSD__) - vaddr_t pa_csrs; + vm_offset_t pa_csrs; #endif unsigned csroffset = TULIP_PCI_CSROFFSET; unsigned csrsize = TULIP_PCI_CSRSIZE; @@ -5717,7 +5717,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, (vaddr_t *) &csr_base, &pa_csrs); + retval = pci_map_mem(config_id, PCI_CBMA, (vm_offset_t *) &csr_base, &pa_csrs); #endif if (!retval) { free((caddr_t) sc, M_DEVBUF); @@ -5731,7 +5731,7 @@ tulip_pci_attach( #if defined(TULIP_IOMAPPED) csr_base = ia->ia_iobase; #else - csr_base = (vaddr_t) mapphys((vaddr_t) ia->ia_maddr, ia->ia_msize); + csr_base = (vm_offset_t) mapphys((vm_offset_t) ia->ia_maddr, ia->ia_msize); #endif #endif /* __bsdi__ */ diff --git a/sys/dev/de/if_devar.h b/sys/dev/de/if_devar.h index 5a3953e..1f4b577 100644 --- a/sys/dev/de/if_devar.h +++ b/sys/dev/de/if_devar.h @@ -1,5 +1,5 @@ /* $NetBSD: if_devar.h,v 1.31 1998/09/29 22:40:52 matt Exp $ */ -/* $Id: if_devar.h,v 1.9 1998/09/16 08:27:07 dfr Exp $ */ +/* $Id: if_devar.h,v 1.10 1998/10/13 09:05:58 peter Exp $ */ /*- * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com) @@ -1029,7 +1029,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((vaddr_t)(va)) +#define TULIP_KVATOPHYS(sc, va) alpha_XXX_dmamap((vm_offset_t)(va)) #endif #endif #endif /* __NetBSD__ */ |
