Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/alpha G/C alpha_XXX_dmamap() / alpha_XXX_dmamap_or....
details: https://anonhg.NetBSD.org/src/rev/8f429cf3c565
branches: trunk
changeset: 940590:8f429cf3c565
user: thorpej <thorpej%NetBSD.org@localhost>
date: Sat Oct 10 21:59:03 2020 +0000
description:
G/C alpha_XXX_dmamap() / alpha_XXX_dmamap_or. They haven't been needed
for a long time.
diffstat:
sys/arch/alpha/alpha/machdep.c | 15 ++-------------
sys/arch/alpha/include/param.h | 6 +-----
sys/arch/alpha/jensenio/jensenio_dma.c | 10 ++--------
sys/arch/alpha/pci/apecs_dma.c | 11 ++---------
sys/arch/alpha/pci/cia_dma.c | 11 ++---------
sys/arch/alpha/pci/dwlpx_dma.c | 11 ++---------
sys/arch/alpha/pci/irongate_dma.c | 11 ++---------
sys/arch/alpha/pci/lca_dma.c | 11 ++---------
sys/arch/alpha/pci/mcpcia_dma.c | 11 ++---------
sys/arch/alpha/pci/tsp_dma.c | 11 ++---------
sys/arch/alpha/pci/ttwoga_dma.c | 11 ++---------
sys/arch/alpha/tc/tc_dma.c | 12 +++---------
12 files changed, 24 insertions(+), 107 deletions(-)
diffs (truncated from 373 to 300 lines):
diff -r 2aef913cdd00 -r 8f429cf3c565 sys/arch/alpha/alpha/machdep.c
--- a/sys/arch/alpha/alpha/machdep.c Sat Oct 10 21:47:42 2020 +0000
+++ b/sys/arch/alpha/alpha/machdep.c Sat Oct 10 21:59:03 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.366 2020/10/03 17:31:46 thorpej Exp $ */
+/* $NetBSD: machdep.c,v 1.367 2020/10/10 21:59:03 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2019 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.366 2020/10/03 17:31:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.367 2020/10/10 21:59:03 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1735,17 +1735,6 @@
return true;
}
-/* XXX XXX BEGIN XXX XXX */
-paddr_t alpha_XXX_dmamap_or; /* XXX */
- /* XXX */
-paddr_t /* XXX */
-alpha_XXX_dmamap(vaddr_t v) /* XXX */
-{ /* XXX */
- /* XXX */
- return (vtophys(v) | alpha_XXX_dmamap_or); /* XXX */
-} /* XXX */
-/* XXX XXX END XXX XXX */
-
char *
dot_conv(unsigned long x)
{
diff -r 2aef913cdd00 -r 8f429cf3c565 sys/arch/alpha/include/param.h
--- a/sys/arch/alpha/include/param.h Sat Oct 10 21:47:42 2020 +0000
+++ b/sys/arch/alpha/include/param.h Sat Oct 10 21:59:03 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.46 2020/09/03 22:56:11 thorpej Exp $ */
+/* $NetBSD: param.h,v 1.47 2020/10/10 21:59:03 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -117,9 +117,5 @@
void delay(unsigned long);
#define DELAY(n) delay(n)
-/* XXX THE FOLLOWING PROTOTYPE SHOULD BE A BUS.H INTERFACE */
-paddr_t alpha_XXX_dmamap(vaddr_t);
-/* XXX END BUS.H */
-
#endif
#endif /* !_KERNEL */
diff -r 2aef913cdd00 -r 8f429cf3c565 sys/arch/alpha/jensenio/jensenio_dma.c
--- a/sys/arch/alpha/jensenio/jensenio_dma.c Sat Oct 10 21:47:42 2020 +0000
+++ b/sys/arch/alpha/jensenio/jensenio_dma.c Sat Oct 10 21:59:03 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: jensenio_dma.c,v 1.5 2012/02/06 02:14:14 matt Exp $ */
+/* $NetBSD: jensenio_dma.c,v 1.6 2020/10/10 21:59:03 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: jensenio_dma.c,v 1.5 2012/02/06 02:14:14 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: jensenio_dma.c,v 1.6 2020/10/10 21:59:03 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -123,12 +123,6 @@
t->_dmamem_map = _bus_dmamem_map;
t->_dmamem_unmap = _bus_dmamem_unmap;
t->_dmamem_mmap = _bus_dmamem_mmap;
-
- /* XXX XXX BEGIN XXX XXX */
- { /* XXX */
- extern paddr_t alpha_XXX_dmamap_or; /* XXX */
- alpha_XXX_dmamap_or = 0; /* XXX */
- }
}
/*
diff -r 2aef913cdd00 -r 8f429cf3c565 sys/arch/alpha/pci/apecs_dma.c
--- a/sys/arch/alpha/pci/apecs_dma.c Sat Oct 10 21:47:42 2020 +0000
+++ b/sys/arch/alpha/pci/apecs_dma.c Sat Oct 10 21:59:03 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: apecs_dma.c,v 1.21 2012/02/06 02:14:14 matt Exp $ */
+/* $NetBSD: apecs_dma.c,v 1.22 2020/10/10 21:59:04 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: apecs_dma.c,v 1.21 2012/02/06 02:14:14 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apecs_dma.c,v 1.22 2020/10/10 21:59:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -181,13 +181,6 @@
alpha_mb();
APECS_TLB_INVALIDATE();
-
- /* XXX XXX BEGIN XXX XXX */
- { /* XXX */
- extern paddr_t alpha_XXX_dmamap_or; /* XXX */
- alpha_XXX_dmamap_or = APECS_DIRECT_MAPPED_BASE; /* XXX */
- } /* XXX */
- /* XXX XXX END XXX XXX */
}
/*
diff -r 2aef913cdd00 -r 8f429cf3c565 sys/arch/alpha/pci/cia_dma.c
--- a/sys/arch/alpha/pci/cia_dma.c Sat Oct 10 21:47:42 2020 +0000
+++ b/sys/arch/alpha/pci/cia_dma.c Sat Oct 10 21:59:03 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cia_dma.c,v 1.29 2013/11/04 16:58:14 christos Exp $ */
+/* $NetBSD: cia_dma.c,v 1.30 2020/10/10 21:59:04 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: cia_dma.c,v 1.29 2013/11/04 16:58:14 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cia_dma.c,v 1.30 2020/10/10 21:59:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -234,13 +234,6 @@
cia_tlb_invalidate_fn = cia_tlb_invalidate;
CIA_TLB_INVALIDATE();
-
- /* XXX XXX BEGIN XXX XXX */
- { /* XXX */
- extern paddr_t alpha_XXX_dmamap_or; /* XXX */
- alpha_XXX_dmamap_or = CIA_DIRECT_MAPPED_BASE; /* XXX */
- } /* XXX */
- /* XXX XXX END XXX XXX */
}
/*
diff -r 2aef913cdd00 -r 8f429cf3c565 sys/arch/alpha/pci/dwlpx_dma.c
--- a/sys/arch/alpha/pci/dwlpx_dma.c Sat Oct 10 21:47:42 2020 +0000
+++ b/sys/arch/alpha/pci/dwlpx_dma.c Sat Oct 10 21:59:03 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dwlpx_dma.c,v 1.25 2019/11/10 21:16:22 chs Exp $ */
+/* $NetBSD: dwlpx_dma.c,v 1.26 2020/10/10 21:59:04 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dwlpx_dma.c,v 1.25 2019/11/10 21:16:22 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwlpx_dma.c,v 1.26 2020/10/10 21:59:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -239,13 +239,6 @@
DWLPx_SG_MAPPED_BASE | PCIA_WBASE_W_EN | PCIA_WBASE_SG_EN;
alpha_mb();
}
-
- /* XXX XXX BEGIN XXX XXX */
- { /* XXX */
- extern paddr_t alpha_XXX_dmamap_or; /* XXX */
- alpha_XXX_dmamap_or = DWLPx_DIRECT_MAPPED_BASE; /* XXX */
- } /* XXX */
- /* XXX XXX END XXX XXX */
}
/*
diff -r 2aef913cdd00 -r 8f429cf3c565 sys/arch/alpha/pci/irongate_dma.c
--- a/sys/arch/alpha/pci/irongate_dma.c Sat Oct 10 21:47:42 2020 +0000
+++ b/sys/arch/alpha/pci/irongate_dma.c Sat Oct 10 21:59:03 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: irongate_dma.c,v 1.6 2011/07/01 19:19:49 dyoung Exp $ */
+/* $NetBSD: irongate_dma.c,v 1.7 2020/10/10 21:59:04 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: irongate_dma.c,v 1.6 2011/07/01 19:19:49 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irongate_dma.c,v 1.7 2020/10/10 21:59:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -122,13 +122,6 @@
t->_dmamem_map = _bus_dmamem_map;
t->_dmamem_unmap = _bus_dmamem_unmap;
t->_dmamem_mmap = _bus_dmamem_mmap;
-
- /* XXX XXX BEGIN XXX XXX */
- { /* XXX */
- extern paddr_t alpha_XXX_dmamap_or; /* XXX */
- alpha_XXX_dmamap_or = 0; /* XXX */
- } /* XXX */
- /* XXX XXX END XXX XXX */
}
/*
diff -r 2aef913cdd00 -r 8f429cf3c565 sys/arch/alpha/pci/lca_dma.c
--- a/sys/arch/alpha/pci/lca_dma.c Sat Oct 10 21:47:42 2020 +0000
+++ b/sys/arch/alpha/pci/lca_dma.c Sat Oct 10 21:59:03 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lca_dma.c,v 1.23 2012/02/06 02:14:14 matt Exp $ */
+/* $NetBSD: lca_dma.c,v 1.24 2020/10/10 21:59:04 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: lca_dma.c,v 1.23 2012/02/06 02:14:14 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lca_dma.c,v 1.24 2020/10/10 21:59:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -186,13 +186,6 @@
alpha_mb();
LCA_TLB_INVALIDATE();
-
- /* XXX XXX BEGIN XXX XXX */
- { /* XXX */
- extern paddr_t alpha_XXX_dmamap_or; /* XXX */
- alpha_XXX_dmamap_or = LCA_DIRECT_MAPPED_BASE; /* XXX */
- } /* XXX */
- /* XXX XXX END XXX XXX */
}
/*
diff -r 2aef913cdd00 -r 8f429cf3c565 sys/arch/alpha/pci/mcpcia_dma.c
--- a/sys/arch/alpha/pci/mcpcia_dma.c Sat Oct 10 21:47:42 2020 +0000
+++ b/sys/arch/alpha/pci/mcpcia_dma.c Sat Oct 10 21:59:03 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mcpcia_dma.c,v 1.21 2012/02/06 02:14:14 matt Exp $ */
+/* $NetBSD: mcpcia_dma.c,v 1.22 2020/10/10 21:59:04 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mcpcia_dma.c,v 1.21 2012/02/06 02:14:14 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcpcia_dma.c,v 1.22 2020/10/10 21:59:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -240,13 +240,6 @@
REGVAL(MCPCIA_W2_BASE(ccp)) =
MCPCIA_WBASE_EN | MCPCIA_WBASE_SG | MCPCIA_PCI_SG_MAPPED_BASE;
alpha_mb();
-
- /* XXX XXX BEGIN XXX XXX */
- { /* XXX */
- extern paddr_t alpha_XXX_dmamap_or; /* XXX */
- alpha_XXX_dmamap_or = MCPCIA_DIRECT_MAPPED_BASE;/* XXX */
- } /* XXX */
- /* XXX XXX END XXX XXX */
}
/*
diff -r 2aef913cdd00 -r 8f429cf3c565 sys/arch/alpha/pci/tsp_dma.c
--- a/sys/arch/alpha/pci/tsp_dma.c Sat Oct 10 21:47:42 2020 +0000
+++ b/sys/arch/alpha/pci/tsp_dma.c Sat Oct 10 21:59:03 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tsp_dma.c,v 1.13 2013/09/23 16:41:57 tsutsui Exp $ */
+/* $NetBSD: tsp_dma.c,v 1.14 2020/10/10 21:59:04 thorpej Exp $ */
/*-
* Copyright (c) 1999 by Ross Harvey. All rights reserved.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tsp_dma.c,v 1.13 2013/09/23 16:41:57 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tsp_dma.c,v 1.14 2020/10/10 21:59:04 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -231,13 +231,6 @@
tsp_tlb_invalidate(pcp);
alpha_mb();
Home |
Main Index |
Thread Index |
Old Index