From c119c284e9758e665f303f8862f4274430fedd03 Mon Sep 17 00:00:00 2001 From: thorpej Date: Sat, 8 May 2021 00:08:43 +0000 Subject: [PATCH] More symbol sanitizing. --- 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(-) diff --git a/sys/arch/alpha/pci/sio_pic.c b/sys/arch/alpha/pci/sio_pic.c index 10d6dfb51a91..f5c5adc5849a 100644 --- a/sys/arch/alpha/pci/sio_pic.c +++ b/sys/arch/alpha/pci/sio_pic.c @@ -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 /* 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 #include @@ -102,9 +102,9 @@ __KERNEL_RCSID(0, "$NetBSD: sio_pic.c,v 1.47 2021/05/07 16:58:34 thorpej Exp $") * 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 @@ cy82c693_write_elcr(int elcr, uint8_t val) * 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 --git a/sys/arch/alpha/pci/ttwoga.c b/sys/arch/alpha/pci/ttwoga.c index 6ef4a0563f78..72d1fba87a2e 100644 --- a/sys/arch/alpha/pci/ttwoga.c +++ b/sys/arch/alpha/pci/ttwoga.c @@ -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 /* 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 #include @@ -62,27 +62,27 @@ __KERNEL_RCSID(0, "$NetBSD: ttwoga.c,v 1.16 2021/04/24 23:36:23 thorpej Exp $"); #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 @@ bus_addr_t ttwoga_gamma_cbus_bias; #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 @@ const struct ttwoga_sysmap ttwoga_sysmap[2] = { #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 @@ ttwogamatch(device_t parent, cfdata_t match, void *aux) return (1); } -void +static void ttwogaattach(device_t parent, device_t self, void *aux) { struct pcibus_attach_args pba; @@ -149,7 +149,7 @@ ttwogaattach(device_t parent, device_t self, void *aux) } } -int +static int ttwogaprint(void *aux, const char *pnp) { struct pcibus_attach_args *pba = aux; @@ -204,7 +204,7 @@ ttwoga_init(int hose, int mallocsafe) return (tcp); } -int +static int ttwopcimatch(device_t parent, cfdata_t match, void *aux) { struct pcibus_attach_args *pba = aux; @@ -216,7 +216,7 @@ ttwopcimatch(device_t parent, cfdata_t match, void *aux) 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 @@ ttwopciattach(device_t parent, device_t self, void *aux) CFARG_EOL); } -int +static int ttwosableioprint(void *aux, const char *pnp) { struct pcibus_attach_args *pba = aux; diff --git a/sys/arch/alpha/pci/ttwoga_dma.c b/sys/arch/alpha/pci/ttwoga_dma.c index 4e6aa5fc0184..1a30386781db 100644 --- a/sys/arch/alpha/pci/ttwoga_dma.c +++ b/sys/arch/alpha/pci/ttwoga_dma.c @@ -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 /* 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 #include @@ -339,7 +339,7 @@ ttwoga_bus_dmamap_load_raw_sgmap(bus_dma_tag_t t, bus_dmamap_t map, /* * 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 --git a/sys/arch/alpha/pci/ttwogavar.h b/sys/arch/alpha/pci/ttwogavar.h index 9d7a31c6d8ab..b2790956bcab 100644 --- a/sys/arch/alpha/pci/ttwogavar.h +++ b/sys/arch/alpha/pci/ttwogavar.h @@ -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 @@ struct ttwoga_config { }; 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 *);