[src/trunk]: src/sys/arch/alpha/pci More symbol sanitizing.

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

details:   https://anonhg.NetBSD.org/src/rev/d0b3c3e843f5
branches:  trunk
changeset: 983177:d0b3c3e843f5
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sat May 08 00:08:43 2021 +0000

description:
More symbol sanitizing.

diffstat:

 sys/arch/alpha/pci/sio_pic.c    |  12 ++++++------
 sys/arch/alpha/pci/ttwoga.c     |  34 +++++++++++++++++-----------------
 sys/arch/alpha/pci/ttwoga_dma.c |   6 +++---
 sys/arch/alpha/pci/ttwogavar.h  |   3 +--
 4 files changed, 27 insertions(+), 28 deletions(-)

diffs (201 lines):

diff -r e32ef35e1ec4 -r d0b3c3e843f5 sys/arch/alpha/pci/sio_pic.c
--- a/sys/arch/alpha/pci/sio_pic.c      Fri May 07 23:00:04 2021 +0000
+++ b/sys/arch/alpha/pci/sio_pic.c      Sat May 08 00:08:43 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sio_pic.c,v 1.47 2021/05/07 16:58:34 thorpej Exp $ */
+/* $NetBSD: sio_pic.c,v 1.48 2021/05/08 00:08:43 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1998, 2000, 2020 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: sio_pic.c,v 1.47 2021/05/07 16:58:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sio_pic.c,v 1.48 2021/05/08 00:08:43 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -102,9 +102,9 @@
  * Private functions and variables.
  */
 
-bus_space_tag_t sio_iot;
-pci_chipset_tag_t sio_pc;
-bus_space_handle_t sio_ioh_icu1, sio_ioh_icu2;
+static bus_space_tag_t sio_iot;
+static pci_chipset_tag_t sio_pc;
+static bus_space_handle_t sio_ioh_icu1, sio_ioh_icu2;
 
 #define        ICU_LEN         16              /* number of ISA IRQs */
 
@@ -262,7 +262,7 @@
  * they should panic.
  */
 
-int (*const sio_elcr_setup_funcs[])(void) = {
+static int (*const sio_elcr_setup_funcs[])(void) = {
        cy82c693_setup_elcr,
        i82378_setup_elcr,
        NULL,
diff -r e32ef35e1ec4 -r d0b3c3e843f5 sys/arch/alpha/pci/ttwoga.c
--- a/sys/arch/alpha/pci/ttwoga.c       Fri May 07 23:00:04 2021 +0000
+++ b/sys/arch/alpha/pci/ttwoga.c       Sat May 08 00:08:43 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ttwoga.c,v 1.16 2021/04/24 23:36:23 thorpej Exp $ */
+/* $NetBSD: ttwoga.c,v 1.17 2021/05/08 00:08:43 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: ttwoga.c,v 1.16 2021/04/24 23:36:23 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttwoga.c,v 1.17 2021/05/08 00:08:43 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -62,27 +62,27 @@
 
 #include "locators.h"
 
-int    ttwogamatch(device_t, cfdata_t, void *);
-void   ttwogaattach(device_t, device_t, void *);
+static int     ttwogamatch(device_t, cfdata_t, void *);
+static void    ttwogaattach(device_t, device_t, void *);
 
 CFATTACH_DECL_NEW(ttwoga, 0,
     ttwogamatch, ttwogaattach, NULL, NULL);
 
-int    ttwogaprint(void *, const char *);
+static int     ttwogaprint(void *, const char *);
 
-int    ttwopcimatch(device_t, cfdata_t, void *);
-void   ttwopciattach(device_t, device_t, void *);
+static int     ttwopcimatch(device_t, cfdata_t, void *);
+static void    ttwopciattach(device_t, device_t, void *);
 
 CFATTACH_DECL_NEW(ttwopci, 0,
     ttwopcimatch, ttwopciattach, NULL, NULL);
 
-int    ttwosableioprint(void *, const char *);
+static int     ttwosableioprint(void *, const char *);
 
 /*
  * There can be only one, but it might have 2 primary PCI busses.
  */
-int ttwogafound;
-struct ttwoga_config ttwoga_configuration[2];
+static int ttwogafound;
+static struct ttwoga_config ttwoga_configuration[2];
 
 /* CBUS address bias for Gamma systems. */
 bus_addr_t ttwoga_gamma_cbus_bias;
@@ -90,7 +90,7 @@
 #define        GIGABYTE        (1024UL * 1024UL * 1024UL)
 #define        MEGABYTE        (1024UL * 1024UL)
 
-const struct ttwoga_sysmap ttwoga_sysmap[2] = {
+static const struct ttwoga_sysmap ttwoga_sysmap[2] = {
 /*       Base                  System size     Bus size        */
        { T2_PCI0_SIO_BASE,     256UL * MEGABYTE, 8UL * MEGABYTE,
          T2_PCI0_SMEM_BASE,    4UL * GIGABYTE, 128UL * MEGABYTE,
@@ -107,7 +107,7 @@
 #undef GIGABYTE
 #undef MEGABYTE
 
-int
+static int
 ttwogamatch(device_t parent, cfdata_t match, void *aux)
 {
        struct mainbus_attach_args *ma = aux;
@@ -122,7 +122,7 @@
        return (1);
 }
 
-void
+static void
 ttwogaattach(device_t parent, device_t self, void *aux)
 {
        struct pcibus_attach_args pba;
@@ -149,7 +149,7 @@
        }
 }
 
-int
+static int
 ttwogaprint(void *aux, const char *pnp)
 {
        struct pcibus_attach_args *pba = aux;
@@ -204,7 +204,7 @@
        return (tcp);
 }
 
-int
+static int
 ttwopcimatch(device_t parent, cfdata_t match, void *aux)
 {
        struct pcibus_attach_args *pba = aux;
@@ -216,7 +216,7 @@
        return (1);
 }
 
-void
+static void
 ttwopciattach(device_t parent, device_t self, void *aux)
 {
        struct pcibus_attach_args *pba = aux, npba;
@@ -273,7 +273,7 @@
            CFARG_EOL);
 }
 
-int
+static int
 ttwosableioprint(void *aux, const char *pnp)
 {
        struct pcibus_attach_args *pba = aux;
diff -r e32ef35e1ec4 -r d0b3c3e843f5 sys/arch/alpha/pci/ttwoga_dma.c
--- a/sys/arch/alpha/pci/ttwoga_dma.c   Fri May 07 23:00:04 2021 +0000
+++ b/sys/arch/alpha/pci/ttwoga_dma.c   Sat May 08 00:08:43 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ttwoga_dma.c,v 1.10 2021/05/05 02:15:18 thorpej Exp $ */
+/* $NetBSD: ttwoga_dma.c,v 1.11 2021/05/08 00:08:43 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.10 2021/05/05 02:15:18 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttwoga_dma.c,v 1.11 2021/05/08 00:08:43 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -339,7 +339,7 @@
 /*
  * Unload an T2 DMA map.
  */
-void
+static void
 ttwoga_bus_dmamap_unload_sgmap(bus_dma_tag_t t, bus_dmamap_t map)
 {
        struct ttwoga_config *tcp = t->_cookie;
diff -r e32ef35e1ec4 -r d0b3c3e843f5 sys/arch/alpha/pci/ttwogavar.h
--- a/sys/arch/alpha/pci/ttwogavar.h    Fri May 07 23:00:04 2021 +0000
+++ b/sys/arch/alpha/pci/ttwogavar.h    Sat May 08 00:08:43 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ttwogavar.h,v 1.6 2020/09/22 15:24:02 thorpej Exp $ */
+/* $NetBSD: ttwogavar.h,v 1.7 2021/05/08 00:08:43 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -96,7 +96,6 @@
 };
 
 extern cpuid_t ttwoga_conf_cpu;
-extern struct ttwoga_config ttwoga_configuration[];
 
 struct ttwoga_config *ttwoga_init(int, int);
 void   ttwoga_pci_init(pci_chipset_tag_t, void *);