[src/trunk]: src/sys/arch/alpha Liberally sprinkle static around to get more ...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4a862846ad44
branches:  trunk
changeset: 983169:4a862846ad44
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Fri May 07 16:58:33 2021 +0000

description:
Liberally sprinkle static around to get more symbols out of the
global namespace.  A small bit of const poisoning in the TC code.

diffstat:

 sys/arch/alpha/common/bus_dma.c            |  12 +++---
 sys/arch/alpha/common/shared_intr.c        |   6 +--
 sys/arch/alpha/isa/isa_machdep.c           |  12 +++---
 sys/arch/alpha/isa/isadma_bounce.c         |  14 ++++----
 sys/arch/alpha/isa/mcclock_isa.c           |  20 ++++++------
 sys/arch/alpha/jensenio/com_jensenio.c     |  12 +++---
 sys/arch/alpha/jensenio/jensenio.c         |   8 ++--
 sys/arch/alpha/jensenio/jensenio_dma.c     |   8 ++--
 sys/arch/alpha/jensenio/jensenio_intr.c    |  49 +++++++++++++++--------------
 sys/arch/alpha/jensenio/lpt_jensenio.c     |  12 +++---
 sys/arch/alpha/jensenio/mcclock_jensenio.c |  20 ++++++------
 sys/arch/alpha/jensenio/pckbc_jensenio.c   |  17 +++++----
 sys/arch/alpha/pci/apecs_pci.c             |  28 ++++++++--------
 sys/arch/alpha/pci/cia_pci.c               |  28 ++++++++--------
 sys/arch/alpha/pci/dwlpx_pci.c             |  32 ++++++++-----------
 sys/arch/alpha/pci/irongate_pci.c          |  28 ++++++++--------
 sys/arch/alpha/pci/lca_pci.c               |  28 ++++++++--------
 sys/arch/alpha/pci/mcpcia_pci.c            |  23 +++++--------
 sys/arch/alpha/pci/sio.c                   |  44 +++++++++++++-------------
 sys/arch/alpha/pci/sio_pic.c               |  46 +++++++++++++--------------
 sys/arch/alpha/pci/tsp_pci.c               |  30 +++++++++---------
 sys/arch/alpha/pci/ttwoga_pci.c            |  34 ++++++++++----------
 sys/arch/alpha/sableio/com_sableio.c       |  12 +++---
 sys/arch/alpha/sableio/fdc_sableio.c       |  12 +++---
 sys/arch/alpha/sableio/lpt_sableio.c       |  12 +++---
 sys/arch/alpha/sableio/pckbc_sableio.c     |  17 +++++----
 sys/arch/alpha/sableio/sableio.c           |  20 ++++++------
 sys/arch/alpha/tc/ioasic.c                 |  28 ++++++++--------
 sys/arch/alpha/tc/mcclock_ioasic.c         |  20 ++++++------
 sys/arch/alpha/tc/tc_3000_300.c            |  20 +++++------
 sys/arch/alpha/tc/tc_3000_500.c            |  38 +++++++++--------------
 sys/arch/alpha/tc/tc_conf.h                |  22 ++++++------
 32 files changed, 346 insertions(+), 366 deletions(-)

diffs (truncated from 2240 to 300 lines):

diff -r 97c7651d39c5 -r 4a862846ad44 sys/arch/alpha/common/bus_dma.c
--- a/sys/arch/alpha/common/bus_dma.c   Fri May 07 16:55:58 2021 +0000
+++ b/sys/arch/alpha/common/bus_dma.c   Fri May 07 16:58:33 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.71 2020/11/18 02:04:29 thorpej Exp $ */
+/* $NetBSD: bus_dma.c,v 1.72 2021/05/07 16:58:33 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: bus_dma.c,v 1.71 2020/11/18 02:04:29 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.72 2021/05/07 16:58:33 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -50,9 +50,9 @@
 
 #include <dev/bus_dma/bus_dmamem_common.h>
 
-int    _bus_dmamap_load_buffer_direct(bus_dma_tag_t,
-           bus_dmamap_t, void *, bus_size_t, struct vmspace *, int,
-           paddr_t *, int *, int);
+static int     _bus_dmamap_load_buffer_direct(bus_dma_tag_t,
+                   bus_dmamap_t, void *, bus_size_t, struct vmspace *, int,
+                   paddr_t *, int *, int);
 
 extern paddr_t avail_start, avail_end; /* from pmap.c */
 
@@ -129,7 +129,7 @@
  * the starting segment on entrance, and the ending segment on exit.
  * first indicates if this is the first invocation of this function.
  */
-int
+static int
 _bus_dmamap_load_buffer_direct(bus_dma_tag_t t, bus_dmamap_t map,
     void *buf, size_t buflen, struct vmspace *vm, int flags, paddr_t *lastaddrp,
     int *segp, int first)
diff -r 97c7651d39c5 -r 4a862846ad44 sys/arch/alpha/common/shared_intr.c
--- a/sys/arch/alpha/common/shared_intr.c       Fri May 07 16:55:58 2021 +0000
+++ b/sys/arch/alpha/common/shared_intr.c       Fri May 07 16:58:33 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: shared_intr.c,v 1.26 2020/09/26 02:35:31 thorpej Exp $ */
+/* $NetBSD: shared_intr.c,v 1.27 2021/05/07 16:58:33 thorpej Exp $ */
 
 /*
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: shared_intr.c,v 1.26 2020/09/26 02:35:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: shared_intr.c,v 1.27 2021/05/07 16:58:33 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -76,8 +76,6 @@
 #include <sys/intr.h>
 #include <sys/xcall.h>
 
-static const char *intr_typename(int);
-
 static const char *
 intr_typename(int type)
 {
diff -r 97c7651d39c5 -r 4a862846ad44 sys/arch/alpha/isa/isa_machdep.c
--- a/sys/arch/alpha/isa/isa_machdep.c  Fri May 07 16:55:58 2021 +0000
+++ b/sys/arch/alpha/isa/isa_machdep.c  Fri May 07 16:58:33 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.21 2012/02/06 02:14:13 matt Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.22 2021/05/07 16:58:33 thorpej Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.21 2012/02/06 02:14:13 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.22 2021/05/07 16:58:33 thorpej Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -55,8 +55,8 @@
 #if (NPCPPI > 0)
 #include <dev/isa/pcppivar.h>
 
-int isabeepmatch(device_t, cfdata_t, void *);
-void isabeepattach(device_t, device_t, void *);
+static int     isabeepmatch(device_t, cfdata_t, void *);
+static void    isabeepattach(device_t, device_t, void *);
 
 CFATTACH_DECL_NEW(isabeep, 0,
     isabeepmatch, isabeepattach, NULL, NULL);
@@ -78,13 +78,13 @@
 }
 
 #if (NPCPPI > 0)
-int
+static int
 isabeepmatch(device_t parent, cfdata_t match, void *aux)
 {
        return (!ppi_attached);
 }
 
-void
+static void
 isabeepattach(device_t parent, device_t self, void *aux)
 {
        printf("\n");
diff -r 97c7651d39c5 -r 4a862846ad44 sys/arch/alpha/isa/isadma_bounce.c
--- a/sys/arch/alpha/isa/isadma_bounce.c        Fri May 07 16:55:58 2021 +0000
+++ b/sys/arch/alpha/isa/isadma_bounce.c        Fri May 07 16:58:33 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: isadma_bounce.c,v 1.14 2020/11/18 02:04:29 thorpej Exp $ */
+/* $NetBSD: isadma_bounce.c,v 1.15 2021/05/07 16:58:33 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.14 2020/11/18 02:04:29 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.15 2021/05/07 16:58:33 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -86,9 +86,9 @@
 #define        ID_BUFTYPE_UIO          3
 #define        ID_BUFTYPE_RAW          4
 
-int    isadma_bounce_alloc_bouncebuf(bus_dma_tag_t, bus_dmamap_t,
-           bus_size_t, int);
-void   isadma_bounce_free_bouncebuf(bus_dma_tag_t, bus_dmamap_t);
+static int     isadma_bounce_alloc_bouncebuf(bus_dma_tag_t, bus_dmamap_t,
+                   bus_size_t, int);
+static void    isadma_bounce_free_bouncebuf(bus_dma_tag_t, bus_dmamap_t);
 
 /*
  * Returns true if the system memory configuration exceeds the
@@ -577,7 +577,7 @@
  * ISA DMA utility functions
  **********************************************************************/
 
-int
+static int
 isadma_bounce_alloc_bouncebuf(bus_dma_tag_t t, bus_dmamap_t map,
     bus_size_t size, int flags)
 {
@@ -606,7 +606,7 @@
        return (error);
 }
 
-void
+static void
 isadma_bounce_free_bouncebuf(bus_dma_tag_t t, bus_dmamap_t map)
 {
        struct isadma_bounce_cookie *cookie = map->_dm_cookie;
diff -r 97c7651d39c5 -r 4a862846ad44 sys/arch/alpha/isa/mcclock_isa.c
--- a/sys/arch/alpha/isa/mcclock_isa.c  Fri May 07 16:55:58 2021 +0000
+++ b/sys/arch/alpha/isa/mcclock_isa.c  Fri May 07 16:58:33 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclock_isa.c,v 1.20 2011/07/01 19:22:35 dyoung Exp $ */
+/* $NetBSD: mcclock_isa.c,v 1.21 2021/05/07 16:58:33 thorpej Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: mcclock_isa.c,v 1.20 2011/07/01 19:22:35 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock_isa.c,v 1.21 2021/05/07 16:58:33 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -46,16 +46,16 @@
 
 #include <alpha/alpha/mcclockvar.h>
 
-int    mcclock_isa_match(device_t, cfdata_t, void *);
-void   mcclock_isa_attach(device_t, device_t, void *);
+static int     mcclock_isa_match(device_t, cfdata_t, void *);
+static void    mcclock_isa_attach(device_t, device_t, void *);
 
 CFATTACH_DECL_NEW(mcclock_isa, sizeof(struct mc146818_softc),
     mcclock_isa_match, mcclock_isa_attach, NULL, NULL);
 
-void   mcclock_isa_write(struct mc146818_softc *, u_int, u_int);
-u_int  mcclock_isa_read(struct mc146818_softc *, u_int);
+static void    mcclock_isa_write(struct mc146818_softc *, u_int, u_int);
+static u_int   mcclock_isa_read(struct mc146818_softc *, u_int);
 
-int
+static int
 mcclock_isa_match(device_t parent, cfdata_t cf, void *aux)
 {
        struct isa_attach_args *ia = aux;
@@ -94,7 +94,7 @@
        return (1);
 }
 
-void
+static void
 mcclock_isa_attach(device_t parent, device_t self, void *aux)
 {
        struct mc146818_softc *sc = device_private(self);
@@ -112,7 +112,7 @@
        mcclock_attach(sc);
 }
 
-void
+static void
 mcclock_isa_write(struct mc146818_softc *sc, u_int reg, u_int datum)
 {
        bus_space_tag_t iot = sc->sc_bst;
@@ -122,7 +122,7 @@
        bus_space_write_1(iot, ioh, 1, datum);
 }
 
-u_int
+static u_int
 mcclock_isa_read(struct mc146818_softc *sc, u_int reg)
 {
        bus_space_tag_t iot = sc->sc_bst;
diff -r 97c7651d39c5 -r 4a862846ad44 sys/arch/alpha/jensenio/com_jensenio.c
--- a/sys/arch/alpha/jensenio/com_jensenio.c    Fri May 07 16:55:58 2021 +0000
+++ b/sys/arch/alpha/jensenio/com_jensenio.c    Fri May 07 16:58:33 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: com_jensenio.c,v 1.18 2020/09/25 03:40:11 thorpej Exp $ */
+/* $NetBSD: com_jensenio.c,v 1.19 2021/05/07 16:58:34 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: com_jensenio.c,v 1.18 2020/09/25 03:40:11 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_jensenio.c,v 1.19 2021/05/07 16:58:34 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -67,13 +67,13 @@
        struct jensenio_scb_intrhand sc_jih;
 };
 
-int    com_jensenio_match(device_t, cfdata_t , void *);
-void   com_jensenio_attach(device_t, device_t, void *);
+static int     com_jensenio_match(device_t, cfdata_t , void *);
+static void    com_jensenio_attach(device_t, device_t, void *);
 
 CFATTACH_DECL_NEW(com_jensenio, sizeof(struct com_jensenio_softc),
     com_jensenio_match, com_jensenio_attach, NULL, NULL);
 
-int
+static int
 com_jensenio_match(device_t parent, cfdata_t match, void *aux)
 {
        struct jensenio_attach_args *ja = aux;
@@ -85,7 +85,7 @@
        return (0);
 }
 
-void
+static void
 com_jensenio_attach(device_t parent, device_t self, void *aux)
 {
        struct com_jensenio_softc *jsc = device_private(self);
diff -r 97c7651d39c5 -r 4a862846ad44 sys/arch/alpha/jensenio/jensenio.c
--- a/sys/arch/alpha/jensenio/jensenio.c        Fri May 07 16:55:58 2021 +0000
+++ b/sys/arch/alpha/jensenio/jensenio.c        Fri May 07 16:58:33 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: jensenio.c,v 1.20 2021/04/24 23:36:23 thorpej Exp $ */
+/* $NetBSD: jensenio.c,v 1.21 2021/05/07 16:58:34 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: jensenio.c,v 1.20 2021/04/24 23:36:23 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: jensenio.c,v 1.21 2021/05/07 16:58:34 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -91,11 +91,11 @@
 struct jensenio_config jensenio_configuration;
 
 static void    jensenio_eisa_attach_hook(device_t, device_t,
-           struct eisabus_attach_args *);
+                   struct eisabus_attach_args *);
 static int     jensenio_eisa_maxslots(void *);
 
 static void    jensenio_isa_attach_hook(device_t, device_t,
-           struct isabus_attach_args *);