Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update drivers to use the new NetBSD/alpha DMA mapping hack, since

Browse Source 
the old one is not workable with the new bus.h.
This commit is contained in:
cgd 1996-10-23 04:37:31 +00:00
parent 1b03f1bca7
commit 2e7c250f84
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/ic/midway.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: midway.c,v 1.18 1996/10/21 22:34:27 thorpej Exp $ */
/* $NetBSD: midway.c,v 1.19 1996/10/23 04:37:31 cgd Exp $ */
/* (sync'd to midway.c 1.62) */
/*
@ -123,7 +123,7 @@
#if defined(__alpha__)
/* XXX XXX NEED REAL DMA MAPPING SUPPORT XXX XXX */
#undef vtophys
#define vtophys(va) __alpha_bus_XXX_dmamap(sc->en_memt, (void *)(va))
#define vtophys(va) alpha_XXX_dmamap((void *)(va))
#endif
#elif defined(__FreeBSD__)
#include <machine/cpufunc.h> /* for rdtsc proto for clock.h below */

4
sys/dev/ic/pdqvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pdqvar.h,v 1.9 1996/10/21 22:34:36 thorpej Exp $ */
/* $NetBSD: pdqvar.h,v 1.10 1996/10/23 04:37:32 cgd Exp $ */
/*-
* Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com>
@ -83,7 +83,7 @@ enum _pdq_type_t {
#define PDQ_OS_USEC_DELAY(n) DELAY(n)
#define PDQ_OS_MEMZERO(p, n) bzero((caddr_t)(p), (n))
#if defined(__NetBSD__) && defined(__alpha__)
#define PDQ_OS_VA_TO_PA(pdq, p) (vtophys((vm_offset_t)p) | (pdq->pdq_type == PDQ_DEFTA ? 0 : 0x40000000))
#define PDQ_OS_VA_TO_PA(pdq, p) (alpha_XXX_dmamap((void *)p))
#else
#define PDQ_OS_VA_TO_PA(pdq, p) vtophys(p)
#endif

4
sys/dev/pci/if_de.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_de.c,v 1.27 1996/10/21 22:56:32 thorpej Exp $ */
/* $NetBSD: if_de.c,v 1.28 1996/10/23 04:37:34 cgd Exp $ */
/*-
* Copyright (c) 1994, 1995 Matt Thomas (matt@lkg.dec.com)
@ -421,7 +421,7 @@ 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_bst, (void *)(va))
#define vtophys(va) alpha_XXX_dmamap((void *)(va))
#endif

4
sys/dev/pci/if_le_pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_le_pci.c,v 1.11 1996/10/21 22:56:43 thorpej Exp $ */
/* $NetBSD: if_le_pci.c,v 1.12 1996/10/23 04:37:35 cgd Exp $ */
/*-
* Copyright (c) 1995 Charles M. Hannum. All rights reserved.
@ -77,7 +77,7 @@
#ifdef __alpha__ /* XXX */
/* XXX XXX NEED REAL DMA MAPPING SUPPORT XXX XXX */
#undef vtophys
#define vtophys(va) __alpha_bus_XXX_dmamap(lesc->sc_iot, (void *)(va))
#define vtophys(va) alpha_XXX_dmamap((void *)(va))
#endif
int le_pci_match __P((struct device *, void *, void *));

6
sys/dev/pci/ncr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ncr.c,v 1.45 1996/10/21 22:56:51 thorpej Exp $ */
/* $NetBSD: ncr.c,v 1.46 1996/10/23 04:37:37 cgd Exp $ */
/**************************************************************************
**
@ -213,7 +213,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_memt, (void *)(va))
#define vtophys(va) alpha_XXX_dmamap((void *)(va))
#endif
/*==========================================================
@ -1328,7 +1328,7 @@ static void ncr_attach (pcici_t tag, int unit);
#if 0
static char ident[] =
"\n$NetBSD: ncr.c,v 1.45 1996/10/21 22:56:51 thorpej Exp $\n";
"\n$NetBSD: ncr.c,v 1.46 1996/10/23 04:37:37 cgd Exp $\n";
#endif
u_long ncr_version = NCR_VERSION * 11