Module Name: src
Committed By: thorpej
Date: Wed May 5 02:15:18 UTC 2021
Modified Files:
src/sys/arch/alpha/pci: apecs_dma.c cia_dma.c dwlpx_dma.c
irongate_dma.c lca_dma.c mcpcia_dma.c pci_bwx_bus_io_chipdep.c
pci_bwx_bus_mem_chipdep.c pci_swiz_bus_io_chipdep.c
pci_swiz_bus_mem_chipdep.c tsp_dma.c ttwoga_dma.c
src/sys/arch/alpha/tc: tc_bus_mem.c
Log Message:
Moar static.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/alpha/pci/apecs_dma.c \
src/sys/arch/alpha/pci/mcpcia_dma.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/alpha/pci/cia_dma.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/alpha/pci/dwlpx_dma.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/alpha/pci/irongate_dma.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/alpha/pci/lca_dma.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/alpha/pci/tsp_dma.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/alpha/pci/ttwoga_dma.c
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/alpha/tc/tc_bus_mem.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/alpha/pci/apecs_dma.c
diff -u src/sys/arch/alpha/pci/apecs_dma.c:1.23 src/sys/arch/alpha/pci/apecs_dma.c:1.24
--- src/sys/arch/alpha/pci/apecs_dma.c:1.23 Sun Oct 11 00:33:31 2020
+++ src/sys/arch/alpha/pci/apecs_dma.c Wed May 5 02:15:18 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: apecs_dma.c,v 1.23 2020/10/11 00:33:31 thorpej Exp $ */
+/* $NetBSD: apecs_dma.c,v 1.24 2021/05/05 02:15:18 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.23 2020/10/11 00:33:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apecs_dma.c,v 1.24 2021/05/05 02:15:18 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,21 +48,21 @@ __KERNEL_RCSID(0, "$NetBSD: apecs_dma.c,
#include <alpha/pci/apecsreg.h>
#include <alpha/pci/apecsvar.h>
-bus_dma_tag_t apecs_dma_get_tag(bus_dma_tag_t, alpha_bus_t);
+static bus_dma_tag_t apecs_dma_get_tag(bus_dma_tag_t, alpha_bus_t);
-int apecs_bus_dmamap_load_sgmap(bus_dma_tag_t, bus_dmamap_t, void *,
- bus_size_t, struct proc *, int);
+static int apecs_bus_dmamap_load_sgmap(bus_dma_tag_t, bus_dmamap_t, void *,
+ bus_size_t, struct proc *, int);
-int apecs_bus_dmamap_load_mbuf_sgmap(bus_dma_tag_t, bus_dmamap_t,
- struct mbuf *, int);
+static int apecs_bus_dmamap_load_mbuf_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ struct mbuf *, int);
-int apecs_bus_dmamap_load_uio_sgmap(bus_dma_tag_t, bus_dmamap_t,
- struct uio *, int);
+static int apecs_bus_dmamap_load_uio_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ struct uio *, int);
-int apecs_bus_dmamap_load_raw_sgmap(bus_dma_tag_t, bus_dmamap_t,
- bus_dma_segment_t *, int, bus_size_t, int);
+static int apecs_bus_dmamap_load_raw_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ bus_dma_segment_t *, int, bus_size_t, int);
-void apecs_bus_dmamap_unload_sgmap(bus_dma_tag_t, bus_dmamap_t);
+static void apecs_bus_dmamap_unload_sgmap(bus_dma_tag_t, bus_dmamap_t);
/*
* Direct-mapped window: 1G at 1G
@@ -187,7 +187,7 @@ apecs_dma_init(struct apecs_config *acp)
* Return the bus dma tag to be used for the specified bus type.
* INTERNAL USE ONLY!
*/
-bus_dma_tag_t
+static bus_dma_tag_t
apecs_dma_get_tag(bus_dma_tag_t t, alpha_bus_t bustype)
{
struct apecs_config *acp = t->_cookie;
@@ -218,7 +218,7 @@ apecs_dma_get_tag(bus_dma_tag_t t, alpha
/*
* Load an APECS SGMAP-mapped DMA map with a linear buffer.
*/
-int
+static int
apecs_bus_dmamap_load_sgmap(bus_dma_tag_t t, bus_dmamap_t map, void *buf, bus_size_t buflen, struct proc *p, int flags)
{
int error;
@@ -234,7 +234,7 @@ apecs_bus_dmamap_load_sgmap(bus_dma_tag_
/*
* Load an APECS SGMAP-mapped DMA map with an mbuf chain.
*/
-int
+static int
apecs_bus_dmamap_load_mbuf_sgmap(bus_dma_tag_t t, bus_dmamap_t map, struct mbuf *m, int flags)
{
int error;
@@ -249,7 +249,7 @@ apecs_bus_dmamap_load_mbuf_sgmap(bus_dma
/*
* Load an APECS SGMAP-mapped DMA map with a uio.
*/
-int
+static int
apecs_bus_dmamap_load_uio_sgmap(bus_dma_tag_t t, bus_dmamap_t map, struct uio *uio, int flags)
{
int error;
@@ -264,7 +264,7 @@ apecs_bus_dmamap_load_uio_sgmap(bus_dma_
/*
* Load an APECS SGMAP-mapped DMA map with raw memory.
*/
-int
+static int
apecs_bus_dmamap_load_raw_sgmap(bus_dma_tag_t t, bus_dmamap_t map, bus_dma_segment_t *segs, int nsegs, bus_size_t size, int flags)
{
int error;
@@ -280,7 +280,7 @@ apecs_bus_dmamap_load_raw_sgmap(bus_dma_
/*
* Unload an APECS DMA map.
*/
-void
+static void
apecs_bus_dmamap_unload_sgmap(bus_dma_tag_t t, bus_dmamap_t map)
{
Index: src/sys/arch/alpha/pci/mcpcia_dma.c
diff -u src/sys/arch/alpha/pci/mcpcia_dma.c:1.23 src/sys/arch/alpha/pci/mcpcia_dma.c:1.24
--- src/sys/arch/alpha/pci/mcpcia_dma.c:1.23 Sun Oct 11 00:33:31 2020
+++ src/sys/arch/alpha/pci/mcpcia_dma.c Wed May 5 02:15:18 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mcpcia_dma.c,v 1.23 2020/10/11 00:33:31 thorpej Exp $ */
+/* $NetBSD: mcpcia_dma.c,v 1.24 2021/05/05 02:15:18 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.23 2020/10/11 00:33:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcpcia_dma.c,v 1.24 2021/05/05 02:15:18 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -49,21 +49,21 @@ __KERNEL_RCSID(0, "$NetBSD: mcpcia_dma.c
#include <alpha/pci/mcpciavar.h>
#include <alpha/pci/pci_kn300.h>
-bus_dma_tag_t mcpcia_dma_get_tag(bus_dma_tag_t, alpha_bus_t);
+static bus_dma_tag_t mcpcia_dma_get_tag(bus_dma_tag_t, alpha_bus_t);
-int mcpcia_bus_dmamap_load_sgmap(bus_dma_tag_t, bus_dmamap_t, void *,
- bus_size_t, struct proc *, int);
+static int mcpcia_bus_dmamap_load_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ void *, bus_size_t, struct proc *, int);
-int mcpcia_bus_dmamap_load_mbuf_sgmap(bus_dma_tag_t, bus_dmamap_t,
- struct mbuf *, int);
+static int mcpcia_bus_dmamap_load_mbuf_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ struct mbuf *, int);
-int mcpcia_bus_dmamap_load_uio_sgmap(bus_dma_tag_t, bus_dmamap_t,
- struct uio *, int);
+static int mcpcia_bus_dmamap_load_uio_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ struct uio *, int);
-int mcpcia_bus_dmamap_load_raw_sgmap(bus_dma_tag_t, bus_dmamap_t,
- bus_dma_segment_t *, int, bus_size_t, int);
+static int mcpcia_bus_dmamap_load_raw_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ bus_dma_segment_t *, int, bus_size_t, int);
-void mcpcia_bus_dmamap_unload_sgmap(bus_dma_tag_t, bus_dmamap_t);
+static void mcpcia_bus_dmamap_unload_sgmap(bus_dma_tag_t, bus_dmamap_t);
/*
* Direct-mapped window: 2G at 2G
@@ -246,7 +246,7 @@ mcpcia_dma_init(struct mcpcia_config *cc
* Return the bus dma tag to be used for the specified bus type.
* INTERNAL USE ONLY!
*/
-bus_dma_tag_t
+static bus_dma_tag_t
mcpcia_dma_get_tag(bus_dma_tag_t t, alpha_bus_t bustype)
{
struct mcpcia_config *ccp = t->_cookie;
@@ -277,7 +277,7 @@ mcpcia_dma_get_tag(bus_dma_tag_t t, alph
/*
* Load a MCPCIA SGMAP-mapped DMA map with a linear buffer.
*/
-int
+static int
mcpcia_bus_dmamap_load_sgmap(bus_dma_tag_t t, bus_dmamap_t map, void *buf, bus_size_t buflen, struct proc *p, int flags)
{
int error;
@@ -293,7 +293,7 @@ mcpcia_bus_dmamap_load_sgmap(bus_dma_tag
/*
* Load a MCPCIA SGMAP-mapped DMA map with an mbuf chain.
*/
-int
+static int
mcpcia_bus_dmamap_load_mbuf_sgmap(bus_dma_tag_t t, bus_dmamap_t map, struct mbuf *m, int flags)
{
int error;
@@ -308,7 +308,7 @@ mcpcia_bus_dmamap_load_mbuf_sgmap(bus_dm
/*
* Load a MCPCIA SGMAP-mapped DMA map with a uio.
*/
-int
+static int
mcpcia_bus_dmamap_load_uio_sgmap(bus_dma_tag_t t, bus_dmamap_t map, struct uio *uio, int flags)
{
int error;
@@ -323,7 +323,7 @@ mcpcia_bus_dmamap_load_uio_sgmap(bus_dma
/*
* Load a MCPCIA SGMAP-mapped DMA map with raw memory.
*/
-int
+static int
mcpcia_bus_dmamap_load_raw_sgmap(bus_dma_tag_t t, bus_dmamap_t map, bus_dma_segment_t *segs, int nsegs, bus_size_t size, int flags)
{
int error;
@@ -339,7 +339,7 @@ mcpcia_bus_dmamap_load_raw_sgmap(bus_dma
/*
* Unload a MCPCIA DMA map.
*/
-void
+static void
mcpcia_bus_dmamap_unload_sgmap(bus_dma_tag_t t, bus_dmamap_t map)
{
struct mcpcia_config *ccp = t->_cookie;
Index: src/sys/arch/alpha/pci/cia_dma.c
diff -u src/sys/arch/alpha/pci/cia_dma.c:1.31 src/sys/arch/alpha/pci/cia_dma.c:1.32
--- src/sys/arch/alpha/pci/cia_dma.c:1.31 Sun Oct 11 00:33:31 2020
+++ src/sys/arch/alpha/pci/cia_dma.c Wed May 5 02:15:18 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cia_dma.c,v 1.31 2020/10/11 00:33:31 thorpej Exp $ */
+/* $NetBSD: cia_dma.c,v 1.32 2021/05/05 02:15:18 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.31 2020/10/11 00:33:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cia_dma.c,v 1.32 2021/05/05 02:15:18 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,24 +48,24 @@ __KERNEL_RCSID(0, "$NetBSD: cia_dma.c,v
#include <alpha/pci/ciareg.h>
#include <alpha/pci/ciavar.h>
-bus_dma_tag_t cia_dma_get_tag(bus_dma_tag_t, alpha_bus_t);
+static bus_dma_tag_t cia_dma_get_tag(bus_dma_tag_t, alpha_bus_t);
-int cia_bus_dmamap_create_direct(bus_dma_tag_t, bus_size_t, int,
- bus_size_t, bus_size_t, int, bus_dmamap_t *);
+static int cia_bus_dmamap_create_direct(bus_dma_tag_t, bus_size_t, int,
+ bus_size_t, bus_size_t, int, bus_dmamap_t *);
-int cia_bus_dmamap_load_sgmap(bus_dma_tag_t, bus_dmamap_t, void *,
- bus_size_t, struct proc *, int);
+static int cia_bus_dmamap_load_sgmap(bus_dma_tag_t, bus_dmamap_t, void *,
+ bus_size_t, struct proc *, int);
-int cia_bus_dmamap_load_mbuf_sgmap(bus_dma_tag_t, bus_dmamap_t,
- struct mbuf *, int);
+static int cia_bus_dmamap_load_mbuf_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ struct mbuf *, int);
-int cia_bus_dmamap_load_uio_sgmap(bus_dma_tag_t, bus_dmamap_t,
- struct uio *, int);
+static int cia_bus_dmamap_load_uio_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ struct uio *, int);
-int cia_bus_dmamap_load_raw_sgmap(bus_dma_tag_t, bus_dmamap_t,
- bus_dma_segment_t *, int, bus_size_t, int);
+static int cia_bus_dmamap_load_raw_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ bus_dma_segment_t *, int, bus_size_t, int);
-void cia_bus_dmamap_unload_sgmap(bus_dma_tag_t, bus_dmamap_t);
+static void cia_bus_dmamap_unload_sgmap(bus_dma_tag_t, bus_dmamap_t);
/*
* Direct-mapped window: 1G at 1G
@@ -82,10 +82,10 @@ void cia_bus_dmamap_unload_sgmap(bus_dma
/* ALCOR/ALGOR2/PYXIS have a 256-byte out-bound DMA prefetch threshold. */
#define CIA_SGMAP_PFTHRESH 256
-void cia_tlb_invalidate(void);
-void cia_broken_pyxis_tlb_invalidate(void);
+static void cia_tlb_invalidate(void);
+static void cia_broken_pyxis_tlb_invalidate(void);
-void (*cia_tlb_invalidate_fn)(void);
+static void (*cia_tlb_invalidate_fn)(void);
#define CIA_TLB_INVALIDATE() (*cia_tlb_invalidate_fn)()
@@ -240,7 +240,7 @@ cia_dma_init(struct cia_config *ccp)
* Return the bus dma tag to be used for the specified bus type.
* INTERNAL USE ONLY!
*/
-bus_dma_tag_t
+static bus_dma_tag_t
cia_dma_get_tag(bus_dma_tag_t t, alpha_bus_t bustype)
{
struct cia_config *ccp = t->_cookie;
@@ -277,7 +277,7 @@ cia_dma_get_tag(bus_dma_tag_t t, alpha_b
/*
* Create a CIA direct-mapped DMA map.
*/
-int
+static int
cia_bus_dmamap_create_direct(
bus_dma_tag_t t,
bus_size_t size,
@@ -320,7 +320,7 @@ cia_bus_dmamap_create_direct(
/*
* Load a CIA SGMAP-mapped DMA map with a linear buffer.
*/
-int
+static int
cia_bus_dmamap_load_sgmap(bus_dma_tag_t t, bus_dmamap_t map, void *buf, bus_size_t buflen, struct proc *p, int flags)
{
int error;
@@ -336,7 +336,7 @@ cia_bus_dmamap_load_sgmap(bus_dma_tag_t
/*
* Load a CIA SGMAP-mapped DMA map with an mbuf chain.
*/
-int
+static int
cia_bus_dmamap_load_mbuf_sgmap(bus_dma_tag_t t, bus_dmamap_t map, struct mbuf *m, int flags)
{
int error;
@@ -351,7 +351,7 @@ cia_bus_dmamap_load_mbuf_sgmap(bus_dma_t
/*
* Load a CIA SGMAP-mapped DMA map with a uio.
*/
-int
+static int
cia_bus_dmamap_load_uio_sgmap(bus_dma_tag_t t, bus_dmamap_t map, struct uio *uio, int flags)
{
int error;
@@ -366,7 +366,7 @@ cia_bus_dmamap_load_uio_sgmap(bus_dma_ta
/*
* Load a CIA SGMAP-mapped DMA map with raw memory.
*/
-int
+static int
cia_bus_dmamap_load_raw_sgmap(bus_dma_tag_t t, bus_dmamap_t map, bus_dma_segment_t *segs, int nsegs, bus_size_t size, int flags)
{
int error;
@@ -382,7 +382,7 @@ cia_bus_dmamap_load_raw_sgmap(bus_dma_ta
/*
* Unload a CIA DMA map.
*/
-void
+static void
cia_bus_dmamap_unload_sgmap(bus_dma_tag_t t, bus_dmamap_t map)
{
@@ -402,7 +402,7 @@ cia_bus_dmamap_unload_sgmap(bus_dma_tag_
/*
* Flush the CIA scatter/gather TLB.
*/
-void
+static void
cia_tlb_invalidate(void)
{
@@ -414,7 +414,7 @@ cia_tlb_invalidate(void)
/*
* Flush the scatter/gather TLB on broken Pyxis chips.
*/
-void
+static void
cia_broken_pyxis_tlb_invalidate(void)
{
uint32_t ctrl;
Index: src/sys/arch/alpha/pci/dwlpx_dma.c
diff -u src/sys/arch/alpha/pci/dwlpx_dma.c:1.28 src/sys/arch/alpha/pci/dwlpx_dma.c:1.29
--- src/sys/arch/alpha/pci/dwlpx_dma.c:1.28 Wed Nov 18 02:04:29 2020
+++ src/sys/arch/alpha/pci/dwlpx_dma.c Wed May 5 02:15:18 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dwlpx_dma.c,v 1.28 2020/11/18 02:04:29 thorpej Exp $ */
+/* $NetBSD: dwlpx_dma.c,v 1.29 2021/05/05 02:15:18 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.28 2020/11/18 02:04:29 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwlpx_dma.c,v 1.29 2021/05/05 02:15:18 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -52,21 +52,21 @@ __KERNEL_RCSID(0, "$NetBSD: dwlpx_dma.c,
#include <alpha/pci/dwlpxvar.h>
#include <alpha/pci/pci_kn8ae.h>
-bus_dma_tag_t dwlpx_dma_get_tag(bus_dma_tag_t, alpha_bus_t);
+static bus_dma_tag_t dwlpx_dma_get_tag(bus_dma_tag_t, alpha_bus_t);
-int dwlpx_bus_dmamap_load_sgmap(bus_dma_tag_t, bus_dmamap_t, void *,
- bus_size_t, struct proc *, int);
+static int dwlpx_bus_dmamap_load_sgmap(bus_dma_tag_t, bus_dmamap_t, void *,
+ bus_size_t, struct proc *, int);
-int dwlpx_bus_dmamap_load_mbuf_sgmap(bus_dma_tag_t, bus_dmamap_t,
- struct mbuf *, int);
+static int dwlpx_bus_dmamap_load_mbuf_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ struct mbuf *, int);
-int dwlpx_bus_dmamap_load_uio_sgmap(bus_dma_tag_t, bus_dmamap_t,
- struct uio *, int);
+static int dwlpx_bus_dmamap_load_uio_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ struct uio *, int);
-int dwlpx_bus_dmamap_load_raw_sgmap(bus_dma_tag_t, bus_dmamap_t,
- bus_dma_segment_t *, int, bus_size_t, int);
+static int dwlpx_bus_dmamap_load_raw_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ bus_dma_segment_t *, int, bus_size_t, int);
-void dwlpx_bus_dmamap_unload_sgmap(bus_dma_tag_t, bus_dmamap_t);
+static void dwlpx_bus_dmamap_unload_sgmap(bus_dma_tag_t, bus_dmamap_t);
/*
* Direct-mapped window: 2G at 2G
@@ -243,7 +243,7 @@ dwlpx_dma_init(struct dwlpx_config *ccp)
* Return the bus dma tag to be used for the specified bus type.
* INTERNAL USE ONLY!
*/
-bus_dma_tag_t
+static bus_dma_tag_t
dwlpx_dma_get_tag(bus_dma_tag_t t, alpha_bus_t bustype)
{
struct dwlpx_config *ccp = t->_cookie;
@@ -281,7 +281,7 @@ dwlpx_dma_get_tag(bus_dma_tag_t t, alpha
/*
* Load a DWLPx SGMAP-mapped DMA map with a linear buffer.
*/
-int
+static int
dwlpx_bus_dmamap_load_sgmap(bus_dma_tag_t t, bus_dmamap_t map, void *buf, bus_size_t buflen, struct proc *p, int flags)
{
@@ -292,7 +292,7 @@ dwlpx_bus_dmamap_load_sgmap(bus_dma_tag_
/*
* Load a DWLPx SGMAP-mapped DMA map with an mbuf chain.
*/
-int
+static int
dwlpx_bus_dmamap_load_mbuf_sgmap(bus_dma_tag_t t, bus_dmamap_t map, struct mbuf *m, int flags)
{
@@ -302,7 +302,7 @@ dwlpx_bus_dmamap_load_mbuf_sgmap(bus_dma
/*
* Load a DWLPx SGMAP-mapped DMA map with a uio.
*/
-int
+static int
dwlpx_bus_dmamap_load_uio_sgmap(bus_dma_tag_t t, bus_dmamap_t map, struct uio *uio, int flags)
{
@@ -312,7 +312,7 @@ dwlpx_bus_dmamap_load_uio_sgmap(bus_dma_
/*
* Load a DWLPx SGMAP-mapped DMA map with raw memory.
*/
-int
+static int
dwlpx_bus_dmamap_load_raw_sgmap(bus_dma_tag_t t, bus_dmamap_t map, bus_dma_segment_t *segs, int nsegs, bus_size_t size, int flags)
{
@@ -323,7 +323,7 @@ dwlpx_bus_dmamap_load_raw_sgmap(bus_dma_
/*
* Unload a DWLPx DMA map.
*/
-void
+static void
dwlpx_bus_dmamap_unload_sgmap(bus_dma_tag_t t, bus_dmamap_t map)
{
Index: src/sys/arch/alpha/pci/irongate_dma.c
diff -u src/sys/arch/alpha/pci/irongate_dma.c:1.8 src/sys/arch/alpha/pci/irongate_dma.c:1.9
--- src/sys/arch/alpha/pci/irongate_dma.c:1.8 Wed Oct 14 00:59:50 2020
+++ src/sys/arch/alpha/pci/irongate_dma.c Wed May 5 02:15:18 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: irongate_dma.c,v 1.8 2020/10/14 00:59:50 thorpej Exp $ */
+/* $NetBSD: irongate_dma.c,v 1.9 2021/05/05 02:15:18 thorpej Exp $ */
/*-
* Copyright (c) 2000, 2020 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.8 2020/10/14 00:59:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irongate_dma.c,v 1.9 2021/05/05 02:15:18 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -66,7 +66,7 @@ __KERNEL_RCSID(0, "$NetBSD: irongate_dma
#include <machine/alpha.h>
-bus_dma_tag_t irongate_dma_get_tag(bus_dma_tag_t, alpha_bus_t);
+static bus_dma_tag_t irongate_dma_get_tag(bus_dma_tag_t, alpha_bus_t);
void
irongate_page_physload(unsigned long const start_pfn,
@@ -143,7 +143,7 @@ irongate_dma_init(struct irongate_config
* Return the bus dma tag to be used for the specified bus type.
* INTERNAL USE ONLY!
*/
-bus_dma_tag_t
+static bus_dma_tag_t
irongate_dma_get_tag(bus_dma_tag_t t, alpha_bus_t bustype)
{
struct irongate_config *icp = t->_cookie;
Index: src/sys/arch/alpha/pci/lca_dma.c
diff -u src/sys/arch/alpha/pci/lca_dma.c:1.25 src/sys/arch/alpha/pci/lca_dma.c:1.26
--- src/sys/arch/alpha/pci/lca_dma.c:1.25 Sun Oct 11 00:33:31 2020
+++ src/sys/arch/alpha/pci/lca_dma.c Wed May 5 02:15:18 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: lca_dma.c,v 1.25 2020/10/11 00:33:31 thorpej Exp $ */
+/* $NetBSD: lca_dma.c,v 1.26 2021/05/05 02:15:18 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.25 2020/10/11 00:33:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lca_dma.c,v 1.26 2021/05/05 02:15:18 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,21 +48,21 @@ __KERNEL_RCSID(0, "$NetBSD: lca_dma.c,v
#include <alpha/pci/lcareg.h>
#include <alpha/pci/lcavar.h>
-bus_dma_tag_t lca_dma_get_tag(bus_dma_tag_t, alpha_bus_t);
+static bus_dma_tag_t lca_dma_get_tag(bus_dma_tag_t, alpha_bus_t);
-int lca_bus_dmamap_load_sgmap(bus_dma_tag_t, bus_dmamap_t, void *,
- bus_size_t, struct proc *, int);
+static int lca_bus_dmamap_load_sgmap(bus_dma_tag_t, bus_dmamap_t, void *,
+ bus_size_t, struct proc *, int);
-int lca_bus_dmamap_load_mbuf_sgmap(bus_dma_tag_t, bus_dmamap_t,
- struct mbuf *, int);
+static int lca_bus_dmamap_load_mbuf_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ struct mbuf *, int);
-int lca_bus_dmamap_load_uio_sgmap(bus_dma_tag_t, bus_dmamap_t,
- struct uio *, int);
+static int lca_bus_dmamap_load_uio_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ struct uio *, int);
-int lca_bus_dmamap_load_raw_sgmap(bus_dma_tag_t, bus_dmamap_t,
- bus_dma_segment_t *, int, bus_size_t, int);
+static int lca_bus_dmamap_load_raw_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ bus_dma_segment_t *, int, bus_size_t, int);
-void lca_bus_dmamap_unload_sgmap(bus_dma_tag_t, bus_dmamap_t);
+static void lca_bus_dmamap_unload_sgmap(bus_dma_tag_t, bus_dmamap_t);
/*
* Direct-mapped window: 1G at 1G
@@ -192,7 +192,7 @@ lca_dma_init(struct lca_config *lcp)
* Return the bus dma tag to be used for the specified bus type.
* INTERNAL USE ONLY!
*/
-bus_dma_tag_t
+static bus_dma_tag_t
lca_dma_get_tag(bus_dma_tag_t t, alpha_bus_t bustype)
{
struct lca_config *lcp = t->_cookie;
@@ -223,7 +223,7 @@ lca_dma_get_tag(bus_dma_tag_t t, alpha_b
/*
* Load an LCA SGMAP-mapped DMA map with a linear buffer.
*/
-int
+static int
lca_bus_dmamap_load_sgmap(bus_dma_tag_t t, bus_dmamap_t map, void *buf, bus_size_t buflen, struct proc *p, int flags)
{
int error;
@@ -239,7 +239,7 @@ lca_bus_dmamap_load_sgmap(bus_dma_tag_t
/*
* Load an LCA SGMAP-mapped DMA map with an mbuf chain.
*/
-int
+static int
lca_bus_dmamap_load_mbuf_sgmap(bus_dma_tag_t t, bus_dmamap_t map, struct mbuf *m, int flags)
{
int error;
@@ -254,7 +254,7 @@ lca_bus_dmamap_load_mbuf_sgmap(bus_dma_t
/*
* Load an LCA SGMAP-mapped DMA map with a uio.
*/
-int
+static int
lca_bus_dmamap_load_uio_sgmap(bus_dma_tag_t t, bus_dmamap_t map, struct uio *uio, int flags)
{
int error;
@@ -269,7 +269,7 @@ lca_bus_dmamap_load_uio_sgmap(bus_dma_ta
/*
* Load an LCA SGMAP-mapped DMA map with raw memory.
*/
-int
+static int
lca_bus_dmamap_load_raw_sgmap(bus_dma_tag_t t, bus_dmamap_t map, bus_dma_segment_t *segs, int nsegs, bus_size_t size, int flags)
{
int error;
@@ -285,7 +285,7 @@ lca_bus_dmamap_load_raw_sgmap(bus_dma_ta
/*
* Unload an LCA DMA map.
*/
-void
+static void
lca_bus_dmamap_unload_sgmap(bus_dma_tag_t t, bus_dmamap_t map)
{
Index: src/sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c
diff -u src/sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c:1.21 src/sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c:1.22
--- src/sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c:1.21 Mon Feb 6 02:14:15 2012
+++ src/sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c Wed May 5 02:15:18 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_bwx_bus_io_chipdep.c,v 1.21 2012/02/06 02:14:15 matt Exp $ */
+/* $NetBSD: pci_bwx_bus_io_chipdep.c,v 1.22 2021/05/05 02:15:18 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: pci_bwx_bus_io_chipdep.c,v 1.21 2012/02/06 02:14:15 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: pci_bwx_bus_io_chipdep.c,v 1.22 2021/05/05 02:15:18 thorpej Exp $");
#include <sys/extent.h>
@@ -86,37 +86,37 @@ __KERNEL_RCSID(1, "$NetBSD: pci_bwx_bus_
#define __S(S) __STRING(S)
/* mapping/unmapping */
-int __C(CHIP,_io_map)(void *, bus_addr_t, bus_size_t, int,
+static int __C(CHIP,_io_map)(void *, bus_addr_t, bus_size_t, int,
bus_space_handle_t *, int);
-void __C(CHIP,_io_unmap)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_unmap)(void *, bus_space_handle_t,
bus_size_t, int);
-int __C(CHIP,_io_subregion)(void *, bus_space_handle_t,
+static int __C(CHIP,_io_subregion)(void *, bus_space_handle_t,
bus_size_t, bus_size_t, bus_space_handle_t *);
-int __C(CHIP,_io_translate)(void *, bus_addr_t, bus_size_t,
+static int __C(CHIP,_io_translate)(void *, bus_addr_t, bus_size_t,
int, struct alpha_bus_space_translation *);
-int __C(CHIP,_io_get_window)(void *, int,
+static int __C(CHIP,_io_get_window)(void *, int,
struct alpha_bus_space_translation *);
/* allocation/deallocation */
-int __C(CHIP,_io_alloc)(void *, bus_addr_t, bus_addr_t,
+static int __C(CHIP,_io_alloc)(void *, bus_addr_t, bus_addr_t,
bus_size_t, bus_size_t, bus_addr_t, int, bus_addr_t *,
bus_space_handle_t *);
-void __C(CHIP,_io_free)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_free)(void *, bus_space_handle_t,
bus_size_t);
/* get kernel virtual address */
-void * __C(CHIP,_io_vaddr)(void *, bus_space_handle_t);
+static void * __C(CHIP,_io_vaddr)(void *, bus_space_handle_t);
/* mmap for user */
-paddr_t __C(CHIP,_io_mmap)(void *, bus_addr_t, off_t, int, int);
+static paddr_t __C(CHIP,_io_mmap)(void *, bus_addr_t, off_t, int, int);
/* barrier */
-static inline void __C(CHIP,_io_barrier)(void *, bus_space_handle_t,
+static inline void __C(CHIP,_io_barrier)(void *, bus_space_handle_t,
bus_size_t, bus_size_t, int);
/* read (single) */
-static inline uint8_t __C(CHIP,_io_read_1)(void *, bus_space_handle_t,
+static inline uint8_t __C(CHIP,_io_read_1)(void *, bus_space_handle_t,
bus_size_t);
static inline uint16_t __C(CHIP,_io_read_2)(void *, bus_space_handle_t,
bus_size_t);
@@ -126,83 +126,83 @@ static inline uint64_t __C(CHIP,_io_read
bus_size_t);
/* read multiple */
-void __C(CHIP,_io_read_multi_1)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_read_multi_1)(void *, bus_space_handle_t,
bus_size_t, uint8_t *, bus_size_t);
-void __C(CHIP,_io_read_multi_2)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_read_multi_2)(void *, bus_space_handle_t,
bus_size_t, uint16_t *, bus_size_t);
-void __C(CHIP,_io_read_multi_4)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_read_multi_4)(void *, bus_space_handle_t,
bus_size_t, uint32_t *, bus_size_t);
-void __C(CHIP,_io_read_multi_8)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_read_multi_8)(void *, bus_space_handle_t,
bus_size_t, uint64_t *, bus_size_t);
/* read region */
-void __C(CHIP,_io_read_region_1)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_read_region_1)(void *, bus_space_handle_t,
bus_size_t, uint8_t *, bus_size_t);
-void __C(CHIP,_io_read_region_2)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_read_region_2)(void *, bus_space_handle_t,
bus_size_t, uint16_t *, bus_size_t);
-void __C(CHIP,_io_read_region_4)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_read_region_4)(void *, bus_space_handle_t,
bus_size_t, uint32_t *, bus_size_t);
-void __C(CHIP,_io_read_region_8)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_read_region_8)(void *, bus_space_handle_t,
bus_size_t, uint64_t *, bus_size_t);
/* write (single) */
-static inline void __C(CHIP,_io_write_1)(void *, bus_space_handle_t,
+static inline void __C(CHIP,_io_write_1)(void *, bus_space_handle_t,
bus_size_t, uint8_t);
-static inline void __C(CHIP,_io_write_2)(void *, bus_space_handle_t,
+static inline void __C(CHIP,_io_write_2)(void *, bus_space_handle_t,
bus_size_t, uint16_t);
-static inline void __C(CHIP,_io_write_4)(void *, bus_space_handle_t,
+static inline void __C(CHIP,_io_write_4)(void *, bus_space_handle_t,
bus_size_t, uint32_t);
-static inline void __C(CHIP,_io_write_8)(void *, bus_space_handle_t,
+static inline void __C(CHIP,_io_write_8)(void *, bus_space_handle_t,
bus_size_t, uint64_t);
/* write multiple */
-void __C(CHIP,_io_write_multi_1)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_write_multi_1)(void *, bus_space_handle_t,
bus_size_t, const uint8_t *, bus_size_t);
-void __C(CHIP,_io_write_multi_2)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_write_multi_2)(void *, bus_space_handle_t,
bus_size_t, const uint16_t *, bus_size_t);
-void __C(CHIP,_io_write_multi_4)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_write_multi_4)(void *, bus_space_handle_t,
bus_size_t, const uint32_t *, bus_size_t);
-void __C(CHIP,_io_write_multi_8)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_write_multi_8)(void *, bus_space_handle_t,
bus_size_t, const uint64_t *, bus_size_t);
/* write region */
-void __C(CHIP,_io_write_region_1)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_write_region_1)(void *, bus_space_handle_t,
bus_size_t, const uint8_t *, bus_size_t);
-void __C(CHIP,_io_write_region_2)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_write_region_2)(void *, bus_space_handle_t,
bus_size_t, const uint16_t *, bus_size_t);
-void __C(CHIP,_io_write_region_4)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_write_region_4)(void *, bus_space_handle_t,
bus_size_t, const uint32_t *, bus_size_t);
-void __C(CHIP,_io_write_region_8)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_write_region_8)(void *, bus_space_handle_t,
bus_size_t, const uint64_t *, bus_size_t);
/* set multiple */
-void __C(CHIP,_io_set_multi_1)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_set_multi_1)(void *, bus_space_handle_t,
bus_size_t, uint8_t, bus_size_t);
-void __C(CHIP,_io_set_multi_2)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_set_multi_2)(void *, bus_space_handle_t,
bus_size_t, uint16_t, bus_size_t);
-void __C(CHIP,_io_set_multi_4)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_set_multi_4)(void *, bus_space_handle_t,
bus_size_t, uint32_t, bus_size_t);
-void __C(CHIP,_io_set_multi_8)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_set_multi_8)(void *, bus_space_handle_t,
bus_size_t, uint64_t, bus_size_t);
/* set region */
-void __C(CHIP,_io_set_region_1)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_set_region_1)(void *, bus_space_handle_t,
bus_size_t, uint8_t, bus_size_t);
-void __C(CHIP,_io_set_region_2)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_set_region_2)(void *, bus_space_handle_t,
bus_size_t, uint16_t, bus_size_t);
-void __C(CHIP,_io_set_region_4)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_set_region_4)(void *, bus_space_handle_t,
bus_size_t, uint32_t, bus_size_t);
-void __C(CHIP,_io_set_region_8)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_set_region_8)(void *, bus_space_handle_t,
bus_size_t, uint64_t, bus_size_t);
/* copy */
-void __C(CHIP,_io_copy_region_1)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_copy_region_1)(void *, bus_space_handle_t,
bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
-void __C(CHIP,_io_copy_region_2)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_copy_region_2)(void *, bus_space_handle_t,
bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
-void __C(CHIP,_io_copy_region_4)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_copy_region_4)(void *, bus_space_handle_t,
bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
-void __C(CHIP,_io_copy_region_8)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_copy_region_8)(void *, bus_space_handle_t,
bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
#ifndef CHIP_IO_EX_STORE
@@ -308,7 +308,7 @@ __C(CHIP,_bus_io_init)(
CHIP_IO_EXTENT(v) = ex;
}
-int
+static int
__C(CHIP,_io_translate)(
void *v,
bus_addr_t ioaddr,
@@ -327,7 +327,7 @@ __C(CHIP,_io_translate)(
return (__C(CHIP,_io_get_window)(v, 0, abst));
}
-int
+static int
__C(CHIP,_io_get_window)(
void *v,
int window,
@@ -353,7 +353,7 @@ __C(CHIP,_io_get_window)(
return (0);
}
-int
+static int
__C(CHIP,_io_map)(
void *v,
bus_addr_t ioaddr,
@@ -394,7 +394,7 @@ __C(CHIP,_io_map)(
return (0);
}
-void
+static void
__C(CHIP,_io_unmap)(
void *v,
bus_space_handle_t ioh,
@@ -428,7 +428,7 @@ __C(CHIP,_io_unmap)(
}
}
-int
+static int
__C(CHIP,_io_subregion)(
void *v,
bus_space_handle_t ioh,
@@ -441,7 +441,7 @@ __C(CHIP,_io_subregion)(
return (0);
}
-int
+static int
__C(CHIP,_io_alloc)(
void *v,
bus_addr_t rstart,
@@ -499,7 +499,7 @@ __C(CHIP,_io_alloc)(
return (0);
}
-void
+static void
__C(CHIP,_io_free)(
void *v,
bus_space_handle_t bsh,
@@ -510,7 +510,7 @@ __C(CHIP,_io_free)(
__C(CHIP,_io_unmap)(v, bsh, size, 1);
}
-void *
+static void *
__C(CHIP,_io_vaddr)(
void *v,
bus_space_handle_t bsh)
@@ -522,7 +522,7 @@ __C(CHIP,_io_vaddr)(
panic("_io_vaddr");
}
-paddr_t
+static paddr_t
__C(CHIP,_io_mmap)(
void *v,
bus_addr_t addr,
@@ -611,7 +611,7 @@ __C(CHIP,_io_read_8)(
}
#define CHIP_io_read_multi_N(BYTES,TYPE) \
-void \
+static void \
__C(__C(CHIP,_io_read_multi_),BYTES)( \
void *v, \
bus_space_handle_t h, \
@@ -632,7 +632,7 @@ CHIP_io_read_multi_N(4,uint32_t)
CHIP_io_read_multi_N(8,uint64_t)
#define CHIP_io_read_region_N(BYTES,TYPE) \
-void \
+static void \
__C(__C(CHIP,_io_read_region_),BYTES)( \
void *v, \
bus_space_handle_t h, \
@@ -717,7 +717,7 @@ __C(CHIP,_io_write_8)(
}
#define CHIP_io_write_multi_N(BYTES,TYPE) \
-void \
+static void \
__C(__C(CHIP,_io_write_multi_),BYTES)( \
void *v, \
bus_space_handle_t h, \
@@ -738,7 +738,7 @@ CHIP_io_write_multi_N(4,uint32_t)
CHIP_io_write_multi_N(8,uint64_t)
#define CHIP_io_write_region_N(BYTES,TYPE) \
-void \
+static void \
__C(__C(CHIP,_io_write_region_),BYTES)( \
void *v, \
bus_space_handle_t h, \
@@ -758,7 +758,7 @@ CHIP_io_write_region_N(4,uint32_t)
CHIP_io_write_region_N(8,uint64_t)
#define CHIP_io_set_multi_N(BYTES,TYPE) \
-void \
+static void \
__C(__C(CHIP,_io_set_multi_),BYTES)( \
void *v, \
bus_space_handle_t h, \
@@ -779,7 +779,7 @@ CHIP_io_set_multi_N(4,uint32_t)
CHIP_io_set_multi_N(8,uint64_t)
#define CHIP_io_set_region_N(BYTES,TYPE) \
-void \
+static void \
__C(__C(CHIP,_io_set_region_),BYTES)( \
void *v, \
bus_space_handle_t h, \
@@ -799,7 +799,7 @@ CHIP_io_set_region_N(4,uint32_t)
CHIP_io_set_region_N(8,uint64_t)
#define CHIP_io_copy_region_N(BYTES) \
-void \
+static void \
__C(__C(CHIP,_io_copy_region_),BYTES)( \
void *v, \
bus_space_handle_t h1, \
Index: src/sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c
diff -u src/sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c:1.27 src/sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c:1.28
--- src/sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c:1.27 Wed Jan 15 14:27:49 2014
+++ src/sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c Wed May 5 02:15:18 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_bwx_bus_mem_chipdep.c,v 1.27 2014/01/15 14:27:49 tsutsui Exp $ */
+/* $NetBSD: pci_bwx_bus_mem_chipdep.c,v 1.28 2021/05/05 02:15:18 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: pci_bwx_bus_mem_chipdep.c,v 1.27 2014/01/15 14:27:49 tsutsui Exp $");
+__KERNEL_RCSID(1, "$NetBSD: pci_bwx_bus_mem_chipdep.c,v 1.28 2021/05/05 02:15:18 thorpej Exp $");
#include <sys/extent.h>
@@ -86,37 +86,37 @@ __KERNEL_RCSID(1, "$NetBSD: pci_bwx_bus_
#define __S(S) __STRING(S)
/* mapping/unmapping */
-int __C(CHIP,_mem_map)(void *, bus_addr_t, bus_size_t, int,
+static int __C(CHIP,_mem_map)(void *, bus_addr_t, bus_size_t, int,
bus_space_handle_t *, int);
-void __C(CHIP,_mem_unmap)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_unmap)(void *, bus_space_handle_t,
bus_size_t, int);
-int __C(CHIP,_mem_subregion)(void *, bus_space_handle_t,
+static int __C(CHIP,_mem_subregion)(void *, bus_space_handle_t,
bus_size_t, bus_size_t, bus_space_handle_t *);
-int __C(CHIP,_mem_translate)(void *, bus_addr_t, bus_size_t,
+static int __C(CHIP,_mem_translate)(void *, bus_addr_t, bus_size_t,
int, struct alpha_bus_space_translation *);
-int __C(CHIP,_mem_get_window)(void *, int,
+static int __C(CHIP,_mem_get_window)(void *, int,
struct alpha_bus_space_translation *);
/* allocation/deallocation */
-int __C(CHIP,_mem_alloc)(void *, bus_addr_t, bus_addr_t,
+static int __C(CHIP,_mem_alloc)(void *, bus_addr_t, bus_addr_t,
bus_size_t, bus_size_t, bus_addr_t, int, bus_addr_t *,
bus_space_handle_t *);
-void __C(CHIP,_mem_free)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_free)(void *, bus_space_handle_t,
bus_size_t);
/* get kernel virtual address */
-void * __C(CHIP,_mem_vaddr)(void *, bus_space_handle_t);
+static void * __C(CHIP,_mem_vaddr)(void *, bus_space_handle_t);
/* mmap for user */
-paddr_t __C(CHIP,_mem_mmap)(void *, bus_addr_t, off_t, int, int);
+static paddr_t __C(CHIP,_mem_mmap)(void *, bus_addr_t, off_t, int, int);
/* barrier */
-static inline void __C(CHIP,_mem_barrier)(void *, bus_space_handle_t,
+static inline void __C(CHIP,_mem_barrier)(void *, bus_space_handle_t,
bus_size_t, bus_size_t, int);
/* read (single) */
-static inline uint8_t __C(CHIP,_mem_read_1)(void *, bus_space_handle_t,
+static inline uint8_t __C(CHIP,_mem_read_1)(void *, bus_space_handle_t,
bus_size_t);
static inline uint16_t __C(CHIP,_mem_read_2)(void *, bus_space_handle_t,
bus_size_t);
@@ -126,83 +126,83 @@ static inline uint64_t __C(CHIP,_mem_rea
bus_size_t);
/* read multiple */
-void __C(CHIP,_mem_read_multi_1)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_read_multi_1)(void *, bus_space_handle_t,
bus_size_t, uint8_t *, bus_size_t);
-void __C(CHIP,_mem_read_multi_2)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_read_multi_2)(void *, bus_space_handle_t,
bus_size_t, uint16_t *, bus_size_t);
-void __C(CHIP,_mem_read_multi_4)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_read_multi_4)(void *, bus_space_handle_t,
bus_size_t, uint32_t *, bus_size_t);
-void __C(CHIP,_mem_read_multi_8)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_read_multi_8)(void *, bus_space_handle_t,
bus_size_t, uint64_t *, bus_size_t);
/* read region */
-void __C(CHIP,_mem_read_region_1)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_read_region_1)(void *, bus_space_handle_t,
bus_size_t, uint8_t *, bus_size_t);
-void __C(CHIP,_mem_read_region_2)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_read_region_2)(void *, bus_space_handle_t,
bus_size_t, uint16_t *, bus_size_t);
-void __C(CHIP,_mem_read_region_4)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_read_region_4)(void *, bus_space_handle_t,
bus_size_t, uint32_t *, bus_size_t);
-void __C(CHIP,_mem_read_region_8)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_read_region_8)(void *, bus_space_handle_t,
bus_size_t, uint64_t *, bus_size_t);
/* write (single) */
-static inline void __C(CHIP,_mem_write_1)(void *, bus_space_handle_t,
+static inline void __C(CHIP,_mem_write_1)(void *, bus_space_handle_t,
bus_size_t, uint8_t);
-static inline void __C(CHIP,_mem_write_2)(void *, bus_space_handle_t,
+static inline void __C(CHIP,_mem_write_2)(void *, bus_space_handle_t,
bus_size_t, uint16_t);
-static inline void __C(CHIP,_mem_write_4)(void *, bus_space_handle_t,
+static inline void __C(CHIP,_mem_write_4)(void *, bus_space_handle_t,
bus_size_t, uint32_t);
-static inline void __C(CHIP,_mem_write_8)(void *, bus_space_handle_t,
+static inline void __C(CHIP,_mem_write_8)(void *, bus_space_handle_t,
bus_size_t, uint64_t);
/* write multiple */
-void __C(CHIP,_mem_write_multi_1)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_write_multi_1)(void *, bus_space_handle_t,
bus_size_t, const uint8_t *, bus_size_t);
-void __C(CHIP,_mem_write_multi_2)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_write_multi_2)(void *, bus_space_handle_t,
bus_size_t, const uint16_t *, bus_size_t);
-void __C(CHIP,_mem_write_multi_4)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_write_multi_4)(void *, bus_space_handle_t,
bus_size_t, const uint32_t *, bus_size_t);
-void __C(CHIP,_mem_write_multi_8)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_write_multi_8)(void *, bus_space_handle_t,
bus_size_t, const uint64_t *, bus_size_t);
/* write region */
-void __C(CHIP,_mem_write_region_1)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_write_region_1)(void *, bus_space_handle_t,
bus_size_t, const uint8_t *, bus_size_t);
-void __C(CHIP,_mem_write_region_2)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_write_region_2)(void *, bus_space_handle_t,
bus_size_t, const uint16_t *, bus_size_t);
-void __C(CHIP,_mem_write_region_4)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_write_region_4)(void *, bus_space_handle_t,
bus_size_t, const uint32_t *, bus_size_t);
-void __C(CHIP,_mem_write_region_8)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_write_region_8)(void *, bus_space_handle_t,
bus_size_t, const uint64_t *, bus_size_t);
/* set multiple */
-void __C(CHIP,_mem_set_multi_1)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_set_multi_1)(void *, bus_space_handle_t,
bus_size_t, uint8_t, bus_size_t);
-void __C(CHIP,_mem_set_multi_2)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_set_multi_2)(void *, bus_space_handle_t,
bus_size_t, uint16_t, bus_size_t);
-void __C(CHIP,_mem_set_multi_4)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_set_multi_4)(void *, bus_space_handle_t,
bus_size_t, uint32_t, bus_size_t);
-void __C(CHIP,_mem_set_multi_8)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_set_multi_8)(void *, bus_space_handle_t,
bus_size_t, uint64_t, bus_size_t);
/* set region */
-void __C(CHIP,_mem_set_region_1)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_set_region_1)(void *, bus_space_handle_t,
bus_size_t, uint8_t, bus_size_t);
-void __C(CHIP,_mem_set_region_2)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_set_region_2)(void *, bus_space_handle_t,
bus_size_t, uint16_t, bus_size_t);
-void __C(CHIP,_mem_set_region_4)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_set_region_4)(void *, bus_space_handle_t,
bus_size_t, uint32_t, bus_size_t);
-void __C(CHIP,_mem_set_region_8)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_set_region_8)(void *, bus_space_handle_t,
bus_size_t, uint64_t, bus_size_t);
/* copy */
-void __C(CHIP,_mem_copy_region_1)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_copy_region_1)(void *, bus_space_handle_t,
bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
-void __C(CHIP,_mem_copy_region_2)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_copy_region_2)(void *, bus_space_handle_t,
bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
-void __C(CHIP,_mem_copy_region_4)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_copy_region_4)(void *, bus_space_handle_t,
bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
-void __C(CHIP,_mem_copy_region_8)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_copy_region_8)(void *, bus_space_handle_t,
bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
#ifndef CHIP_MEM_EX_STORE
@@ -308,7 +308,7 @@ __C(CHIP,_bus_mem_init)(
CHIP_MEM_EXTENT(v) = ex;
}
-int
+static int
__C(CHIP,_mem_translate)(
void *v,
bus_addr_t memaddr,
@@ -321,7 +321,7 @@ __C(CHIP,_mem_translate)(
return (EOPNOTSUPP);
}
-int
+static int
__C(CHIP,_mem_get_window)(
void *v,
int window,
@@ -347,7 +347,7 @@ __C(CHIP,_mem_get_window)(
return (0);
}
-int
+static int
__C(CHIP,_mem_map)(
void *v,
bus_addr_t memaddr,
@@ -381,7 +381,7 @@ __C(CHIP,_mem_map)(
return (0);
}
-void
+static void
__C(CHIP,_mem_unmap)(
void *v,
bus_space_handle_t memh,
@@ -416,7 +416,7 @@ __C(CHIP,_mem_unmap)(
}
}
-int
+static int
__C(CHIP,_mem_subregion)(
void *v,
bus_space_handle_t memh,
@@ -429,7 +429,7 @@ __C(CHIP,_mem_subregion)(
return (0);
}
-int
+static int
__C(CHIP,_mem_alloc)(
void *v,
bus_addr_t rstart,
@@ -471,7 +471,7 @@ __C(CHIP,_mem_alloc)(
return (0);
}
-void
+static void
__C(CHIP,_mem_free)(
void *v,
bus_space_handle_t bsh,
@@ -482,7 +482,7 @@ __C(CHIP,_mem_free)(
__C(CHIP,_mem_unmap)(v, bsh, size, 1);
}
-void *
+static void *
__C(CHIP,_mem_vaddr)(
void *v,
bus_space_handle_t bsh)
@@ -491,7 +491,7 @@ __C(CHIP,_mem_vaddr)(
return ((void *)bsh);
}
-paddr_t
+static paddr_t
__C(CHIP,_mem_mmap)(
void *v,
bus_addr_t addr,
@@ -581,7 +581,7 @@ __C(CHIP,_mem_read_8)(
}
#define CHIP_mem_read_multi_N(BYTES,TYPE) \
-void \
+static void \
__C(__C(CHIP,_mem_read_multi_),BYTES)( \
void *v, \
bus_space_handle_t h, \
@@ -602,7 +602,7 @@ CHIP_mem_read_multi_N(4,uint32_t)
CHIP_mem_read_multi_N(8,uint64_t)
#define CHIP_mem_read_region_N(BYTES,TYPE) \
-void \
+static void \
__C(__C(CHIP,_mem_read_region_),BYTES)( \
void *v, \
bus_space_handle_t h, \
@@ -687,7 +687,7 @@ __C(CHIP,_mem_write_8)(
}
#define CHIP_mem_write_multi_N(BYTES,TYPE) \
-void \
+static void \
__C(__C(CHIP,_mem_write_multi_),BYTES)( \
void *v, \
bus_space_handle_t h, \
@@ -708,7 +708,7 @@ CHIP_mem_write_multi_N(4,uint32_t)
CHIP_mem_write_multi_N(8,uint64_t)
#define CHIP_mem_write_region_N(BYTES,TYPE) \
-void \
+static void \
__C(__C(CHIP,_mem_write_region_),BYTES)( \
void *v, \
bus_space_handle_t h, \
@@ -728,7 +728,7 @@ CHIP_mem_write_region_N(4,uint32_t)
CHIP_mem_write_region_N(8,uint64_t)
#define CHIP_mem_set_multi_N(BYTES,TYPE) \
-void \
+static void \
__C(__C(CHIP,_mem_set_multi_),BYTES)( \
void *v, \
bus_space_handle_t h, \
@@ -749,7 +749,7 @@ CHIP_mem_set_multi_N(4,uint32_t)
CHIP_mem_set_multi_N(8,uint64_t)
#define CHIP_mem_set_region_N(BYTES,TYPE) \
-void \
+static void \
__C(__C(CHIP,_mem_set_region_),BYTES)( \
void *v, \
bus_space_handle_t h, \
@@ -769,7 +769,7 @@ CHIP_mem_set_region_N(4,uint32_t)
CHIP_mem_set_region_N(8,uint64_t)
#define CHIP_mem_copy_region_N(BYTES) \
-void \
+static void \
__C(__C(CHIP,_mem_copy_region_),BYTES)( \
void *v, \
bus_space_handle_t h1, \
Index: src/sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c
diff -u src/sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c:1.42 src/sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c:1.43
--- src/sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c:1.42 Mon Nov 4 16:58:33 2013
+++ src/sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c Wed May 5 02:15:18 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_swiz_bus_io_chipdep.c,v 1.42 2013/11/04 16:58:33 christos Exp $ */
+/* $NetBSD: pci_swiz_bus_io_chipdep.c,v 1.43 2021/05/05 02:15:18 thorpej Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: pci_swiz_bus_io_chipdep.c,v 1.42 2013/11/04 16:58:33 christos Exp $");
+__KERNEL_RCSID(1, "$NetBSD: pci_swiz_bus_io_chipdep.c,v 1.43 2021/05/05 02:15:18 thorpej Exp $");
#include <sys/extent.h>
@@ -84,37 +84,37 @@ __KERNEL_RCSID(1, "$NetBSD: pci_swiz_bus
#define __S(S) __STRING(S)
/* mapping/unmapping */
-int __C(CHIP,_io_map)(void *, bus_addr_t, bus_size_t, int,
+static int __C(CHIP,_io_map)(void *, bus_addr_t, bus_size_t, int,
bus_space_handle_t *, int);
-void __C(CHIP,_io_unmap)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_unmap)(void *, bus_space_handle_t,
bus_size_t, int);
-int __C(CHIP,_io_subregion)(void *, bus_space_handle_t,
+static int __C(CHIP,_io_subregion)(void *, bus_space_handle_t,
bus_size_t, bus_size_t, bus_space_handle_t *);
-int __C(CHIP,_io_translate)(void *, bus_addr_t, bus_size_t,
+static int __C(CHIP,_io_translate)(void *, bus_addr_t, bus_size_t,
int, struct alpha_bus_space_translation *);
-int __C(CHIP,_io_get_window)(void *, int,
+static int __C(CHIP,_io_get_window)(void *, int,
struct alpha_bus_space_translation *);
/* allocation/deallocation */
-int __C(CHIP,_io_alloc)(void *, bus_addr_t, bus_addr_t,
+static int __C(CHIP,_io_alloc)(void *, bus_addr_t, bus_addr_t,
bus_size_t, bus_size_t, bus_addr_t, int, bus_addr_t *,
bus_space_handle_t *);
-void __C(CHIP,_io_free)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_free)(void *, bus_space_handle_t,
bus_size_t);
/* get kernel virtual address */
-void * __C(CHIP,_io_vaddr)(void *, bus_space_handle_t);
+static void * __C(CHIP,_io_vaddr)(void *, bus_space_handle_t);
/* mmap for user */
-paddr_t __C(CHIP,_io_mmap)(void *, bus_addr_t, off_t, int, int);
+static paddr_t __C(CHIP,_io_mmap)(void *, bus_addr_t, off_t, int, int);
/* barrier */
-static inline void __C(CHIP,_io_barrier)(void *, bus_space_handle_t,
+static inline void __C(CHIP,_io_barrier)(void *, bus_space_handle_t,
bus_size_t, bus_size_t, int);
/* read (single) */
-static inline uint8_t __C(CHIP,_io_read_1)(void *, bus_space_handle_t,
+static inline uint8_t __C(CHIP,_io_read_1)(void *, bus_space_handle_t,
bus_size_t);
static inline uint16_t __C(CHIP,_io_read_2)(void *, bus_space_handle_t,
bus_size_t);
@@ -124,83 +124,83 @@ static inline uint64_t __C(CHIP,_io_read
bus_size_t);
/* read multiple */
-void __C(CHIP,_io_read_multi_1)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_read_multi_1)(void *, bus_space_handle_t,
bus_size_t, uint8_t *, bus_size_t);
-void __C(CHIP,_io_read_multi_2)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_read_multi_2)(void *, bus_space_handle_t,
bus_size_t, uint16_t *, bus_size_t);
-void __C(CHIP,_io_read_multi_4)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_read_multi_4)(void *, bus_space_handle_t,
bus_size_t, uint32_t *, bus_size_t);
-void __C(CHIP,_io_read_multi_8)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_read_multi_8)(void *, bus_space_handle_t,
bus_size_t, uint64_t *, bus_size_t);
/* read region */
-void __C(CHIP,_io_read_region_1)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_read_region_1)(void *, bus_space_handle_t,
bus_size_t, uint8_t *, bus_size_t);
-void __C(CHIP,_io_read_region_2)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_read_region_2)(void *, bus_space_handle_t,
bus_size_t, uint16_t *, bus_size_t);
-void __C(CHIP,_io_read_region_4)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_read_region_4)(void *, bus_space_handle_t,
bus_size_t, uint32_t *, bus_size_t);
-void __C(CHIP,_io_read_region_8)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_read_region_8)(void *, bus_space_handle_t,
bus_size_t, uint64_t *, bus_size_t);
/* write (single) */
-static inline void __C(CHIP,_io_write_1)(void *, bus_space_handle_t,
+static inline void __C(CHIP,_io_write_1)(void *, bus_space_handle_t,
bus_size_t, uint8_t);
-static inline void __C(CHIP,_io_write_2)(void *, bus_space_handle_t,
+static inline void __C(CHIP,_io_write_2)(void *, bus_space_handle_t,
bus_size_t, uint16_t);
-static inline void __C(CHIP,_io_write_4)(void *, bus_space_handle_t,
+static inline void __C(CHIP,_io_write_4)(void *, bus_space_handle_t,
bus_size_t, uint32_t);
-static inline void __C(CHIP,_io_write_8)(void *, bus_space_handle_t,
+static inline void __C(CHIP,_io_write_8)(void *, bus_space_handle_t,
bus_size_t, uint64_t);
/* write multiple */
-void __C(CHIP,_io_write_multi_1)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_write_multi_1)(void *, bus_space_handle_t,
bus_size_t, const uint8_t *, bus_size_t);
-void __C(CHIP,_io_write_multi_2)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_write_multi_2)(void *, bus_space_handle_t,
bus_size_t, const uint16_t *, bus_size_t);
-void __C(CHIP,_io_write_multi_4)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_write_multi_4)(void *, bus_space_handle_t,
bus_size_t, const uint32_t *, bus_size_t);
-void __C(CHIP,_io_write_multi_8)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_write_multi_8)(void *, bus_space_handle_t,
bus_size_t, const uint64_t *, bus_size_t);
/* write region */
-void __C(CHIP,_io_write_region_1)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_write_region_1)(void *, bus_space_handle_t,
bus_size_t, const uint8_t *, bus_size_t);
-void __C(CHIP,_io_write_region_2)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_write_region_2)(void *, bus_space_handle_t,
bus_size_t, const uint16_t *, bus_size_t);
-void __C(CHIP,_io_write_region_4)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_write_region_4)(void *, bus_space_handle_t,
bus_size_t, const uint32_t *, bus_size_t);
-void __C(CHIP,_io_write_region_8)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_write_region_8)(void *, bus_space_handle_t,
bus_size_t, const uint64_t *, bus_size_t);
/* set multiple */
-void __C(CHIP,_io_set_multi_1)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_set_multi_1)(void *, bus_space_handle_t,
bus_size_t, uint8_t, bus_size_t);
-void __C(CHIP,_io_set_multi_2)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_set_multi_2)(void *, bus_space_handle_t,
bus_size_t, uint16_t, bus_size_t);
-void __C(CHIP,_io_set_multi_4)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_set_multi_4)(void *, bus_space_handle_t,
bus_size_t, uint32_t, bus_size_t);
-void __C(CHIP,_io_set_multi_8)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_set_multi_8)(void *, bus_space_handle_t,
bus_size_t, uint64_t, bus_size_t);
/* set region */
-void __C(CHIP,_io_set_region_1)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_set_region_1)(void *, bus_space_handle_t,
bus_size_t, uint8_t, bus_size_t);
-void __C(CHIP,_io_set_region_2)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_set_region_2)(void *, bus_space_handle_t,
bus_size_t, uint16_t, bus_size_t);
-void __C(CHIP,_io_set_region_4)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_set_region_4)(void *, bus_space_handle_t,
bus_size_t, uint32_t, bus_size_t);
-void __C(CHIP,_io_set_region_8)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_set_region_8)(void *, bus_space_handle_t,
bus_size_t, uint64_t, bus_size_t);
/* copy */
-void __C(CHIP,_io_copy_region_1)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_copy_region_1)(void *, bus_space_handle_t,
bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
-void __C(CHIP,_io_copy_region_2)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_copy_region_2)(void *, bus_space_handle_t,
bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
-void __C(CHIP,_io_copy_region_4)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_copy_region_4)(void *, bus_space_handle_t,
bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
-void __C(CHIP,_io_copy_region_8)(void *, bus_space_handle_t,
+static void __C(CHIP,_io_copy_region_8)(void *, bus_space_handle_t,
bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
#ifndef CHIP_IO_EX_STORE
@@ -334,7 +334,7 @@ __C(CHIP,_bus_io_init)(bus_space_tag_t t
CHIP_IO_EXTENT(v) = ex;
}
-int
+static int
__C(CHIP,_io_translate)(void *v, bus_addr_t ioaddr, bus_size_t iolen,
int flags, struct alpha_bus_space_translation *abst)
{
@@ -376,7 +376,7 @@ __C(CHIP,_io_translate)(void *v, bus_add
return (EINVAL);
}
-int
+static int
__C(CHIP,_io_get_window)(void *v, int window,
struct alpha_bus_space_translation *abst)
{
@@ -414,7 +414,7 @@ __C(CHIP,_io_get_window)(void *v, int wi
return (0);
}
-int
+static int
__C(CHIP,_io_map)(void *v, bus_addr_t ioaddr, bus_size_t iosize,
int flags, bus_space_handle_t *iohp, int acct)
{
@@ -451,7 +451,7 @@ __C(CHIP,_io_map)(void *v, bus_addr_t io
return (0);
}
-void
+static void
__C(CHIP,_io_unmap)(void *v, bus_space_handle_t ioh,
bus_size_t iosize, int acct)
{
@@ -512,7 +512,7 @@ __C(CHIP,_io_unmap)(void *v, bus_space_h
}
}
-int
+static int
__C(CHIP,_io_subregion)(void *v, bus_space_handle_t ioh,
bus_size_t offset, bus_size_t size, bus_space_handle_t *nioh)
{
@@ -521,7 +521,7 @@ __C(CHIP,_io_subregion)(void *v, bus_spa
return (0);
}
-int
+static int
__C(CHIP,_io_alloc)(void *v, bus_addr_t rstart, bus_addr_t rend,
bus_size_t size, bus_size_t align, bus_size_t boundary, int flags,
bus_addr_t *addrp, bus_space_handle_t *bshp)
@@ -573,7 +573,7 @@ __C(CHIP,_io_alloc)(void *v, bus_addr_t
return (0);
}
-void
+static void
__C(CHIP,_io_free)(void *v, bus_space_handle_t bsh, bus_size_t size)
{
@@ -581,7 +581,7 @@ __C(CHIP,_io_free)(void *v, bus_space_ha
__C(CHIP,_io_unmap)(v, bsh, size, 1);
}
-void *
+static void *
__C(CHIP,_io_vaddr)(void *v, bus_space_handle_t bsh)
{
/*
@@ -591,7 +591,7 @@ __C(CHIP,_io_vaddr)(void *v, bus_space_h
panic("_io_vaddr");
}
-paddr_t
+static paddr_t
__C(CHIP,_io_mmap)(void *v, bus_addr_t addr, off_t off, int prot, int flags)
{
@@ -682,7 +682,7 @@ __C(CHIP,_io_read_8)(void *v, bus_space_
}
#define CHIP_io_read_multi_N(BYTES,TYPE) \
-void \
+static void \
__C(__C(CHIP,_io_read_multi_),BYTES)(void *v, bus_space_handle_t h, bus_size_t o, TYPE *a, bus_size_t c) \
{ \
\
@@ -698,7 +698,7 @@ CHIP_io_read_multi_N(4,uint32_t)
CHIP_io_read_multi_N(8,uint64_t)
#define CHIP_io_read_region_N(BYTES,TYPE) \
-void \
+static void \
__C(__C(CHIP,_io_read_region_),BYTES)(void *v, bus_space_handle_t h, bus_size_t o, TYPE *a, bus_size_t c) \
{ \
\
@@ -776,7 +776,7 @@ __C(CHIP,_io_write_8)(void *v, bus_space
}
#define CHIP_io_write_multi_N(BYTES,TYPE) \
-void \
+static void \
__C(__C(CHIP,_io_write_multi_),BYTES)(void *v, bus_space_handle_t h, bus_size_t o, const TYPE *a, bus_size_t c) \
{ \
\
@@ -792,7 +792,7 @@ CHIP_io_write_multi_N(4,uint32_t)
CHIP_io_write_multi_N(8,uint64_t)
#define CHIP_io_write_region_N(BYTES,TYPE) \
-void \
+static void \
__C(__C(CHIP,_io_write_region_),BYTES)(void *v, bus_space_handle_t h, bus_size_t o, const TYPE *a, bus_size_t c) \
{ \
\
@@ -807,7 +807,7 @@ CHIP_io_write_region_N(4,uint32_t)
CHIP_io_write_region_N(8,uint64_t)
#define CHIP_io_set_multi_N(BYTES,TYPE) \
-void \
+static void \
__C(__C(CHIP,_io_set_multi_),BYTES)(void *v, bus_space_handle_t h, bus_size_t o, TYPE val, bus_size_t c) \
{ \
\
@@ -823,7 +823,7 @@ CHIP_io_set_multi_N(4,uint32_t)
CHIP_io_set_multi_N(8,uint64_t)
#define CHIP_io_set_region_N(BYTES,TYPE) \
-void \
+static void \
__C(__C(CHIP,_io_set_region_),BYTES)(void *v, bus_space_handle_t h, bus_size_t o, TYPE val, bus_size_t c) \
{ \
\
@@ -838,7 +838,7 @@ CHIP_io_set_region_N(4,uint32_t)
CHIP_io_set_region_N(8,uint64_t)
#define CHIP_io_copy_region_N(BYTES) \
-void \
+static void \
__C(__C(CHIP,_io_copy_region_),BYTES)(void *v, bus_space_handle_t h1, bus_size_t o1, bus_space_handle_t h2, bus_size_t o2, bus_size_t c) \
{ \
bus_size_t o; \
Index: src/sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c
diff -u src/sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c:1.47 src/sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c:1.48
--- src/sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c:1.47 Mon Nov 4 16:58:33 2013
+++ src/sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c Wed May 5 02:15:18 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_swiz_bus_mem_chipdep.c,v 1.47 2013/11/04 16:58:33 christos Exp $ */
+/* $NetBSD: pci_swiz_bus_mem_chipdep.c,v 1.48 2021/05/05 02:15:18 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -85,7 +85,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: pci_swiz_bus_mem_chipdep.c,v 1.47 2013/11/04 16:58:33 christos Exp $");
+__KERNEL_RCSID(1, "$NetBSD: pci_swiz_bus_mem_chipdep.c,v 1.48 2021/05/05 02:15:18 thorpej Exp $");
#include <sys/extent.h>
@@ -93,37 +93,37 @@ __KERNEL_RCSID(1, "$NetBSD: pci_swiz_bus
#define __S(S) __STRING(S)
/* mapping/unmapping */
-int __C(CHIP,_mem_map)(void *, bus_addr_t, bus_size_t, int,
+static int __C(CHIP,_mem_map)(void *, bus_addr_t, bus_size_t, int,
bus_space_handle_t *, int);
-void __C(CHIP,_mem_unmap)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_unmap)(void *, bus_space_handle_t,
bus_size_t, int);
-int __C(CHIP,_mem_subregion)(void *, bus_space_handle_t,
+static int __C(CHIP,_mem_subregion)(void *, bus_space_handle_t,
bus_size_t, bus_size_t, bus_space_handle_t *);
-int __C(CHIP,_mem_translate)(void *, bus_addr_t, bus_size_t,
+static int __C(CHIP,_mem_translate)(void *, bus_addr_t, bus_size_t,
int, struct alpha_bus_space_translation *);
-int __C(CHIP,_mem_get_window)(void *, int,
+static int __C(CHIP,_mem_get_window)(void *, int,
struct alpha_bus_space_translation *);
/* allocation/deallocation */
-int __C(CHIP,_mem_alloc)(void *, bus_addr_t, bus_addr_t,
+static int __C(CHIP,_mem_alloc)(void *, bus_addr_t, bus_addr_t,
bus_size_t, bus_size_t, bus_addr_t, int, bus_addr_t *,
bus_space_handle_t *);
-void __C(CHIP,_mem_free)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_free)(void *, bus_space_handle_t,
bus_size_t);
/* get kernel virtual address */
-void * __C(CHIP,_mem_vaddr)(void *, bus_space_handle_t);
+static void * __C(CHIP,_mem_vaddr)(void *, bus_space_handle_t);
/* mmap for user */
-paddr_t __C(CHIP,_mem_mmap)(void *, bus_addr_t, off_t, int, int);
+static paddr_t __C(CHIP,_mem_mmap)(void *, bus_addr_t, off_t, int, int);
/* barrier */
-static inline void __C(CHIP,_mem_barrier)(void *, bus_space_handle_t,
+static inline void __C(CHIP,_mem_barrier)(void *, bus_space_handle_t,
bus_size_t, bus_size_t, int);
/* read (single) */
-static inline uint8_t __C(CHIP,_mem_read_1)(void *, bus_space_handle_t,
+static inline uint8_t __C(CHIP,_mem_read_1)(void *, bus_space_handle_t,
bus_size_t);
static inline uint16_t __C(CHIP,_mem_read_2)(void *, bus_space_handle_t,
bus_size_t);
@@ -133,83 +133,83 @@ static inline uint64_t __C(CHIP,_mem_rea
bus_size_t);
/* read multiple */
-void __C(CHIP,_mem_read_multi_1)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_read_multi_1)(void *, bus_space_handle_t,
bus_size_t, uint8_t *, bus_size_t);
-void __C(CHIP,_mem_read_multi_2)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_read_multi_2)(void *, bus_space_handle_t,
bus_size_t, uint16_t *, bus_size_t);
-void __C(CHIP,_mem_read_multi_4)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_read_multi_4)(void *, bus_space_handle_t,
bus_size_t, uint32_t *, bus_size_t);
-void __C(CHIP,_mem_read_multi_8)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_read_multi_8)(void *, bus_space_handle_t,
bus_size_t, uint64_t *, bus_size_t);
/* read region */
-void __C(CHIP,_mem_read_region_1)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_read_region_1)(void *, bus_space_handle_t,
bus_size_t, uint8_t *, bus_size_t);
-void __C(CHIP,_mem_read_region_2)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_read_region_2)(void *, bus_space_handle_t,
bus_size_t, uint16_t *, bus_size_t);
-void __C(CHIP,_mem_read_region_4)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_read_region_4)(void *, bus_space_handle_t,
bus_size_t, uint32_t *, bus_size_t);
-void __C(CHIP,_mem_read_region_8)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_read_region_8)(void *, bus_space_handle_t,
bus_size_t, uint64_t *, bus_size_t);
/* write (single) */
-static inline void __C(CHIP,_mem_write_1)(void *, bus_space_handle_t,
+static inline void __C(CHIP,_mem_write_1)(void *, bus_space_handle_t,
bus_size_t, uint8_t);
-static inline void __C(CHIP,_mem_write_2)(void *, bus_space_handle_t,
+static inline void __C(CHIP,_mem_write_2)(void *, bus_space_handle_t,
bus_size_t, uint16_t);
-static inline void __C(CHIP,_mem_write_4)(void *, bus_space_handle_t,
+static inline void __C(CHIP,_mem_write_4)(void *, bus_space_handle_t,
bus_size_t, uint32_t);
-static inline void __C(CHIP,_mem_write_8)(void *, bus_space_handle_t,
+static inline void __C(CHIP,_mem_write_8)(void *, bus_space_handle_t,
bus_size_t, uint64_t);
/* write multiple */
-void __C(CHIP,_mem_write_multi_1)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_write_multi_1)(void *, bus_space_handle_t,
bus_size_t, const uint8_t *, bus_size_t);
-void __C(CHIP,_mem_write_multi_2)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_write_multi_2)(void *, bus_space_handle_t,
bus_size_t, const uint16_t *, bus_size_t);
-void __C(CHIP,_mem_write_multi_4)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_write_multi_4)(void *, bus_space_handle_t,
bus_size_t, const uint32_t *, bus_size_t);
-void __C(CHIP,_mem_write_multi_8)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_write_multi_8)(void *, bus_space_handle_t,
bus_size_t, const uint64_t *, bus_size_t);
/* write region */
-void __C(CHIP,_mem_write_region_1)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_write_region_1)(void *, bus_space_handle_t,
bus_size_t, const uint8_t *, bus_size_t);
-void __C(CHIP,_mem_write_region_2)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_write_region_2)(void *, bus_space_handle_t,
bus_size_t, const uint16_t *, bus_size_t);
-void __C(CHIP,_mem_write_region_4)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_write_region_4)(void *, bus_space_handle_t,
bus_size_t, const uint32_t *, bus_size_t);
-void __C(CHIP,_mem_write_region_8)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_write_region_8)(void *, bus_space_handle_t,
bus_size_t, const uint64_t *, bus_size_t);
/* set multiple */
-void __C(CHIP,_mem_set_multi_1)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_set_multi_1)(void *, bus_space_handle_t,
bus_size_t, uint8_t, bus_size_t);
-void __C(CHIP,_mem_set_multi_2)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_set_multi_2)(void *, bus_space_handle_t,
bus_size_t, uint16_t, bus_size_t);
-void __C(CHIP,_mem_set_multi_4)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_set_multi_4)(void *, bus_space_handle_t,
bus_size_t, uint32_t, bus_size_t);
-void __C(CHIP,_mem_set_multi_8)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_set_multi_8)(void *, bus_space_handle_t,
bus_size_t, uint64_t, bus_size_t);
/* set region */
-void __C(CHIP,_mem_set_region_1)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_set_region_1)(void *, bus_space_handle_t,
bus_size_t, uint8_t, bus_size_t);
-void __C(CHIP,_mem_set_region_2)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_set_region_2)(void *, bus_space_handle_t,
bus_size_t, uint16_t, bus_size_t);
-void __C(CHIP,_mem_set_region_4)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_set_region_4)(void *, bus_space_handle_t,
bus_size_t, uint32_t, bus_size_t);
-void __C(CHIP,_mem_set_region_8)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_set_region_8)(void *, bus_space_handle_t,
bus_size_t, uint64_t, bus_size_t);
/* copy */
-void __C(CHIP,_mem_copy_region_1)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_copy_region_1)(void *, bus_space_handle_t,
bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
-void __C(CHIP,_mem_copy_region_2)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_copy_region_2)(void *, bus_space_handle_t,
bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
-void __C(CHIP,_mem_copy_region_4)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_copy_region_4)(void *, bus_space_handle_t,
bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
-void __C(CHIP,_mem_copy_region_8)(void *, bus_space_handle_t,
+static void __C(CHIP,_mem_copy_region_8)(void *, bus_space_handle_t,
bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
#ifdef CHIP_D_MEM_W1_SYS_START
@@ -529,7 +529,7 @@ __C(CHIP,_xlate_sparse_handle_to_addr)(v
return (0);
}
-int
+static int
__C(CHIP,_mem_translate)(void *v, bus_addr_t memaddr, bus_size_t memlen,
int flags, struct alpha_bus_space_translation *abst)
{
@@ -538,7 +538,7 @@ __C(CHIP,_mem_translate)(void *v, bus_ad
return (EOPNOTSUPP);
}
-int
+static int
__C(CHIP,_mem_get_window)(void *v, int window,
struct alpha_bus_space_translation *abst)
{
@@ -604,7 +604,7 @@ __C(CHIP,_mem_get_window)(void *v, int w
return (0);
}
-int
+static int
__C(CHIP,_mem_map)(void *v, bus_addr_t memaddr, bus_size_t memsize,
int flags, bus_space_handle_t *memhp, int acct)
{
@@ -770,7 +770,7 @@ bad:
return (mustd && !didd ? errord : (musts && !dids ? errors : EINVAL));
}
-void
+static void
__C(CHIP,_mem_unmap)(void *v, bus_space_handle_t memh,
bus_size_t memsize, int acct)
{
@@ -845,7 +845,7 @@ __C(CHIP,_mem_unmap)(void *v, bus_space_
}
}
-int
+static int
__C(CHIP,_mem_subregion)(void *v, bus_space_handle_t memh,
bus_size_t offset, bus_size_t size, bus_space_handle_t *nmemh)
{
@@ -854,7 +854,7 @@ __C(CHIP,_mem_subregion)(void *v, bus_sp
return (0);
}
-int
+static int
__C(CHIP,_mem_alloc)(void *v, bus_addr_t rstart, bus_addr_t rend,
bus_size_t size, bus_size_t align, bus_size_t boundary, int flags,
bus_addr_t *addrp, bus_space_handle_t *bshp)
@@ -864,7 +864,7 @@ __C(CHIP,_mem_alloc)(void *v, bus_addr_t
panic("%s not implemented", __S(__C(CHIP,_mem_alloc)));
}
-void
+static void
__C(CHIP,_mem_free)(void *v, bus_space_handle_t bsh, bus_size_t size)
{
@@ -872,7 +872,7 @@ __C(CHIP,_mem_free)(void *v, bus_space_h
panic("%s not implemented", __S(__C(CHIP,_mem_free)));
}
-void *
+static void *
__C(CHIP,_mem_vaddr)(void *v, bus_space_handle_t bsh)
{
#ifdef CHIP_D_MEM_W1_SYS_START
@@ -886,7 +886,7 @@ __C(CHIP,_mem_vaddr)(void *v, bus_space_
return (0);
}
-paddr_t
+static paddr_t
__C(CHIP,_mem_mmap)(void *v, bus_addr_t addr, off_t off, int prot, int flags)
{
bus_space_handle_t dh = 0, sh = 0; /* XXX -Wuninitialized */
@@ -1021,7 +1021,7 @@ __C(CHIP,_mem_read_8)(void *v, bus_space
}
#define CHIP_mem_read_multi_N(BYTES,TYPE) \
-void \
+static void \
__C(__C(CHIP,_mem_read_multi_),BYTES)(void *v, bus_space_handle_t h, bus_size_t o, TYPE *a, bus_size_t c) \
{ \
\
@@ -1037,7 +1037,7 @@ CHIP_mem_read_multi_N(4,uint32_t)
CHIP_mem_read_multi_N(8,uint64_t)
#define CHIP_mem_read_region_N(BYTES,TYPE) \
-void \
+static void \
__C(__C(CHIP,_mem_read_region_),BYTES)(void *v, bus_space_handle_t h, bus_size_t o, TYPE *a, bus_size_t c) \
{ \
\
@@ -1140,7 +1140,7 @@ __C(CHIP,_mem_write_8)(void *v, bus_spac
}
#define CHIP_mem_write_multi_N(BYTES,TYPE) \
-void \
+static void \
__C(__C(CHIP,_mem_write_multi_),BYTES)(void *v, bus_space_handle_t h, bus_size_t o, const TYPE *a, bus_size_t c) \
{ \
\
@@ -1156,7 +1156,7 @@ CHIP_mem_write_multi_N(4,uint32_t)
CHIP_mem_write_multi_N(8,uint64_t)
#define CHIP_mem_write_region_N(BYTES,TYPE) \
-void \
+static void \
__C(__C(CHIP,_mem_write_region_),BYTES)(void *v, bus_space_handle_t h, bus_size_t o, const TYPE *a, bus_size_t c) \
{ \
\
@@ -1171,7 +1171,7 @@ CHIP_mem_write_region_N(4,uint32_t)
CHIP_mem_write_region_N(8,uint64_t)
#define CHIP_mem_set_multi_N(BYTES,TYPE) \
-void \
+static void \
__C(__C(CHIP,_mem_set_multi_),BYTES)(void *v, bus_space_handle_t h, bus_size_t o, TYPE val, bus_size_t c) \
{ \
\
@@ -1187,7 +1187,7 @@ CHIP_mem_set_multi_N(4,uint32_t)
CHIP_mem_set_multi_N(8,uint64_t)
#define CHIP_mem_set_region_N(BYTES,TYPE) \
-void \
+static void \
__C(__C(CHIP,_mem_set_region_),BYTES)(void *v, bus_space_handle_t h, bus_size_t o, TYPE val, bus_size_t c) \
{ \
\
@@ -1202,7 +1202,7 @@ CHIP_mem_set_region_N(4,uint32_t)
CHIP_mem_set_region_N(8,uint64_t)
#define CHIP_mem_copy_region_N(BYTES) \
-void \
+static void \
__C(__C(CHIP,_mem_copy_region_),BYTES)(void *v, bus_space_handle_t h1, bus_size_t o1, bus_space_handle_t h2, bus_size_t o2, bus_size_t c) \
{ \
bus_size_t o; \
Index: src/sys/arch/alpha/pci/tsp_dma.c
diff -u src/sys/arch/alpha/pci/tsp_dma.c:1.15 src/sys/arch/alpha/pci/tsp_dma.c:1.16
--- src/sys/arch/alpha/pci/tsp_dma.c:1.15 Sun Oct 11 00:33:31 2020
+++ src/sys/arch/alpha/pci/tsp_dma.c Wed May 5 02:15:18 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tsp_dma.c,v 1.15 2020/10/11 00:33:31 thorpej Exp $ */
+/* $NetBSD: tsp_dma.c,v 1.16 2021/05/05 02:15:18 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.15 2020/10/11 00:33:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tsp_dma.c,v 1.16 2021/05/05 02:15:18 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -84,23 +84,23 @@ __KERNEL_RCSID(0, "$NetBSD: tsp_dma.c,v
#define EDIFF(a, b) (((a) | WSBA_ENA | WSBA_SG) != ((b) | WSBA_ENA | WSBA_SG))
-bus_dma_tag_t tsp_dma_get_tag(bus_dma_tag_t, alpha_bus_t);
+static bus_dma_tag_t tsp_dma_get_tag(bus_dma_tag_t, alpha_bus_t);
-int tsp_bus_dmamap_load_sgmap(bus_dma_tag_t, bus_dmamap_t, void *,
- bus_size_t, struct proc *, int);
+static int tsp_bus_dmamap_load_sgmap(bus_dma_tag_t, bus_dmamap_t, void *,
+ bus_size_t, struct proc *, int);
-int tsp_bus_dmamap_load_mbuf_sgmap(bus_dma_tag_t, bus_dmamap_t,
- struct mbuf *, int);
+static int tsp_bus_dmamap_load_mbuf_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ struct mbuf *, int);
-int tsp_bus_dmamap_load_uio_sgmap(bus_dma_tag_t, bus_dmamap_t,
- struct uio *, int);
+static int tsp_bus_dmamap_load_uio_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ struct uio *, int);
-int tsp_bus_dmamap_load_raw_sgmap(bus_dma_tag_t, bus_dmamap_t,
- bus_dma_segment_t *, int, bus_size_t, int);
+static int tsp_bus_dmamap_load_raw_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ bus_dma_segment_t *, int, bus_size_t, int);
-void tsp_bus_dmamap_unload_sgmap(bus_dma_tag_t, bus_dmamap_t);
+static void tsp_bus_dmamap_unload_sgmap(bus_dma_tag_t, bus_dmamap_t);
-void tsp_tlb_invalidate(struct tsp_config *);
+static void tsp_tlb_invalidate(struct tsp_config *);
/*
* XXX Need to figure out what this is, if any. Initialize it to
@@ -237,7 +237,7 @@ tsp_dma_init(struct tsp_config *pcp)
* Return the bus dma tag to be used for the specified bus type.
* INTERNAL USE ONLY!
*/
-bus_dma_tag_t
+static bus_dma_tag_t
tsp_dma_get_tag(bus_dma_tag_t t, alpha_bus_t bustype)
{
struct tsp_config *pcp = t->_cookie;
@@ -268,7 +268,7 @@ tsp_dma_get_tag(bus_dma_tag_t t, alpha_b
/*
* Load a TSP SGMAP-mapped DMA map with a linear buffer.
*/
-int
+static int
tsp_bus_dmamap_load_sgmap(bus_dma_tag_t t, bus_dmamap_t map, void *buf, bus_size_t buflen, struct proc *p, int flags)
{
int error;
@@ -284,7 +284,7 @@ tsp_bus_dmamap_load_sgmap(bus_dma_tag_t
/*
* Load a TSP SGMAP-mapped DMA map with an mbuf chain.
*/
-int
+static int
tsp_bus_dmamap_load_mbuf_sgmap(bus_dma_tag_t t, bus_dmamap_t map, struct mbuf *m, int flags)
{
int error;
@@ -299,7 +299,7 @@ tsp_bus_dmamap_load_mbuf_sgmap(bus_dma_t
/*
* Load a TSP SGMAP-mapped DMA map with a uio.
*/
-int
+static int
tsp_bus_dmamap_load_uio_sgmap(bus_dma_tag_t t, bus_dmamap_t map, struct uio *uio, int flags)
{
int error;
@@ -314,7 +314,7 @@ tsp_bus_dmamap_load_uio_sgmap(bus_dma_ta
/*
* Load a TSP SGMAP-mapped DMA map with raw memory.
*/
-int
+static int
tsp_bus_dmamap_load_raw_sgmap(bus_dma_tag_t t, bus_dmamap_t map, bus_dma_segment_t *segs, int nsegs, bus_size_t size, int flags)
{
int error;
@@ -330,7 +330,7 @@ tsp_bus_dmamap_load_raw_sgmap(bus_dma_ta
/*
* Unload a TSP DMA map.
*/
-void
+static void
tsp_bus_dmamap_unload_sgmap(bus_dma_tag_t t, bus_dmamap_t map)
{
@@ -350,7 +350,7 @@ tsp_bus_dmamap_unload_sgmap(bus_dma_tag_
/*
* Flush the TSP scatter/gather TLB.
*/
-void
+static void
tsp_tlb_invalidate(struct tsp_config *pcp)
{
Index: src/sys/arch/alpha/pci/ttwoga_dma.c
diff -u src/sys/arch/alpha/pci/ttwoga_dma.c:1.9 src/sys/arch/alpha/pci/ttwoga_dma.c:1.10
--- src/sys/arch/alpha/pci/ttwoga_dma.c:1.9 Sun Oct 11 00:33:31 2020
+++ src/sys/arch/alpha/pci/ttwoga_dma.c Wed May 5 02:15:18 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ttwoga_dma.c,v 1.9 2020/10/11 00:33:31 thorpej Exp $ */
+/* $NetBSD: ttwoga_dma.c,v 1.10 2021/05/05 02:15:18 thorpej Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: ttwoga_dma.c,v 1.9 2020/10/11 00:33:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttwoga_dma.c,v 1.10 2021/05/05 02:15:18 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -47,21 +47,21 @@ __KERNEL_RCSID(0, "$NetBSD: ttwoga_dma.c
#include <alpha/pci/ttwogareg.h>
#include <alpha/pci/ttwogavar.h>
-bus_dma_tag_t ttwoga_dma_get_tag(bus_dma_tag_t, alpha_bus_t);
+static bus_dma_tag_t ttwoga_dma_get_tag(bus_dma_tag_t, alpha_bus_t);
-int ttwoga_bus_dmamap_load_sgmap(bus_dma_tag_t, bus_dmamap_t, void *,
- bus_size_t, struct proc *, int);
+static int ttwoga_bus_dmamap_load_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ void *, bus_size_t, struct proc *, int);
-int ttwoga_bus_dmamap_load_mbuf_sgmap(bus_dma_tag_t, bus_dmamap_t,
- struct mbuf *, int);
+static int ttwoga_bus_dmamap_load_mbuf_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ struct mbuf *, int);
-int ttwoga_bus_dmamap_load_uio_sgmap(bus_dma_tag_t, bus_dmamap_t,
- struct uio *, int);
+static int ttwoga_bus_dmamap_load_uio_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ struct uio *, int);
-int ttwoga_bus_dmamap_load_raw_sgmap(bus_dma_tag_t, bus_dmamap_t,
- bus_dma_segment_t *, int, bus_size_t, int);
+static int ttwoga_bus_dmamap_load_raw_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ bus_dma_segment_t *, int, bus_size_t, int);
-void ttwoga_bus_dmamap_unload_sgmap(bus_dma_tag_t, bus_dmamap_t);
+static void ttwoga_bus_dmamap_unload_sgmap(bus_dma_tag_t, bus_dmamap_t);
/*
* Direct-mapped window: 1G at 1G
@@ -236,7 +236,7 @@ ttwoga_dma_init(struct ttwoga_config *tc
* Return the bus dma tag to be used for the specified bus type.
* INTERNAL USE ONLY!
*/
-bus_dma_tag_t
+static bus_dma_tag_t
ttwoga_dma_get_tag(bus_dma_tag_t t, alpha_bus_t bustype)
{
struct ttwoga_config *tcp = t->_cookie;
@@ -269,7 +269,7 @@ ttwoga_dma_get_tag(bus_dma_tag_t t, alph
/*
* Load a T2 SGMAP-mapped DMA map with a liner buffer.
*/
-int
+static int
ttwoga_bus_dmamap_load_sgmap(bus_dma_tag_t t, bus_dmamap_t map, void *buf,
bus_size_t buflen, struct proc *p, int flags)
{
@@ -287,7 +287,7 @@ ttwoga_bus_dmamap_load_sgmap(bus_dma_tag
/*
* Load a T2 SGMAP-mapped DMA map with an mbuf chain.
*/
-int
+static int
ttwoga_bus_dmamap_load_mbuf_sgmap(bus_dma_tag_t t, bus_dmamap_t map,
struct mbuf *m, int flags)
{
@@ -304,7 +304,7 @@ ttwoga_bus_dmamap_load_mbuf_sgmap(bus_dm
/*
* Load a T2 SGMAP-mapped DMA map with a uio.
*/
-int
+static int
ttwoga_bus_dmamap_load_uio_sgmap(bus_dma_tag_t t, bus_dmamap_t map,
struct uio *uio, int flags)
{
@@ -321,7 +321,7 @@ ttwoga_bus_dmamap_load_uio_sgmap(bus_dma
/*
* Load a T2 SGMAP-mapped DMA map with raw memory.
*/
-int
+static int
ttwoga_bus_dmamap_load_raw_sgmap(bus_dma_tag_t t, bus_dmamap_t map,
bus_dma_segment_t *segs, int nsegs, bus_size_t size, int flags)
{
Index: src/sys/arch/alpha/tc/tc_bus_mem.c
diff -u src/sys/arch/alpha/tc/tc_bus_mem.c:1.38 src/sys/arch/alpha/tc/tc_bus_mem.c:1.39
--- src/sys/arch/alpha/tc/tc_bus_mem.c:1.38 Thu Jun 22 16:46:52 2017
+++ src/sys/arch/alpha/tc/tc_bus_mem.c Wed May 5 02:15:18 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_bus_mem.c,v 1.38 2017/06/22 16:46:52 flxd Exp $ */
+/* $NetBSD: tc_bus_mem.c,v 1.39 2021/05/05 02:15:18 thorpej Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: tc_bus_mem.c,v 1.38 2017/06/22 16:46:52 flxd Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tc_bus_mem.c,v 1.39 2021/05/05 02:15:18 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -47,117 +47,117 @@ __KERNEL_RCSID(0, "$NetBSD: tc_bus_mem.c
#define __C(A,B) __CONCAT(A,B)
/* mapping/unmapping */
-int tc_mem_map(void *, bus_addr_t, bus_size_t, int,
+static int tc_mem_map(void *, bus_addr_t, bus_size_t, int,
bus_space_handle_t *, int);
-void tc_mem_unmap(void *, bus_space_handle_t, bus_size_t, int);
-int tc_mem_subregion(void *, bus_space_handle_t, bus_size_t,
+static void tc_mem_unmap(void *, bus_space_handle_t, bus_size_t, int);
+static int tc_mem_subregion(void *, bus_space_handle_t, bus_size_t,
bus_size_t, bus_space_handle_t *);
-int tc_mem_translate(void *, bus_addr_t, bus_size_t,
+static int tc_mem_translate(void *, bus_addr_t, bus_size_t,
int, struct alpha_bus_space_translation *);
-int tc_mem_get_window(void *, int,
+static int tc_mem_get_window(void *, int,
struct alpha_bus_space_translation *);
/* allocation/deallocation */
-int tc_mem_alloc(void *, bus_addr_t, bus_addr_t, bus_size_t,
+static int tc_mem_alloc(void *, bus_addr_t, bus_addr_t, bus_size_t,
bus_size_t, bus_addr_t, int, bus_addr_t *,
bus_space_handle_t *);
-void tc_mem_free(void *, bus_space_handle_t, bus_size_t);
+static void tc_mem_free(void *, bus_space_handle_t, bus_size_t);
/* get kernel virtual address */
-void * tc_mem_vaddr(void *, bus_space_handle_t);
+static void * tc_mem_vaddr(void *, bus_space_handle_t);
/* mmap for user */
-paddr_t tc_mem_mmap(void *, bus_addr_t, off_t, int, int);
+static paddr_t tc_mem_mmap(void *, bus_addr_t, off_t, int, int);
/* barrier */
-static inline void tc_mem_barrier(void *, bus_space_handle_t,
+static inline void tc_mem_barrier(void *, bus_space_handle_t,
bus_size_t, bus_size_t, int);
/* read (single) */
-static inline uint8_t tc_mem_read_1(void *, bus_space_handle_t, bus_size_t);
+static inline uint8_t tc_mem_read_1(void *, bus_space_handle_t, bus_size_t);
static inline uint16_t tc_mem_read_2(void *, bus_space_handle_t, bus_size_t);
static inline uint32_t tc_mem_read_4(void *, bus_space_handle_t, bus_size_t);
static inline uint64_t tc_mem_read_8(void *, bus_space_handle_t, bus_size_t);
/* read multiple */
-void tc_mem_read_multi_1(void *, bus_space_handle_t,
+static void tc_mem_read_multi_1(void *, bus_space_handle_t,
bus_size_t, uint8_t *, bus_size_t);
-void tc_mem_read_multi_2(void *, bus_space_handle_t,
+static void tc_mem_read_multi_2(void *, bus_space_handle_t,
bus_size_t, uint16_t *, bus_size_t);
-void tc_mem_read_multi_4(void *, bus_space_handle_t,
+static void tc_mem_read_multi_4(void *, bus_space_handle_t,
bus_size_t, uint32_t *, bus_size_t);
-void tc_mem_read_multi_8(void *, bus_space_handle_t,
+static void tc_mem_read_multi_8(void *, bus_space_handle_t,
bus_size_t, uint64_t *, bus_size_t);
/* read region */
-void tc_mem_read_region_1(void *, bus_space_handle_t,
+static void tc_mem_read_region_1(void *, bus_space_handle_t,
bus_size_t, uint8_t *, bus_size_t);
-void tc_mem_read_region_2(void *, bus_space_handle_t,
+static void tc_mem_read_region_2(void *, bus_space_handle_t,
bus_size_t, uint16_t *, bus_size_t);
-void tc_mem_read_region_4(void *, bus_space_handle_t,
+static void tc_mem_read_region_4(void *, bus_space_handle_t,
bus_size_t, uint32_t *, bus_size_t);
-void tc_mem_read_region_8(void *, bus_space_handle_t,
+static void tc_mem_read_region_8(void *, bus_space_handle_t,
bus_size_t, uint64_t *, bus_size_t);
/* write (single) */
-static inline void tc_mem_write_1(void *, bus_space_handle_t, bus_size_t,
+static inline void tc_mem_write_1(void *, bus_space_handle_t, bus_size_t,
uint8_t);
-static inline void tc_mem_write_2(void *, bus_space_handle_t, bus_size_t,
+static inline void tc_mem_write_2(void *, bus_space_handle_t, bus_size_t,
uint16_t);
-static inline void tc_mem_write_4(void *, bus_space_handle_t, bus_size_t,
+static inline void tc_mem_write_4(void *, bus_space_handle_t, bus_size_t,
uint32_t);
-static inline void tc_mem_write_8(void *, bus_space_handle_t, bus_size_t,
+static inline void tc_mem_write_8(void *, bus_space_handle_t, bus_size_t,
uint64_t);
/* write multiple */
-void tc_mem_write_multi_1(void *, bus_space_handle_t,
+static void tc_mem_write_multi_1(void *, bus_space_handle_t,
bus_size_t, const uint8_t *, bus_size_t);
-void tc_mem_write_multi_2(void *, bus_space_handle_t,
+static void tc_mem_write_multi_2(void *, bus_space_handle_t,
bus_size_t, const uint16_t *, bus_size_t);
-void tc_mem_write_multi_4(void *, bus_space_handle_t,
+static void tc_mem_write_multi_4(void *, bus_space_handle_t,
bus_size_t, const uint32_t *, bus_size_t);
-void tc_mem_write_multi_8(void *, bus_space_handle_t,
+static void tc_mem_write_multi_8(void *, bus_space_handle_t,
bus_size_t, const uint64_t *, bus_size_t);
/* write region */
-void tc_mem_write_region_1(void *, bus_space_handle_t,
+static void tc_mem_write_region_1(void *, bus_space_handle_t,
bus_size_t, const uint8_t *, bus_size_t);
-void tc_mem_write_region_2(void *, bus_space_handle_t,
+static void tc_mem_write_region_2(void *, bus_space_handle_t,
bus_size_t, const uint16_t *, bus_size_t);
-void tc_mem_write_region_4(void *, bus_space_handle_t,
+static void tc_mem_write_region_4(void *, bus_space_handle_t,
bus_size_t, const uint32_t *, bus_size_t);
-void tc_mem_write_region_8(void *, bus_space_handle_t,
+static void tc_mem_write_region_8(void *, bus_space_handle_t,
bus_size_t, const uint64_t *, bus_size_t);
/* set multiple */
-void tc_mem_set_multi_1(void *, bus_space_handle_t,
+static void tc_mem_set_multi_1(void *, bus_space_handle_t,
bus_size_t, uint8_t, bus_size_t);
-void tc_mem_set_multi_2(void *, bus_space_handle_t,
+static void tc_mem_set_multi_2(void *, bus_space_handle_t,
bus_size_t, uint16_t, bus_size_t);
-void tc_mem_set_multi_4(void *, bus_space_handle_t,
+static void tc_mem_set_multi_4(void *, bus_space_handle_t,
bus_size_t, uint32_t, bus_size_t);
-void tc_mem_set_multi_8(void *, bus_space_handle_t,
+static void tc_mem_set_multi_8(void *, bus_space_handle_t,
bus_size_t, uint64_t, bus_size_t);
/* set region */
-void tc_mem_set_region_1(void *, bus_space_handle_t,
+static void tc_mem_set_region_1(void *, bus_space_handle_t,
bus_size_t, uint8_t, bus_size_t);
-void tc_mem_set_region_2(void *, bus_space_handle_t,
+static void tc_mem_set_region_2(void *, bus_space_handle_t,
bus_size_t, uint16_t, bus_size_t);
-void tc_mem_set_region_4(void *, bus_space_handle_t,
+static void tc_mem_set_region_4(void *, bus_space_handle_t,
bus_size_t, uint32_t, bus_size_t);
-void tc_mem_set_region_8(void *, bus_space_handle_t,
+static void tc_mem_set_region_8(void *, bus_space_handle_t,
bus_size_t, uint64_t, bus_size_t);
/* copy */
-void tc_mem_copy_region_1(void *, bus_space_handle_t,
+static void tc_mem_copy_region_1(void *, bus_space_handle_t,
bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
-void tc_mem_copy_region_2(void *, bus_space_handle_t,
+static void tc_mem_copy_region_2(void *, bus_space_handle_t,
bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
-void tc_mem_copy_region_4(void *, bus_space_handle_t,
+static void tc_mem_copy_region_4(void *, bus_space_handle_t,
bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
-void tc_mem_copy_region_8(void *, bus_space_handle_t,
+static void tc_mem_copy_region_8(void *, bus_space_handle_t,
bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
static struct alpha_bus_space tc_mem_space = {
@@ -250,7 +250,7 @@ tc_bus_mem_init(void *memv)
}
/* ARGSUSED */
-int
+static int
tc_mem_translate(void *v, bus_addr_t memaddr, bus_size_t memlen, int flags, struct alpha_bus_space_translation *abst)
{
@@ -258,7 +258,7 @@ tc_mem_translate(void *v, bus_addr_t mem
}
/* ARGSUSED */
-int
+static int
tc_mem_get_window(void *v, int window, struct alpha_bus_space_translation *abst)
{
@@ -266,7 +266,7 @@ tc_mem_get_window(void *v, int window, s
}
/* ARGSUSED */
-int
+static int
tc_mem_map(void *v, bus_addr_t memaddr, bus_size_t memsize, int flags, bus_space_handle_t *memhp, int acct)
{
int cacheable = flags & BUS_SPACE_MAP_CACHEABLE;
@@ -286,14 +286,14 @@ tc_mem_map(void *v, bus_addr_t memaddr,
}
/* ARGSUSED */
-void
+static void
tc_mem_unmap(void *v, bus_space_handle_t memh, bus_size_t memsize, int acct)
{
/* XXX XX XXX nothing to do. */
}
-int
+static int
tc_mem_subregion(void *v, bus_space_handle_t memh, bus_size_t offset, bus_size_t size, bus_space_handle_t *nmemh)
{
@@ -309,7 +309,7 @@ tc_mem_subregion(void *v, bus_space_hand
return (0);
}
-int
+static int
tc_mem_alloc(void *v, bus_addr_t rstart, bus_addr_t rend, bus_size_t size, bus_size_t align, bus_size_t boundary, int flags, bus_addr_t *addrp, bus_space_handle_t *bshp)
{
@@ -317,7 +317,7 @@ tc_mem_alloc(void *v, bus_addr_t rstart,
panic("%s: unimplemented", __func__);
}
-void
+static void
tc_mem_free(void *v, bus_space_handle_t bsh, bus_size_t size)
{
@@ -325,7 +325,7 @@ tc_mem_free(void *v, bus_space_handle_t
panic("%s: unimplemented", __func__);
}
-void *
+static void *
tc_mem_vaddr(void *v, bus_space_handle_t bsh)
{
#ifdef DIAGNOSTIC
@@ -340,7 +340,7 @@ tc_mem_vaddr(void *v, bus_space_handle_t
return ((void *)bsh);
}
-paddr_t
+static paddr_t
tc_mem_mmap(void *v, bus_addr_t addr, off_t off, int prot, int flags)
{
int linear = flags & BUS_SPACE_MAP_LINEAR;
@@ -445,7 +445,7 @@ tc_mem_read_8(void *v, bus_space_handle_
}
#define tc_mem_read_multi_N(BYTES,TYPE) \
-void \
+static void \
__C(tc_mem_read_multi_,BYTES)( \
void *v, \
bus_space_handle_t h, \
@@ -465,7 +465,7 @@ tc_mem_read_multi_N(4,uint32_t)
tc_mem_read_multi_N(8,uint64_t)
#define tc_mem_read_region_N(BYTES,TYPE) \
-void \
+static void \
__C(tc_mem_read_region_,BYTES)( \
void *v, \
bus_space_handle_t h, \
@@ -547,7 +547,7 @@ tc_mem_write_8(void *v, bus_space_handle
}
#define tc_mem_write_multi_N(BYTES,TYPE) \
-void \
+static void \
__C(tc_mem_write_multi_,BYTES)( \
void *v, \
bus_space_handle_t h, \
@@ -567,7 +567,7 @@ tc_mem_write_multi_N(4,uint32_t)
tc_mem_write_multi_N(8,uint64_t)
#define tc_mem_write_region_N(BYTES,TYPE) \
-void \
+static void \
__C(tc_mem_write_region_,BYTES)( \
void *v, \
bus_space_handle_t h, \
@@ -587,7 +587,7 @@ tc_mem_write_region_N(4,uint32_t)
tc_mem_write_region_N(8,uint64_t)
#define tc_mem_set_multi_N(BYTES,TYPE) \
-void \
+static void \
__C(tc_mem_set_multi_,BYTES)( \
void *v, \
bus_space_handle_t h, \
@@ -607,7 +607,7 @@ tc_mem_set_multi_N(4,uint32_t)
tc_mem_set_multi_N(8,uint64_t)
#define tc_mem_set_region_N(BYTES,TYPE) \
-void \
+static void \
__C(tc_mem_set_region_,BYTES)( \
void *v, \
bus_space_handle_t h, \
@@ -627,7 +627,7 @@ tc_mem_set_region_N(4,uint32_t)
tc_mem_set_region_N(8,uint64_t)
#define tc_mem_copy_region_N(BYTES) \
-void \
+static void \
__C(tc_mem_copy_region_,BYTES)( \
void *v, \
bus_space_handle_t h1, \
