before #defining the vtophys() hack for the alpha, #undef vtophys since

it may be a macro.
This commit is contained in:
cgd 1996-07-15 16:40:27 +00:00
parent ce30ddd46b
commit effd413ecd
4 changed files with 10 additions and 6 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: midway.c,v 1.11 1996/07/14 20:05:31 cgd Exp $ */
/* $NetBSD: midway.c,v 1.12 1996/07/15 16:40:27 cgd Exp $ */
/* (sync'd to midway.c 1.59) */
/*
@ -122,6 +122,7 @@
#include <dev/ic/midwayvar.h>
#if defined(__alpha__)
/* XXX XXX NEED REAL DMA MAPPING SUPPORT XXX XXX */
#undef vtophys
#define vtophys(va) __alpha_bus_XXX_dmamap(sc->en_bc, (void *)(va))
#endif
#elif defined(__FreeBSD__)

View File

@ -1,4 +1,4 @@
/* $NetBSD: if_de.c,v 1.23 1996/06/03 20:30:21 cgd Exp $ */
/* $NetBSD: if_de.c,v 1.24 1996/07/15 16:40:40 cgd Exp $ */
/*-
* Copyright (c) 1994, 1995 Matt Thomas (matt@lkg.dec.com)
@ -424,9 +424,10 @@ static void tulip_addr_filter(tulip_softc_t *sc);
#if defined(__NetBSD__) && defined(__alpha__)
/* XXX XXX NEED REAL DMA MAPPING SUPPORT XXX XXX */
#undef vtophys
#define vtophys(va) __alpha_bus_XXX_dmamap(sc->tulip_bc, (void *)(va))
#endif
static int
tulip_dc21040_media_probe(

View File

@ -1,4 +1,4 @@
/* $NetBSD: if_le_pci.c,v 1.7 1996/06/03 20:30:29 cgd Exp $ */
/* $NetBSD: if_le_pci.c,v 1.8 1996/07/15 16:40:46 cgd Exp $ */
/*-
* Copyright (c) 1995 Charles M. Hannum. All rights reserved.
@ -76,6 +76,7 @@
#ifdef __alpha__ /* XXX */
/* XXX XXX NEED REAL DMA MAPPING SUPPORT XXX XXX */
#undef vtophys
#define vtophys(va) __alpha_bus_XXX_dmamap(lesc->sc_bc, (void *)(va))
#endif

View File

@ -1,4 +1,4 @@
/* $NetBSD: ncr.c,v 1.36 1996/06/03 20:30:34 cgd Exp $ */
/* $NetBSD: ncr.c,v 1.37 1996/07/15 16:40:52 cgd Exp $ */
/**************************************************************************
**
@ -211,6 +211,7 @@ extern PRINT_ADDR();
#if defined(__NetBSD__) && defined(__alpha__)
/* XXX XXX NEED REAL DMA MAPPING SUPPORT XXX XXX */
#undef vtophys
#define vtophys(va) __alpha_bus_XXX_dmamap(np->sc_bc, (void *)(va))
#endif
@ -1329,7 +1330,7 @@ static void ncr_attach (pcici_t tag, int unit);
#if 0
static char ident[] =
"\n$NetBSD: ncr.c,v 1.36 1996/06/03 20:30:34 cgd Exp $\n";
"\n$NetBSD: ncr.c,v 1.37 1996/07/15 16:40:52 cgd Exp $\n";
#endif
u_long ncr_version = NCR_VERSION * 11