Module Name: src
Committed By: maxv
Date: Fri Dec 6 07:12:39 UTC 2019
Modified Files:
src/sys/dev/gpio: gpioow.c
src/sys/dev/ic: smc91cxx.c smc91cxxvar.h
src/sys/dev/pci: if_txp.c
src/sys/dev/pcmcia: if_cnw.c
src/sys/dev/usb: uhidev.c uirda.c umass.c
src/sys/dev/wscons: wsdisplay.c
Log Message:
localify
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/gpio/gpioow.c
cvs rdiff -u -r1.102 -r1.103 src/sys/dev/ic/smc91cxx.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/ic/smc91cxxvar.h
cvs rdiff -u -r1.61 -r1.62 src/sys/dev/pci/if_txp.c
cvs rdiff -u -r1.66 -r1.67 src/sys/dev/pcmcia/if_cnw.c
cvs rdiff -u -r1.75 -r1.76 src/sys/dev/usb/uhidev.c
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/usb/uirda.c
cvs rdiff -u -r1.175 -r1.176 src/sys/dev/usb/umass.c
cvs rdiff -u -r1.159 -r1.160 src/sys/dev/wscons/wsdisplay.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/dev/gpio/gpioow.c
diff -u src/sys/dev/gpio/gpioow.c:1.16 src/sys/dev/gpio/gpioow.c:1.17
--- src/sys/dev/gpio/gpioow.c:1.16 Sat Nov 30 23:04:12 2019
+++ src/sys/dev/gpio/gpioow.c Fri Dec 6 07:12:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: gpioow.c,v 1.16 2019/11/30 23:04:12 ad Exp $ */
+/* $NetBSD: gpioow.c,v 1.17 2019/12/06 07:12:38 maxv Exp $ */
/* $OpenBSD: gpioow.c,v 1.1 2006/03/04 16:27:03 grange Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gpioow.c,v 1.16 2019/11/30 23:04:12 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gpioow.c,v 1.17 2019/12/06 07:12:38 maxv Exp $");
/*
* 1-Wire bus bit-banging through GPIO pin.
@@ -51,19 +51,19 @@ struct gpioow_softc {
int sc_dying;
};
-int gpioow_match(device_t, cfdata_t, void *);
-void gpioow_attach(device_t, device_t, void *);
-int gpioow_detach(device_t, int);
-int gpioow_activate(device_t, enum devact);
-
-int gpioow_ow_reset(void *);
-int gpioow_ow_read_bit(void *);
-void gpioow_ow_write_bit(void *, int);
-
-void gpioow_bb_rx(void *);
-void gpioow_bb_tx(void *);
-int gpioow_bb_get(void *);
-void gpioow_bb_set(void *, int);
+static int gpioow_match(device_t, cfdata_t, void *);
+static void gpioow_attach(device_t, device_t, void *);
+static int gpioow_detach(device_t, int);
+static int gpioow_activate(device_t, enum devact);
+
+static int gpioow_ow_reset(void *);
+static int gpioow_ow_read_bit(void *);
+static void gpioow_ow_write_bit(void *, int);
+
+static void gpioow_bb_rx(void *);
+static void gpioow_bb_tx(void *);
+static int gpioow_bb_get(void *);
+static void gpioow_bb_set(void *, int);
CFATTACH_DECL_NEW(gpioow, sizeof(struct gpioow_softc),
gpioow_match, gpioow_attach, gpioow_detach, gpioow_activate);
@@ -75,7 +75,7 @@ static const struct onewire_bbops gpioow
gpioow_bb_set
};
-int
+static int
gpioow_match(device_t parent, cfdata_t cf, void *aux)
{
struct gpio_attach_args *ga = aux;
@@ -95,7 +95,7 @@ gpioow_match(device_t parent, cfdata_t c
return 1;
}
-void
+static void
gpioow_attach(device_t parent, device_t self, void *aux)
{
struct gpioow_softc *sc = device_private(self);
@@ -158,7 +158,7 @@ finish:
return;
}
-int
+static int
gpioow_detach(device_t self, int flags)
{
struct gpioow_softc *sc = device_private(self);
@@ -174,7 +174,7 @@ gpioow_detach(device_t self, int flags)
return rv;
}
-int
+static int
gpioow_activate(device_t self, enum devact act)
{
struct gpioow_softc *sc = device_private(self);
@@ -188,25 +188,25 @@ gpioow_activate(device_t self, enum deva
}
}
-int
+static int
gpioow_ow_reset(void *arg)
{
return (onewire_bb_reset(&gpioow_bbops, arg));
}
-int
+static int
gpioow_ow_read_bit(void *arg)
{
return (onewire_bb_read_bit(&gpioow_bbops, arg));
}
-void
+static void
gpioow_ow_write_bit(void *arg, int value)
{
onewire_bb_write_bit(&gpioow_bbops, arg, value);
}
-void
+static void
gpioow_bb_rx(void *arg)
{
struct gpioow_softc *sc = arg;
@@ -223,7 +223,7 @@ gpioow_bb_rx(void *arg)
}
}
-void
+static void
gpioow_bb_tx(void *arg)
{
struct gpioow_softc *sc = arg;
@@ -238,7 +238,7 @@ gpioow_bb_tx(void *arg)
}
}
-int
+static int
gpioow_bb_get(void *arg)
{
struct gpioow_softc *sc = arg;
@@ -247,7 +247,7 @@ gpioow_bb_get(void *arg)
GPIO_PIN_HIGH ? 1 : 0);
}
-void
+static void
gpioow_bb_set(void *arg, int value)
{
struct gpioow_softc *sc = arg;
Index: src/sys/dev/ic/smc91cxx.c
diff -u src/sys/dev/ic/smc91cxx.c:1.102 src/sys/dev/ic/smc91cxx.c:1.103
--- src/sys/dev/ic/smc91cxx.c:1.102 Thu May 30 02:32:18 2019
+++ src/sys/dev/ic/smc91cxx.c Fri Dec 6 07:12:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: smc91cxx.c,v 1.102 2019/05/30 02:32:18 msaitoh Exp $ */
+/* $NetBSD: smc91cxx.c,v 1.103 2019/12/06 07:12:38 maxv Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smc91cxx.c,v 1.102 2019/05/30 02:32:18 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smc91cxx.c,v 1.103 2019/12/06 07:12:38 maxv Exp $");
#include "opt_inet.h"
@@ -153,8 +153,8 @@ static const int smc91cxx_media[] = {
/*
* MII bit-bang glue.
*/
-uint32_t smc91cxx_mii_bitbang_read(device_t);
-void smc91cxx_mii_bitbang_write(device_t, uint32_t);
+static uint32_t smc91cxx_mii_bitbang_read(device_t);
+static void smc91cxx_mii_bitbang_write(device_t, uint32_t);
static const struct mii_bitbang_ops smc91cxx_mii_bitbang_ops = {
smc91cxx_mii_bitbang_read,
@@ -169,25 +169,27 @@ static const struct mii_bitbang_ops smc9
};
/* MII callbacks */
-int smc91cxx_mii_readreg(device_t, int, int, uint16_t *);
-int smc91cxx_mii_writereg(device_t, int, int, uint16_t);
-void smc91cxx_statchg(struct ifnet *);
-void smc91cxx_tick(void *);
-
-int smc91cxx_mediachange(struct ifnet *);
-void smc91cxx_mediastatus(struct ifnet *, struct ifmediareq *);
-
-int smc91cxx_set_media(struct smc91cxx_softc *, int);
-
-void smc91cxx_init(struct smc91cxx_softc *);
-void smc91cxx_read(struct smc91cxx_softc *);
-void smc91cxx_reset(struct smc91cxx_softc *);
-void smc91cxx_start(struct ifnet *);
-uint8_t smc91cxx_copy_tx_frame(struct smc91cxx_softc *, struct mbuf *);
-void smc91cxx_resume(struct smc91cxx_softc *);
-void smc91cxx_stop(struct smc91cxx_softc *);
-void smc91cxx_watchdog(struct ifnet *);
-int smc91cxx_ioctl(struct ifnet *, u_long, void *);
+static int smc91cxx_mii_readreg(device_t, int, int, uint16_t *);
+static int smc91cxx_mii_writereg(device_t, int, int, uint16_t);
+static void smc91cxx_statchg(struct ifnet *);
+static void smc91cxx_tick(void *);
+
+static int smc91cxx_mediachange(struct ifnet *);
+static void smc91cxx_mediastatus(struct ifnet *, struct ifmediareq *);
+
+static int smc91cxx_set_media(struct smc91cxx_softc *, int);
+
+static void smc91cxx_init(struct smc91cxx_softc *);
+static void smc91cxx_read(struct smc91cxx_softc *);
+static void smc91cxx_reset(struct smc91cxx_softc *);
+static void smc91cxx_start(struct ifnet *);
+static uint8_t smc91cxx_copy_tx_frame(struct smc91cxx_softc *, struct mbuf *);
+static void smc91cxx_stop(struct smc91cxx_softc *);
+static void smc91cxx_watchdog(struct ifnet *);
+static int smc91cxx_ioctl(struct ifnet *, u_long, void *);
+
+static int smc91cxx_enable(struct smc91cxx_softc *);
+static void smc91cxx_disable(struct smc91cxx_softc *);
static inline int ether_cmp(const void *, const void *);
static inline int
@@ -387,7 +389,7 @@ smc91cxx_attach(struct smc91cxx_softc *s
/*
* Change media according to request.
*/
-int
+static int
smc91cxx_mediachange(struct ifnet *ifp)
{
struct smc91cxx_softc *sc = ifp->if_softc;
@@ -395,7 +397,7 @@ smc91cxx_mediachange(struct ifnet *ifp)
return smc91cxx_set_media(sc, sc->sc_mii.mii_media.ifm_media);
}
-int
+static int
smc91cxx_set_media(struct smc91cxx_softc *sc, int media)
{
bus_space_tag_t bst = sc->sc_bst;
@@ -441,7 +443,7 @@ smc91cxx_set_media(struct smc91cxx_softc
/*
* Notify the world which media we're using.
*/
-void
+static void
smc91cxx_mediastatus(struct ifnet *ifp, struct ifmediareq *ifmr)
{
struct smc91cxx_softc *sc = ifp->if_softc;
@@ -472,7 +474,7 @@ smc91cxx_mediastatus(struct ifnet *ifp,
/*
* Reset and initialize the chip.
*/
-void
+static void
smc91cxx_init(struct smc91cxx_softc *sc)
{
struct ifnet *ifp = &sc->sc_ec.ec_if;
@@ -604,7 +606,7 @@ smc91cxx_init(struct smc91cxx_softc *sc)
* Start output on an interface.
* Must be called at splnet or interrupt level.
*/
-void
+static void
smc91cxx_start(struct ifnet *ifp)
{
struct smc91cxx_softc *sc = ifp->if_softc;
@@ -776,7 +778,7 @@ smc91cxx_start(struct ifnet *ifp)
/*
* Squirt a (possibly misaligned) mbuf to the device
*/
-uint8_t
+static uint8_t
smc91cxx_copy_tx_frame(struct smc91cxx_softc *sc, struct mbuf *m0)
{
bus_space_tag_t bst = sc->sc_bst;
@@ -1038,7 +1040,7 @@ smc91cxx_intr(void *arg)
* Read a packet from the card and pass it up to the kernel.
* NOTE! WE EXPECT TO BE IN REGISTER WINDOW 2!
*/
-void
+static void
smc91cxx_read(struct smc91cxx_softc *sc)
{
struct ifnet *ifp = &sc->sc_ec.ec_if;
@@ -1184,7 +1186,7 @@ smc91cxx_read(struct smc91cxx_softc *sc)
/*
* Process an ioctl request.
*/
-int
+static int
smc91cxx_ioctl(struct ifnet *ifp, u_long cmd, void *data)
{
struct smc91cxx_softc *sc = ifp->if_softc;
@@ -1274,7 +1276,7 @@ smc91cxx_ioctl(struct ifnet *ifp, u_long
/*
* Reset the interface.
*/
-void
+static void
smc91cxx_reset(struct smc91cxx_softc *sc)
{
int s;
@@ -1288,7 +1290,7 @@ smc91cxx_reset(struct smc91cxx_softc *sc
/*
* Watchdog timer.
*/
-void
+static void
smc91cxx_watchdog(struct ifnet *ifp)
{
struct smc91cxx_softc *sc = ifp->if_softc;
@@ -1301,7 +1303,7 @@ smc91cxx_watchdog(struct ifnet *ifp)
/*
* Stop output on the interface.
*/
-void
+static void
smc91cxx_stop(struct smc91cxx_softc *sc)
{
bus_space_tag_t bst = sc->sc_bst;
@@ -1323,7 +1325,7 @@ smc91cxx_stop(struct smc91cxx_softc *sc)
/*
* Enable power on the interface.
*/
-int
+static int
smc91cxx_enable(struct smc91cxx_softc *sc)
{
@@ -1341,7 +1343,7 @@ smc91cxx_enable(struct smc91cxx_softc *s
/*
* Disable power on the interface.
*/
-void
+static void
smc91cxx_disable(struct smc91cxx_softc *sc)
{
@@ -1391,7 +1393,7 @@ smc91cxx_detach(device_t self, int flags
return 0;
}
-uint32_t
+static uint32_t
smc91cxx_mii_bitbang_read(device_t self)
{
struct smc91cxx_softc *sc = device_private(self);
@@ -1400,7 +1402,7 @@ smc91cxx_mii_bitbang_read(device_t self)
return bus_space_read_2(sc->sc_bst, sc->sc_bsh, MGMT_REG_W);
}
-void
+static void
smc91cxx_mii_bitbang_write(device_t self, uint32_t val)
{
struct smc91cxx_softc *sc = device_private(self);
@@ -1409,7 +1411,7 @@ smc91cxx_mii_bitbang_write(device_t self
bus_space_write_2(sc->sc_bst, sc->sc_bsh, MGMT_REG_W, val);
}
-int
+static int
smc91cxx_mii_readreg(device_t self, int phy, int reg, uint16_t *val)
{
struct smc91cxx_softc *sc = device_private(self);
@@ -1425,7 +1427,7 @@ smc91cxx_mii_readreg(device_t self, int
return rv;
}
-int
+static int
smc91cxx_mii_writereg(device_t self, int phy, int reg, uint16_t val)
{
struct smc91cxx_softc *sc = device_private(self);
@@ -1441,7 +1443,7 @@ smc91cxx_mii_writereg(device_t self, int
return rv;
}
-void
+static void
smc91cxx_statchg(struct ifnet *ifp)
{
struct smc91cxx_softc *sc = ifp->if_softc;
@@ -1462,7 +1464,7 @@ smc91cxx_statchg(struct ifnet *ifp)
/*
* One second timer, used to tick the MII.
*/
-void
+static void
smc91cxx_tick(void *arg)
{
struct smc91cxx_softc *sc = arg;
Index: src/sys/dev/ic/smc91cxxvar.h
diff -u src/sys/dev/ic/smc91cxxvar.h:1.20 src/sys/dev/ic/smc91cxxvar.h:1.21
--- src/sys/dev/ic/smc91cxxvar.h:1.20 Mon Apr 13 16:33:24 2015
+++ src/sys/dev/ic/smc91cxxvar.h Fri Dec 6 07:12:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: smc91cxxvar.h,v 1.20 2015/04/13 16:33:24 riastradh Exp $ */
+/* $NetBSD: smc91cxxvar.h,v 1.21 2019/12/06 07:12:38 maxv Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -66,7 +66,5 @@ struct smc91cxx_softc {
void smc91cxx_attach(struct smc91cxx_softc *, u_int8_t *);
int smc91cxx_intr(void *);
-int smc91cxx_enable(struct smc91cxx_softc *);
-void smc91cxx_disable(struct smc91cxx_softc *);
int smc91cxx_activate(device_t, enum devact);
int smc91cxx_detach(device_t, int);
Index: src/sys/dev/pci/if_txp.c
diff -u src/sys/dev/pci/if_txp.c:1.61 src/sys/dev/pci/if_txp.c:1.62
--- src/sys/dev/pci/if_txp.c:1.61 Sun Nov 10 21:16:36 2019
+++ src/sys/dev/pci/if_txp.c Fri Dec 6 07:12:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_txp.c,v 1.61 2019/11/10 21:16:36 chs Exp $ */
+/* $NetBSD: if_txp.c,v 1.62 2019/12/06 07:12:39 maxv Exp $ */
/*
* Copyright (c) 2001
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_txp.c,v 1.61 2019/11/10 21:16:36 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_txp.c,v 1.62 2019/12/06 07:12:39 maxv Exp $");
#include "opt_inet.h"
@@ -80,53 +80,52 @@ __KERNEL_RCSID(0, "$NetBSD: if_txp.c,v 1
#undef TRY_TX_UDP_CSUM
#undef TRY_TX_TCP_CSUM
-int txp_probe(device_t, cfdata_t, void *);
-void txp_attach(device_t, device_t, void *);
-int txp_intr(void *);
-void txp_tick(void *);
-bool txp_shutdown(device_t, int);
-int txp_ioctl(struct ifnet *, u_long, void *);
-void txp_start(struct ifnet *);
-void txp_stop(struct txp_softc *);
-void txp_init(struct txp_softc *);
-void txp_watchdog(struct ifnet *);
-
-int txp_chip_init(struct txp_softc *);
-int txp_reset_adapter(struct txp_softc *);
-int txp_download_fw(struct txp_softc *);
-int txp_download_fw_wait(struct txp_softc *);
-int txp_download_fw_section(struct txp_softc *,
+static int txp_probe(device_t, cfdata_t, void *);
+static void txp_attach(device_t, device_t, void *);
+static int txp_intr(void *);
+static void txp_tick(void *);
+static bool txp_shutdown(device_t, int);
+static int txp_ioctl(struct ifnet *, u_long, void *);
+static void txp_start(struct ifnet *);
+static void txp_stop(struct txp_softc *);
+static void txp_init(struct txp_softc *);
+static void txp_watchdog(struct ifnet *);
+
+static int txp_chip_init(struct txp_softc *);
+static int txp_reset_adapter(struct txp_softc *);
+static int txp_download_fw(struct txp_softc *);
+static int txp_download_fw_wait(struct txp_softc *);
+static int txp_download_fw_section(struct txp_softc *,
const struct txp_fw_section_header *, int);
-int txp_alloc_rings(struct txp_softc *);
-void txp_dma_free(struct txp_softc *, struct txp_dma_alloc *);
-int txp_dma_malloc(struct txp_softc *, bus_size_t, struct txp_dma_alloc *, int);
-void txp_set_filter(struct txp_softc *);
+static int txp_alloc_rings(struct txp_softc *);
+static void txp_dma_free(struct txp_softc *, struct txp_dma_alloc *);
+static int txp_dma_malloc(struct txp_softc *, bus_size_t, struct txp_dma_alloc *, int);
+static void txp_set_filter(struct txp_softc *);
-int txp_cmd_desc_numfree(struct txp_softc *);
-int txp_command(struct txp_softc *, uint16_t, uint16_t, uint32_t,
+static int txp_cmd_desc_numfree(struct txp_softc *);
+static int txp_command(struct txp_softc *, uint16_t, uint16_t, uint32_t,
uint32_t, uint16_t *, uint32_t *, uint32_t *, int);
-int txp_command2(struct txp_softc *, uint16_t, uint16_t,
+static int txp_command2(struct txp_softc *, uint16_t, uint16_t,
uint32_t, uint32_t, struct txp_ext_desc *, uint8_t,
struct txp_rsp_desc **, int);
-int txp_response(struct txp_softc *, uint32_t, uint16_t, uint16_t,
+static int txp_response(struct txp_softc *, uint32_t, uint16_t, uint16_t,
struct txp_rsp_desc **);
-void txp_rsp_fixup(struct txp_softc *, struct txp_rsp_desc *,
+static void txp_rsp_fixup(struct txp_softc *, struct txp_rsp_desc *,
struct txp_rsp_desc *);
-void txp_capabilities(struct txp_softc *);
+static void txp_capabilities(struct txp_softc *);
-void txp_ifmedia_sts(struct ifnet *, struct ifmediareq *);
-int txp_ifmedia_upd(struct ifnet *);
-void txp_show_descriptor(void *);
-void txp_tx_reclaim(struct txp_softc *, struct txp_tx_ring *,
+static void txp_ifmedia_sts(struct ifnet *, struct ifmediareq *);
+static int txp_ifmedia_upd(struct ifnet *);
+static void txp_tx_reclaim(struct txp_softc *, struct txp_tx_ring *,
struct txp_dma_alloc *);
-void txp_rxbuf_reclaim(struct txp_softc *);
-void txp_rx_reclaim(struct txp_softc *, struct txp_rx_ring *,
+static void txp_rxbuf_reclaim(struct txp_softc *);
+static void txp_rx_reclaim(struct txp_softc *, struct txp_rx_ring *,
struct txp_dma_alloc *);
CFATTACH_DECL_NEW(txp, sizeof(struct txp_softc), txp_probe, txp_attach,
NULL, NULL);
-const struct txp_pci_match {
+static const struct txp_pci_match {
int vid, did, flags;
} txp_devices[] = {
{ PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3CR990, 0 },
@@ -167,7 +166,7 @@ txp_pcilookup(pcireg_t id)
return (0);
}
-int
+static int
txp_probe(device_t parent, cfdata_t match, void *aux)
{
struct pci_attach_args *pa = aux;
@@ -177,7 +176,7 @@ txp_probe(device_t parent, cfdata_t matc
return (0);
}
-void
+static void
txp_attach(device_t parent, device_t self, void *aux)
{
struct txp_softc *sc = device_private(self);
@@ -358,7 +357,7 @@ cleanupintr:
}
-int
+static int
txp_chip_init(struct txp_softc *sc)
{
/* disable interrupts */
@@ -395,7 +394,7 @@ txp_chip_init(struct txp_softc *sc)
return (0);
}
-int
+static int
txp_reset_adapter(struct txp_softc *sc)
{
uint32_t r;
@@ -421,7 +420,7 @@ txp_reset_adapter(struct txp_softc *sc)
return (0);
}
-int
+static int
txp_download_fw(struct txp_softc *sc)
{
const struct txp_fw_file_header *fileheader;
@@ -497,7 +496,7 @@ txp_download_fw(struct txp_softc *sc)
return (0);
}
-int
+static int
txp_download_fw_wait(struct txp_softc *sc)
{
uint32_t i, r;
@@ -524,7 +523,7 @@ txp_download_fw_wait(struct txp_softc *s
return (0);
}
-int
+static int
txp_download_fw_section(struct txp_softc *sc,
const struct txp_fw_section_header *sect, int sectnum)
{
@@ -604,7 +603,7 @@ txp_download_fw_section(struct txp_softc
return (err);
}
-int
+static int
txp_intr(void *vsc)
{
struct txp_softc *sc = vsc;
@@ -659,7 +658,7 @@ txp_intr(void *vsc)
return (claimed);
}
-void
+static void
txp_rx_reclaim(struct txp_softc *sc, struct txp_rx_ring *r,
struct txp_dma_alloc *dma)
{
@@ -775,7 +774,7 @@ next:
*r->r_roff = htole32(woff);
}
-void
+static void
txp_rxbuf_reclaim(struct txp_softc *sc)
{
struct ifnet *ifp = &sc->sc_arpcom.ec_if;
@@ -854,7 +853,7 @@ err_sd:
/*
* Reclaim mbufs and entries from a transmit ring.
*/
-void
+static void
txp_tx_reclaim(struct txp_softc *sc, struct txp_tx_ring *r,
struct txp_dma_alloc *dma)
{
@@ -907,7 +906,7 @@ txp_tx_reclaim(struct txp_softc *sc, str
ifp->if_timer = 0;
}
-bool
+static bool
txp_shutdown(device_t self, int howto)
{
struct txp_softc *sc;
@@ -927,7 +926,7 @@ txp_shutdown(device_t self, int howto)
return true;
}
-int
+static int
txp_alloc_rings(struct txp_softc *sc)
{
struct ifnet *ifp = &sc->sc_arpcom.ec_if;
@@ -1196,7 +1195,7 @@ bail_boot:
return (-1);
}
-int
+static int
txp_dma_malloc(struct txp_softc *sc, bus_size_t size,
struct txp_dma_alloc *dma, int mapflags)
{
@@ -1231,7 +1230,7 @@ fail_0:
return (r);
}
-void
+static void
txp_dma_free(struct txp_softc *sc, struct txp_dma_alloc *dma)
{
bus_size_t mapsize = dma->dma_map->dm_mapsize;
@@ -1242,7 +1241,7 @@ txp_dma_free(struct txp_softc *sc, struc
bus_dmamap_destroy(sc->sc_dmat, dma->dma_map);
}
-int
+static int
txp_ioctl(struct ifnet *ifp, u_long command, void *data)
{
struct txp_softc *sc = ifp->if_softc;
@@ -1309,7 +1308,7 @@ txp_ioctl(struct ifnet *ifp, u_long comm
return (error);
}
-void
+static void
txp_init(struct txp_softc *sc)
{
struct ifnet *ifp = &sc->sc_arpcom.ec_if;
@@ -1341,7 +1340,7 @@ txp_init(struct txp_softc *sc)
splx(s);
}
-void
+static void
txp_tick(void *vsc)
{
struct txp_softc *sc = vsc;
@@ -1379,7 +1378,7 @@ out:
callout_schedule(&sc->sc_tick, hz);
}
-void
+static void
txp_start(struct ifnet *ifp)
{
struct txp_softc *sc = ifp->if_softc;
@@ -1554,7 +1553,7 @@ oactive1:
/*
* Handle simple commands sent to the typhoon
*/
-int
+static int
txp_command(struct txp_softc *sc, uint16_t id, uint16_t in1, uint32_t in2,
uint32_t in3, uint16_t *out1, uint32_t *out2, uint32_t *out3, int wait)
{
@@ -1576,7 +1575,7 @@ txp_command(struct txp_softc *sc, uint16
return (0);
}
-int
+static int
txp_command2(struct txp_softc *sc, uint16_t id, uint16_t in1, uint32_t in2,
uint32_t in3, struct txp_ext_desc *in_extp, uint8_t in_extn,
struct txp_rsp_desc **rspp, int wait)
@@ -1651,7 +1650,7 @@ txp_command2(struct txp_softc *sc, uint1
return (0);
}
-int
+static int
txp_response(struct txp_softc *sc, uint32_t ridx, uint16_t id, uint16_t seq,
struct txp_rsp_desc **rspp)
{
@@ -1699,7 +1698,7 @@ txp_response(struct txp_softc *sc, uint3
return (0);
}
-void
+static void
txp_rsp_fixup(struct txp_softc *sc, struct txp_rsp_desc *rsp,
struct txp_rsp_desc *dst)
{
@@ -1725,7 +1724,7 @@ txp_rsp_fixup(struct txp_softc *sc, stru
hv->hv_resp_read_idx = htole32(ridx);
}
-int
+static int
txp_cmd_desc_numfree(struct txp_softc *sc)
{
struct txp_hostvar *hv = sc->sc_hostvar;
@@ -1749,7 +1748,7 @@ txp_cmd_desc_numfree(struct txp_softc *s
return (nfree / sizeof(struct txp_cmd_desc));
}
-void
+static void
txp_stop(struct txp_softc *sc)
{
txp_command(sc, TXP_CMD_TX_DISABLE, 0, 0, 0, NULL, NULL, NULL, 1);
@@ -1759,12 +1758,12 @@ txp_stop(struct txp_softc *sc)
callout_stop(&sc->sc_tick);
}
-void
+static void
txp_watchdog(struct ifnet *ifp)
{
}
-int
+static int
txp_ifmedia_upd(struct ifnet *ifp)
{
struct txp_softc *sc = ifp->if_softc;
@@ -1801,7 +1800,7 @@ txp_ifmedia_upd(struct ifnet *ifp)
return (0);
}
-void
+static void
txp_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr)
{
struct txp_softc *sc = ifp->if_softc;
@@ -1865,7 +1864,8 @@ bail:
ifmr->ifm_status &= ~IFM_AVALID;
}
-void
+#if 0 /* XXX XXX XXX UNUSED */
+static void
txp_show_descriptor(void *d)
{
struct txp_cmd_desc *cmd = d;
@@ -1914,8 +1914,9 @@ txp_show_descriptor(void *d)
break;
}
}
+#endif
-void
+static void
txp_set_filter(struct txp_softc *sc)
{
struct ethercom *ec = &sc->sc_arpcom;
@@ -1996,7 +1997,7 @@ setit:
NULL, NULL, NULL, 1);
}
-void
+static void
txp_capabilities(struct txp_softc *sc)
{
struct ifnet *ifp = &sc->sc_arpcom.ec_if;
Index: src/sys/dev/pcmcia/if_cnw.c
diff -u src/sys/dev/pcmcia/if_cnw.c:1.66 src/sys/dev/pcmcia/if_cnw.c:1.67
--- src/sys/dev/pcmcia/if_cnw.c:1.66 Mon Oct 21 08:22:06 2019
+++ src/sys/dev/pcmcia/if_cnw.c Fri Dec 6 07:12:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cnw.c,v 1.66 2019/10/21 08:22:06 msaitoh Exp $ */
+/* $NetBSD: if_cnw.c,v 1.67 2019/12/06 07:12:39 maxv Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -105,7 +105,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cnw.c,v 1.66 2019/10/21 08:22:06 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cnw.c,v 1.67 2019/12/06 07:12:39 maxv Exp $");
#include "opt_inet.h"
@@ -173,11 +173,11 @@ int cnw_skey = CNW_SCRAMBLEKEY; /* Scra
*/
#define MEMORY_MAPPED
-int cnw_match(device_t, cfdata_t, void *);
-void cnw_attach(device_t, device_t, void *);
-int cnw_detach(device_t, int);
+static int cnw_match(device_t, cfdata_t, void *);
+static void cnw_attach(device_t, device_t, void *);
+static int cnw_detach(device_t, int);
-int cnw_activate(device_t, enum devact);
+static int cnw_activate(device_t, enum devact);
struct cnw_softc {
device_t sc_dev; /* Device glue (must be first) */
@@ -213,18 +213,17 @@ struct cnw_softc {
CFATTACH_DECL_NEW(cnw, sizeof(struct cnw_softc),
cnw_match, cnw_attach, cnw_detach, cnw_activate);
-void cnw_reset(struct cnw_softc *);
-void cnw_init(struct cnw_softc *);
-int cnw_enable(struct cnw_softc *sc);
-void cnw_disable(struct cnw_softc *sc);
-void cnw_config(struct cnw_softc *sc, u_int8_t *);
-void cnw_start(struct ifnet *);
-void cnw_transmit(struct cnw_softc *, struct mbuf *);
-struct mbuf *cnw_read(struct cnw_softc *);
-void cnw_recv(struct cnw_softc *);
-int cnw_intr(void *arg);
-int cnw_ioctl(struct ifnet *, u_long, void *);
-void cnw_watchdog(struct ifnet *);
+static void cnw_reset(struct cnw_softc *);
+static void cnw_init(struct cnw_softc *);
+static int cnw_enable(struct cnw_softc *sc);
+static void cnw_disable(struct cnw_softc *sc);
+static void cnw_start(struct ifnet *);
+static void cnw_transmit(struct cnw_softc *, struct mbuf *);
+static struct mbuf *cnw_read(struct cnw_softc *);
+static void cnw_recv(struct cnw_softc *);
+static int cnw_intr(void *arg);
+static int cnw_ioctl(struct ifnet *, u_long, void *);
+static void cnw_watchdog(struct ifnet *);
static int cnw_setdomain(struct cnw_softc *, int);
static int cnw_setkey(struct cnw_softc *, int);
@@ -324,7 +323,7 @@ cnw_cmd(struct cnw_softc *sc, int cmd, i
/*
* Reset the hardware.
*/
-void
+static void
cnw_reset(struct cnw_softc *sc)
{
#ifdef CNW_DEBUG
@@ -352,7 +351,7 @@ cnw_reset(struct cnw_softc *sc)
/*
* Initialize the card.
*/
-void
+static void
cnw_init(struct cnw_softc *sc)
{
struct ifnet *ifp = &sc->sc_ethercom.ec_if;
@@ -408,7 +407,7 @@ cnw_init(struct cnw_softc *sc)
/*
* Enable and initialize the card.
*/
-int
+static int
cnw_enable(struct cnw_softc *sc)
{
struct ifnet *ifp = &sc->sc_ethercom.ec_if;
@@ -436,7 +435,7 @@ cnw_enable(struct cnw_softc *sc)
/*
* Stop and disable the card.
*/
-void
+static void
cnw_disable(struct cnw_softc *sc)
{
struct ifnet *ifp = &sc->sc_ethercom.ec_if;
@@ -455,7 +454,7 @@ cnw_disable(struct cnw_softc *sc)
/*
* Match the hardware we handle.
*/
-int
+static int
cnw_match(device_t parent, cfdata_t match, void *aux)
{
struct pcmcia_attach_args *pa = aux;
@@ -473,7 +472,7 @@ cnw_match(device_t parent, cfdata_t matc
/*
* Attach the card.
*/
-void
+static void
cnw_attach(device_t parent, device_t self, void *aux)
{
struct cnw_softc *sc = device_private(self);
@@ -584,7 +583,7 @@ fail:
/*
* Start outputting on the interface.
*/
-void
+static void
cnw_start(struct ifnet *ifp)
{
struct cnw_softc *sc = ifp->if_softc;
@@ -682,7 +681,7 @@ cnw_start(struct ifnet *ifp)
/*
* Transmit a packet.
*/
-void
+static void
cnw_transmit(struct cnw_softc *sc, struct mbuf *m0)
{
int buffer, bufsize, bufoffset, bufptr, bufspace, len, mbytes, n;
@@ -737,7 +736,7 @@ cnw_transmit(struct cnw_softc *sc, struc
/*
* Pull a packet from the card into an mbuf chain.
*/
-struct mbuf *
+static struct mbuf *
cnw_read(struct cnw_softc *sc)
{
struct mbuf *m, *top, **mp;
@@ -823,7 +822,7 @@ cnw_read(struct cnw_softc *sc)
/*
* Handle received packets.
*/
-void
+static void
cnw_recv(struct cnw_softc *sc)
{
int rser;
@@ -858,7 +857,7 @@ cnw_recv(struct cnw_softc *sc)
/*
* Interrupt handler.
*/
-int
+static int
cnw_intr(void *arg)
{
struct cnw_softc *sc = arg;
@@ -980,7 +979,7 @@ cnw_intr(void *arg)
/*
* Handle device ioctls.
*/
-int
+static int
cnw_ioctl(struct ifnet *ifp, u_long cmd, void *data)
{
struct cnw_softc *sc = ifp->if_softc;
@@ -1115,7 +1114,7 @@ cnw_ioctl(struct ifnet *ifp, u_long cmd,
* Device timeout/watchdog routine. Entered if the device neglects to
* generate an interrupt after a transmit has been started on it.
*/
-void
+static void
cnw_watchdog(struct ifnet *ifp)
{
struct cnw_softc *sc = ifp->if_softc;
@@ -1125,7 +1124,7 @@ cnw_watchdog(struct ifnet *ifp)
cnw_init(sc);
}
-int
+static int
cnw_setdomain(struct cnw_softc *sc, int domain)
{
int s;
@@ -1141,7 +1140,7 @@ cnw_setdomain(struct cnw_softc *sc, int
return 0;
}
-int
+static int
cnw_setkey(struct cnw_softc *sc, int key)
{
int s;
@@ -1157,7 +1156,7 @@ cnw_setkey(struct cnw_softc *sc, int key
return 0;
}
-int
+static int
cnw_activate(device_t self, enum devact act)
{
struct cnw_softc *sc = device_private(self);
@@ -1171,7 +1170,7 @@ cnw_activate(device_t self, enum devact
}
}
-int
+static int
cnw_detach(device_t self, int flags)
{
struct cnw_softc *sc = device_private(self);
Index: src/sys/dev/usb/uhidev.c
diff -u src/sys/dev/usb/uhidev.c:1.75 src/sys/dev/usb/uhidev.c:1.76
--- src/sys/dev/usb/uhidev.c:1.75 Sun May 5 03:17:54 2019
+++ src/sys/dev/usb/uhidev.c Fri Dec 6 07:12:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uhidev.c,v 1.75 2019/05/05 03:17:54 mrg Exp $ */
+/* $NetBSD: uhidev.c,v 1.76 2019/12/06 07:12:39 maxv Exp $ */
/*
* Copyright (c) 2001, 2012 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.75 2019/05/05 03:17:54 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.76 2019/12/06 07:12:39 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -85,16 +85,16 @@ Static void uhidev_intr(struct usbd_xfer
Static int uhidev_maxrepid(void *, int);
Static int uhidevprint(void *, const char *);
-int uhidev_match(device_t, cfdata_t, void *);
-void uhidev_attach(device_t, device_t, void *);
-void uhidev_childdet(device_t, device_t);
-int uhidev_detach(device_t, int);
-int uhidev_activate(device_t, enum devact);
+static int uhidev_match(device_t, cfdata_t, void *);
+static void uhidev_attach(device_t, device_t, void *);
+static void uhidev_childdet(device_t, device_t);
+static int uhidev_detach(device_t, int);
+static int uhidev_activate(device_t, enum devact);
CFATTACH_DECL2_NEW(uhidev, sizeof(struct uhidev_softc), uhidev_match,
uhidev_attach, uhidev_detach, uhidev_activate, NULL, uhidev_childdet);
-int
+static int
uhidev_match(device_t parent, cfdata_t match, void *aux)
{
struct usbif_attach_arg *uiaa = aux;
@@ -113,7 +113,7 @@ uhidev_match(device_t parent, cfdata_t m
return UMATCH_IFACECLASS_GENERIC;
}
-void
+static void
uhidev_attach(device_t parent, device_t self, void *aux)
{
struct uhidev_softc *sc = device_private(self);
@@ -413,7 +413,7 @@ uhidevprint(void *aux, const char *pnp)
return UNCONF;
}
-int
+static int
uhidev_activate(device_t self, enum devact act)
{
struct uhidev_softc *sc = device_private(self);
@@ -427,7 +427,7 @@ uhidev_activate(device_t self, enum deva
}
}
-void
+static void
uhidev_childdet(device_t self, device_t child)
{
int i;
@@ -441,7 +441,7 @@ uhidev_childdet(device_t self, device_t
sc->sc_subdevs[i] = NULL;
}
-int
+static int
uhidev_detach(device_t self, int flags)
{
struct uhidev_softc *sc = device_private(self);
Index: src/sys/dev/usb/uirda.c
diff -u src/sys/dev/usb/uirda.c:1.44 src/sys/dev/usb/uirda.c:1.45
--- src/sys/dev/usb/uirda.c:1.44 Sun May 5 03:17:54 2019
+++ src/sys/dev/usb/uirda.c Fri Dec 6 07:12:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uirda.c,v 1.44 2019/05/05 03:17:54 mrg Exp $ */
+/* $NetBSD: uirda.c,v 1.45 2019/12/06 07:12:39 maxv Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.44 2019/05/05 03:17:54 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.45 2019/12/06 07:12:39 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -77,7 +77,7 @@ int uirdadebug = 0;
#define UR_IRDA_GET_DESC 0x06
#define UIRDA_NEBOFS 8
-static struct {
+static const struct {
int count;
int mask;
int header;
@@ -93,7 +93,7 @@ static struct {
};
#define UIRDA_NSPEEDS 9
-static struct {
+static const struct {
int speed;
int mask;
int header;
@@ -121,15 +121,15 @@ int uirda_get_turnarounds(void *, int *)
int uirda_poll(void *, int, struct lwp *);
int uirda_kqfilter(void *, struct knote *);
-struct irframe_methods uirda_methods = {
+static const struct irframe_methods uirda_methods = {
uirda_open, uirda_close, uirda_read, uirda_write, uirda_poll,
uirda_kqfilter, uirda_set_params, uirda_get_speeds,
uirda_get_turnarounds
};
-void uirda_rd_cb(struct usbd_xfer *xfer, void *priv,
+static void uirda_rd_cb(struct usbd_xfer *xfer, void *priv,
usbd_status status);
-usbd_status uirda_start_read(struct uirda_softc *sc);
+static usbd_status uirda_start_read(struct uirda_softc *sc);
/*
* These devices don't quite follow the spec. Speed changing is broken
@@ -862,7 +862,7 @@ uirda_get_turnarounds(void *h, int *turn
return 0;
}
-void
+static void
uirda_rd_cb(struct usbd_xfer *xfer, void *priv,
usbd_status status)
{
@@ -886,7 +886,7 @@ uirda_rd_cb(struct usbd_xfer *xfer, void
selnotify(&sc->sc_rd_sel, 0, 0);
}
-usbd_status
+static usbd_status
uirda_start_read(struct uirda_softc *sc)
{
usbd_status err;
Index: src/sys/dev/usb/umass.c
diff -u src/sys/dev/usb/umass.c:1.175 src/sys/dev/usb/umass.c:1.176
--- src/sys/dev/usb/umass.c:1.175 Sun May 5 03:17:54 2019
+++ src/sys/dev/usb/umass.c Fri Dec 6 07:12:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: umass.c,v 1.175 2019/05/05 03:17:54 mrg Exp $ */
+/* $NetBSD: umass.c,v 1.176 2019/12/06 07:12:39 maxv Exp $ */
/*
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -124,7 +124,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.175 2019/05/05 03:17:54 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.176 2019/12/06 07:12:39 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -214,11 +214,11 @@ const char *states[TSTATE_STATES+1] = {
#endif
/* USB device probe/attach/detach functions */
-int umass_match(device_t, cfdata_t, void *);
-void umass_attach(device_t, device_t, void *);
-int umass_detach(device_t, int);
+static int umass_match(device_t, cfdata_t, void *);
+static void umass_attach(device_t, device_t, void *);
+static int umass_detach(device_t, int);
static void umass_childdet(device_t, device_t);
-int umass_activate(device_t, enum devact);
+static int umass_activate(device_t, enum devact);
CFATTACH_DECL2_NEW(umass, sizeof(struct umass_softc), umass_match,
umass_attach, umass_detach, umass_activate, NULL, umass_childdet);
@@ -246,7 +246,7 @@ Static void umass_bbb_transfer(struct um
Static void umass_bbb_reset(struct umass_softc *, int);
Static void umass_bbb_state(struct usbd_xfer *, void *, usbd_status);
-usbd_status umass_bbb_get_max_lun(struct umass_softc *, uint8_t *);
+static usbd_status umass_bbb_get_max_lun(struct umass_softc *, uint8_t *);
/* CBI related functions */
Static void umass_cbi_transfer(struct umass_softc *, int, void *, int, void *,
@@ -281,7 +281,7 @@ Static void umass_dump_buffer(struct uma
* USB device probe/attach/detach
*/
-int
+static int
umass_match(device_t parent, cfdata_t match, void *aux)
{
struct usbif_attach_arg *uiaa = aux;
@@ -319,7 +319,7 @@ umass_match(device_t parent, cfdata_t ma
return UMATCH_IFACECLASS_IFACESUBCLASS_IFACEPROTO;
}
-void
+static void
umass_attach(device_t parent, device_t self, void *aux)
{
UMASSHIST_FUNC(); UMASSHIST_CALLED();
@@ -788,7 +788,7 @@ umass_childdet(device_t self, device_t c
sc->bus->sc_child = NULL;
}
-int
+static int
umass_detach(device_t self, int flags)
{
UMASSHIST_FUNC(); UMASSHIST_CALLED();
@@ -876,7 +876,7 @@ umass_detach(device_t self, int flags)
return rv;
}
-int
+static int
umass_activate(device_t dev, enum devact act)
{
UMASSHIST_FUNC(); UMASSHIST_CALLED();
@@ -1953,7 +1953,7 @@ umass_cbi_state(struct usbd_xfer *xfer,
}
}
-usbd_status
+static usbd_status
umass_bbb_get_max_lun(struct umass_softc *sc, uint8_t *maxlun)
{
UMASSHIST_FUNC(); UMASSHIST_CALLED();
Index: src/sys/dev/wscons/wsdisplay.c
diff -u src/sys/dev/wscons/wsdisplay.c:1.159 src/sys/dev/wscons/wsdisplay.c:1.160
--- src/sys/dev/wscons/wsdisplay.c:1.159 Sun Nov 10 21:16:38 2019
+++ src/sys/dev/wscons/wsdisplay.c Fri Dec 6 07:12:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay.c,v 1.159 2019/11/10 21:16:38 chs Exp $ */
+/* $NetBSD: wsdisplay.c,v 1.160 2019/12/06 07:12:39 maxv Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.159 2019/11/10 21:16:38 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.160 2019/12/06 07:12:39 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_wsdisplay_compat.h"
@@ -120,15 +120,15 @@ struct wsscreen {
#endif
};
-struct wsscreen *wsscreen_attach(struct wsdisplay_softc *, int,
+static struct wsscreen *wsscreen_attach(struct wsdisplay_softc *, int,
const char *,
const struct wsscreen_descr *, void *,
int, int, long);
-void wsscreen_detach(struct wsscreen *);
-int wsdisplay_addscreen(struct wsdisplay_softc *, int, const char *, const char *);
+static void wsscreen_detach(struct wsscreen *);
+static int wsdisplay_addscreen(struct wsdisplay_softc *, int, const char *, const char *);
static void wsdisplay_addscreen_print(struct wsdisplay_softc *, int, int);
static void wsdisplay_closescreen(struct wsdisplay_softc *, struct wsscreen *);
-int wsdisplay_delscreen(struct wsdisplay_softc *, int, int);
+static int wsdisplay_delscreen(struct wsdisplay_softc *, int, int);
#define WSDISPLAY_MAXSCREEN 8
@@ -311,7 +311,7 @@ wsscreen_getc_poll(void *priv)
}
#endif
-struct wsscreen *
+static struct wsscreen *
wsscreen_attach(struct wsdisplay_softc *sc, int console, const char *emul,
const struct wsscreen_descr *type, void *cookie, int ccol,
int crow, long defattr)
@@ -373,7 +373,7 @@ wsscreen_attach(struct wsdisplay_softc *
return (scr);
}
-void
+static void
wsscreen_detach(struct wsscreen *scr)
{
u_int ccol, crow; /* XXX */
@@ -433,7 +433,7 @@ wsdisplay_addscreen_print(struct wsdispl
aprint_verbose(")\n");
}
-int
+static int
wsdisplay_addscreen(struct wsdisplay_softc *sc, int idx,
const char *screentype, const char *emul)
{
@@ -552,7 +552,7 @@ wsdisplay_scroll(void *arg, int op)
}
#endif
-int
+static int
wsdisplay_delscreen(struct wsdisplay_softc *sc, int idx, int flags)
{
struct wsscreen *scr;
