diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c index d854a446b7a7..fb775f7726e8 100644 --- a/sys/dev/dc/if_dc.c +++ b/sys/dev/dc/if_dc.c @@ -320,7 +320,8 @@ DRIVER_MODULE(miibus, dc, miibus_driver, miibus_devclass, 0, 0); #define IS_MPSAFE 0 -static void dc_delay(sc) +static void +dc_delay(sc) struct dc_softc *sc; { int idx; @@ -329,7 +330,8 @@ static void dc_delay(sc) CSR_READ_4(sc, DC_BUSCTL); } -static void dc_eeprom_idle(sc) +static void +dc_eeprom_idle(sc) struct dc_softc *sc; { register int i; @@ -362,7 +364,8 @@ static void dc_eeprom_idle(sc) /* * Send a read command and address to the EEPROM, check for ACK. */ -static void dc_eeprom_putbyte(sc, addr) +static void +dc_eeprom_putbyte(sc, addr) struct dc_softc *sc; int addr; { @@ -402,7 +405,8 @@ static void dc_eeprom_putbyte(sc, addr) * The PNIC 82c168/82c169 has its own non-standard way to read * the EEPROM. */ -static void dc_eeprom_getword_pnic(sc, addr, dest) +static void +dc_eeprom_getword_pnic(sc, addr, dest) struct dc_softc *sc; int addr; u_int16_t *dest; @@ -429,7 +433,8 @@ static void dc_eeprom_getword_pnic(sc, addr, dest) * The Xircom X3201 has its own non-standard way to read * the EEPROM, too. */ -static void dc_eeprom_getword_xircom(sc, addr, dest) +static void +dc_eeprom_getword_xircom(sc, addr, dest) struct dc_softc *sc; int addr; u_int16_t *dest; @@ -450,7 +455,8 @@ static void dc_eeprom_getword_xircom(sc, addr, dest) /* * Read a word of data stored in the EEPROM at address 'addr.' */ -static void dc_eeprom_getword(sc, addr, dest) +static void +dc_eeprom_getword(sc, addr, dest) struct dc_softc *sc; int addr; u_int16_t *dest; @@ -500,7 +506,8 @@ static void dc_eeprom_getword(sc, addr, dest) /* * Read a sequence of words from the EEPROM. */ -static void dc_read_eeprom(sc, dest, off, cnt, swap) +static void +dc_read_eeprom(sc, dest, off, cnt, swap) struct dc_softc *sc; caddr_t dest; int off; @@ -534,7 +541,8 @@ static void dc_read_eeprom(sc, dest, off, cnt, swap) /* * Write a bit to the MII bus. */ -static void dc_mii_writebit(sc, bit) +static void +dc_mii_writebit(sc, bit) struct dc_softc *sc; int bit; { @@ -553,7 +561,8 @@ static void dc_mii_writebit(sc, bit) /* * Read a bit from the MII bus. */ -static int dc_mii_readbit(sc) +static int +dc_mii_readbit(sc) struct dc_softc *sc; { CSR_WRITE_4(sc, DC_SIO, DC_SIO_ROMCTL_READ|DC_SIO_MII_DIR); @@ -569,7 +578,8 @@ static int dc_mii_readbit(sc) /* * Sync the PHYs by setting data bit and strobing the clock 32 times. */ -static void dc_mii_sync(sc) +static void +dc_mii_sync(sc) struct dc_softc *sc; { register int i; @@ -585,7 +595,8 @@ static void dc_mii_sync(sc) /* * Clock a series of bits through the MII. */ -static void dc_mii_send(sc, bits, cnt) +static void +dc_mii_send(sc, bits, cnt) struct dc_softc *sc; u_int32_t bits; int cnt; @@ -599,7 +610,8 @@ static void dc_mii_send(sc, bits, cnt) /* * Read an PHY register through the MII. */ -static int dc_mii_readreg(sc, frame) +static int +dc_mii_readreg(sc, frame) struct dc_softc *sc; struct dc_mii_frame *frame; @@ -671,7 +683,8 @@ static int dc_mii_readreg(sc, frame) /* * Write to a PHY register through the MII. */ -static int dc_mii_writereg(sc, frame) +static int +dc_mii_writereg(sc, frame) struct dc_softc *sc; struct dc_mii_frame *frame; @@ -706,7 +719,8 @@ static int dc_mii_writereg(sc, frame) return(0); } -static int dc_miibus_readreg(dev, phy, reg) +static int +dc_miibus_readreg(dev, phy, reg) device_t dev; int phy, reg; { @@ -829,7 +843,8 @@ static int dc_miibus_readreg(dev, phy, reg) return(frame.mii_data); } -static int dc_miibus_writereg(dev, phy, reg, data) +static int +dc_miibus_writereg(dev, phy, reg, data) device_t dev; int phy, reg, data; { @@ -905,7 +920,8 @@ static int dc_miibus_writereg(dev, phy, reg, data) return(0); } -static void dc_miibus_statchg(dev) +static void +dc_miibus_statchg(dev) device_t dev; { struct dc_softc *sc; @@ -938,7 +954,8 @@ static void dc_miibus_statchg(dev) * the driver has to just 'know' about the additional mode and deal * with it itself. *sigh* */ -static void dc_miibus_mediainit(dev) +static void +dc_miibus_mediainit(dev) device_t dev; { struct dc_softc *sc; @@ -963,7 +980,8 @@ static void dc_miibus_mediainit(dev) #define DC_BITS_128 7 #define DC_BITS_64 6 -static u_int32_t dc_crc_le(sc, addr) +static u_int32_t +dc_crc_le(sc, addr) struct dc_softc *sc; caddr_t addr; { @@ -1003,7 +1021,8 @@ static u_int32_t dc_crc_le(sc, addr) /* * Calculate CRC of a multicast group address, return the lower 6 bits. */ -static u_int32_t dc_crc_be(addr) +static u_int32_t +dc_crc_be(addr) caddr_t addr; { u_int32_t crc, carry; @@ -1038,7 +1057,8 @@ static u_int32_t dc_crc_be(addr) * frames. We also sneak the broadcast address into the hash filter since * we need that too. */ -void dc_setfilt_21143(sc) +void +dc_setfilt_21143(sc) struct dc_softc *sc; { struct dc_desc *sframe; @@ -1107,7 +1127,8 @@ void dc_setfilt_21143(sc) return; } -void dc_setfilt_admtek(sc) +void +dc_setfilt_admtek(sc) struct dc_softc *sc; { struct ifnet *ifp; @@ -1160,7 +1181,8 @@ void dc_setfilt_admtek(sc) return; } -void dc_setfilt_asix(sc) +void +dc_setfilt_asix(sc) struct dc_softc *sc; { struct ifnet *ifp; @@ -1230,7 +1252,8 @@ void dc_setfilt_asix(sc) return; } -void dc_setfilt_xircom(sc) +void +dc_setfilt_xircom(sc) struct dc_softc *sc; { struct dc_desc *sframe; @@ -1300,7 +1323,8 @@ void dc_setfilt_xircom(sc) return; } -static void dc_setfilt(sc) +static void +dc_setfilt(sc) struct dc_softc *sc; { if (DC_IS_INTEL(sc) || DC_IS_MACRONIX(sc) || DC_IS_PNIC(sc) || @@ -1324,7 +1348,8 @@ static void dc_setfilt(sc) * 'full-duplex' and '100Mbps' bits in the netconfig register, we * first have to put the transmit and/or receive logic in the idle state. */ -static void dc_setcfg(sc, media) +static void +dc_setcfg(sc, media) struct dc_softc *sc; int media; { @@ -1473,7 +1498,8 @@ static void dc_setcfg(sc, media) return; } -static void dc_reset(sc) +static void +dc_reset(sc) struct dc_softc *sc; { register int i; @@ -1518,7 +1544,8 @@ static void dc_reset(sc) return; } -static struct dc_type *dc_devtype(dev) +static struct dc_type * +dc_devtype(dev) device_t dev; { struct dc_type *t; @@ -1569,7 +1596,8 @@ static struct dc_type *dc_devtype(dev) * chips and the 98725, as well as the ASIX and ADMtek chips. In some * cases, the exact chip revision affects driver behavior. */ -static int dc_probe(dev) +static int +dc_probe(dev) device_t dev; { struct dc_type *t; @@ -1584,7 +1612,8 @@ static int dc_probe(dev) return(ENXIO); } -static void dc_acpi(dev) +static void +dc_acpi(dev) device_t dev; { int unit; @@ -1614,7 +1643,8 @@ static void dc_acpi(dev) return; } -static void dc_apply_fixup(sc, media) +static void +dc_apply_fixup(sc, media) struct dc_softc *sc; int media; { @@ -1647,7 +1677,8 @@ static void dc_apply_fixup(sc, media) return; } -static void dc_decode_leaf_sia(sc, l) +static void +dc_decode_leaf_sia(sc, l) struct dc_softc *sc; struct dc_eblock_sia *l; { @@ -1678,7 +1709,8 @@ static void dc_decode_leaf_sia(sc, l) return; } -static void dc_decode_leaf_sym(sc, l) +static void +dc_decode_leaf_sym(sc, l) struct dc_softc *sc; struct dc_eblock_sym *l; { @@ -1703,7 +1735,8 @@ static void dc_decode_leaf_sym(sc, l) return; } -static void dc_decode_leaf_mii(sc, l) +static void +dc_decode_leaf_mii(sc, l) struct dc_softc *sc; struct dc_eblock_mii *l; { @@ -1730,7 +1763,8 @@ static void dc_decode_leaf_mii(sc, l) return; } -static void dc_parse_21143_srom(sc) +static void +dc_parse_21143_srom(sc) struct dc_softc *sc; { struct dc_leaf_hdr *lhdr; @@ -1770,7 +1804,8 @@ static void dc_parse_21143_srom(sc) * Attach the interface. Allocate softc structures, do ifmedia * setup and ethernet/BPF attach. */ -static int dc_attach(dev) +static int +dc_attach(dev) device_t dev; { int tmp = 0; @@ -2176,7 +2211,8 @@ static int dc_attach(dev) return(error); } -static int dc_detach(dev) +static int +dc_detach(dev) device_t dev; { struct dc_softc *sc; @@ -2218,7 +2254,8 @@ static int dc_detach(dev) /* * Initialize the transmit descriptors. */ -static int dc_list_tx_init(sc) +static int +dc_list_tx_init(sc) struct dc_softc *sc; { struct dc_chain_data *cd; @@ -2246,7 +2283,8 @@ static int dc_list_tx_init(sc) * we arrange the descriptors in a closed ring, so that the last descriptor * points back to the first. */ -static int dc_list_rx_init(sc) +static int +dc_list_rx_init(sc) struct dc_softc *sc; { struct dc_chain_data *cd; @@ -2271,7 +2309,8 @@ static int dc_list_rx_init(sc) /* * Initialize an RX descriptor and attach an MBUF cluster. */ -static int dc_newbuf(sc, i, m) +static int +dc_newbuf(sc, i, m) struct dc_softc *sc; int i; struct mbuf *m; @@ -2369,7 +2408,8 @@ static int dc_newbuf(sc, i, m) */ #define DC_WHOLEFRAME (DC_RXSTAT_FIRSTFRAG|DC_RXSTAT_LASTFRAG) -static void dc_pnic_rx_bug_war(sc, idx) +static void +dc_pnic_rx_bug_war(sc, idx) struct dc_softc *sc; int idx; { @@ -2438,7 +2478,8 @@ static void dc_pnic_rx_bug_war(sc, idx) * should still be getting RX DONE interrupts to drive the search * for new packets in the RX ring, so we should catch up eventually. */ -static int dc_rx_resync(sc) +static int +dc_rx_resync(sc) struct dc_softc *sc; { int i, pos; @@ -2467,7 +2508,8 @@ static int dc_rx_resync(sc) * A frame has been uploaded: pass the resulting mbuf chain up to * the higher level protocols. */ -static void dc_rxeof(sc) +static void +dc_rxeof(sc) struct dc_softc *sc; { struct ether_header *eh; @@ -2584,7 +2626,8 @@ static void dc_rxeof(sc) * the list buffers. */ -static void dc_txeof(sc) +static void +dc_txeof(sc) struct dc_softc *sc; { struct dc_desc *cur_tx = NULL; @@ -2686,7 +2729,8 @@ static void dc_txeof(sc) return; } -static void dc_tick(xsc) +static void +dc_tick(xsc) void *xsc; { struct dc_softc *sc; @@ -2765,7 +2809,8 @@ static void dc_tick(xsc) * A transmit underrun has occurred. Back off the transmit threshold, * or switch to store and forward mode if we have to. */ -static void dc_tx_underrun(sc) +static void +dc_tx_underrun(sc) struct dc_softc *sc; { u_int32_t isr; @@ -2866,7 +2911,8 @@ dc_poll(struct ifnet *ifp, enum poll_cmd cmd, int count) } #endif /* DEVICE_POLLING */ -static void dc_intr(arg) +static void +dc_intr(arg) void *arg; { struct dc_softc *sc; @@ -2969,7 +3015,8 @@ static void dc_intr(arg) * Encapsulate an mbuf chain in a descriptor by coupling the mbuf data * pointers to the fragment pointers. */ -static int dc_encap(sc, m_head, txidx) +static int +dc_encap(sc, m_head, txidx) struct dc_softc *sc; struct mbuf *m_head; u_int32_t *txidx; @@ -3034,7 +3081,8 @@ static int dc_encap(sc, m_head, txidx) * Needed for some really badly behaved chips that just can't * do scatter/gather correctly. */ -static int dc_coal(sc, m_head) +static int +dc_coal(sc, m_head) struct dc_softc *sc; struct mbuf **m_head; { @@ -3066,7 +3114,8 @@ static int dc_coal(sc, m_head) * physical addresses. */ -static void dc_start(ifp) +static void +dc_start(ifp) struct ifnet *ifp; { struct dc_softc *sc; @@ -3138,7 +3187,8 @@ static void dc_start(ifp) return; } -static void dc_init(xsc) +static void +dc_init(xsc) void *xsc; { struct dc_softc *sc = xsc; @@ -3330,7 +3380,8 @@ static void dc_init(xsc) /* * Set media options. */ -static int dc_ifmedia_upd(ifp) +static int +dc_ifmedia_upd(ifp) struct ifnet *ifp; { struct dc_softc *sc; @@ -3354,7 +3405,8 @@ static int dc_ifmedia_upd(ifp) /* * Report current media status. */ -static void dc_ifmedia_sts(ifp, ifmr) +static void +dc_ifmedia_sts(ifp, ifmr) struct ifnet *ifp; struct ifmediareq *ifmr; { @@ -3379,7 +3431,8 @@ static void dc_ifmedia_sts(ifp, ifmr) return; } -static int dc_ioctl(ifp, command, data) +static int +dc_ioctl(ifp, command, data) struct ifnet *ifp; u_long command; caddr_t data; @@ -3442,7 +3495,8 @@ static int dc_ioctl(ifp, command, data) return(error); } -static void dc_watchdog(ifp) +static void +dc_watchdog(ifp) struct ifnet *ifp; { struct dc_softc *sc; @@ -3470,7 +3524,8 @@ static void dc_watchdog(ifp) * Stop the adapter and free any mbufs allocated to the * RX and TX lists. */ -static void dc_stop(sc) +static void +dc_stop(sc) struct dc_softc *sc; { register int i; @@ -3534,7 +3589,8 @@ static void dc_stop(sc) * settings in case the BIOS doesn't restore them properly on * resume. */ -static int dc_suspend(dev) +static int +dc_suspend(dev) device_t dev; { register int i; @@ -3565,7 +3621,8 @@ static int dc_suspend(dev) * doesn't, re-enable busmastering, and restart the interface if * appropriate. */ -static int dc_resume(dev) +static int +dc_resume(dev) device_t dev; { register int i; @@ -3606,7 +3663,8 @@ static int dc_resume(dev) * Stop all chip I/O so that the kernel's probe routines don't * get confused by errant DMAs when rebooting. */ -static void dc_shutdown(dev) +static void +dc_shutdown(dev) device_t dev; { struct dc_softc *sc; diff --git a/sys/dev/sf/if_sf.c b/sys/dev/sf/if_sf.c index 6322a3b37671..358507c4ab34 100644 --- a/sys/dev/sf/if_sf.c +++ b/sys/dev/sf/if_sf.c @@ -216,7 +216,8 @@ DRIVER_MODULE(miibus, sf, miibus_driver, miibus_devclass, 0, 0); #define SF_CLRBIT(sc, reg, x) \ csr_write_4(sc, reg, csr_read_4(sc, reg) & ~x) -static u_int32_t csr_read_4(sc, reg) +static u_int32_t +csr_read_4(sc, reg) struct sf_softc *sc; int reg; { @@ -232,7 +233,8 @@ static u_int32_t csr_read_4(sc, reg) return(val); } -static u_int8_t sf_read_eeprom(sc, reg) +static u_int8_t +sf_read_eeprom(sc, reg) struct sf_softc *sc; int reg; { @@ -244,7 +246,8 @@ static u_int8_t sf_read_eeprom(sc, reg) return(val); } -static void csr_write_4(sc, reg, val) +static void +csr_write_4(sc, reg, val) struct sf_softc *sc; int reg; u_int32_t val; @@ -258,7 +261,8 @@ static void csr_write_4(sc, reg, val) return; } -static u_int32_t sf_calchash(addr) +static u_int32_t +sf_calchash(addr) caddr_t addr; { u_int32_t crc, carry; @@ -288,7 +292,8 @@ static u_int32_t sf_calchash(addr) * offset 'idx.' The perfect filter only has 16 entries so do * some sanity tests. */ -static int sf_setperf(sc, idx, mac) +static int +sf_setperf(sc, idx, mac) struct sf_softc *sc; int idx; caddr_t mac; @@ -318,7 +323,8 @@ static int sf_setperf(sc, idx, mac) * specified mac address 'mac.' If 'prio' is nonzero, update the * priority hash table instead of the filter hash table. */ -static int sf_sethash(sc, mac, prio) +static int +sf_sethash(sc, mac, prio) struct sf_softc *sc; caddr_t mac; int prio; @@ -345,7 +351,8 @@ static int sf_sethash(sc, mac, prio) /* * Set a VLAN tag in the receive filter. */ -static int sf_setvlan(sc, idx, vlan) +static int +sf_setvlan(sc, idx, vlan) struct sf_softc *sc; int idx; u_int32_t vlan; @@ -360,7 +367,8 @@ static int sf_setvlan(sc, idx, vlan) } #endif -static int sf_miibus_readreg(dev, phy, reg) +static int +sf_miibus_readreg(dev, phy, reg) device_t dev; int phy, reg; { @@ -385,7 +393,8 @@ static int sf_miibus_readreg(dev, phy, reg) return(val & 0x0000FFFF); } -static int sf_miibus_writereg(dev, phy, reg, val) +static int +sf_miibus_writereg(dev, phy, reg, val) device_t dev; int phy, reg, val; { @@ -406,7 +415,8 @@ static int sf_miibus_writereg(dev, phy, reg, val) return(0); } -static void sf_miibus_statchg(dev) +static void +sf_miibus_statchg(dev) device_t dev; { struct sf_softc *sc; @@ -426,7 +436,8 @@ static void sf_miibus_statchg(dev) return; } -static void sf_setmulti(sc) +static void +sf_setmulti(sc) struct sf_softc *sc; { struct ifnet *ifp; @@ -475,7 +486,8 @@ static void sf_setmulti(sc) /* * Set media options. */ -static int sf_ifmedia_upd(ifp) +static int +sf_ifmedia_upd(ifp) struct ifnet *ifp; { struct sf_softc *sc; @@ -497,7 +509,8 @@ static int sf_ifmedia_upd(ifp) /* * Report current media status. */ -static void sf_ifmedia_sts(ifp, ifmr) +static void +sf_ifmedia_sts(ifp, ifmr) struct ifnet *ifp; struct ifmediareq *ifmr; { @@ -514,7 +527,8 @@ static void sf_ifmedia_sts(ifp, ifmr) return; } -static int sf_ioctl(ifp, command, data) +static int +sf_ioctl(ifp, command, data) struct ifnet *ifp; u_long command; caddr_t data; @@ -571,7 +585,8 @@ static int sf_ioctl(ifp, command, data) return(error); } -static void sf_reset(sc) +static void +sf_reset(sc) struct sf_softc *sc; { register int i; @@ -603,7 +618,8 @@ static void sf_reset(sc) * We also check the subsystem ID so that we can identify exactly which * NIC has been found, if possible. */ -static int sf_probe(dev) +static int +sf_probe(dev) device_t dev; { struct sf_type *t; @@ -658,7 +674,8 @@ static int sf_probe(dev) * Attach the interface. Allocate softc structures, do ifmedia * setup and ethernet/BPF attach. */ -static int sf_attach(dev) +static int +sf_attach(dev) device_t dev; { int i; @@ -827,7 +844,8 @@ static int sf_attach(dev) return(error); } -static int sf_detach(dev) +static int +sf_detach(dev) device_t dev; { struct sf_softc *sc; @@ -855,7 +873,8 @@ static int sf_detach(dev) return(0); } -static int sf_init_rx_ring(sc) +static int +sf_init_rx_ring(sc) struct sf_softc *sc; { struct sf_list_data *ld; @@ -876,7 +895,8 @@ static int sf_init_rx_ring(sc) return(0); } -static void sf_init_tx_ring(sc) +static void +sf_init_tx_ring(sc) struct sf_softc *sc; { struct sf_list_data *ld; @@ -900,7 +920,8 @@ static void sf_init_tx_ring(sc) return; } -static int sf_newbuf(sc, c, m) +static int +sf_newbuf(sc, c, m) struct sf_softc *sc; struct sf_rx_bufdesc_type0 *c; struct mbuf *m; @@ -952,7 +973,8 @@ static int sf_newbuf(sc, c, m) * packets into properly aligned buffers before handing them off. */ -static void sf_rxeof(sc) +static void +sf_rxeof(sc) struct sf_softc *sc; { struct ether_header *eh; @@ -1019,7 +1041,8 @@ static void sf_rxeof(sc) * gives the impression that it should match the producer/consumer * index, which is the offset in 8 byte blocks. */ -static void sf_txeof(sc) +static void +sf_txeof(sc) struct sf_softc *sc; { int txcons, cmpprodidx, cmpconsidx; @@ -1064,7 +1087,8 @@ static void sf_txeof(sc) return; } -static void sf_txthresh_adjust(sc) +static void +sf_txthresh_adjust(sc) struct sf_softc *sc; { u_int32_t txfctl; @@ -1087,7 +1111,8 @@ static void sf_txthresh_adjust(sc) return; } -static void sf_intr(arg) +static void +sf_intr(arg) void *arg; { struct sf_softc *sc; @@ -1146,7 +1171,8 @@ static void sf_intr(arg) return; } -static void sf_init(xsc) +static void +sf_init(xsc) void *xsc; { struct sf_softc *sc; @@ -1260,7 +1286,8 @@ static void sf_init(xsc) return; } -static int sf_encap(sc, c, m_head) +static int +sf_encap(sc, c, m_head) struct sf_softc *sc; struct sf_tx_bufdesc_type0 *c; struct mbuf *m_head; @@ -1323,7 +1350,8 @@ static int sf_encap(sc, c, m_head) return(0); } -static void sf_start(ifp) +static void +sf_start(ifp) struct ifnet *ifp; { struct sf_softc *sc; @@ -1405,7 +1433,8 @@ static void sf_start(ifp) return; } -static void sf_stop(sc) +static void +sf_stop(sc) struct sf_softc *sc; { int i; @@ -1457,7 +1486,8 @@ static void sf_stop(sc) * indirect data register, the contents of the address register could * be changed out from under us. */ -static void sf_stats_update(xsc) +static void +sf_stats_update(xsc) void *xsc; { struct sf_softc *sc; @@ -1500,7 +1530,8 @@ static void sf_stats_update(xsc) return; } -static void sf_watchdog(ifp) +static void +sf_watchdog(ifp) struct ifnet *ifp; { struct sf_softc *sc; @@ -1524,7 +1555,8 @@ static void sf_watchdog(ifp) return; } -static void sf_shutdown(dev) +static void +sf_shutdown(dev) device_t dev; { struct sf_softc *sc; diff --git a/sys/dev/sk/if_sk.c b/sys/dev/sk/if_sk.c index adb523cdec6b..47f0cafce1a1 100644 --- a/sys/dev/sk/if_sk.c +++ b/sys/dev/sk/if_sk.c @@ -257,7 +257,8 @@ DRIVER_MODULE(miibus, sk, miibus_driver, miibus_devclass, 0, 0); #define SK_WIN_CLRBIT_2(sc, reg, x) \ sk_win_write_2(sc, reg, sk_win_read_2(sc, reg) & ~x) -static u_int32_t sk_win_read_4(sc, reg) +static u_int32_t +sk_win_read_4(sc, reg) struct sk_softc *sc; int reg; { @@ -265,7 +266,8 @@ static u_int32_t sk_win_read_4(sc, reg) return(CSR_READ_4(sc, SK_WIN_BASE + SK_REG(reg))); } -static u_int16_t sk_win_read_2(sc, reg) +static u_int16_t +sk_win_read_2(sc, reg) struct sk_softc *sc; int reg; { @@ -273,7 +275,8 @@ static u_int16_t sk_win_read_2(sc, reg) return(CSR_READ_2(sc, SK_WIN_BASE + SK_REG(reg))); } -static u_int8_t sk_win_read_1(sc, reg) +static u_int8_t +sk_win_read_1(sc, reg) struct sk_softc *sc; int reg; { @@ -281,7 +284,8 @@ static u_int8_t sk_win_read_1(sc, reg) return(CSR_READ_1(sc, SK_WIN_BASE + SK_REG(reg))); } -static void sk_win_write_4(sc, reg, val) +static void +sk_win_write_4(sc, reg, val) struct sk_softc *sc; int reg; u_int32_t val; @@ -291,7 +295,8 @@ static void sk_win_write_4(sc, reg, val) return; } -static void sk_win_write_2(sc, reg, val) +static void +sk_win_write_2(sc, reg, val) struct sk_softc *sc; int reg; u_int32_t val; @@ -301,7 +306,8 @@ static void sk_win_write_2(sc, reg, val) return; } -static void sk_win_write_1(sc, reg, val) +static void +sk_win_write_1(sc, reg, val) struct sk_softc *sc; int reg; u_int32_t val; @@ -322,7 +328,8 @@ static void sk_win_write_1(sc, reg, val) * the controller softc structure for later use. At the moment, * we only use the ID string during sk_attach(). */ -static u_int8_t sk_vpd_readbyte(sc, addr) +static u_int8_t +sk_vpd_readbyte(sc, addr) struct sk_softc *sc; int addr; { @@ -342,7 +349,8 @@ static u_int8_t sk_vpd_readbyte(sc, addr) return(sk_win_read_1(sc, SK_PCI_REG(SK_PCI_VPD_DATA))); } -static void sk_vpd_read_res(sc, res, addr) +static void +sk_vpd_read_res(sc, res, addr) struct sk_softc *sc; struct vpd_res *res; int addr; @@ -357,7 +365,8 @@ static void sk_vpd_read_res(sc, res, addr) return; } -static void sk_vpd_read(sc) +static void +sk_vpd_read(sc) struct sk_softc *sc; { int pos = 0, i; @@ -401,7 +410,8 @@ static void sk_vpd_read(sc) return; } -static int sk_miibus_readreg(dev, phy, reg) +static int +sk_miibus_readreg(dev, phy, reg) device_t dev; int phy, reg; { @@ -437,7 +447,8 @@ static int sk_miibus_readreg(dev, phy, reg) return(i); } -static int sk_miibus_writereg(dev, phy, reg, val) +static int +sk_miibus_writereg(dev, phy, reg, val) device_t dev; int phy, reg, val; { @@ -473,7 +484,8 @@ static int sk_miibus_writereg(dev, phy, reg, val) return(0); } -static void sk_miibus_statchg(dev) +static void +sk_miibus_statchg(dev) device_t dev; { struct sk_if_softc *sc_if; @@ -501,7 +513,8 @@ static void sk_miibus_statchg(dev) #define SK_POLY 0xEDB88320 #define SK_BITS 6 -static u_int32_t sk_calchash(addr) +static u_int32_t +sk_calchash(addr) caddr_t addr; { u_int32_t idx, bit, data, crc; @@ -517,7 +530,8 @@ static u_int32_t sk_calchash(addr) return (~crc & ((1 << SK_BITS) - 1)); } -static void sk_setfilt(sc_if, addr, slot) +static void +sk_setfilt(sc_if, addr, slot) struct sk_if_softc *sc_if; caddr_t addr; int slot; @@ -533,7 +547,8 @@ static void sk_setfilt(sc_if, addr, slot) return; } -static void sk_setmulti(sc_if) +static void +sk_setmulti(sc_if) struct sk_if_softc *sc_if; { struct ifnet *ifp; @@ -588,7 +603,8 @@ static void sk_setmulti(sc_if) return; } -static int sk_init_rx_ring(sc_if) +static int +sk_init_rx_ring(sc_if) struct sk_if_softc *sc_if; { struct sk_chain_data *cd; @@ -624,7 +640,8 @@ static int sk_init_rx_ring(sc_if) return(0); } -static void sk_init_tx_ring(sc_if) +static void +sk_init_tx_ring(sc_if) struct sk_if_softc *sc_if; { struct sk_chain_data *cd; @@ -659,7 +676,8 @@ static void sk_init_tx_ring(sc_if) return; } -static int sk_newbuf(sc_if, c, m) +static int +sk_newbuf(sc_if, c, m) struct sk_if_softc *sc_if; struct sk_chain *c; struct mbuf *m; @@ -725,7 +743,8 @@ static int sk_newbuf(sc_if, c, m) * our own jumbo buffer pool. Fortunately, this does not require an * excessive amount of additional code. */ -static int sk_alloc_jumbo_mem(sc_if) +static int +sk_alloc_jumbo_mem(sc_if) struct sk_if_softc *sc_if; { caddr_t ptr; @@ -772,7 +791,8 @@ static int sk_alloc_jumbo_mem(sc_if) /* * Allocate a jumbo buffer. */ -static void *sk_jalloc(sc_if) +static void * +sk_jalloc(sc_if) struct sk_if_softc *sc_if; { struct sk_jpool_entry *entry; @@ -794,7 +814,8 @@ static void *sk_jalloc(sc_if) /* * Release a jumbo buffer. */ -static void sk_jfree(buf, args) +static void +sk_jfree(buf, args) void *buf; void *args; { @@ -828,7 +849,8 @@ static void sk_jfree(buf, args) /* * Set media options. */ -static int sk_ifmedia_upd(ifp) +static int +sk_ifmedia_upd(ifp) struct ifnet *ifp; { struct sk_if_softc *sc_if; @@ -845,7 +867,8 @@ static int sk_ifmedia_upd(ifp) /* * Report current media status. */ -static void sk_ifmedia_sts(ifp, ifmr) +static void +sk_ifmedia_sts(ifp, ifmr) struct ifnet *ifp; struct ifmediareq *ifmr; { @@ -862,7 +885,8 @@ static void sk_ifmedia_sts(ifp, ifmr) return; } -static int sk_ioctl(ifp, command, data) +static int +sk_ioctl(ifp, command, data) struct ifnet *ifp; u_long command; caddr_t data; @@ -934,7 +958,8 @@ static int sk_ioctl(ifp, command, data) * Probe for a SysKonnect GEnesis chip. Check the PCI vendor and device * IDs against our list and return a device name if we find a match. */ -static int sk_probe(dev) +static int +sk_probe(dev) device_t dev; { struct sk_type *t; @@ -956,7 +981,8 @@ static int sk_probe(dev) /* * Force the GEnesis into reset, then bring it out of reset. */ -static void sk_reset(sc) +static void +sk_reset(sc) struct sk_softc *sc; { CSR_WRITE_4(sc, SK_CSR, SK_CSR_SW_RESET); @@ -983,15 +1009,16 @@ static void sk_reset(sc) * register represents 18.825ns, so to specify a timeout in * microseconds, we have to multiply by 54. */ - sk_win_write_4(sc, SK_IMTIMERINIT, SK_IM_USECS(200)); - sk_win_write_4(sc, SK_IMMR, SK_ISR_TX1_S_EOF|SK_ISR_TX2_S_EOF| + sk_win_write_4(sc, SK_IMTIMERINIT, SK_IM_USECS(200)); + sk_win_write_4(sc, SK_IMMR, SK_ISR_TX1_S_EOF|SK_ISR_TX2_S_EOF| SK_ISR_RX1_EOF|SK_ISR_RX2_EOF); - sk_win_write_1(sc, SK_IMTIMERCTL, SK_IMCTL_START); + sk_win_write_1(sc, SK_IMTIMERCTL, SK_IMCTL_START); return; } -static int sk_probe_xmac(dev) +static int +sk_probe_xmac(dev) device_t dev; { /* @@ -1009,7 +1036,8 @@ static int sk_probe_xmac(dev) * Each XMAC chip is attached as a separate logical IP interface. * Single port cards will have only one logical interface of course. */ -static int sk_attach_xmac(dev) +static int +sk_attach_xmac(dev) device_t dev; { struct sk_softc *sc; @@ -1172,7 +1200,8 @@ static int sk_attach_xmac(dev) * Attach the interface. Allocate softc structures, do ifmedia * setup and ethernet/BPF attach. */ -static int sk_attach(dev) +static int +sk_attach(dev) device_t dev; { u_int32_t command; @@ -1355,7 +1384,8 @@ static int sk_attach(dev) return(error); } -static int sk_detach_xmac(dev) +static int +sk_detach_xmac(dev) device_t dev; { struct sk_softc *sc; @@ -1379,7 +1409,8 @@ static int sk_detach_xmac(dev) return(0); } -static int sk_detach(dev) +static int +sk_detach(dev) device_t dev; { struct sk_softc *sc; @@ -1403,7 +1434,8 @@ static int sk_detach(dev) return(0); } -static int sk_encap(sc_if, m_head, txidx) +static int +sk_encap(sc_if, m_head, txidx) struct sk_if_softc *sc_if; struct mbuf *m_head; u_int32_t *txidx; @@ -1452,7 +1484,8 @@ static int sk_encap(sc_if, m_head, txidx) return(0); } -static void sk_start(ifp) +static void +sk_start(ifp) struct ifnet *ifp; { struct sk_softc *sc; @@ -1503,7 +1536,8 @@ static void sk_start(ifp) } -static void sk_watchdog(ifp) +static void +sk_watchdog(ifp) struct ifnet *ifp; { struct sk_if_softc *sc_if; @@ -1516,7 +1550,8 @@ static void sk_watchdog(ifp) return; } -static void sk_shutdown(dev) +static void +sk_shutdown(dev) device_t dev; { struct sk_softc *sc; @@ -1537,7 +1572,8 @@ static void sk_shutdown(dev) return; } -static void sk_rxeof(sc_if) +static void +sk_rxeof(sc_if) struct sk_if_softc *sc_if; { struct ether_header *eh; @@ -1605,7 +1641,8 @@ static void sk_rxeof(sc_if) return; } -static void sk_txeof(sc_if) +static void +sk_txeof(sc_if) struct sk_if_softc *sc_if; { struct sk_tx_desc *cur_tx = NULL; @@ -1642,7 +1679,8 @@ static void sk_txeof(sc_if) return; } -static void sk_tick(xsc_if) +static void +sk_tick(xsc_if) void *xsc_if; { struct sk_if_softc *sc_if; @@ -1694,7 +1732,8 @@ static void sk_tick(xsc_if) return; } -static void sk_intr_bcom(sc_if) +static void +sk_intr_bcom(sc_if) struct sk_if_softc *sc_if; { struct sk_softc *sc; @@ -1751,7 +1790,8 @@ static void sk_intr_bcom(sc_if) return; } -static void sk_intr_xmac(sc_if) +static void +sk_intr_xmac(sc_if) struct sk_if_softc *sc_if; { struct sk_softc *sc; @@ -1788,7 +1828,8 @@ static void sk_intr_xmac(sc_if) return; } -static void sk_intr(xsc) +static void +sk_intr(xsc) void *xsc; { struct sk_softc *sc = xsc; @@ -1864,7 +1905,8 @@ static void sk_intr(xsc) return; } -static void sk_init_xmac(sc_if) +static void +sk_init_xmac(sc_if) struct sk_if_softc *sc_if; { struct sk_softc *sc; @@ -2036,7 +2078,8 @@ static void sk_init_xmac(sc_if) * Note that to properly initialize any part of the GEnesis chip, * you first have to take it out of reset mode. */ -static void sk_init(xsc) +static void +sk_init(xsc) void *xsc; { struct sk_if_softc *sc_if = xsc; @@ -2145,7 +2188,8 @@ static void sk_init(xsc) return; } -static void sk_stop(sc_if) +static void +sk_stop(sc_if) struct sk_if_softc *sc_if; { int i; diff --git a/sys/pci/if_dc.c b/sys/pci/if_dc.c index d854a446b7a7..fb775f7726e8 100644 --- a/sys/pci/if_dc.c +++ b/sys/pci/if_dc.c @@ -320,7 +320,8 @@ DRIVER_MODULE(miibus, dc, miibus_driver, miibus_devclass, 0, 0); #define IS_MPSAFE 0 -static void dc_delay(sc) +static void +dc_delay(sc) struct dc_softc *sc; { int idx; @@ -329,7 +330,8 @@ static void dc_delay(sc) CSR_READ_4(sc, DC_BUSCTL); } -static void dc_eeprom_idle(sc) +static void +dc_eeprom_idle(sc) struct dc_softc *sc; { register int i; @@ -362,7 +364,8 @@ static void dc_eeprom_idle(sc) /* * Send a read command and address to the EEPROM, check for ACK. */ -static void dc_eeprom_putbyte(sc, addr) +static void +dc_eeprom_putbyte(sc, addr) struct dc_softc *sc; int addr; { @@ -402,7 +405,8 @@ static void dc_eeprom_putbyte(sc, addr) * The PNIC 82c168/82c169 has its own non-standard way to read * the EEPROM. */ -static void dc_eeprom_getword_pnic(sc, addr, dest) +static void +dc_eeprom_getword_pnic(sc, addr, dest) struct dc_softc *sc; int addr; u_int16_t *dest; @@ -429,7 +433,8 @@ static void dc_eeprom_getword_pnic(sc, addr, dest) * The Xircom X3201 has its own non-standard way to read * the EEPROM, too. */ -static void dc_eeprom_getword_xircom(sc, addr, dest) +static void +dc_eeprom_getword_xircom(sc, addr, dest) struct dc_softc *sc; int addr; u_int16_t *dest; @@ -450,7 +455,8 @@ static void dc_eeprom_getword_xircom(sc, addr, dest) /* * Read a word of data stored in the EEPROM at address 'addr.' */ -static void dc_eeprom_getword(sc, addr, dest) +static void +dc_eeprom_getword(sc, addr, dest) struct dc_softc *sc; int addr; u_int16_t *dest; @@ -500,7 +506,8 @@ static void dc_eeprom_getword(sc, addr, dest) /* * Read a sequence of words from the EEPROM. */ -static void dc_read_eeprom(sc, dest, off, cnt, swap) +static void +dc_read_eeprom(sc, dest, off, cnt, swap) struct dc_softc *sc; caddr_t dest; int off; @@ -534,7 +541,8 @@ static void dc_read_eeprom(sc, dest, off, cnt, swap) /* * Write a bit to the MII bus. */ -static void dc_mii_writebit(sc, bit) +static void +dc_mii_writebit(sc, bit) struct dc_softc *sc; int bit; { @@ -553,7 +561,8 @@ static void dc_mii_writebit(sc, bit) /* * Read a bit from the MII bus. */ -static int dc_mii_readbit(sc) +static int +dc_mii_readbit(sc) struct dc_softc *sc; { CSR_WRITE_4(sc, DC_SIO, DC_SIO_ROMCTL_READ|DC_SIO_MII_DIR); @@ -569,7 +578,8 @@ static int dc_mii_readbit(sc) /* * Sync the PHYs by setting data bit and strobing the clock 32 times. */ -static void dc_mii_sync(sc) +static void +dc_mii_sync(sc) struct dc_softc *sc; { register int i; @@ -585,7 +595,8 @@ static void dc_mii_sync(sc) /* * Clock a series of bits through the MII. */ -static void dc_mii_send(sc, bits, cnt) +static void +dc_mii_send(sc, bits, cnt) struct dc_softc *sc; u_int32_t bits; int cnt; @@ -599,7 +610,8 @@ static void dc_mii_send(sc, bits, cnt) /* * Read an PHY register through the MII. */ -static int dc_mii_readreg(sc, frame) +static int +dc_mii_readreg(sc, frame) struct dc_softc *sc; struct dc_mii_frame *frame; @@ -671,7 +683,8 @@ static int dc_mii_readreg(sc, frame) /* * Write to a PHY register through the MII. */ -static int dc_mii_writereg(sc, frame) +static int +dc_mii_writereg(sc, frame) struct dc_softc *sc; struct dc_mii_frame *frame; @@ -706,7 +719,8 @@ static int dc_mii_writereg(sc, frame) return(0); } -static int dc_miibus_readreg(dev, phy, reg) +static int +dc_miibus_readreg(dev, phy, reg) device_t dev; int phy, reg; { @@ -829,7 +843,8 @@ static int dc_miibus_readreg(dev, phy, reg) return(frame.mii_data); } -static int dc_miibus_writereg(dev, phy, reg, data) +static int +dc_miibus_writereg(dev, phy, reg, data) device_t dev; int phy, reg, data; { @@ -905,7 +920,8 @@ static int dc_miibus_writereg(dev, phy, reg, data) return(0); } -static void dc_miibus_statchg(dev) +static void +dc_miibus_statchg(dev) device_t dev; { struct dc_softc *sc; @@ -938,7 +954,8 @@ static void dc_miibus_statchg(dev) * the driver has to just 'know' about the additional mode and deal * with it itself. *sigh* */ -static void dc_miibus_mediainit(dev) +static void +dc_miibus_mediainit(dev) device_t dev; { struct dc_softc *sc; @@ -963,7 +980,8 @@ static void dc_miibus_mediainit(dev) #define DC_BITS_128 7 #define DC_BITS_64 6 -static u_int32_t dc_crc_le(sc, addr) +static u_int32_t +dc_crc_le(sc, addr) struct dc_softc *sc; caddr_t addr; { @@ -1003,7 +1021,8 @@ static u_int32_t dc_crc_le(sc, addr) /* * Calculate CRC of a multicast group address, return the lower 6 bits. */ -static u_int32_t dc_crc_be(addr) +static u_int32_t +dc_crc_be(addr) caddr_t addr; { u_int32_t crc, carry; @@ -1038,7 +1057,8 @@ static u_int32_t dc_crc_be(addr) * frames. We also sneak the broadcast address into the hash filter since * we need that too. */ -void dc_setfilt_21143(sc) +void +dc_setfilt_21143(sc) struct dc_softc *sc; { struct dc_desc *sframe; @@ -1107,7 +1127,8 @@ void dc_setfilt_21143(sc) return; } -void dc_setfilt_admtek(sc) +void +dc_setfilt_admtek(sc) struct dc_softc *sc; { struct ifnet *ifp; @@ -1160,7 +1181,8 @@ void dc_setfilt_admtek(sc) return; } -void dc_setfilt_asix(sc) +void +dc_setfilt_asix(sc) struct dc_softc *sc; { struct ifnet *ifp; @@ -1230,7 +1252,8 @@ void dc_setfilt_asix(sc) return; } -void dc_setfilt_xircom(sc) +void +dc_setfilt_xircom(sc) struct dc_softc *sc; { struct dc_desc *sframe; @@ -1300,7 +1323,8 @@ void dc_setfilt_xircom(sc) return; } -static void dc_setfilt(sc) +static void +dc_setfilt(sc) struct dc_softc *sc; { if (DC_IS_INTEL(sc) || DC_IS_MACRONIX(sc) || DC_IS_PNIC(sc) || @@ -1324,7 +1348,8 @@ static void dc_setfilt(sc) * 'full-duplex' and '100Mbps' bits in the netconfig register, we * first have to put the transmit and/or receive logic in the idle state. */ -static void dc_setcfg(sc, media) +static void +dc_setcfg(sc, media) struct dc_softc *sc; int media; { @@ -1473,7 +1498,8 @@ static void dc_setcfg(sc, media) return; } -static void dc_reset(sc) +static void +dc_reset(sc) struct dc_softc *sc; { register int i; @@ -1518,7 +1544,8 @@ static void dc_reset(sc) return; } -static struct dc_type *dc_devtype(dev) +static struct dc_type * +dc_devtype(dev) device_t dev; { struct dc_type *t; @@ -1569,7 +1596,8 @@ static struct dc_type *dc_devtype(dev) * chips and the 98725, as well as the ASIX and ADMtek chips. In some * cases, the exact chip revision affects driver behavior. */ -static int dc_probe(dev) +static int +dc_probe(dev) device_t dev; { struct dc_type *t; @@ -1584,7 +1612,8 @@ static int dc_probe(dev) return(ENXIO); } -static void dc_acpi(dev) +static void +dc_acpi(dev) device_t dev; { int unit; @@ -1614,7 +1643,8 @@ static void dc_acpi(dev) return; } -static void dc_apply_fixup(sc, media) +static void +dc_apply_fixup(sc, media) struct dc_softc *sc; int media; { @@ -1647,7 +1677,8 @@ static void dc_apply_fixup(sc, media) return; } -static void dc_decode_leaf_sia(sc, l) +static void +dc_decode_leaf_sia(sc, l) struct dc_softc *sc; struct dc_eblock_sia *l; { @@ -1678,7 +1709,8 @@ static void dc_decode_leaf_sia(sc, l) return; } -static void dc_decode_leaf_sym(sc, l) +static void +dc_decode_leaf_sym(sc, l) struct dc_softc *sc; struct dc_eblock_sym *l; { @@ -1703,7 +1735,8 @@ static void dc_decode_leaf_sym(sc, l) return; } -static void dc_decode_leaf_mii(sc, l) +static void +dc_decode_leaf_mii(sc, l) struct dc_softc *sc; struct dc_eblock_mii *l; { @@ -1730,7 +1763,8 @@ static void dc_decode_leaf_mii(sc, l) return; } -static void dc_parse_21143_srom(sc) +static void +dc_parse_21143_srom(sc) struct dc_softc *sc; { struct dc_leaf_hdr *lhdr; @@ -1770,7 +1804,8 @@ static void dc_parse_21143_srom(sc) * Attach the interface. Allocate softc structures, do ifmedia * setup and ethernet/BPF attach. */ -static int dc_attach(dev) +static int +dc_attach(dev) device_t dev; { int tmp = 0; @@ -2176,7 +2211,8 @@ static int dc_attach(dev) return(error); } -static int dc_detach(dev) +static int +dc_detach(dev) device_t dev; { struct dc_softc *sc; @@ -2218,7 +2254,8 @@ static int dc_detach(dev) /* * Initialize the transmit descriptors. */ -static int dc_list_tx_init(sc) +static int +dc_list_tx_init(sc) struct dc_softc *sc; { struct dc_chain_data *cd; @@ -2246,7 +2283,8 @@ static int dc_list_tx_init(sc) * we arrange the descriptors in a closed ring, so that the last descriptor * points back to the first. */ -static int dc_list_rx_init(sc) +static int +dc_list_rx_init(sc) struct dc_softc *sc; { struct dc_chain_data *cd; @@ -2271,7 +2309,8 @@ static int dc_list_rx_init(sc) /* * Initialize an RX descriptor and attach an MBUF cluster. */ -static int dc_newbuf(sc, i, m) +static int +dc_newbuf(sc, i, m) struct dc_softc *sc; int i; struct mbuf *m; @@ -2369,7 +2408,8 @@ static int dc_newbuf(sc, i, m) */ #define DC_WHOLEFRAME (DC_RXSTAT_FIRSTFRAG|DC_RXSTAT_LASTFRAG) -static void dc_pnic_rx_bug_war(sc, idx) +static void +dc_pnic_rx_bug_war(sc, idx) struct dc_softc *sc; int idx; { @@ -2438,7 +2478,8 @@ static void dc_pnic_rx_bug_war(sc, idx) * should still be getting RX DONE interrupts to drive the search * for new packets in the RX ring, so we should catch up eventually. */ -static int dc_rx_resync(sc) +static int +dc_rx_resync(sc) struct dc_softc *sc; { int i, pos; @@ -2467,7 +2508,8 @@ static int dc_rx_resync(sc) * A frame has been uploaded: pass the resulting mbuf chain up to * the higher level protocols. */ -static void dc_rxeof(sc) +static void +dc_rxeof(sc) struct dc_softc *sc; { struct ether_header *eh; @@ -2584,7 +2626,8 @@ static void dc_rxeof(sc) * the list buffers. */ -static void dc_txeof(sc) +static void +dc_txeof(sc) struct dc_softc *sc; { struct dc_desc *cur_tx = NULL; @@ -2686,7 +2729,8 @@ static void dc_txeof(sc) return; } -static void dc_tick(xsc) +static void +dc_tick(xsc) void *xsc; { struct dc_softc *sc; @@ -2765,7 +2809,8 @@ static void dc_tick(xsc) * A transmit underrun has occurred. Back off the transmit threshold, * or switch to store and forward mode if we have to. */ -static void dc_tx_underrun(sc) +static void +dc_tx_underrun(sc) struct dc_softc *sc; { u_int32_t isr; @@ -2866,7 +2911,8 @@ dc_poll(struct ifnet *ifp, enum poll_cmd cmd, int count) } #endif /* DEVICE_POLLING */ -static void dc_intr(arg) +static void +dc_intr(arg) void *arg; { struct dc_softc *sc; @@ -2969,7 +3015,8 @@ static void dc_intr(arg) * Encapsulate an mbuf chain in a descriptor by coupling the mbuf data * pointers to the fragment pointers. */ -static int dc_encap(sc, m_head, txidx) +static int +dc_encap(sc, m_head, txidx) struct dc_softc *sc; struct mbuf *m_head; u_int32_t *txidx; @@ -3034,7 +3081,8 @@ static int dc_encap(sc, m_head, txidx) * Needed for some really badly behaved chips that just can't * do scatter/gather correctly. */ -static int dc_coal(sc, m_head) +static int +dc_coal(sc, m_head) struct dc_softc *sc; struct mbuf **m_head; { @@ -3066,7 +3114,8 @@ static int dc_coal(sc, m_head) * physical addresses. */ -static void dc_start(ifp) +static void +dc_start(ifp) struct ifnet *ifp; { struct dc_softc *sc; @@ -3138,7 +3187,8 @@ static void dc_start(ifp) return; } -static void dc_init(xsc) +static void +dc_init(xsc) void *xsc; { struct dc_softc *sc = xsc; @@ -3330,7 +3380,8 @@ static void dc_init(xsc) /* * Set media options. */ -static int dc_ifmedia_upd(ifp) +static int +dc_ifmedia_upd(ifp) struct ifnet *ifp; { struct dc_softc *sc; @@ -3354,7 +3405,8 @@ static int dc_ifmedia_upd(ifp) /* * Report current media status. */ -static void dc_ifmedia_sts(ifp, ifmr) +static void +dc_ifmedia_sts(ifp, ifmr) struct ifnet *ifp; struct ifmediareq *ifmr; { @@ -3379,7 +3431,8 @@ static void dc_ifmedia_sts(ifp, ifmr) return; } -static int dc_ioctl(ifp, command, data) +static int +dc_ioctl(ifp, command, data) struct ifnet *ifp; u_long command; caddr_t data; @@ -3442,7 +3495,8 @@ static int dc_ioctl(ifp, command, data) return(error); } -static void dc_watchdog(ifp) +static void +dc_watchdog(ifp) struct ifnet *ifp; { struct dc_softc *sc; @@ -3470,7 +3524,8 @@ static void dc_watchdog(ifp) * Stop the adapter and free any mbufs allocated to the * RX and TX lists. */ -static void dc_stop(sc) +static void +dc_stop(sc) struct dc_softc *sc; { register int i; @@ -3534,7 +3589,8 @@ static void dc_stop(sc) * settings in case the BIOS doesn't restore them properly on * resume. */ -static int dc_suspend(dev) +static int +dc_suspend(dev) device_t dev; { register int i; @@ -3565,7 +3621,8 @@ static int dc_suspend(dev) * doesn't, re-enable busmastering, and restart the interface if * appropriate. */ -static int dc_resume(dev) +static int +dc_resume(dev) device_t dev; { register int i; @@ -3606,7 +3663,8 @@ static int dc_resume(dev) * Stop all chip I/O so that the kernel's probe routines don't * get confused by errant DMAs when rebooting. */ -static void dc_shutdown(dev) +static void +dc_shutdown(dev) device_t dev; { struct dc_softc *sc; diff --git a/sys/pci/if_pcn.c b/sys/pci/if_pcn.c index bd54fcdd88ee..dc1c2022c21d 100644 --- a/sys/pci/if_pcn.c +++ b/sys/pci/if_pcn.c @@ -197,7 +197,8 @@ DRIVER_MODULE(miibus, pcn, miibus_driver, miibus_devclass, 0, 0); #define PCN_BCR_CLRBIT(sc, reg, x) \ pcn_bcr_write(sc, reg, pcn_bcr_read(sc, reg) & ~(x)) -static u_int32_t pcn_csr_read(sc, reg) +static u_int32_t +pcn_csr_read(sc, reg) struct pcn_softc *sc; int reg; { @@ -205,7 +206,8 @@ static u_int32_t pcn_csr_read(sc, reg) return(CSR_READ_4(sc, PCN_IO32_RDP)); } -static u_int16_t pcn_csr_read16(sc, reg) +static u_int16_t +pcn_csr_read16(sc, reg) struct pcn_softc *sc; int reg; { @@ -213,7 +215,8 @@ static u_int16_t pcn_csr_read16(sc, reg) return(CSR_READ_2(sc, PCN_IO16_RDP)); } -static void pcn_csr_write(sc, reg, val) +static void +pcn_csr_write(sc, reg, val) struct pcn_softc *sc; int reg; { @@ -222,7 +225,8 @@ static void pcn_csr_write(sc, reg, val) return; } -static u_int32_t pcn_bcr_read(sc, reg) +static u_int32_t +pcn_bcr_read(sc, reg) struct pcn_softc *sc; int reg; { @@ -230,7 +234,8 @@ static u_int32_t pcn_bcr_read(sc, reg) return(CSR_READ_4(sc, PCN_IO32_BDP)); } -static u_int16_t pcn_bcr_read16(sc, reg) +static u_int16_t +pcn_bcr_read16(sc, reg) struct pcn_softc *sc; int reg; { @@ -238,7 +243,8 @@ static u_int16_t pcn_bcr_read16(sc, reg) return(CSR_READ_2(sc, PCN_IO16_BDP)); } -static void pcn_bcr_write(sc, reg, val) +static void +pcn_bcr_write(sc, reg, val) struct pcn_softc *sc; int reg; { @@ -247,7 +253,8 @@ static void pcn_bcr_write(sc, reg, val) return; } -static int pcn_miibus_readreg(dev, phy, reg) +static int +pcn_miibus_readreg(dev, phy, reg) device_t dev; int phy, reg; { @@ -269,7 +276,8 @@ static int pcn_miibus_readreg(dev, phy, reg) return(val); } -static int pcn_miibus_writereg(dev, phy, reg, data) +static int +pcn_miibus_writereg(dev, phy, reg, data) device_t dev; int phy, reg, data; { @@ -283,7 +291,8 @@ static int pcn_miibus_writereg(dev, phy, reg, data) return(0); } -static void pcn_miibus_statchg(dev) +static void +pcn_miibus_statchg(dev) device_t dev; { struct pcn_softc *sc; @@ -303,7 +312,8 @@ static void pcn_miibus_statchg(dev) #define DC_POLY 0xEDB88320 -static u_int32_t pcn_crc(addr) +static u_int32_t +pcn_crc(addr) caddr_t addr; { u_int32_t idx, bit, data, crc; @@ -319,7 +329,8 @@ static u_int32_t pcn_crc(addr) return ((crc >> 26) & 0x3F); } -static void pcn_setmulti(sc) +static void +pcn_setmulti(sc) struct pcn_softc *sc; { struct ifnet *ifp; @@ -358,7 +369,8 @@ static void pcn_setmulti(sc) return; } -static void pcn_reset(sc) +static void +pcn_reset(sc) struct pcn_softc *sc; { /* @@ -387,7 +399,8 @@ static void pcn_reset(sc) * Probe for an AMD chip. Check the PCI vendor and device * IDs against our list and return a device name if we find a match. */ -static int pcn_probe(dev) +static int +pcn_probe(dev) device_t dev; { struct pcn_type *t; @@ -492,7 +505,8 @@ static int pcn_probe(dev) * Attach the interface. Allocate softc structures, do ifmedia * setup and ethernet/BPF attach. */ -static int pcn_attach(dev) +static int +pcn_attach(dev) device_t dev; { u_int32_t eaddr[2]; @@ -663,7 +677,8 @@ static int pcn_attach(dev) return(error); } -static int pcn_detach(dev) +static int +pcn_detach(dev) device_t dev; { struct pcn_softc *sc; @@ -698,7 +713,8 @@ static int pcn_detach(dev) /* * Initialize the transmit descriptors. */ -static int pcn_list_tx_init(sc) +static int +pcn_list_tx_init(sc) struct pcn_softc *sc; { struct pcn_list_data *ld; @@ -724,7 +740,8 @@ static int pcn_list_tx_init(sc) /* * Initialize the RX descriptors and allocate mbufs for them. */ -static int pcn_list_rx_init(sc) +static int +pcn_list_rx_init(sc) struct pcn_softc *sc; { struct pcn_list_data *ld; @@ -747,7 +764,8 @@ static int pcn_list_rx_init(sc) /* * Initialize an RX descriptor and attach an MBUF cluster. */ -static int pcn_newbuf(sc, idx, m) +static int +pcn_newbuf(sc, idx, m) struct pcn_softc *sc; int idx; struct mbuf *m; @@ -789,7 +807,8 @@ static int pcn_newbuf(sc, idx, m) * A frame has been uploaded: pass the resulting mbuf chain up to * the higher level protocols. */ -static void pcn_rxeof(sc) +static void +pcn_rxeof(sc) struct pcn_softc *sc; { struct ether_header *eh; @@ -851,7 +870,8 @@ static void pcn_rxeof(sc) * the list buffers. */ -static void pcn_txeof(sc) +static void +pcn_txeof(sc) struct pcn_softc *sc; { struct pcn_tx_desc *cur_tx = NULL; @@ -908,7 +928,8 @@ static void pcn_txeof(sc) return; } -static void pcn_tick(xsc) +static void +pcn_tick(xsc) void *xsc; { struct pcn_softc *sc; @@ -941,7 +962,8 @@ static void pcn_tick(xsc) return; } -static void pcn_intr(arg) +static void +pcn_intr(arg) void *arg; { struct pcn_softc *sc; @@ -984,7 +1006,8 @@ static void pcn_intr(arg) * Encapsulate an mbuf chain in a descriptor by coupling the mbuf data * pointers to the fragment pointers. */ -static int pcn_encap(sc, m_head, txidx) +static int +pcn_encap(sc, m_head, txidx) struct pcn_softc *sc; struct mbuf *m_head; u_int32_t *txidx; @@ -1039,7 +1062,8 @@ static int pcn_encap(sc, m_head, txidx) * copy of the pointers since the transmit list fragment pointers are * physical addresses. */ -static void pcn_start(ifp) +static void +pcn_start(ifp) struct ifnet *ifp; { struct pcn_softc *sc; @@ -1096,7 +1120,8 @@ static void pcn_start(ifp) return; } -static void pcn_setfilt(ifp) +static void +pcn_setfilt(ifp) struct ifnet *ifp; { struct pcn_softc *sc; @@ -1120,7 +1145,8 @@ static void pcn_setfilt(ifp) return; } -static void pcn_init(xsc) +static void +pcn_init(xsc) void *xsc; { struct pcn_softc *sc = xsc; @@ -1230,7 +1256,8 @@ static void pcn_init(xsc) /* * Set media options. */ -static int pcn_ifmedia_upd(ifp) +static int +pcn_ifmedia_upd(ifp) struct ifnet *ifp; { struct pcn_softc *sc; @@ -1253,7 +1280,8 @@ static int pcn_ifmedia_upd(ifp) /* * Report current media status. */ -static void pcn_ifmedia_sts(ifp, ifmr) +static void +pcn_ifmedia_sts(ifp, ifmr) struct ifnet *ifp; struct ifmediareq *ifmr; { @@ -1270,7 +1298,8 @@ static void pcn_ifmedia_sts(ifp, ifmr) return; } -static int pcn_ioctl(ifp, command, data) +static int +pcn_ioctl(ifp, command, data) struct ifnet *ifp; u_long command; caddr_t data; @@ -1339,7 +1368,8 @@ static int pcn_ioctl(ifp, command, data) return(error); } -static void pcn_watchdog(ifp) +static void +pcn_watchdog(ifp) struct ifnet *ifp; { struct pcn_softc *sc; @@ -1367,7 +1397,8 @@ static void pcn_watchdog(ifp) * Stop the adapter and free any mbufs allocated to the * RX and TX lists. */ -static void pcn_stop(sc) +static void +pcn_stop(sc) struct pcn_softc *sc; { register int i; @@ -1416,7 +1447,8 @@ static void pcn_stop(sc) * Stop all chip I/O so that the kernel's probe routines don't * get confused by errant DMAs when rebooting. */ -static void pcn_shutdown(dev) +static void +pcn_shutdown(dev) device_t dev; { struct pcn_softc *sc; diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c index 63dc6f8cdd9e..4d2961a374f7 100644 --- a/sys/pci/if_rl.c +++ b/sys/pci/if_rl.c @@ -280,7 +280,8 @@ rl_dma_map_txbuf(arg, segs, nseg, error) /* * Send a read command and address to the EEPROM, check for ACK. */ -static void rl_eeprom_putbyte(sc, addr) +static void +rl_eeprom_putbyte(sc, addr) struct rl_softc *sc; int addr; { @@ -310,7 +311,8 @@ static void rl_eeprom_putbyte(sc, addr) /* * Read a word of data stored in the EEPROM at address 'addr.' */ -static void rl_eeprom_getword(sc, addr, dest) +static void +rl_eeprom_getword(sc, addr, dest) struct rl_softc *sc; int addr; u_int16_t *dest; @@ -351,7 +353,8 @@ static void rl_eeprom_getword(sc, addr, dest) /* * Read a sequence of words from the EEPROM. */ -static void rl_read_eeprom(sc, dest, off, cnt, swap) +static void +rl_read_eeprom(sc, dest, off, cnt, swap) struct rl_softc *sc; caddr_t dest; int off; @@ -391,7 +394,8 @@ static void rl_read_eeprom(sc, dest, off, cnt, swap) /* * Sync the PHYs by setting data bit and strobing the clock 32 times. */ -static void rl_mii_sync(sc) +static void +rl_mii_sync(sc) struct rl_softc *sc; { register int i; @@ -411,7 +415,8 @@ static void rl_mii_sync(sc) /* * Clock a series of bits through the MII. */ -static void rl_mii_send(sc, bits, cnt) +static void +rl_mii_send(sc, bits, cnt) struct rl_softc *sc; u_int32_t bits; int cnt; @@ -436,7 +441,8 @@ static void rl_mii_send(sc, bits, cnt) /* * Read an PHY register through the MII. */ -static int rl_mii_readreg(sc, frame) +static int +rl_mii_readreg(sc, frame) struct rl_softc *sc; struct rl_mii_frame *frame; @@ -529,7 +535,8 @@ static int rl_mii_readreg(sc, frame) /* * Write to a PHY register through the MII. */ -static int rl_mii_writereg(sc, frame) +static int +rl_mii_writereg(sc, frame) struct rl_softc *sc; struct rl_mii_frame *frame; @@ -574,7 +581,8 @@ static int rl_mii_writereg(sc, frame) return(0); } -static int rl_miibus_readreg(dev, phy, reg) +static int +rl_miibus_readreg(dev, phy, reg) device_t dev; int phy, reg; { @@ -644,7 +652,8 @@ static int rl_miibus_readreg(dev, phy, reg) return(frame.mii_data); } -static int rl_miibus_writereg(dev, phy, reg, data) +static int +rl_miibus_writereg(dev, phy, reg, data) device_t dev; int phy, reg, data; { @@ -704,7 +713,8 @@ static int rl_miibus_writereg(dev, phy, reg, data) return(0); } -static void rl_miibus_statchg(dev) +static void +rl_miibus_statchg(dev) device_t dev; { return; @@ -713,7 +723,8 @@ static void rl_miibus_statchg(dev) /* * Calculate CRC of a multicast group address, return the upper 6 bits. */ -static u_int8_t rl_calchash(addr) +static u_int8_t +rl_calchash(addr) caddr_t addr; { u_int32_t crc, carry; @@ -741,7 +752,8 @@ static u_int8_t rl_calchash(addr) /* * Program the 64-bit multicast hash filter. */ -static void rl_setmulti(sc) +static void +rl_setmulti(sc) struct rl_softc *sc; { struct ifnet *ifp; @@ -791,7 +803,8 @@ static void rl_setmulti(sc) return; } -static void rl_reset(sc) +static void +rl_reset(sc) struct rl_softc *sc; { register int i; @@ -813,7 +826,8 @@ static void rl_reset(sc) * Probe for a RealTek 8129/8139 chip. Check the PCI vendor and device * IDs against our list and return a device name if we find a match. */ -static int rl_probe(dev) +static int +rl_probe(dev) device_t dev; { struct rl_type *t; @@ -836,7 +850,8 @@ static int rl_probe(dev) * Attach the interface. Allocate softc structures, do ifmedia * setup and ethernet/BPF attach. */ -static int rl_attach(dev) +static int +rl_attach(dev) device_t dev; { u_char eaddr[ETHER_ADDR_LEN]; @@ -1081,7 +1096,8 @@ static int rl_attach(dev) return(error); } -static int rl_detach(dev) +static int +rl_detach(dev) device_t dev; { struct rl_softc *sc; @@ -1116,7 +1132,8 @@ static int rl_detach(dev) /* * Initialize the transmit descriptors. */ -static int rl_list_tx_init(sc) +static int +rl_list_tx_init(sc) struct rl_softc *sc; { struct rl_chain_data *cd; @@ -1156,7 +1173,8 @@ static int rl_list_tx_init(sc) * on a 32-bit boundary. To achieve this, we pass RL_ETHER_ALIGN (2 bytes) * as the offset argument to m_devget(). */ -static void rl_rxeof(sc) +static void +rl_rxeof(sc) struct rl_softc *sc; { struct ether_header *eh; @@ -1284,7 +1302,8 @@ static void rl_rxeof(sc) * A frame was downloaded to the chip. It's safe for us to clean up * the list buffers. */ -static void rl_txeof(sc) +static void +rl_txeof(sc) struct rl_softc *sc; { struct ifnet *ifp; @@ -1340,7 +1359,8 @@ static void rl_txeof(sc) return; } -static void rl_tick(xsc) +static void +rl_tick(xsc) void *xsc; { struct rl_softc *sc; @@ -1399,7 +1419,8 @@ rl_poll (struct ifnet *ifp, enum poll_cmd cmd, int count) } #endif /* DEVICE_POLLING */ -static void rl_intr(arg) +static void +rl_intr(arg) void *arg; { struct rl_softc *sc; @@ -1468,7 +1489,8 @@ static void rl_intr(arg) * Encapsulate an mbuf chain in a descriptor by coupling the mbuf data * pointers to the fragment pointers. */ -static int rl_encap(sc, m_head) +static int +rl_encap(sc, m_head) struct rl_softc *sc; struct mbuf *m_head; { @@ -1519,7 +1541,8 @@ static int rl_encap(sc, m_head) * Main transmit routine. */ -static void rl_start(ifp) +static void +rl_start(ifp) struct ifnet *ifp; { struct rl_softc *sc; @@ -1579,7 +1602,8 @@ static void rl_start(ifp) return; } -static void rl_init(xsc) +static void +rl_init(xsc) void *xsc; { struct rl_softc *sc = xsc; @@ -1688,7 +1712,8 @@ static void rl_init(xsc) /* * Set media options. */ -static int rl_ifmedia_upd(ifp) +static int +rl_ifmedia_upd(ifp) struct ifnet *ifp; { struct rl_softc *sc; @@ -1704,7 +1729,8 @@ static int rl_ifmedia_upd(ifp) /* * Report current media status. */ -static void rl_ifmedia_sts(ifp, ifmr) +static void +rl_ifmedia_sts(ifp, ifmr) struct ifnet *ifp; struct ifmediareq *ifmr; { @@ -1721,7 +1747,8 @@ static void rl_ifmedia_sts(ifp, ifmr) return; } -static int rl_ioctl(ifp, command, data) +static int +rl_ioctl(ifp, command, data) struct ifnet *ifp; u_long command; caddr_t data; @@ -1768,7 +1795,8 @@ static int rl_ioctl(ifp, command, data) return(error); } -static void rl_watchdog(ifp) +static void +rl_watchdog(ifp) struct ifnet *ifp; { struct rl_softc *sc; @@ -1790,7 +1818,8 @@ static void rl_watchdog(ifp) * Stop the adapter and free any mbufs allocated to the * RX and TX lists. */ -static void rl_stop(sc) +static void +rl_stop(sc) struct rl_softc *sc; { register int i; @@ -1834,7 +1863,8 @@ static void rl_stop(sc) * settings in case the BIOS doesn't restore them properly on * resume. */ -static int rl_suspend(dev) +static int +rl_suspend(dev) device_t dev; { register int i; @@ -1861,7 +1891,8 @@ static int rl_suspend(dev) * doesn't, re-enable busmastering, and restart the interface if * appropriate. */ -static int rl_resume(dev) +static int +rl_resume(dev) device_t dev; { register int i; @@ -1896,7 +1927,8 @@ static int rl_resume(dev) * Stop all chip I/O so that the kernel's probe routines don't * get confused by errant DMAs when rebooting. */ -static void rl_shutdown(dev) +static void +rl_shutdown(dev) device_t dev; { struct rl_softc *sc; diff --git a/sys/pci/if_sf.c b/sys/pci/if_sf.c index 6322a3b37671..358507c4ab34 100644 --- a/sys/pci/if_sf.c +++ b/sys/pci/if_sf.c @@ -216,7 +216,8 @@ DRIVER_MODULE(miibus, sf, miibus_driver, miibus_devclass, 0, 0); #define SF_CLRBIT(sc, reg, x) \ csr_write_4(sc, reg, csr_read_4(sc, reg) & ~x) -static u_int32_t csr_read_4(sc, reg) +static u_int32_t +csr_read_4(sc, reg) struct sf_softc *sc; int reg; { @@ -232,7 +233,8 @@ static u_int32_t csr_read_4(sc, reg) return(val); } -static u_int8_t sf_read_eeprom(sc, reg) +static u_int8_t +sf_read_eeprom(sc, reg) struct sf_softc *sc; int reg; { @@ -244,7 +246,8 @@ static u_int8_t sf_read_eeprom(sc, reg) return(val); } -static void csr_write_4(sc, reg, val) +static void +csr_write_4(sc, reg, val) struct sf_softc *sc; int reg; u_int32_t val; @@ -258,7 +261,8 @@ static void csr_write_4(sc, reg, val) return; } -static u_int32_t sf_calchash(addr) +static u_int32_t +sf_calchash(addr) caddr_t addr; { u_int32_t crc, carry; @@ -288,7 +292,8 @@ static u_int32_t sf_calchash(addr) * offset 'idx.' The perfect filter only has 16 entries so do * some sanity tests. */ -static int sf_setperf(sc, idx, mac) +static int +sf_setperf(sc, idx, mac) struct sf_softc *sc; int idx; caddr_t mac; @@ -318,7 +323,8 @@ static int sf_setperf(sc, idx, mac) * specified mac address 'mac.' If 'prio' is nonzero, update the * priority hash table instead of the filter hash table. */ -static int sf_sethash(sc, mac, prio) +static int +sf_sethash(sc, mac, prio) struct sf_softc *sc; caddr_t mac; int prio; @@ -345,7 +351,8 @@ static int sf_sethash(sc, mac, prio) /* * Set a VLAN tag in the receive filter. */ -static int sf_setvlan(sc, idx, vlan) +static int +sf_setvlan(sc, idx, vlan) struct sf_softc *sc; int idx; u_int32_t vlan; @@ -360,7 +367,8 @@ static int sf_setvlan(sc, idx, vlan) } #endif -static int sf_miibus_readreg(dev, phy, reg) +static int +sf_miibus_readreg(dev, phy, reg) device_t dev; int phy, reg; { @@ -385,7 +393,8 @@ static int sf_miibus_readreg(dev, phy, reg) return(val & 0x0000FFFF); } -static int sf_miibus_writereg(dev, phy, reg, val) +static int +sf_miibus_writereg(dev, phy, reg, val) device_t dev; int phy, reg, val; { @@ -406,7 +415,8 @@ static int sf_miibus_writereg(dev, phy, reg, val) return(0); } -static void sf_miibus_statchg(dev) +static void +sf_miibus_statchg(dev) device_t dev; { struct sf_softc *sc; @@ -426,7 +436,8 @@ static void sf_miibus_statchg(dev) return; } -static void sf_setmulti(sc) +static void +sf_setmulti(sc) struct sf_softc *sc; { struct ifnet *ifp; @@ -475,7 +486,8 @@ static void sf_setmulti(sc) /* * Set media options. */ -static int sf_ifmedia_upd(ifp) +static int +sf_ifmedia_upd(ifp) struct ifnet *ifp; { struct sf_softc *sc; @@ -497,7 +509,8 @@ static int sf_ifmedia_upd(ifp) /* * Report current media status. */ -static void sf_ifmedia_sts(ifp, ifmr) +static void +sf_ifmedia_sts(ifp, ifmr) struct ifnet *ifp; struct ifmediareq *ifmr; { @@ -514,7 +527,8 @@ static void sf_ifmedia_sts(ifp, ifmr) return; } -static int sf_ioctl(ifp, command, data) +static int +sf_ioctl(ifp, command, data) struct ifnet *ifp; u_long command; caddr_t data; @@ -571,7 +585,8 @@ static int sf_ioctl(ifp, command, data) return(error); } -static void sf_reset(sc) +static void +sf_reset(sc) struct sf_softc *sc; { register int i; @@ -603,7 +618,8 @@ static void sf_reset(sc) * We also check the subsystem ID so that we can identify exactly which * NIC has been found, if possible. */ -static int sf_probe(dev) +static int +sf_probe(dev) device_t dev; { struct sf_type *t; @@ -658,7 +674,8 @@ static int sf_probe(dev) * Attach the interface. Allocate softc structures, do ifmedia * setup and ethernet/BPF attach. */ -static int sf_attach(dev) +static int +sf_attach(dev) device_t dev; { int i; @@ -827,7 +844,8 @@ static int sf_attach(dev) return(error); } -static int sf_detach(dev) +static int +sf_detach(dev) device_t dev; { struct sf_softc *sc; @@ -855,7 +873,8 @@ static int sf_detach(dev) return(0); } -static int sf_init_rx_ring(sc) +static int +sf_init_rx_ring(sc) struct sf_softc *sc; { struct sf_list_data *ld; @@ -876,7 +895,8 @@ static int sf_init_rx_ring(sc) return(0); } -static void sf_init_tx_ring(sc) +static void +sf_init_tx_ring(sc) struct sf_softc *sc; { struct sf_list_data *ld; @@ -900,7 +920,8 @@ static void sf_init_tx_ring(sc) return; } -static int sf_newbuf(sc, c, m) +static int +sf_newbuf(sc, c, m) struct sf_softc *sc; struct sf_rx_bufdesc_type0 *c; struct mbuf *m; @@ -952,7 +973,8 @@ static int sf_newbuf(sc, c, m) * packets into properly aligned buffers before handing them off. */ -static void sf_rxeof(sc) +static void +sf_rxeof(sc) struct sf_softc *sc; { struct ether_header *eh; @@ -1019,7 +1041,8 @@ static void sf_rxeof(sc) * gives the impression that it should match the producer/consumer * index, which is the offset in 8 byte blocks. */ -static void sf_txeof(sc) +static void +sf_txeof(sc) struct sf_softc *sc; { int txcons, cmpprodidx, cmpconsidx; @@ -1064,7 +1087,8 @@ static void sf_txeof(sc) return; } -static void sf_txthresh_adjust(sc) +static void +sf_txthresh_adjust(sc) struct sf_softc *sc; { u_int32_t txfctl; @@ -1087,7 +1111,8 @@ static void sf_txthresh_adjust(sc) return; } -static void sf_intr(arg) +static void +sf_intr(arg) void *arg; { struct sf_softc *sc; @@ -1146,7 +1171,8 @@ static void sf_intr(arg) return; } -static void sf_init(xsc) +static void +sf_init(xsc) void *xsc; { struct sf_softc *sc; @@ -1260,7 +1286,8 @@ static void sf_init(xsc) return; } -static int sf_encap(sc, c, m_head) +static int +sf_encap(sc, c, m_head) struct sf_softc *sc; struct sf_tx_bufdesc_type0 *c; struct mbuf *m_head; @@ -1323,7 +1350,8 @@ static int sf_encap(sc, c, m_head) return(0); } -static void sf_start(ifp) +static void +sf_start(ifp) struct ifnet *ifp; { struct sf_softc *sc; @@ -1405,7 +1433,8 @@ static void sf_start(ifp) return; } -static void sf_stop(sc) +static void +sf_stop(sc) struct sf_softc *sc; { int i; @@ -1457,7 +1486,8 @@ static void sf_stop(sc) * indirect data register, the contents of the address register could * be changed out from under us. */ -static void sf_stats_update(xsc) +static void +sf_stats_update(xsc) void *xsc; { struct sf_softc *sc; @@ -1500,7 +1530,8 @@ static void sf_stats_update(xsc) return; } -static void sf_watchdog(ifp) +static void +sf_watchdog(ifp) struct ifnet *ifp; { struct sf_softc *sc; @@ -1524,7 +1555,8 @@ static void sf_watchdog(ifp) return; } -static void sf_shutdown(dev) +static void +sf_shutdown(dev) device_t dev; { struct sf_softc *sc; diff --git a/sys/pci/if_sk.c b/sys/pci/if_sk.c index adb523cdec6b..47f0cafce1a1 100644 --- a/sys/pci/if_sk.c +++ b/sys/pci/if_sk.c @@ -257,7 +257,8 @@ DRIVER_MODULE(miibus, sk, miibus_driver, miibus_devclass, 0, 0); #define SK_WIN_CLRBIT_2(sc, reg, x) \ sk_win_write_2(sc, reg, sk_win_read_2(sc, reg) & ~x) -static u_int32_t sk_win_read_4(sc, reg) +static u_int32_t +sk_win_read_4(sc, reg) struct sk_softc *sc; int reg; { @@ -265,7 +266,8 @@ static u_int32_t sk_win_read_4(sc, reg) return(CSR_READ_4(sc, SK_WIN_BASE + SK_REG(reg))); } -static u_int16_t sk_win_read_2(sc, reg) +static u_int16_t +sk_win_read_2(sc, reg) struct sk_softc *sc; int reg; { @@ -273,7 +275,8 @@ static u_int16_t sk_win_read_2(sc, reg) return(CSR_READ_2(sc, SK_WIN_BASE + SK_REG(reg))); } -static u_int8_t sk_win_read_1(sc, reg) +static u_int8_t +sk_win_read_1(sc, reg) struct sk_softc *sc; int reg; { @@ -281,7 +284,8 @@ static u_int8_t sk_win_read_1(sc, reg) return(CSR_READ_1(sc, SK_WIN_BASE + SK_REG(reg))); } -static void sk_win_write_4(sc, reg, val) +static void +sk_win_write_4(sc, reg, val) struct sk_softc *sc; int reg; u_int32_t val; @@ -291,7 +295,8 @@ static void sk_win_write_4(sc, reg, val) return; } -static void sk_win_write_2(sc, reg, val) +static void +sk_win_write_2(sc, reg, val) struct sk_softc *sc; int reg; u_int32_t val; @@ -301,7 +306,8 @@ static void sk_win_write_2(sc, reg, val) return; } -static void sk_win_write_1(sc, reg, val) +static void +sk_win_write_1(sc, reg, val) struct sk_softc *sc; int reg; u_int32_t val; @@ -322,7 +328,8 @@ static void sk_win_write_1(sc, reg, val) * the controller softc structure for later use. At the moment, * we only use the ID string during sk_attach(). */ -static u_int8_t sk_vpd_readbyte(sc, addr) +static u_int8_t +sk_vpd_readbyte(sc, addr) struct sk_softc *sc; int addr; { @@ -342,7 +349,8 @@ static u_int8_t sk_vpd_readbyte(sc, addr) return(sk_win_read_1(sc, SK_PCI_REG(SK_PCI_VPD_DATA))); } -static void sk_vpd_read_res(sc, res, addr) +static void +sk_vpd_read_res(sc, res, addr) struct sk_softc *sc; struct vpd_res *res; int addr; @@ -357,7 +365,8 @@ static void sk_vpd_read_res(sc, res, addr) return; } -static void sk_vpd_read(sc) +static void +sk_vpd_read(sc) struct sk_softc *sc; { int pos = 0, i; @@ -401,7 +410,8 @@ static void sk_vpd_read(sc) return; } -static int sk_miibus_readreg(dev, phy, reg) +static int +sk_miibus_readreg(dev, phy, reg) device_t dev; int phy, reg; { @@ -437,7 +447,8 @@ static int sk_miibus_readreg(dev, phy, reg) return(i); } -static int sk_miibus_writereg(dev, phy, reg, val) +static int +sk_miibus_writereg(dev, phy, reg, val) device_t dev; int phy, reg, val; { @@ -473,7 +484,8 @@ static int sk_miibus_writereg(dev, phy, reg, val) return(0); } -static void sk_miibus_statchg(dev) +static void +sk_miibus_statchg(dev) device_t dev; { struct sk_if_softc *sc_if; @@ -501,7 +513,8 @@ static void sk_miibus_statchg(dev) #define SK_POLY 0xEDB88320 #define SK_BITS 6 -static u_int32_t sk_calchash(addr) +static u_int32_t +sk_calchash(addr) caddr_t addr; { u_int32_t idx, bit, data, crc; @@ -517,7 +530,8 @@ static u_int32_t sk_calchash(addr) return (~crc & ((1 << SK_BITS) - 1)); } -static void sk_setfilt(sc_if, addr, slot) +static void +sk_setfilt(sc_if, addr, slot) struct sk_if_softc *sc_if; caddr_t addr; int slot; @@ -533,7 +547,8 @@ static void sk_setfilt(sc_if, addr, slot) return; } -static void sk_setmulti(sc_if) +static void +sk_setmulti(sc_if) struct sk_if_softc *sc_if; { struct ifnet *ifp; @@ -588,7 +603,8 @@ static void sk_setmulti(sc_if) return; } -static int sk_init_rx_ring(sc_if) +static int +sk_init_rx_ring(sc_if) struct sk_if_softc *sc_if; { struct sk_chain_data *cd; @@ -624,7 +640,8 @@ static int sk_init_rx_ring(sc_if) return(0); } -static void sk_init_tx_ring(sc_if) +static void +sk_init_tx_ring(sc_if) struct sk_if_softc *sc_if; { struct sk_chain_data *cd; @@ -659,7 +676,8 @@ static void sk_init_tx_ring(sc_if) return; } -static int sk_newbuf(sc_if, c, m) +static int +sk_newbuf(sc_if, c, m) struct sk_if_softc *sc_if; struct sk_chain *c; struct mbuf *m; @@ -725,7 +743,8 @@ static int sk_newbuf(sc_if, c, m) * our own jumbo buffer pool. Fortunately, this does not require an * excessive amount of additional code. */ -static int sk_alloc_jumbo_mem(sc_if) +static int +sk_alloc_jumbo_mem(sc_if) struct sk_if_softc *sc_if; { caddr_t ptr; @@ -772,7 +791,8 @@ static int sk_alloc_jumbo_mem(sc_if) /* * Allocate a jumbo buffer. */ -static void *sk_jalloc(sc_if) +static void * +sk_jalloc(sc_if) struct sk_if_softc *sc_if; { struct sk_jpool_entry *entry; @@ -794,7 +814,8 @@ static void *sk_jalloc(sc_if) /* * Release a jumbo buffer. */ -static void sk_jfree(buf, args) +static void +sk_jfree(buf, args) void *buf; void *args; { @@ -828,7 +849,8 @@ static void sk_jfree(buf, args) /* * Set media options. */ -static int sk_ifmedia_upd(ifp) +static int +sk_ifmedia_upd(ifp) struct ifnet *ifp; { struct sk_if_softc *sc_if; @@ -845,7 +867,8 @@ static int sk_ifmedia_upd(ifp) /* * Report current media status. */ -static void sk_ifmedia_sts(ifp, ifmr) +static void +sk_ifmedia_sts(ifp, ifmr) struct ifnet *ifp; struct ifmediareq *ifmr; { @@ -862,7 +885,8 @@ static void sk_ifmedia_sts(ifp, ifmr) return; } -static int sk_ioctl(ifp, command, data) +static int +sk_ioctl(ifp, command, data) struct ifnet *ifp; u_long command; caddr_t data; @@ -934,7 +958,8 @@ static int sk_ioctl(ifp, command, data) * Probe for a SysKonnect GEnesis chip. Check the PCI vendor and device * IDs against our list and return a device name if we find a match. */ -static int sk_probe(dev) +static int +sk_probe(dev) device_t dev; { struct sk_type *t; @@ -956,7 +981,8 @@ static int sk_probe(dev) /* * Force the GEnesis into reset, then bring it out of reset. */ -static void sk_reset(sc) +static void +sk_reset(sc) struct sk_softc *sc; { CSR_WRITE_4(sc, SK_CSR, SK_CSR_SW_RESET); @@ -983,15 +1009,16 @@ static void sk_reset(sc) * register represents 18.825ns, so to specify a timeout in * microseconds, we have to multiply by 54. */ - sk_win_write_4(sc, SK_IMTIMERINIT, SK_IM_USECS(200)); - sk_win_write_4(sc, SK_IMMR, SK_ISR_TX1_S_EOF|SK_ISR_TX2_S_EOF| + sk_win_write_4(sc, SK_IMTIMERINIT, SK_IM_USECS(200)); + sk_win_write_4(sc, SK_IMMR, SK_ISR_TX1_S_EOF|SK_ISR_TX2_S_EOF| SK_ISR_RX1_EOF|SK_ISR_RX2_EOF); - sk_win_write_1(sc, SK_IMTIMERCTL, SK_IMCTL_START); + sk_win_write_1(sc, SK_IMTIMERCTL, SK_IMCTL_START); return; } -static int sk_probe_xmac(dev) +static int +sk_probe_xmac(dev) device_t dev; { /* @@ -1009,7 +1036,8 @@ static int sk_probe_xmac(dev) * Each XMAC chip is attached as a separate logical IP interface. * Single port cards will have only one logical interface of course. */ -static int sk_attach_xmac(dev) +static int +sk_attach_xmac(dev) device_t dev; { struct sk_softc *sc; @@ -1172,7 +1200,8 @@ static int sk_attach_xmac(dev) * Attach the interface. Allocate softc structures, do ifmedia * setup and ethernet/BPF attach. */ -static int sk_attach(dev) +static int +sk_attach(dev) device_t dev; { u_int32_t command; @@ -1355,7 +1384,8 @@ static int sk_attach(dev) return(error); } -static int sk_detach_xmac(dev) +static int +sk_detach_xmac(dev) device_t dev; { struct sk_softc *sc; @@ -1379,7 +1409,8 @@ static int sk_detach_xmac(dev) return(0); } -static int sk_detach(dev) +static int +sk_detach(dev) device_t dev; { struct sk_softc *sc; @@ -1403,7 +1434,8 @@ static int sk_detach(dev) return(0); } -static int sk_encap(sc_if, m_head, txidx) +static int +sk_encap(sc_if, m_head, txidx) struct sk_if_softc *sc_if; struct mbuf *m_head; u_int32_t *txidx; @@ -1452,7 +1484,8 @@ static int sk_encap(sc_if, m_head, txidx) return(0); } -static void sk_start(ifp) +static void +sk_start(ifp) struct ifnet *ifp; { struct sk_softc *sc; @@ -1503,7 +1536,8 @@ static void sk_start(ifp) } -static void sk_watchdog(ifp) +static void +sk_watchdog(ifp) struct ifnet *ifp; { struct sk_if_softc *sc_if; @@ -1516,7 +1550,8 @@ static void sk_watchdog(ifp) return; } -static void sk_shutdown(dev) +static void +sk_shutdown(dev) device_t dev; { struct sk_softc *sc; @@ -1537,7 +1572,8 @@ static void sk_shutdown(dev) return; } -static void sk_rxeof(sc_if) +static void +sk_rxeof(sc_if) struct sk_if_softc *sc_if; { struct ether_header *eh; @@ -1605,7 +1641,8 @@ static void sk_rxeof(sc_if) return; } -static void sk_txeof(sc_if) +static void +sk_txeof(sc_if) struct sk_if_softc *sc_if; { struct sk_tx_desc *cur_tx = NULL; @@ -1642,7 +1679,8 @@ static void sk_txeof(sc_if) return; } -static void sk_tick(xsc_if) +static void +sk_tick(xsc_if) void *xsc_if; { struct sk_if_softc *sc_if; @@ -1694,7 +1732,8 @@ static void sk_tick(xsc_if) return; } -static void sk_intr_bcom(sc_if) +static void +sk_intr_bcom(sc_if) struct sk_if_softc *sc_if; { struct sk_softc *sc; @@ -1751,7 +1790,8 @@ static void sk_intr_bcom(sc_if) return; } -static void sk_intr_xmac(sc_if) +static void +sk_intr_xmac(sc_if) struct sk_if_softc *sc_if; { struct sk_softc *sc; @@ -1788,7 +1828,8 @@ static void sk_intr_xmac(sc_if) return; } -static void sk_intr(xsc) +static void +sk_intr(xsc) void *xsc; { struct sk_softc *sc = xsc; @@ -1864,7 +1905,8 @@ static void sk_intr(xsc) return; } -static void sk_init_xmac(sc_if) +static void +sk_init_xmac(sc_if) struct sk_if_softc *sc_if; { struct sk_softc *sc; @@ -2036,7 +2078,8 @@ static void sk_init_xmac(sc_if) * Note that to properly initialize any part of the GEnesis chip, * you first have to take it out of reset mode. */ -static void sk_init(xsc) +static void +sk_init(xsc) void *xsc; { struct sk_if_softc *sc_if = xsc; @@ -2145,7 +2188,8 @@ static void sk_init(xsc) return; } -static void sk_stop(sc_if) +static void +sk_stop(sc_if) struct sk_if_softc *sc_if; { int i; diff --git a/sys/pci/if_ste.c b/sys/pci/if_ste.c index 5dca5da17dea..f57e9c88ea5b 100644 --- a/sys/pci/if_ste.c +++ b/sys/pci/if_ste.c @@ -189,7 +189,8 @@ DRIVER_MODULE(miibus, ste, miibus_driver, miibus_devclass, 0, 0); /* * Sync the PHYs by setting data bit and strobing the clock 32 times. */ -static void ste_mii_sync(sc) +static void +ste_mii_sync(sc) struct ste_softc *sc; { register int i; @@ -209,7 +210,8 @@ static void ste_mii_sync(sc) /* * Clock a series of bits through the MII. */ -static void ste_mii_send(sc, bits, cnt) +static void +ste_mii_send(sc, bits, cnt) struct ste_softc *sc; u_int32_t bits; int cnt; @@ -219,7 +221,7 @@ static void ste_mii_send(sc, bits, cnt) MII_CLR(STE_PHYCTL_MCLK); for (i = (0x1 << (cnt - 1)); i; i >>= 1) { - if (bits & i) { + if (bits & i) { MII_SET(STE_PHYCTL_MDATA); } else { MII_CLR(STE_PHYCTL_MDATA); @@ -234,7 +236,8 @@ static void ste_mii_send(sc, bits, cnt) /* * Read an PHY register through the MII. */ -static int ste_mii_readreg(sc, frame) +static int +ste_mii_readreg(sc, frame) struct ste_softc *sc; struct ste_mii_frame *frame; @@ -326,7 +329,8 @@ static int ste_mii_readreg(sc, frame) /* * Write to a PHY register through the MII. */ -static int ste_mii_writereg(sc, frame) +static int +ste_mii_writereg(sc, frame) struct ste_softc *sc; struct ste_mii_frame *frame; @@ -371,7 +375,8 @@ static int ste_mii_writereg(sc, frame) return(0); } -static int ste_miibus_readreg(dev, phy, reg) +static int +ste_miibus_readreg(dev, phy, reg) device_t dev; int phy, reg; { @@ -392,7 +397,8 @@ static int ste_miibus_readreg(dev, phy, reg) return(frame.mii_data); } -static int ste_miibus_writereg(dev, phy, reg, data) +static int +ste_miibus_writereg(dev, phy, reg, data) device_t dev; int phy, reg, data; { @@ -411,7 +417,8 @@ static int ste_miibus_writereg(dev, phy, reg, data) return(0); } -static void ste_miibus_statchg(dev) +static void +ste_miibus_statchg(dev) device_t dev; { struct ste_softc *sc; @@ -431,7 +438,8 @@ static void ste_miibus_statchg(dev) return; } -static int ste_ifmedia_upd(ifp) +static int +ste_ifmedia_upd(ifp) struct ifnet *ifp; { struct ste_softc *sc; @@ -450,7 +458,8 @@ static int ste_ifmedia_upd(ifp) return(0); } -static void ste_ifmedia_sts(ifp, ifmr) +static void +ste_ifmedia_sts(ifp, ifmr) struct ifnet *ifp; struct ifmediareq *ifmr; { @@ -467,7 +476,8 @@ static void ste_ifmedia_sts(ifp, ifmr) return; } -static void ste_wait(sc) +static void +ste_wait(sc) struct ste_softc *sc; { register int i; @@ -487,7 +497,8 @@ static void ste_wait(sc) * The EEPROM is slow: give it time to come ready after issuing * it a command. */ -static int ste_eeprom_wait(sc) +static int +ste_eeprom_wait(sc) struct ste_softc *sc; { int i; @@ -513,7 +524,8 @@ static int ste_eeprom_wait(sc) * Read a sequence of words from the EEPROM. Note that ethernet address * data is stored in the EEPROM in network byte order. */ -static int ste_read_eeprom(sc, dest, off, cnt, swap) +static int +ste_read_eeprom(sc, dest, off, cnt, swap) struct ste_softc *sc; caddr_t dest; int off; @@ -542,7 +554,8 @@ static int ste_read_eeprom(sc, dest, off, cnt, swap) return(err ? 1 : 0); } -static u_int8_t ste_calchash(addr) +static u_int8_t +ste_calchash(addr) caddr_t addr; { @@ -568,7 +581,8 @@ static u_int8_t ste_calchash(addr) return(crc & 0x0000003F); } -static void ste_setmulti(sc) +static void +ste_setmulti(sc) struct ste_softc *sc; { struct ifnet *ifp; @@ -610,7 +624,8 @@ static void ste_setmulti(sc) return; } -static void ste_intr(xsc) +static void +ste_intr(xsc) void *xsc; { struct ste_softc *sc; @@ -672,7 +687,8 @@ static void ste_intr(xsc) * A frame has been uploaded: pass the resulting mbuf chain up to * the higher level protocols. */ -static void ste_rxeof(sc) +static void +ste_rxeof(sc) struct ste_softc *sc; { struct ether_header *eh; @@ -751,7 +767,8 @@ static void ste_rxeof(sc) return; } -static void ste_txeoc(sc) +static void +ste_txeoc(sc) struct ste_softc *sc; { u_int8_t txstat; @@ -789,7 +806,8 @@ static void ste_txeoc(sc) return; } -static void ste_txeof(sc) +static void +ste_txeof(sc) struct ste_softc *sc; { struct ste_chain *cur_tx = NULL; @@ -825,7 +843,8 @@ static void ste_txeof(sc) return; } -static void ste_stats_update(xsc) +static void +ste_stats_update(xsc) void *xsc; { struct ste_softc *sc; @@ -868,7 +887,8 @@ static void ste_stats_update(xsc) * Probe for a Sundance ST201 chip. Check the PCI vendor and device * IDs against our list and return a device name if we find a match. */ -static int ste_probe(dev) +static int +ste_probe(dev) device_t dev; { struct ste_type *t; @@ -891,7 +911,8 @@ static int ste_probe(dev) * Attach the interface. Allocate softc structures, do ifmedia * setup and ethernet/BPF attach. */ -static int ste_attach(dev) +static int +ste_attach(dev) device_t dev; { u_int32_t command; @@ -1083,7 +1104,8 @@ static int ste_attach(dev) return(error); } -static int ste_detach(dev) +static int +ste_detach(dev) device_t dev; { struct ste_softc *sc; @@ -1111,7 +1133,8 @@ static int ste_detach(dev) return(0); } -static int ste_newbuf(sc, c, m) +static int +ste_newbuf(sc, c, m) struct ste_softc *sc; struct ste_chain_onefrag *c; struct mbuf *m; @@ -1144,7 +1167,8 @@ static int ste_newbuf(sc, c, m) return(0); } -static int ste_init_rx_list(sc) +static int +ste_init_rx_list(sc) struct ste_softc *sc; { struct ste_chain_data *cd; @@ -1177,7 +1201,8 @@ static int ste_init_rx_list(sc) return(0); } -static void ste_init_tx_list(sc) +static void +ste_init_tx_list(sc) struct ste_softc *sc; { struct ste_chain_data *cd; @@ -1212,7 +1237,8 @@ static void ste_init_tx_list(sc) return; } -static void ste_init(xsc) +static void +ste_init(xsc) void *xsc; { struct ste_softc *sc; @@ -1322,7 +1348,8 @@ static void ste_init(xsc) return; } -static void ste_stop(sc) +static void +ste_stop(sc) struct ste_softc *sc; { int i; @@ -1370,7 +1397,8 @@ static void ste_stop(sc) return; } -static void ste_reset(sc) +static void +ste_reset(sc) struct ste_softc *sc; { int i; @@ -1395,7 +1423,8 @@ static void ste_reset(sc) return; } -static int ste_ioctl(ifp, command, data) +static int +ste_ioctl(ifp, command, data) struct ifnet *ifp; u_long command; caddr_t data; @@ -1460,7 +1489,8 @@ static int ste_ioctl(ifp, command, data) return(error); } -static int ste_encap(sc, c, m_head) +static int +ste_encap(sc, c, m_head) struct ste_softc *sc; struct ste_chain *c; struct mbuf *m_head; @@ -1493,7 +1523,8 @@ static int ste_encap(sc, c, m_head) return(0); } -static void ste_start(ifp) +static void +ste_start(ifp) struct ifnet *ifp; { struct ste_softc *sc; @@ -1576,7 +1607,8 @@ static void ste_start(ifp) return; } -static void ste_watchdog(ifp) +static void +ste_watchdog(ifp) struct ifnet *ifp; { struct ste_softc *sc; @@ -1600,7 +1632,8 @@ static void ste_watchdog(ifp) return; } -static void ste_shutdown(dev) +static void +ste_shutdown(dev) device_t dev; { struct ste_softc *sc;