From eb6f11e272d40e07da99c5fa9691798849365b72 Mon Sep 17 00:00:00 2001 From: phk Date: Tue, 15 Oct 2002 20:32:45 +0000 Subject: Be consistent about marking functions static. Found by: FlexeLint. --- sys/i4b/layer1/i4b_l1dmux.c | 4 ++-- sys/i4b/layer1/ihfc/i4b_ihfc_drv.c | 20 ++++++++++---------- sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c | 16 ++++++++-------- sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c | 10 +++++----- sys/i4b/layer1/isic/i4b_isic_pnp.c | 4 ++-- sys/i4b/layer1/itjc/i4b_itjc_pci.c | 4 ++-- sys/i4b/layer2/i4b_l2.c | 3 ++- 7 files changed, 31 insertions(+), 30 deletions(-) diff --git a/sys/i4b/layer1/i4b_l1dmux.c b/sys/i4b/layer1/i4b_l1dmux.c index b554aebce..645e14c 100644 --- a/sys/i4b/layer1/i4b_l1dmux.c +++ b/sys/i4b/layer1/i4b_l1dmux.c @@ -382,7 +382,7 @@ i4b_l1_mph_command_req(int unit, int command, void * parm) /*---------------------------------------------------------------------------* * L2 -> L1 data to be transmitted to hardware *---------------------------------------------------------------------------*/ -int +static int i4b_l1_ph_data_req(int unit, struct mbuf *data, int flag) { register int drv_unit = L0DRVR(l1drvunittab[unit]); @@ -402,7 +402,7 @@ i4b_l1_ph_data_req(int unit, struct mbuf *data, int flag) /*---------------------------------------------------------------------------* * L2 -> L1 activate request to hardware *---------------------------------------------------------------------------*/ -int +static int i4b_l1_ph_activate_req(int unit) { register int drv_unit = L0DRVR(l1drvunittab[unit]); diff --git a/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c b/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c index 16c8b9d..b6bec8f 100644 --- a/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c +++ b/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c @@ -967,7 +967,7 @@ ihfc_Dsel_fifo(ihfc_sc_t *sc, u_char chan, u_char flag) /*---------------------------------------------------------------------------* * Data handler for D channel(write) - chan 0 (HFC-S/SP) *---------------------------------------------------------------------------*/ -void +static void ihfc_hdlc_Dwrite (ihfc_sc_t *sc, u_char chan) { register u_int32_t sendlen; @@ -1028,7 +1028,7 @@ ihfc_hdlc_Dwrite (ihfc_sc_t *sc, u_char chan) * NOTE: Max framelength is (511 - 3) = 508 bytes, when only one frame * is received at a time. *---------------------------------------------------------------------------*/ -void +static void ihfc_hdlc_Dread (ihfc_sc_t *sc, u_char chan) { register u_char tmp = -1; @@ -1143,7 +1143,7 @@ ihfc_cmdr_hdlr (ihfc_sc_t *sc, u_char cmdr) /*---------------------------------------------------------------------------* * Data handler for D channel(write) - chan 0 (HFC-1) *---------------------------------------------------------------------------*/ -void +static void ihfc_isac_Dwrite (ihfc_sc_t *sc, u_char chan) { register u_char sendlen = 32; @@ -1195,7 +1195,7 @@ ihfc_isac_Dwrite (ihfc_sc_t *sc, u_char chan) /*---------------------------------------------------------------------------* * Data handler for D channel(read) - chan 1 (HFC-1) *---------------------------------------------------------------------------*/ -void +static void ihfc_isac_Dread (ihfc_sc_t *sc, u_char chan) { register u_char cmd = 0; @@ -1279,7 +1279,7 @@ ihfc_isac_Dread (ihfc_sc_t *sc, u_char chan) * * NOTE: No XDU checking! *---------------------------------------------------------------------------*/ -void +static void ihfc_trans_Bwrite (ihfc_sc_t *sc, u_char chan) { register u_short sendlen; @@ -1328,7 +1328,7 @@ ihfc_trans_Bwrite (ihfc_sc_t *sc, u_char chan) * Data handler for B channel(read) - chan 3 and 5 (HFC-1/S/SP) * (this code is optimized) *---------------------------------------------------------------------------*/ -void +static void ihfc_trans_Bread (ihfc_sc_t *sc, u_char chan) { register u_short reclen; @@ -1390,7 +1390,7 @@ ihfc_trans_Bread (ihfc_sc_t *sc, u_char chan) * * NOTE: Software HDLC encoding! *---------------------------------------------------------------------------*/ -void +static void ihfc_hdlc_Bwrite (ihfc_sc_t *sc, u_char chan) { register u_short blevel = S_HDLC_BLEVEL; @@ -1474,7 +1474,7 @@ ihfc_hdlc_Bwrite (ihfc_sc_t *sc, u_char chan) * * NOTE: Software HDLC decoding! *---------------------------------------------------------------------------*/ -void +static void ihfc_hdlc_Bread (ihfc_sc_t *sc, u_char chan) { register u_char blevel = S_HDLC_BLEVEL; @@ -1580,7 +1580,7 @@ ihfc_hdlc_Bread (ihfc_sc_t *sc, u_char chan) * * NOTE: This filter is only for testing purpose. *---------------------------------------------------------------------------*/ -void +static void ihfc_test_Bwrite (ihfc_sc_t *sc, u_char chan) { struct mbuf *m; @@ -1646,7 +1646,7 @@ ihfc_test_Bwrite (ihfc_sc_t *sc, u_char chan) * * NOTE: This filter is only for testing purpose. *---------------------------------------------------------------------------*/ -void +static void ihfc_test_Bread (ihfc_sc_t *sc, u_char chan) { static u_short toterrors = 0; diff --git a/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c b/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c index 11dc25a..c5c3d47 100644 --- a/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c +++ b/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c @@ -100,7 +100,7 @@ struct i4b_l1mux_func ihfc_l1mux_func = { * NOTE: We may get called here from ihfc_hdlc_Dread or isac_hdlc_Dread * via the upper layers. *---------------------------------------------------------------------------*/ -int +static int ihfc_ph_data_req(int unit, struct mbuf *m, int freeflag) { ihfc_sc_t *sc = &ihfc_softc[unit]; @@ -148,7 +148,7 @@ ihfc_ph_data_req(int unit, struct mbuf *m, int freeflag) /*---------------------------------------------------------------------------* * L2 -> L1: PH-ACTIVATE-REQUEST (B-channel and D-channel) *---------------------------------------------------------------------------*/ -int +static int ihfc_ph_activate_req(int unit) { ihfc_sc_t *sc = &ihfc_softc[unit]; @@ -172,7 +172,7 @@ ihfc_ph_activate_req(int unit) /*---------------------------------------------------------------------------* * T3 timeout - persistant deactivation *---------------------------------------------------------------------------*/ -void +static void ihfc_T3_expired(ihfc_sc_t *sc) { u_char chan = 0; @@ -198,7 +198,7 @@ ihfc_T3_expired(ihfc_sc_t *sc) /*---------------------------------------------------------------------------* * Command from the upper layers (B-channel and D-channel) *---------------------------------------------------------------------------*/ -int +static int ihfc_mph_command_req(int unit, int command, void *parm) { ihfc_sc_t *sc = &ihfc_softc[unit]; @@ -407,7 +407,7 @@ ihfc_B_setup(int unit, int chan, int bprot, int activate) * NOTE: if "chan" variable is corrupted, it will not cause any harm, * but data may be lost and there may be software sync. errors. *---------------------------------------------------------------------------*/ -void +static void ihfc_B_start(int unit, int chan) { ihfc_sc_t *sc = &ihfc_softc[unit]; @@ -434,7 +434,7 @@ ihfc_B_start(int unit, int chan) /*---------------------------------------------------------------------------* * Fill statistics struct (B-channel) *---------------------------------------------------------------------------*/ -void +static void ihfc_B_stat(int unit, int chan, bchan_statistics_t *bsp) { ihfc_sc_t *sc = &ihfc_softc[unit]; @@ -458,7 +458,7 @@ ihfc_B_stat(int unit, int chan, bchan_statistics_t *bsp) /*---------------------------------------------------------------------------* * Return the address of IHFC linktab to I4B (B-channel) *---------------------------------------------------------------------------*/ -isdn_link_t * +static isdn_link_t * ihfc_B_ret_linktab(int unit, int channel) { ihfc_sc_t *sc = &ihfc_softc[unit]; @@ -472,7 +472,7 @@ ihfc_B_ret_linktab(int unit, int channel) /*---------------------------------------------------------------------------* * Set the I4B driver linktab for IHFC use (B-channel) *---------------------------------------------------------------------------*/ -void +static void ihfc_B_set_linktab(int unit, int channel, drvr_link_t *B_linktab) { ihfc_sc_t *sc = &ihfc_softc[unit]; diff --git a/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c b/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c index f97f50d..3f07375 100644 --- a/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c +++ b/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c @@ -138,7 +138,7 @@ DRIVER_MODULE(ihfcpnp, isa, ihfc_pnp_driver, ihfc_devclass, 0, 0); /*---------------------------------------------------------------------------* * probe for ISA "PnP" card *---------------------------------------------------------------------------*/ -int +static int ihfc_pnp_probe(device_t dev) { u_int unit = device_get_unit(dev); /* get unit */ @@ -237,7 +237,7 @@ ihfc_pnp_probe(device_t dev) /*---------------------------------------------------------------------------* * probe for "ISA" cards *---------------------------------------------------------------------------*/ -int +static int ihfc_isa_probe(device_t dev) { u_int unit = device_get_unit(dev); /* get unit */ @@ -329,7 +329,7 @@ ihfc_isa_probe(device_t dev) /*---------------------------------------------------------------------------* * attach ISA "PnP" card *---------------------------------------------------------------------------*/ -int +static int ihfc_pnp_attach(device_t dev) { u_int unit = device_get_unit(dev); /* get unit */ @@ -357,7 +357,7 @@ ihfc_pnp_attach(device_t dev) /*---------------------------------------------------------------------------* * shutdown for our ISA PnP card *---------------------------------------------------------------------------*/ -int +static int ihfc_pnp_shutdown(device_t dev) { u_int unit = device_get_unit(dev); /* get unit */ @@ -387,7 +387,7 @@ ihfc_pnp_shutdown(device_t dev) * * flag: bit[0] set: teardown interrupt handler too *---------------------------------------------------------------------------*/ -int +static int ihfc_pnp_detach (device_t dev, u_int flag) { u_int unit = device_get_unit(dev); /* get unit */ diff --git a/sys/i4b/layer1/isic/i4b_isic_pnp.c b/sys/i4b/layer1/isic/i4b_isic_pnp.c index dc6c70c..c5c3b5f 100644 --- a/sys/i4b/layer1/isic/i4b_isic_pnp.c +++ b/sys/i4b/layer1/isic/i4b_isic_pnp.c @@ -132,7 +132,7 @@ DRIVER_MODULE(isicpnp, isa, isic_pnp_driver, isic_devclass, 0, 0); /*---------------------------------------------------------------------------* * probe for ISA PnP cards *---------------------------------------------------------------------------*/ -int +static int isic_pnp_probe(device_t dev) { struct isic_pnp_ids *ids; /* pnp id's */ @@ -164,7 +164,7 @@ isic_pnp_probe(device_t dev) /*---------------------------------------------------------------------------* * attach for ISA PnP cards *---------------------------------------------------------------------------*/ -int +static int isic_pnp_attach(device_t dev) { u_int32_t vend_id = isa_get_vendorid(dev); /* vendor id */ diff --git a/sys/i4b/layer1/itjc/i4b_itjc_pci.c b/sys/i4b/layer1/itjc/i4b_itjc_pci.c index d528f62..bdb512e 100644 --- a/sys/i4b/layer1/itjc/i4b_itjc_pci.c +++ b/sys/i4b/layer1/itjc/i4b_itjc_pci.c @@ -601,7 +601,7 @@ itjc_dma_start(struct l1_softc *sc) /*---------------------------------------------------------------------------* * itjc_dma_stop - Stop the Tiger DMA engine. *---------------------------------------------------------------------------*/ -void +static void itjc_dma_stop(struct l1_softc *sc) { dma_context_t *ctx = &dma_context[sc->sc_unit]; @@ -1499,7 +1499,7 @@ static int itjc_probe(device_t dev) /*---------------------------------------------------------------------------* * itjc_attach - attach a (previously probed) card. *---------------------------------------------------------------------------*/ -int +static int itjc_attach(device_t dev) { bus_space_handle_t h; diff --git a/sys/i4b/layer2/i4b_l2.c b/sys/i4b/layer2/i4b_l2.c index d37d5f3..ce8fa08 100644 --- a/sys/i4b/layer2/i4b_l2.c +++ b/sys/i4b/layer2/i4b_l2.c @@ -311,7 +311,8 @@ i4b_mph_status_ind(int unit, int status, int parm) /*---------------------------------------------------------------------------* * MDL_COMMAND_REQ from layer 3 *---------------------------------------------------------------------------*/ -int i4b_mdl_command_req(int unit, int command, void * parm) +static int +i4b_mdl_command_req(int unit, int command, void * parm) { NDBGL2(L2_PRIM, "unit %d, command=%d, parm=%d", unit, command, (unsigned int)parm); -- cgit v1.1