From 2ab4192195099a2dc8061c8a9cabe91fba538679 Mon Sep 17 00:00:00 2001 From: cgd Date: Fri, 25 Oct 1996 21:33:30 +0000 Subject: [PATCH] update alpha_XXX_dmamap() invocations to match prototype. --- sys/dev/ic/midway.c | 4 ++-- sys/dev/ic/pdqvar.h | 4 ++-- sys/dev/pci/if_de.c | 4 ++-- sys/dev/pci/if_le_pci.c | 4 ++-- sys/dev/pci/ncr.c | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sys/dev/ic/midway.c b/sys/dev/ic/midway.c index f1cc9f9250f8..faa6fc5687c8 100644 --- a/sys/dev/ic/midway.c +++ b/sys/dev/ic/midway.c @@ -1,4 +1,4 @@ -/* $NetBSD: midway.c,v 1.19 1996/10/23 04:37:31 cgd Exp $ */ +/* $NetBSD: midway.c,v 1.20 1996/10/25 21:33:36 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_XXX_dmamap((void *)(va)) +#define vtophys(va) alpha_XXX_dmamap((vm_offset_t)(va)) #endif #elif defined(__FreeBSD__) #include /* for rdtsc proto for clock.h below */ diff --git a/sys/dev/ic/pdqvar.h b/sys/dev/ic/pdqvar.h index fae90b907410..8872b28bf63e 100644 --- a/sys/dev/ic/pdqvar.h +++ b/sys/dev/ic/pdqvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: pdqvar.h,v 1.10 1996/10/23 04:37:32 cgd Exp $ */ +/* $NetBSD: pdqvar.h,v 1.11 1996/10/25 21:33:37 cgd Exp $ */ /*- * Copyright (c) 1995, 1996 Matt Thomas @@ -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) (alpha_XXX_dmamap((void *)p)) +#define PDQ_OS_VA_TO_PA(pdq, p) (alpha_XXX_dmamap((vm_offset_t)p)) #else #define PDQ_OS_VA_TO_PA(pdq, p) vtophys(p) #endif diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c index 5d1e04d1af17..689c0fb3f44d 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.28 1996/10/23 04:37:34 cgd Exp $ */ +/* $NetBSD: if_de.c,v 1.29 1996/10/25 21:33:30 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_XXX_dmamap((void *)(va)) +#define vtophys(va) alpha_XXX_dmamap((vm_offset_t)(va)) #endif diff --git a/sys/dev/pci/if_le_pci.c b/sys/dev/pci/if_le_pci.c index ed94faf3e3c1..f78c0562443f 100644 --- a/sys/dev/pci/if_le_pci.c +++ b/sys/dev/pci/if_le_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_le_pci.c,v 1.12 1996/10/23 04:37:35 cgd Exp $ */ +/* $NetBSD: if_le_pci.c,v 1.13 1996/10/25 21:33:32 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_XXX_dmamap((void *)(va)) +#define vtophys(va) alpha_XXX_dmamap((vm_offset_t)(va)) #endif int le_pci_match __P((struct device *, void *, void *)); diff --git a/sys/dev/pci/ncr.c b/sys/dev/pci/ncr.c index 8c8f1742612b..54261856b6ff 100644 --- a/sys/dev/pci/ncr.c +++ b/sys/dev/pci/ncr.c @@ -1,4 +1,4 @@ -/* $NetBSD: ncr.c,v 1.47 1996/10/25 00:33:00 cgd Exp $ */ +/* $NetBSD: ncr.c,v 1.48 1996/10/25 21:33:33 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_XXX_dmamap((void *)(va)) +#define vtophys(va) alpha_XXX_dmamap((vm_offset_t)(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.47 1996/10/25 00:33:00 cgd Exp $\n"; + "\n$NetBSD: ncr.c,v 1.48 1996/10/25 21:33:33 cgd Exp $\n"; #endif u_long ncr_version = NCR_VERSION * 11