DragonFly submit List (threaded) for 2005-11
[
Date Prev][
Date Next]
[
Thread Prev][
Thread Next]
[
Date Index][
Thread Index]
/sys/dev/netif cleanup
Hi,
this patch does the following things:
1) Ansify function definitions
2) Fix functions prototypes
3) Some style(9) cleanups
Index: an/if_an.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/an/if_an.c,v
retrieving revision 1.33
diff -u -r1.33 if_an.c
--- an/if_an.c 22 Nov 2005 00:24:14 -0000 1.33
+++ an/if_an.c 22 Nov 2005 01:19:01 -0000
@@ -310,8 +310,7 @@
* find this, then there's no card present.
*/
int
-an_probe(dev)
- device_t dev;
+an_probe(device_t dev)
{
struct an_softc *sc = device_get_softc(dev);
struct an_ltv_ssidlist_new ssid;
@@ -364,10 +363,7 @@
* Allocate a port resource with the given resource id.
*/
int
-an_alloc_port(dev, rid, size)
- device_t dev;
- int rid;
- int size;
+an_alloc_port(device_t dev, int rid, int size)
{
struct an_softc *sc = device_get_softc(dev);
struct resource *res;
@@ -386,7 +382,8 @@
/*
* Allocate a memory resource with the given resource id.
*/
-int an_alloc_memory(device_t dev, int rid, int size)
+int
+an_alloc_memory(device_t dev, int rid, int size)
{
struct an_softc *sc = device_get_softc(dev);
struct resource *res;
@@ -427,10 +424,7 @@
* Allocate an irq resource with the given resource id.
*/
int
-an_alloc_irq(dev, rid, flags)
- device_t dev;
- int rid;
- int flags;
+an_alloc_irq(device_t dev, int rid, int flags)
{
struct an_softc *sc = device_get_softc(dev);
struct resource *res;
@@ -447,11 +441,7 @@
}
static void
-an_dma_malloc_cb(arg, segs, nseg, error)
- void *arg;
- bus_dma_segment_t *segs;
- int nseg;
- int error;
+an_dma_malloc_cb(void *arg, bus_dma_segment_t *segs, int nseg, int error)
{
bus_addr_t *paddr = (bus_addr_t*) arg;
*paddr = segs->ds_addr;
@@ -461,11 +451,8 @@
* Alloc DMA memory and set the pointer to it
*/
static int
-an_dma_malloc(sc, size, dma, mapflags)
- struct an_softc *sc;
- bus_size_t size;
- struct an_dma_alloc *dma;
- int mapflags;
+an_dma_malloc(struct an_softc *sc, bus_size_t size, struct an_dma_alloc *dma,
+ int mapflags)
{
int r;
@@ -500,9 +487,7 @@
}
static void
-an_dma_free(sc, dma)
- struct an_softc *sc;
- struct an_dma_alloc *dma;
+an_dma_free(struct an_softc *sc, struct an_dma_alloc *dma)
{
bus_dmamap_unload(sc->an_dtag, dma->an_dma_map);
bus_dmamem_free(sc->an_dtag, dma->an_dma_vaddr, dma->an_dma_map);
@@ -514,8 +499,7 @@
* Release all resources
*/
void
-an_release_resources(dev)
- device_t dev;
+an_release_resources(device_t dev)
{
struct an_softc *sc = device_get_softc(dev);
int i;
@@ -558,8 +542,7 @@
}
int
-an_init_mpi350_desc(sc)
- struct an_softc *sc;
+an_init_mpi350_desc(struct an_softc *sc)
{
struct an_command cmd_struct;
struct an_reply reply;
@@ -667,10 +650,7 @@
}
int
-an_attach(sc, dev, flags)
- struct an_softc *sc;
- device_t dev;
- int flags;
+an_attach(struct an_softc *sc, device_t dev, int flags)
{
struct ifnet *ifp = &sc->arpcom.ac_if;
int error;
@@ -824,8 +804,7 @@
}
static void
-an_rxeof(sc)
- struct an_softc *sc;
+an_rxeof(struct an_softc *sc)
{
struct ifnet *ifp;
struct ether_header *eh;
@@ -1068,9 +1047,7 @@
}
static void
-an_txeof(sc, status)
- struct an_softc *sc;
- int status;
+an_txeof(struct an_softc *sc, int status)
{
struct ifnet *ifp;
int id, i;
@@ -1118,8 +1095,7 @@
* in an ad-hoc group, or as a station connected to an access point).
*/
static void
-an_stats_update(xsc)
- void *xsc;
+an_stats_update(void *xsc)
{
struct an_softc *sc;
struct ifnet *ifp;
@@ -1151,8 +1127,7 @@
}
void
-an_intr(xsc)
- void *xsc;
+an_intr(void *xsc)
{
struct an_softc *sc;
struct ifnet *ifp;
@@ -1213,10 +1188,8 @@
}
static int
-an_cmd_struct(sc, cmd, reply)
- struct an_softc *sc;
- struct an_command *cmd;
- struct an_reply *reply;
+an_cmd_struct(struct an_softc *sc, struct an_command *cmd,
+ struct an_reply *reply)
{
int i;
@@ -1260,10 +1233,7 @@
}
static int
-an_cmd(sc, cmd, val)
- struct an_softc *sc;
- int cmd;
- int val;
+an_cmd(struct an_softc *sc, int cmd, int val)
{
int i, s = 0;
@@ -1308,8 +1278,7 @@
* head and force it to reboot correctly.
*/
static void
-an_reset(sc)
- struct an_softc *sc;
+an_reset(struct an_softc *sc)
{
an_cmd(sc, AN_CMD_ENABLE, 0);
an_cmd(sc, AN_CMD_FW_RESTART, 0);
@@ -1327,9 +1296,7 @@
* Read an LTV record from the NIC.
*/
static int
-an_read_record(sc, ltv)
- struct an_softc *sc;
- struct an_ltv_gen *ltv;
+an_read_record(struct an_softc *sc, struct an_ltv_gen *ltv)
{
struct an_ltv_gen *an_ltv;
struct an_card_rid_desc an_rid_desc;
@@ -1440,9 +1407,7 @@
* Same as read, except we inject data instead of reading it.
*/
static int
-an_write_record(sc, ltv)
- struct an_softc *sc;
- struct an_ltv_gen *ltv;
+an_write_record(struct an_softc *sc, struct an_ltv_gen *ltv)
{
struct an_card_rid_desc an_rid_desc;
struct an_command cmd;
@@ -1541,10 +1506,7 @@
}
static void
-an_dump_record(sc, ltv, string)
- struct an_softc *sc;
- struct an_ltv_gen *ltv;
- char *string;
+an_dump_record(struct an_softc *sc, struct an_ltv_gen *ltv, char *string)
{
u_int8_t *ptr2;
int len;
@@ -1586,9 +1548,7 @@
}
static int
-an_seek(sc, id, off, chan)
- struct an_softc *sc;
- int id, off, chan;
+an_seek(struct an_softc *sc, int id, int off, int chan)
{
int i;
int selreg, offreg;
@@ -1622,11 +1582,7 @@
}
static int
-an_read_data(sc, id, off, buf, len)
- struct an_softc *sc;
- int id, off;
- caddr_t buf;
- int len;
+an_read_data(struct an_softc *sc, int id, int off, caddr_t buf, int len)
{
int i;
u_int16_t *ptr;
@@ -1649,11 +1605,7 @@
}
static int
-an_write_data(sc, id, off, buf, len)
- struct an_softc *sc;
- int id, off;
- caddr_t buf;
- int len;
+an_write_data(struct an_softc *sc, int id, int off, caddr_t buf, int len)
{
int i;
u_int16_t *ptr;
@@ -1680,10 +1632,7 @@
* it out.
*/
static int
-an_alloc_nicmem(sc, len, id)
- struct an_softc *sc;
- int len;
- int *id;
+an_alloc_nicmem(struct an_softc *sc, int len, int *id)
{
int i;
@@ -1714,9 +1663,7 @@
}
static void
-an_setdef(sc, areq)
- struct an_softc *sc;
- struct an_req *areq;
+an_setdef(struct an_softc *sc, struct an_req *areq)
{
struct ifnet *ifp;
struct an_ltv_genconfig *cfg;
@@ -1825,9 +1772,7 @@
*/
static void
-an_promisc(sc, promisc)
- struct an_softc *sc;
- int promisc;
+an_promisc(struct an_softc *sc, int promisc)
{
if (sc->an_was_monitor)
an_reset(sc);
@@ -1843,11 +1788,7 @@
}
static int
-an_ioctl(ifp, command, data, cr)
- struct ifnet *ifp;
- u_long command;
- caddr_t data;
- struct ucred *cr;
+an_ioctl(struct ifnet *ifp, u_long command, caddr_t data, struct ucred *cr)
{
int error = 0;
int len;
@@ -2427,8 +2368,7 @@
}
static int
-an_init_tx_ring(sc)
- struct an_softc *sc;
+an_init_tx_ring(struct an_softc *sc)
{
int i;
int id;
@@ -2451,8 +2391,7 @@
}
static void
-an_init(xsc)
- void *xsc;
+an_init(void *xsc)
{
struct an_softc *sc = xsc;
struct ifnet *ifp = &sc->arpcom.ac_if;
@@ -2553,8 +2492,7 @@
}
static void
-an_start(ifp)
- struct ifnet *ifp;
+an_start(struct ifnet *ifp)
{
struct an_softc *sc;
struct mbuf *m0 = NULL;
@@ -2722,8 +2660,7 @@
}
void
-an_stop(sc)
- struct an_softc *sc;
+an_stop(struct an_softc *sc)
{
struct ifnet *ifp;
int i;
@@ -2752,8 +2689,7 @@
}
static void
-an_watchdog(ifp)
- struct ifnet *ifp;
+an_watchdog(struct ifnet *ifp)
{
struct an_softc *sc;
@@ -2772,8 +2708,7 @@
}
void
-an_shutdown(dev)
- device_t dev;
+an_shutdown(device_t dev)
{
struct an_softc *sc;
@@ -2784,8 +2719,7 @@
}
void
-an_resume(dev)
- device_t dev;
+an_resume(device_t dev)
{
struct an_softc *sc;
struct ifnet *ifp;
@@ -2875,11 +2809,8 @@
* strength in MAC (src) indexed cache.
*/
static void
-an_cache_store (sc, m, rx_rssi, rx_quality)
- struct an_softc *sc;
- struct mbuf *m;
- u_int8_t rx_rssi;
- u_int8_t rx_quality;
+an_cache_store (struct an_softc *sc, struct mbuf *m, u_int8_t rx_rssi,
+ u_int8_t rx_quality)
{
struct ether_header *eh = mtod(m, struct ether_header *);
struct ip *ip = NULL;
@@ -3017,8 +2948,7 @@
#endif
static int
-an_media_change(ifp)
- struct ifnet *ifp;
+an_media_change(struct ifnet *ifp)
{
struct an_softc *sc = ifp->if_softc;
struct an_ltv_genconfig *cfg;
@@ -3072,9 +3002,7 @@
}
static void
-an_media_status(ifp, imr)
- struct ifnet *ifp;
- struct ifmediareq *imr;
+an_media_status(struct ifnet *ifp, struct ifmediareq *imr)
{
struct an_ltv_status status;
struct an_softc *sc = ifp->if_softc;
@@ -3122,9 +3050,7 @@
*/
static int
-readrids(ifp, l_ioctl)
- struct ifnet *ifp;
- struct aironet_ioctl *l_ioctl;
+readrids(struct ifnet *ifp, struct aironet_ioctl *l_ioctl)
{
unsigned short rid;
struct an_softc *sc;
@@ -3193,9 +3119,7 @@
}
static int
-writerids(ifp, l_ioctl)
- struct ifnet *ifp;
- struct aironet_ioctl *l_ioctl;
+writerids(struct ifnet *ifp, struct aironet_ioctl *l_ioctl)
{
struct an_softc *sc;
int rid, command;
@@ -3296,8 +3220,7 @@
#define FLASH_SIZE 32 * 1024
static int
-unstickbusy(ifp)
- struct ifnet *ifp;
+unstickbusy(struct ifnet *ifp)
{
struct an_softc *sc = ifp->if_softc;
@@ -3315,9 +3238,7 @@
*/
static int
-WaitBusy(ifp, uSec)
- struct ifnet *ifp;
- int uSec;
+WaitBusy(struct ifnet *ifp, int uSec)
{
int statword = 0xffff;
int delay = 0;
@@ -3341,8 +3262,7 @@
*/
static int
-cmdreset(ifp)
- struct ifnet *ifp;
+cmdreset(struct ifnet *ifp)
{
int status;
struct an_softc *sc = ifp->if_softc;
@@ -3372,8 +3292,7 @@
*/
static int
-setflashmode(ifp)
- struct ifnet *ifp;
+setflashmode(struct ifnet *ifp)
{
int status;
struct an_softc *sc = ifp->if_softc;
@@ -3401,10 +3320,7 @@
*/
static int
-flashgchar(ifp, matchbyte, dwelltime)
- struct ifnet *ifp;
- int matchbyte;
- int dwelltime;
+flashgchar(struct ifnet *ifp, int matchbyte, int dwelltime)
{
int rchar;
unsigned char rbyte = 0;
@@ -3440,10 +3356,7 @@
*/
static int
-flashpchar(ifp, byte, dwelltime)
- struct ifnet *ifp;
- int byte;
- int dwelltime;
+flashpchar(struct ifnet *ifp, int byte, int dwelltime)
{
int echo;
int pollbusy, waittime;
@@ -3499,8 +3412,7 @@
*/
static int
-flashputbuf(ifp)
- struct ifnet *ifp;
+flashputbuf(struct ifnet *ifp)
{
unsigned short *bufp;
int nwords;
@@ -3534,8 +3446,7 @@
*/
static int
-flashrestart(ifp)
- struct ifnet *ifp;
+flashrestart(struct ifnet *ifp)
{
int status = 0;
struct an_softc *sc = ifp->if_softc;
@@ -3553,9 +3464,7 @@
*/
static int
-flashcard(ifp, l_ioctl)
- struct ifnet *ifp;
- struct aironet_ioctl *l_ioctl;
+flashcard(struct ifnet *ifp, struct aironet_ioctl *l_ioctl)
{
int z = 0, status;
struct an_softc *sc;
Index: an/if_an_isa.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/an/if_an_isa.c,v
retrieving revision 1.13
diff -u -r1.13 if_an_isa.c
--- an/if_an_isa.c 12 Oct 2005 17:35:51 -0000 1.13
+++ an/if_an_isa.c 21 Nov 2005 22:50:18 -0000
@@ -81,8 +81,7 @@
static int an_attach_isa (device_t);
static int
-an_probe_isa(dev)
- device_t dev;
+an_probe_isa(device_t dev)
{
int error;
@@ -103,8 +102,7 @@
}
static int
-an_attach_isa(dev)
- device_t dev;
+an_attach_isa(device_t dev)
{
struct an_softc *sc = device_get_softc(dev);
int flags = device_get_flags(dev);
Index: an/if_an_pci.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/an/if_an_pci.c,v
retrieving revision 1.17
diff -u -r1.17 if_an_pci.c
--- an/if_an_pci.c 12 Oct 2005 17:35:51 -0000 1.17
+++ an/if_an_pci.c 21 Nov 2005 22:50:50 -0000
@@ -138,8 +138,7 @@
}
static int
-an_attach_pci(dev)
- device_t dev;
+an_attach_pci(device_t dev)
{
struct an_softc *sc;
int flags, error;
Index: ep/if_ep.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/ep/if_ep.c,v
retrieving revision 1.21
diff -u -r1.21 if_ep.c
--- ep/if_ep.c 22 Nov 2005 00:24:29 -0000 1.21
+++ ep/if_ep.c 22 Nov 2005 01:19:05 -0000
@@ -126,8 +126,7 @@
#define EP_FRST(sc, f) (sc->stat &= ~(f))
static int
-eeprom_rdy(sc)
- struct ep_softc *sc;
+eeprom_rdy(struct ep_softc *sc)
{
int i;
@@ -146,9 +145,7 @@
* before
*/
u_int16_t
-get_e(sc, offset)
- struct ep_softc *sc;
- u_int16_t offset;
+get_e(struct ep_softc *sc, u_int16_t offset)
{
if (!eeprom_rdy(sc))
return (0);
@@ -159,9 +156,7 @@
}
void
-ep_get_macaddr(sc, addr)
- struct ep_softc * sc;
- uint8_t * addr;
+ep_get_macaddr(struct ep_softc *sc, uint8_t *addr)
{
int i;
u_int16_t * macaddr = (u_int16_t *)addr;
@@ -220,8 +215,7 @@
}
void
-ep_get_media(sc)
- struct ep_softc * sc;
+ep_get_media(struct ep_softc *sc)
{
u_int16_t config;
@@ -263,8 +257,7 @@
}
int
-ep_attach(sc)
- struct ep_softc * sc;
+ep_attach(struct ep_softc *sc)
{
struct ifnet * ifp = NULL;
struct ifmedia * ifm = NULL;
@@ -333,8 +326,7 @@
* interrupts. ?!
*/
static void
-ep_if_init(xsc)
- void *xsc;
+ep_if_init(void *xsc)
{
struct ep_softc *sc = xsc;
struct ifnet *ifp = &sc->arpcom.ac_if;
@@ -425,8 +417,7 @@
static const char padmap[] = {0, 3, 2, 1};
static void
-ep_if_start(ifp)
- struct ifnet *ifp;
+ep_if_start(struct ifnet *ifp)
{
struct ep_softc *sc = ifp->if_softc;
u_int len;
@@ -535,8 +526,7 @@
}
void
-ep_intr(arg)
- void *arg;
+ep_intr(void *arg)
{
struct ep_softc *sc = arg;
struct ifnet *ifp = &sc->arpcom.ac_if;
@@ -642,8 +632,7 @@
}
static void
-epread(sc)
- struct ep_softc *sc;
+epread(struct ep_softc *sc)
{
struct mbuf *top, *mcur, *m;
struct ifnet *ifp;
@@ -769,8 +758,7 @@
}
static int
-ep_ifmedia_upd(ifp)
- struct ifnet * ifp;
+ep_ifmedia_upd(struct ifnet *ifp)
{
struct ep_softc * sc = ifp->if_softc;
int i = 0, j;
@@ -815,9 +803,7 @@
}
static void
-ep_ifmedia_sts(ifp, ifmr)
- struct ifnet * ifp;
- struct ifmediareq * ifmr;
+ep_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr)
{
struct ep_softc * sc = ifp->if_softc;
@@ -827,11 +813,7 @@
}
static int
-ep_if_ioctl(ifp, cmd, data, cr)
- struct ifnet * ifp;
- u_long cmd;
- caddr_t data;
- struct ucred * cr;
+ep_if_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data, struct ucred *cr)
{
struct ep_softc * sc = ifp->if_softc;
struct ifreq * ifr = (struct ifreq *)data;
@@ -886,8 +868,7 @@
}
static void
-ep_if_watchdog(ifp)
- struct ifnet *ifp;
+ep_if_watchdog(struct ifnet *ifp)
{
struct ep_softc *sc = ifp->if_softc;
@@ -908,8 +889,7 @@
}
static void
-epstop(sc)
- struct ep_softc *sc;
+epstop(struct ep_softc *sc)
{
if (sc->gone) {
return;
Index: ep/if_ep_isa.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/ep/if_ep_isa.c,v
retrieving revision 1.9
diff -u -r1.9 if_ep_isa.c
--- ep/if_ep_isa.c 30 Oct 2005 04:41:15 -0000 1.9
+++ ep/if_ep_isa.c 21 Nov 2005 22:55:25 -0000
@@ -108,9 +108,7 @@
*/
static u_int16_t
-get_eeprom_data(id_port, offset)
- int id_port;
- int offset;
+get_eeprom_data(int id_port, int offset)
{
int i;
u_int16_t data = 0;
@@ -125,9 +123,7 @@
}
const char *
-ep_isa_match_id (id, isa_devs)
- u_int32_t id;
- struct isa_ident * isa_devs;
+ep_isa_match_id(u_int32_t id, struct isa_ident *isa_devs)
{
struct isa_ident * i = isa_devs;
while(i->name != NULL) {
@@ -147,7 +143,7 @@
}
static int
-ep_isa_identify (driver_t *driver, device_t parent)
+ep_isa_identify(driver_t *driver, device_t parent)
{
int tag = EP_LAST_TAG;
int found = 0;
@@ -280,7 +276,7 @@
}
static int
-ep_isa_probe (device_t dev)
+ep_isa_probe(device_t dev)
{
int error = 0;
@@ -307,7 +303,7 @@
}
static int
-ep_isa_attach (device_t dev)
+ep_isa_attach(device_t dev)
{
struct ep_softc * sc = device_get_softc(dev);
int error = 0;
Index: ep/if_epvar.h
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/ep/if_epvar.h,v
retrieving revision 1.3
diff -u -r1.3 if_epvar.h
--- ep/if_epvar.h 31 May 2005 08:10:44 -0000 1.3
+++ ep/if_epvar.h 22 Nov 2005 00:34:10 -0000
@@ -76,5 +76,5 @@
void ep_get_media (struct ep_softc *);
int ep_attach (struct ep_softc *);
void ep_intr (void *);
-u_int16_t get_e (struct ep_softc *, int);
+u_int16_t get_e (struct ep_softc *, u_int16_t);
void ep_get_macaddr (struct ep_softc *, u_char *);
Index: lnc/if_lnc.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/lnc/if_lnc.c,v
retrieving revision 1.23
diff -u -r1.23 if_lnc.c
--- lnc/if_lnc.c 22 Nov 2005 00:24:33 -0000 1.23
+++ lnc/if_lnc.c 22 Nov 2005 01:19:07 -0000
@@ -885,8 +885,7 @@
}
static void
-lnc_init(xsc)
- void *xsc;
+lnc_init(void *xsc)
{
struct lnc_softc *sc = xsc;
int i;
Index: mii_layer/acphy.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/mii_layer/acphy.c,v
retrieving revision 1.7
diff -u -r1.7 acphy.c
--- mii_layer/acphy.c 24 Oct 2005 16:55:40 -0000 1.7
+++ mii_layer/acphy.c 21 Nov 2005 23:21:16 -0000
@@ -117,8 +117,8 @@
void acphy_reset (struct mii_softc *);
void acphy_status (struct mii_softc *);
-static int acphy_probe(dev)
- device_t dev;
+static int
+acphy_probe(device_t dev)
{
struct mii_attach_args *ma;
@@ -133,8 +133,8 @@
return (0);
}
-static int acphy_attach(dev)
- device_t dev;
+static int
+acphy_attach(device_t dev)
{
struct mii_softc *sc;
struct mii_attach_args *ma;
@@ -167,8 +167,8 @@
return (0);
}
-static int acphy_detach(dev)
- device_t dev;
+static int
+acphy_detach(device_t dev)
{
struct mii_softc *sc;
struct mii_data *mii;
@@ -182,10 +182,7 @@
}
int
-acphy_service(sc, mii, cmd)
- struct mii_softc *sc;
- struct mii_data *mii;
- int cmd;
+acphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
{
struct ifmedia_entry *ife = mii->mii_media.ifm_cur;
int reg;
@@ -271,8 +268,7 @@
}
void
-acphy_status(sc)
- struct mii_softc *sc;
+acphy_status(struct mii_softc *sc)
{
struct mii_data *mii = sc->mii_pdata;
struct ifmedia_entry *ife = mii->mii_media.ifm_cur;
@@ -315,8 +311,7 @@
}
void
-acphy_reset(sc)
- struct mii_softc *sc;
+acphy_reset(struct mii_softc *sc)
{
mii_phy_reset(sc);
Index: mii_layer/amphy.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/mii_layer/amphy.c,v
retrieving revision 1.8
diff -u -r1.8 amphy.c
--- mii_layer/amphy.c 24 Oct 2005 16:55:40 -0000 1.8
+++ mii_layer/amphy.c 21 Nov 2005 23:08:20 -0000
@@ -82,8 +82,8 @@
int amphy_service (struct mii_softc *, struct mii_data *, int);
void amphy_status (struct mii_softc *);
-static int amphy_probe(dev)
- device_t dev;
+static int
+amphy_probe(device_t dev)
{
struct mii_attach_args *ma;
@@ -103,8 +103,8 @@
return(0);
}
-static int amphy_attach(dev)
- device_t dev;
+static int
+amphy_attach(device_t dev)
{
struct mii_softc *sc;
struct mii_attach_args *ma;
@@ -148,8 +148,8 @@
return(0);
}
-static int amphy_detach(dev)
- device_t dev;
+static int
+amphy_detach(device_t dev)
{
struct mii_softc *sc;
struct mii_data *mii;
@@ -162,11 +162,9 @@
return(0);
}
+
int
-amphy_service(sc, mii, cmd)
- struct mii_softc *sc;
- struct mii_data *mii;
+amphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
{
struct ifmedia_entry *ife = mii->mii_media.ifm_cur;
int reg;
@@ -276,8 +274,7 @@
}
void
-amphy_status(sc)
- struct mii_softc *sc;
+amphy_status(struct mii_softc *sc)
{
struct mii_data *mii = sc->mii_pdata;
int bmsr, bmcr, par, anlpar;
Index: mii_layer/brgphy.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/mii_layer/brgphy.c,v
retrieving revision 1.11
diff -u -r1.11 brgphy.c
--- mii_layer/brgphy.c 31 Oct 2005 12:49:05 -0000 1.11
+++ mii_layer/brgphy.c 21 Nov 2005 23:15:30 -0000
@@ -93,8 +93,8 @@
static void bcm5703_load_dspcode(struct mii_softc *);
static int brgphy_mii_model;
-static int brgphy_probe(dev)
- device_t dev;
+static int
+brgphy_probe(device_t dev)
{
struct mii_attach_args *ma;
@@ -146,8 +146,7 @@
}
static int
-brgphy_attach(dev)
- device_t dev;
+brgphy_attach(device_t dev)
{
struct mii_softc *sc;
struct mii_attach_args *ma;
@@ -203,8 +202,7 @@
}
static int
-brgphy_detach(dev)
- device_t dev;
+brgphy_detach(device_t dev)
{
struct mii_softc *sc;
struct mii_data *mii;
@@ -218,10 +216,7 @@
}
static int
-brgphy_service(sc, mii, cmd)
- struct mii_softc *sc;
- struct mii_data *mii;
- int cmd;
+brgphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
{
struct ifmedia_entry *ife = mii->mii_media.ifm_cur;
int reg, speed, gig;
@@ -385,8 +380,7 @@
}
void
-brgphy_status(sc)
- struct mii_softc *sc;
+brgphy_status(struct mii_softc *sc)
{
struct mii_data *mii = sc->mii_pdata;
struct ifmedia_entry *ife = mii->mii_media.ifm_cur;
@@ -448,8 +442,7 @@
static int
-brgphy_mii_phy_auto(mii)
- struct mii_softc *mii;
+brgphy_mii_phy_auto(struct mii_softc *mii)
{
int ktcr = 0;
Index: mii_layer/dcphy.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/mii_layer/dcphy.c,v
retrieving revision 1.7
diff -u -r1.7 dcphy.c
--- mii_layer/dcphy.c 24 Oct 2005 16:55:40 -0000 1.7
+++ mii_layer/dcphy.c 21 Nov 2005 23:10:01 -0000
@@ -117,8 +117,8 @@
static int dcphy_auto (struct mii_softc *, int);
static void dcphy_reset (struct mii_softc *);
-static int dcphy_probe(dev)
- device_t dev;
+static int
+dcphy_probe(device_t dev)
{
struct mii_attach_args *ma;
@@ -137,8 +137,8 @@
return (0);
}
-static int dcphy_attach(dev)
- device_t dev;
+static int
+dcphy_attach(device_t dev)
{
struct mii_softc *sc;
struct mii_attach_args *ma;
@@ -203,8 +203,8 @@
return(0);
}
-static int dcphy_detach(dev)
- device_t dev;
+static int
+dcphy_detach(device_t dev)
{
struct mii_softc *sc;
struct mii_data *mii;
@@ -218,10 +218,7 @@
}
int
-dcphy_service(sc, mii, cmd)
- struct mii_softc *sc;
- struct mii_data *mii;
- int cmd;
+dcphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
{
struct dc_softc *dc_sc;
struct ifmedia_entry *ife = mii->mii_media.ifm_cur;
@@ -357,8 +354,7 @@
}
void
-dcphy_status(sc)
- struct mii_softc *sc;
+dcphy_status(struct mii_softc *sc)
{
struct mii_data *mii = sc->mii_pdata;
int reg, anlpar, tstat = 0;
@@ -443,9 +439,7 @@
}
static int
-dcphy_auto(mii, waitfor)
- struct mii_softc *mii;
- int waitfor;
+dcphy_auto(struct mii_softc *mii, int waitfor)
{
int i;
struct dc_softc *sc;
@@ -493,8 +487,7 @@
}
static void
-dcphy_reset(mii)
- struct mii_softc *mii;
+dcphy_reset(struct mii_softc *mii)
{
struct dc_softc *sc;
@@ -506,4 +499,3 @@
return;
}
-
Index: mii_layer/exphy.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/mii_layer/exphy.c,v
retrieving revision 1.7
diff -u -r1.7 exphy.c
--- mii_layer/exphy.c 24 Oct 2005 16:55:40 -0000 1.7
+++ mii_layer/exphy.c 21 Nov 2005 23:02:37 -0000
@@ -115,8 +115,8 @@
int exphy_service (struct mii_softc *, struct mii_data *, int);
void exphy_reset (struct mii_softc *);
-static int exphy_probe(dev)
- device_t dev;
+static int
+exphy_probe(device_t dev)
{
struct mii_attach_args *ma;
device_t parent;
@@ -147,8 +147,8 @@
return (0);
}
-static int exphy_attach(dev)
- device_t dev;
+static int
+exphy_attach(device_t dev)
{
struct mii_softc *sc;
struct mii_attach_args *ma;
@@ -203,8 +203,8 @@
return(0);
}
-static int exphy_detach(dev)
- device_t dev;
+static int
+exphy_detach(device_t dev)
{
struct mii_softc *sc;
struct mii_data *mii;
@@ -219,10 +219,7 @@
}
int
-exphy_service(sc, mii, cmd)
- struct mii_softc *sc;
- struct mii_data *mii;
- int cmd;
+exphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
{
struct ifmedia_entry *ife = mii->mii_media.ifm_cur;
@@ -299,8 +296,7 @@
}
void
-exphy_reset(sc)
- struct mii_softc *sc;
+exphy_reset(struct mii_softc *sc)
{
mii_phy_reset(sc);
Index: mii_layer/lxtphy.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/mii_layer/lxtphy.c,v
retrieving revision 1.7
diff -u -r1.7 lxtphy.c
--- mii_layer/lxtphy.c 24 Oct 2005 16:55:40 -0000 1.7
+++ mii_layer/lxtphy.c 21 Nov 2005 23:18:31 -0000
@@ -122,8 +122,8 @@
static void lxtphy_set_tp (struct mii_softc *);
static void lxtphy_set_fx (struct mii_softc *);
-static int lxtphy_probe(dev)
- device_t dev;
+static int
+lxtphy_probe(device_t dev)
{
struct mii_attach_args *ma;
@@ -138,8 +138,8 @@
return (0);
}
-static int lxtphy_attach(dev)
- device_t dev;
+static int
+lxtphy_attach(device_t dev)
{
struct mii_softc *sc;
struct mii_attach_args *ma;
@@ -185,8 +185,8 @@
}
-static int lxtphy_detach(dev)
- device_t dev;
+static int
+lxtphy_detach(device_t dev)
{
struct mii_softc *sc;
struct mii_data *mii;
@@ -200,10 +200,7 @@
}
static int
-lxtphy_service(sc, mii, cmd)
- struct mii_softc *sc;
- struct mii_data *mii;
- int cmd;
+lxtphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
{
struct ifmedia_entry *ife = mii->mii_media.ifm_cur;
int reg;
@@ -319,8 +316,7 @@
}
static void
-lxtphy_status(sc)
- struct mii_softc *sc;
+lxtphy_status(struct mii_softc *sc)
{
struct mii_data *mii = sc->mii_pdata;
struct ifmedia_entry *ife = mii->mii_media.ifm_cur;
@@ -366,8 +362,7 @@
}
static void
-lxtphy_set_tp(sc)
- struct mii_softc *sc;
+lxtphy_set_tp(struct mii_softc *sc)
{
int cfg;
@@ -377,8 +372,7 @@
}
static void
-lxtphy_set_fx(sc)
- struct mii_softc *sc;
+lxtphy_set_fx(struct mii_softc *sc)
{
int cfg;
@@ -386,4 +380,3 @@
cfg |= CONFIG_100BASEFX;
PHY_WRITE(sc, MII_LXTPHY_CONFIG, cfg);
}
-
Index: mii_layer/mii.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/mii_layer/mii.c,v
retrieving revision 1.7
diff -u -r1.7 mii.c
--- mii_layer/mii.c 24 Oct 2005 16:45:19 -0000 1.7
+++ mii_layer/mii.c 21 Nov 2005 22:59:28 -0000
@@ -100,8 +100,8 @@
* to the network interface driver parent.
*/
-int miibus_probe(dev)
- device_t dev;
+int
+miibus_probe(device_t dev)
{
struct mii_attach_args ma, *args;
struct mii_data *mii;
@@ -154,8 +154,8 @@
return(0);
}
-int miibus_attach(dev)
- device_t dev;
+int
+miibus_attach(device_t dev)
{
void **v;
ifm_change_cb_t ifmedia_upd;
@@ -173,8 +173,8 @@
return(0);
}
-int miibus_detach(dev)
- device_t dev;
+int
+miibus_detach(device_t dev)
{
struct mii_data *mii;
@@ -186,9 +186,8 @@
return(0);
}
-static int miibus_readreg(dev, phy, reg)
- device_t dev;
- int phy, reg;
+static int
+miibus_readreg(device_t dev, int phy, int reg)
{
device_t parent;
@@ -196,9 +195,8 @@
return(MIIBUS_READREG(parent, phy, reg));
}
-static int miibus_writereg(dev, phy, reg, data)
- device_t dev;
- int phy, reg, data;
+static int
+miibus_writereg(device_t dev, int phy, int reg, int data)
{
device_t parent;
@@ -206,8 +204,8 @@
return(MIIBUS_WRITEREG(parent, phy, reg, data));
}
-static void miibus_statchg(dev)
- device_t dev;
+static void
+miibus_statchg(device_t dev)
{
device_t parent;
@@ -216,8 +214,8 @@
return;
}
-static void miibus_mediainit(dev)
- device_t dev;
+static void
+miibus_mediainit(device_t dev)
{
struct mii_data *mii;
struct ifmedia_entry *m;
@@ -239,11 +237,9 @@
return;
}
-int mii_phy_probe(dev, child, ifmedia_upd, ifmedia_sts)
- device_t dev;
- device_t *child;
- ifm_change_cb_t ifmedia_upd;
- ifm_stat_cb_t ifmedia_sts;
+int
+mii_phy_probe(device_t dev, device_t *child, ifm_change_cb_t ifmedia_upd,
+ ifm_stat_cb_t ifmedia_sts)
{
void **v;
int bmsr, i;
@@ -279,8 +275,7 @@
* Media changed; notify all PHYs.
*/
int
-mii_mediachg(mii)
- struct mii_data *mii;
+mii_mediachg(struct mii_data *mii)
{
struct mii_softc *child;
int rv;
@@ -301,8 +296,7 @@
* Call the PHY tick routines, used during autonegotiation.
*/
void
-mii_tick(mii)
- struct mii_data *mii;
+mii_tick(struct mii_data *mii)
{
struct mii_softc *child;
@@ -315,8 +309,7 @@
* Get media status from PHYs.
*/
void
-mii_pollstat(mii)
- struct mii_data *mii;
+mii_pollstat(struct mii_data *mii)
{
struct mii_softc *child;
Index: mii_layer/mii_physubr.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/mii_layer/mii_physubr.c,v
retrieving revision 1.10
diff -u -r1.10 mii_physubr.c
--- mii_layer/mii_physubr.c 31 Oct 2005 12:49:05 -0000 1.10
+++ mii_layer/mii_physubr.c 21 Nov 2005 23:00:47 -0000
@@ -74,9 +74,7 @@
}
int
-mii_phy_auto(mii, waitfor)
- struct mii_softc *mii;
- int waitfor;
+mii_phy_auto(struct mii_softc *mii, int waitfor)
{
int bmsr, i;
@@ -120,8 +118,7 @@
}
void
-mii_phy_auto_stop(sc)
- struct mii_softc *sc;
+mii_phy_auto_stop(struct mii_softc *sc)
{
if (sc->mii_flags & MIIF_DOINGAUTO) {
sc->mii_flags &= ~MIIF_DOINGAUTO;
@@ -130,8 +127,7 @@
}
void
-mii_phy_auto_timeout(arg)
- void *arg;
+mii_phy_auto_timeout(void *arg)
{
struct mii_softc *mii = arg;
int bmsr;
@@ -153,8 +149,7 @@
}
void
-mii_phy_reset(mii)
- struct mii_softc *mii;
+mii_phy_reset(struct mii_softc *mii)
{
int reg, i;
@@ -218,8 +213,7 @@
* Given a BMCR value, return the corresponding ifmedia word.
*/
int
-mii_media_from_bmcr(bmcr)
- int bmcr;
+mii_media_from_bmcr(int bmcr)
{
int rv = IFM_ETHER;
Index: mii_layer/mlphy.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/mii_layer/mlphy.c,v
retrieving revision 1.7
diff -u -r1.7 mlphy.c
--- mii_layer/mlphy.c 24 Oct 2005 16:55:40 -0000 1.7
+++ mii_layer/mlphy.c 21 Nov 2005 23:05:28 -0000
@@ -102,8 +102,8 @@
static void mlphy_reset (struct mii_softc *);
static void mlphy_status (struct mii_softc *);
-static int mlphy_probe(dev)
- device_t dev;
+static int
+mlphy_probe(device_t dev)
{
struct mii_attach_args *ma;
device_t parent;
@@ -131,8 +131,8 @@
return (0);
}
-static int mlphy_attach(dev)
- device_t dev;
+static int
+mlphy_attach(device_t dev)
{
struct mlphy_softc *msc;
struct mii_softc *sc;
@@ -180,8 +180,8 @@
return(0);
}
-static int mlphy_detach(dev)
- device_t dev;
+static int
+mlphy_detach(device_t dev)
{
struct mlphy_softc *sc;
struct mii_data *mii;
@@ -196,10 +196,7 @@
}
static int
-mlphy_service(xsc, mii, cmd)
- struct mii_softc *xsc;
- struct mii_data *mii;
- int cmd;
+mlphy_service(struct mii_softc *xsc, struct mii_data *mii, int cmd)
{
struct ifmedia_entry *ife = mii->mii_media.ifm_cur;
int reg;
@@ -400,8 +397,8 @@
* The Micro Linear PHY comes out of reset with the 'autoneg
* enable' bit set, which we don't want.
*/
-static void mlphy_reset(sc)
- struct mii_softc *sc;
+static void
+mlphy_reset(struct mii_softc *sc)
{
int reg;
@@ -417,8 +414,8 @@
* If we negotiate a 10Mbps mode, we need to check for an alternate
* PHY and make sure it's enabled and set correctly.
*/
-static void mlphy_status(sc)
- struct mii_softc *sc;
+static void
+mlphy_status(struct mii_softc *sc)
{
struct mlphy_softc *msc = (struct mlphy_softc *)sc;
struct mii_data *mii = msc->ml_mii.mii_pdata;
Index: mii_layer/nsgphy.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/mii_layer/nsgphy.c,v
retrieving revision 1.11
diff -u -r1.11 nsgphy.c
--- mii_layer/nsgphy.c 31 Oct 2005 12:49:05 -0000 1.11
+++ mii_layer/nsgphy.c 21 Nov 2005 23:12:44 -0000
@@ -96,8 +96,8 @@
static int nsgphy_mii_phy_auto (struct mii_softc *, int);
extern void mii_phy_auto_timeout (void *);
-static int nsgphy_probe(dev)
- device_t dev;
+static int
+nsgphy_probe(device_t dev)
{
struct mii_attach_args *ma;
@@ -117,8 +117,8 @@
return(ENXIO);
}
-static int nsgphy_attach(dev)
- device_t dev;
+static int
+nsgphy_attach(device_t dev)
{
struct mii_softc *sc;
struct mii_attach_args *ma;
@@ -181,8 +181,8 @@
return(0);
}
-static int nsgphy_detach(dev)
- device_t dev;
+static int
+nsgphy_detach(device_t dev)
{
struct mii_softc *sc;
struct mii_data *mii;
@@ -196,11 +196,9 @@
return(0);
}
+
int
-nsgphy_service(sc, mii, cmd)
- struct mii_softc *sc;
- struct mii_data *mii;
- int cmd;
+nsgphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
{
struct ifmedia_entry *ife = mii->mii_media.ifm_cur;
int reg;
@@ -343,8 +341,7 @@
}
void
-nsgphy_status(sc)
- struct mii_softc *sc;
+nsgphy_status(struct mii_softc *sc)
{
struct mii_data *mii = sc->mii_pdata;
int bmsr, bmcr, physup, anlpar, gstat;
@@ -413,9 +410,7 @@
static int
-nsgphy_mii_phy_auto(mii, waitfor)
- struct mii_softc *mii;
- int waitfor;
+nsgphy_mii_phy_auto(struct mii_softc *mii, int waitfor)
{
int bmsr, ktcr = 0, i;
Index: mii_layer/nsphy.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/mii_layer/nsphy.c,v
retrieving revision 1.7
diff -u -r1.7 nsphy.c
--- mii_layer/nsphy.c 24 Oct 2005 16:55:40 -0000 1.7
+++ mii_layer/nsphy.c 21 Nov 2005 23:04:02 -0000
@@ -119,8 +119,8 @@
int nsphy_service (struct mii_softc *, struct mii_data *, int);
void nsphy_status (struct mii_softc *);
-static int nsphy_probe(dev)
- device_t dev;
+static int
+nsphy_probe(device_t dev)
{
struct mii_attach_args *ma;
@@ -135,8 +135,8 @@
return (0);
}
-static int nsphy_attach(dev)
- device_t dev;
+static int
+nsphy_attach(device_t dev)
{
struct mii_softc *sc;
struct mii_attach_args *ma;
@@ -190,8 +190,8 @@
return(0);
}
-static int nsphy_detach(dev)
- device_t dev;
+static int
+nsphy_detach(device_t dev)
{
struct mii_softc *sc;
struct mii_data *mii;
@@ -206,10 +206,7 @@
}
int
-nsphy_service(sc, mii, cmd)
- struct mii_softc *sc;
- struct mii_data *mii;
- int cmd;
+nsphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
{
struct ifmedia_entry *ife = mii->mii_media.ifm_cur;
int reg;
@@ -355,8 +352,7 @@
}
void
-nsphy_status(sc)
- struct mii_softc *sc;
+nsphy_status(struct mii_softc *sc)
{
struct mii_data *mii = sc->mii_pdata;
int bmsr, bmcr, par, anlpar;
Index: mii_layer/pnaphy.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/mii_layer/pnaphy.c,v
retrieving revision 1.8
diff -u -r1.8 pnaphy.c
--- mii_layer/pnaphy.c 24 Oct 2005 16:55:40 -0000 1.8
+++ mii_layer/pnaphy.c 21 Nov 2005 23:13:38 -0000
@@ -88,8 +88,7 @@
int pnaphy_service (struct mii_softc *, struct mii_data *, int);
static int
-pnaphy_probe(dev)
- device_t dev;
+pnaphy_probe(device_t dev)
{
struct mii_attach_args *ma;
@@ -106,8 +105,7 @@
}
static int
-pnaphy_attach(dev)
- device_t dev;
+pnaphy_attach(device_t dev)
{
struct mii_softc *sc;
struct mii_attach_args *ma;
@@ -156,8 +154,8 @@
return(0);
}
-static int pnaphy_detach(dev)
- device_t dev;
+static int
+pnaphy_detach(device_t dev)
{
struct mii_softc *sc;
struct mii_data *mii;
@@ -172,10 +170,7 @@
}
int
-pnaphy_service(sc, mii, cmd)
- struct mii_softc *sc;
- struct mii_data *mii;
- int cmd;
+pnaphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
{
struct ifmedia_entry *ife = mii->mii_media.ifm_cur;
int reg;
Index: mii_layer/pnphy.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/mii_layer/pnphy.c,v
retrieving revision 1.8
diff -u -r1.8 pnphy.c
--- mii_layer/pnphy.c 24 Oct 2005 16:55:40 -0000 1.8
+++ mii_layer/pnphy.c 21 Nov 2005 23:11:13 -0000
@@ -101,8 +101,8 @@
int pnphy_service (struct mii_softc *, struct mii_data *, int);
void pnphy_status (struct mii_softc *);
-static int pnphy_probe(dev)
- device_t dev;
+static int
+pnphy_probe(device_t dev)
{
struct mii_attach_args *ma;
@@ -121,8 +121,8 @@
return (0);
}
-static int pnphy_attach(dev)
- device_t dev;
+static int
+pnphy_attach(device_t dev)
{
struct mii_softc *sc;
struct mii_attach_args *ma;
@@ -165,8 +165,8 @@
return(0);
}
-static int pnphy_detach(dev)
- device_t dev;
+static int
+pnphy_detach(device_t dev)
{
struct mii_softc *sc;
struct mii_data *mii;
@@ -180,10 +180,7 @@
}
int
-pnphy_service(sc, mii, cmd)
- struct mii_softc *sc;
- struct mii_data *mii;
- int cmd;
+pnphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
{
struct dc_softc *dc_sc;
struct ifmedia_entry *ife = mii->mii_media.ifm_cur;
@@ -278,8 +275,7 @@
}
void
-pnphy_status(sc)
- struct mii_softc *sc;
+pnphy_status(struct mii_softc *sc)
{
struct mii_data *mii = sc->mii_pdata;
int reg;
Index: mii_layer/qsphy.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/mii_layer/qsphy.c,v
retrieving revision 1.7
diff -u -r1.7 qsphy.c
--- mii_layer/qsphy.c 24 Oct 2005 16:55:40 -0000 1.7
+++ mii_layer/qsphy.c 21 Nov 2005 23:19:53 -0000
@@ -121,8 +121,8 @@
void qsphy_reset (struct mii_softc *);
void qsphy_status (struct mii_softc *);
-static int qsphy_probe(dev)
- device_t dev;
+static int
+qsphy_probe(device_t dev)
{
struct mii_attach_args *ma;
@@ -137,8 +137,8 @@
return (0);
}
-static int qsphy_attach(dev)
- device_t dev;
+static int
+qsphy_attach(device_t dev)
{
struct mii_softc *sc;
struct mii_attach_args *ma;
@@ -171,8 +171,8 @@
return (0);
}
-static int qsphy_detach(dev)
- device_t dev;
+static int
+qsphy_detach(device_t dev)
{
struct mii_softc *sc;
struct mii_data *mii;
@@ -186,10 +186,7 @@
}
int
-qsphy_service(sc, mii, cmd)
- struct mii_softc *sc;
- struct mii_data *mii;
- int cmd;
+qsphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
{
struct ifmedia_entry *ife = mii->mii_media.ifm_cur;
int reg;
@@ -270,8 +267,7 @@
}
void
-qsphy_status(sc)
- struct mii_softc *sc;
+qsphy_status(struct mii_softc *sc)
{
struct mii_data *mii = sc->mii_pdata;
int bmsr, bmcr, pctl;
@@ -322,8 +318,7 @@
}
void
-qsphy_reset(sc)
- struct mii_softc *sc;
+qsphy_reset(struct mii_softc *sc)
{
mii_phy_reset(sc);
Index: mii_layer/tlphy.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/mii_layer/tlphy.c,v
retrieving revision 1.7
diff -u -r1.7 tlphy.c
--- mii_layer/tlphy.c 24 Oct 2005 16:55:40 -0000 1.7
+++ mii_layer/tlphy.c 21 Nov 2005 23:07:04 -0000
@@ -129,8 +129,8 @@
void tlphy_acomp (struct tlphy_softc *);
void tlphy_status (struct tlphy_softc *);
-static int tlphy_probe(dev)
- device_t dev;
+static int
+tlphy_probe(device_t dev)
{
struct mii_attach_args *ma;
@@ -145,8 +145,8 @@
return (0);
}
-static int tlphy_attach(dev)
- device_t dev;
+static int
+tlphy_attach(device_t dev)
{
struct tlphy_softc *sc;
struct mii_attach_args *ma;
@@ -225,8 +225,8 @@
return(0);
}
-static int tlphy_detach(dev)
- device_t dev;
+static int
+tlphy_detach(device_t dev)
{
struct tlphy_softc *sc;
struct mii_data *mii;
@@ -240,10 +240,7 @@
}
int
-tlphy_service(self, mii, cmd)
- struct mii_softc *self;
- struct mii_data *mii;
- int cmd;
+tlphy_service(struct mii_softc *self, struct mii_data *mii, int cmd)
{
struct tlphy_softc *sc = (struct tlphy_softc *)self;
struct ifmedia_entry *ife = mii->mii_media.ifm_cur;
@@ -359,8 +356,7 @@
}
void
-tlphy_status(sc)
- struct tlphy_softc *sc;
+tlphy_status(struct tlphy_softc *sc)
{
struct mii_data *mii = sc->sc_mii.mii_pdata;
int bmsr, bmcr, tlctrl;
@@ -402,9 +398,7 @@
}
int
-tlphy_auto(sc, waitfor)
- struct tlphy_softc *sc;
- int waitfor;
+tlphy_auto(struct tlphy_softc *sc, int waitfor)
{
int error;
@@ -430,8 +424,7 @@
}
void
-tlphy_acomp(sc)
- struct tlphy_softc *sc;
+tlphy_acomp(struct tlphy_softc *sc)
{
int aner, anlpar;
Index: mii_layer/ukphy_subr.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/mii_layer/ukphy_subr.c,v
retrieving revision 1.5
diff -u -r1.5 ukphy_subr.c
--- mii_layer/ukphy_subr.c 24 Oct 2005 15:55:32 -0000 1.5
+++ mii_layer/ukphy_subr.c 21 Nov 2005 23:01:10 -0000
@@ -64,8 +64,7 @@
* by decoding the NWay autonegotiation, use this routine.
*/
void
-ukphy_status(phy)
- struct mii_softc *phy;
+ukphy_status(struct mii_softc *phy)
{
struct mii_data *mii = phy->mii_pdata;
int bmsr, bmcr, anlpar;
Index: mii_layer/xmphy.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/mii_layer/xmphy.c,v
retrieving revision 1.7
diff -u -r1.7 xmphy.c
--- mii_layer/xmphy.c 24 Oct 2005 16:55:40 -0000 1.7
+++ mii_layer/xmphy.c 21 Nov 2005 23:17:04 -0000
@@ -87,8 +87,8 @@
static int xmphy_mii_phy_auto (struct mii_softc *, int);
extern void mii_phy_auto_timeout (void *);
-static int xmphy_probe(dev)
- device_t dev;
+static int
+xmphy_probe(device_t dev)
{
struct mii_attach_args *ma;
@@ -109,8 +109,8 @@
return(ENXIO);
}
-static int xmphy_attach(dev)
- device_t dev;
+static int
+xmphy_attach(device_t dev)
{
struct mii_softc *sc;
struct mii_attach_args *ma;
@@ -160,8 +160,8 @@
return(0);
}
-static int xmphy_detach(dev)
- device_t dev;
+static int
+xmphy_detach(device_t dev)
{
struct mii_softc *sc;
struct mii_data *mii;
@@ -175,11 +175,9 @@
return(0);
}
+
int
-xmphy_service(sc, mii, cmd)
- struct mii_softc *sc;
- struct mii_data *mii;
- int cmd;
+xmphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
{
struct ifmedia_entry *ife = mii->mii_media.ifm_cur;
int reg;
@@ -294,8 +292,7 @@
}
void
-xmphy_status(sc)
- struct mii_softc *sc;
+xmphy_status(struct mii_softc *sc)
{
struct mii_data *mii = sc->mii_pdata;
int bmsr, bmcr, anlpar;
@@ -347,11 +344,8 @@
return;
}
-
static int
-xmphy_mii_phy_auto(mii, waitfor)
- struct mii_softc *mii;
- int waitfor;
+xmphy_mii_phy_auto(struct mii_softc *mii, int waitfor)
{
int bmsr, anar = 0, i;
Index: owi/if_owi.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/owi/if_owi.c,v
retrieving revision 1.12
diff -u -r1.12 if_owi.c
--- owi/if_owi.c 22 Nov 2005 00:24:33 -0000 1.12
+++ owi/if_owi.c 22 Nov 2005 01:19:10 -0000
@@ -177,8 +177,7 @@
};
int
-owi_generic_detach(dev)
- device_t dev;
+owi_generic_detach(device_t dev)
{
struct wi_softc *sc = device_get_softc(dev);
struct ifnet *ifp = &sc->arpcom.ac_if;
@@ -454,8 +453,7 @@
}
static void
-wi_get_id(sc)
- struct wi_softc *sc;
+wi_get_id(struct wi_softc *sc)
{
struct wi_ltv_ver ver;
struct wi_card_ident *id;
@@ -546,8 +544,7 @@
}
static void
-wi_rxeof(sc)
- struct wi_softc *sc;
+wi_rxeof(struct wi_softc *sc)
{
struct ifnet *ifp;
struct ether_header *eh;
@@ -800,9 +797,7 @@
}
static void
-wi_txeof(sc, status)
- struct wi_softc *sc;
- int status;
+wi_txeof(struct wi_softc *sc, int status)
{
struct ifnet *ifp;
@@ -820,8 +815,7 @@
}
static void
-wi_inquire(xsc)
- void *xsc;
+wi_inquire(void *xsc)
{
struct wi_softc *sc = xsc;
struct ifnet *ifp = &sc->arpcom.ac_if;
@@ -842,8 +836,7 @@
}
static void
-wi_update_stats(sc)
- struct wi_softc *sc;
+wi_update_stats(struct wi_softc *sc)
{
struct wi_ltv_gen gen;
u_int16_t id;
@@ -895,8 +888,7 @@
}
static void
-wi_intr(xsc)
- void *xsc;
+wi_intr(void *xsc)
{
struct wi_softc *sc = xsc;
struct ifnet *ifp = &sc->arpcom.ac_if;
@@ -956,12 +948,7 @@
}
static int
-wi_cmd(sc, cmd, val0, val1, val2)
- struct wi_softc *sc;
- int cmd;
- int val0;
- int val1;
- int val2;
+wi_cmd(struct wi_softc *sc, int cmd, int val0, int val1, int val2)
{
int i, s = 0;
static volatile int count = 0;
@@ -1021,8 +1008,7 @@
}
static void
-wi_reset(sc)
- struct wi_softc *sc;
+wi_reset(struct wi_softc *sc)
{
#define WI_INIT_TRIES 3
int i;
@@ -1061,9 +1047,7 @@
* Read an LTV record from the NIC.
*/
static int
-wi_read_record(sc, ltv)
- struct wi_softc *sc;
- struct wi_ltv_gen *ltv;
+wi_read_record(struct wi_softc *sc, struct wi_ltv_gen *ltv)
{
u_int16_t *ptr;
int i, len, code;
@@ -1174,9 +1158,7 @@
* Same as read, except we inject data instead of reading it.
*/
static int
-wi_write_record(sc, ltv)
- struct wi_softc *sc;
- struct wi_ltv_gen *ltv;
+wi_write_record(struct wi_softc *sc, struct wi_ltv_gen *ltv)
{
u_int16_t *ptr;
int i;
@@ -1304,9 +1286,7 @@
}
static int
-wi_seek(sc, id, off, chan)
- struct wi_softc *sc;
- int id, off, chan;
+wi_seek(struct wi_softc *sc, int id, int off, int chan)
{
int i;
int selreg, offreg;
@@ -1346,11 +1326,7 @@
}
static int
-wi_read_data(sc, id, off, buf, len)
- struct wi_softc *sc;
- int id, off;
- caddr_t buf;
- int len;
+wi_read_data(struct wi_softc *sc, int id, int off, caddr_t buf, int len)
{
int i;
u_int16_t *ptr;
@@ -1378,11 +1354,7 @@
* we expect them, we preform the transfer over again.
*/
static int
-wi_write_data(sc, id, off, buf, len)
- struct wi_softc *sc;
- int id, off;
- caddr_t buf;
- int len;
+wi_write_data(struct wi_softc *sc, int id, int off, caddr_t buf, int len)
{
int i;
u_int16_t *ptr;
@@ -1424,10 +1396,7 @@
* it out.
*/
static int
-wi_alloc_nicmem(sc, len, id)
- struct wi_softc *sc;
- int len;
- int *id;
+wi_alloc_nicmem(struct wi_softc *sc, int len, int *id)
{
int i;
@@ -1463,8 +1432,7 @@
}
static void
-wi_setmulti(sc)
- struct wi_softc *sc;
+wi_setmulti(struct wi_softc *sc)
{
struct ifnet *ifp;
int i = 0;
@@ -1507,9 +1475,7 @@
}
static void
-wi_setdef(sc, wreq)
- struct wi_softc *sc;
- struct wi_req *wreq;
+wi_setdef(struct wi_softc *sc, struct wi_req *wreq)
{
struct ifnet *ifp;
@@ -1590,11 +1556,7 @@
}
static int
-wi_ioctl(ifp, command, data, cr)
- struct ifnet *ifp;
- u_long command;
- caddr_t data;
- struct ucred *cr;
+wi_ioctl(struct ifnet *ifp, u_long command, caddr_t data, struct ucred *cr)
{
int error = 0;
int len;
@@ -1980,8 +1942,7 @@
}
static void
-wi_init(xsc)
- void *xsc;
+wi_init(void *xsc)
{
struct wi_softc *sc = xsc;
struct ifnet *ifp = &sc->arpcom.ac_if;
@@ -2201,8 +2162,7 @@
}
static void
-wi_start(ifp)
- struct ifnet *ifp;
+wi_start(struct ifnet *ifp)
{
struct wi_softc *sc = ifp->if_softc;
struct mbuf *m0;
@@ -2343,10 +2303,7 @@
}
int
-owi_mgmt_xmit(sc, data, len)
- struct wi_softc *sc;
- caddr_t data;
- int len;
+owi_mgmt_xmit(struct wi_softc *sc, caddr_t data, int len)
{
struct wi_frame tx_frame;
int id;
@@ -2382,8 +2339,7 @@
}
static void
-wi_stop(sc)
- struct wi_softc *sc;
+wi_stop(struct wi_softc *sc)
{
struct ifnet *ifp;
@@ -2416,8 +2372,7 @@
}
static void
-wi_watchdog(ifp)
- struct ifnet *ifp;
+wi_watchdog(struct ifnet *ifp)
{
struct wi_softc *sc;
@@ -2433,9 +2388,7 @@
}
int
-owi_alloc(dev, rid)
- device_t dev;
- int rid;
+owi_alloc(device_t dev, int rid)
{
struct wi_softc *sc = device_get_softc(dev);
@@ -2485,8 +2438,7 @@
}
void
-owi_free(dev)
- device_t dev;
+owi_free(device_t dev)
{
struct wi_softc *sc = device_get_softc(dev);
@@ -2507,8 +2459,7 @@
}
void
-owi_shutdown(dev)
- device_t dev;
+owi_shutdown(device_t dev)
{
struct wi_softc *sc;
@@ -2722,10 +2673,7 @@
#endif
static int
-wi_get_cur_ssid(sc, ssid, len)
- struct wi_softc *sc;
- char *ssid;
- int *len;
+wi_get_cur_ssid(struct wi_softc *sc, char *ssid, int *len)
{
int error = 0;
struct wi_req wreq;
@@ -2779,8 +2727,7 @@
}
static int
-wi_media_change(ifp)
- struct ifnet *ifp;
+wi_media_change(struct ifnet *ifp)
{
struct wi_softc *sc = ifp->if_softc;
int otype = sc->wi_ptype;
@@ -2843,9 +2790,7 @@
}
static void
-wi_media_status(ifp, imr)
- struct ifnet *ifp;
- struct ifmediareq *imr;
+wi_media_status(struct ifnet *ifp, struct ifmediareq *imr)
{
struct wi_req wreq;
struct wi_softc *sc = ifp->if_softc;
@@ -2905,9 +2850,7 @@
}
static int
-wi_get_debug(sc, wreq)
- struct wi_softc *sc;
- struct wi_req *wreq;
+wi_get_debug(struct wi_softc *sc, struct wi_req *wreq)
{
int error = 0;
@@ -2964,9 +2907,7 @@
}
static int
-wi_set_debug(sc, wreq)
- struct wi_softc *sc;
- struct wi_req *wreq;
+wi_set_debug(struct wi_softc *sc, struct wi_req *wreq)
{
int error = 0;
u_int16_t cmd, param0 = 0, param1 = 0;
Index: owi/if_owi_pccard.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/owi/if_owi_pccard.c,v
retrieving revision 1.1
diff -u -r1.1 if_owi_pccard.c
--- owi/if_owi_pccard.c 5 Sep 2004 13:34:56 -0000 1.1
+++ owi/if_owi_pccard.c 21 Nov 2005 23:30:35 -0000
@@ -151,8 +151,7 @@
};
static int
-wi_pccard_match(dev)
- device_t dev;
+wi_pccard_match(device_t dev)
{
const struct pccard_product *pp;
@@ -165,8 +164,7 @@
}
static int
-wi_pccard_probe(dev)
- device_t dev;
+wi_pccard_probe(device_t dev)
{
struct wi_softc *sc;
int error;
Index: owi/if_owi_pci.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/owi/if_owi_pci.c,v
retrieving revision 1.2
diff -u -r1.2 if_owi_pci.c
--- owi/if_owi_pci.c 24 May 2005 09:52:14 -0000 1.2
+++ owi/if_owi_pci.c 21 Nov 2005 23:30:59 -0000
@@ -108,8 +108,7 @@
DRIVER_MODULE(if_owi, pci, wi_pci_driver, owi_devclass, 0, 0);
static int
-wi_pci_probe(dev)
- device_t dev;
+wi_pci_probe(device_t dev)
{
struct wi_softc *sc;
int i;
Index: pcn/if_pcn.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/pcn/if_pcn.c,v
retrieving revision 1.25
diff -u -r1.25 if_pcn.c
--- pcn/if_pcn.c 22 Nov 2005 00:24:33 -0000 1.25
+++ pcn/if_pcn.c 22 Nov 2005 01:19:11 -0000
@@ -196,59 +196,52 @@
#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)
- struct pcn_softc *sc;
- int reg;
+static u_int32_t
+pcn_csr_read(struct pcn_softc *sc, int reg)
{
CSR_WRITE_4(sc, PCN_IO32_RAP, reg);
return(CSR_READ_4(sc, PCN_IO32_RDP));
}
-static u_int16_t pcn_csr_read16(sc, reg)
- struct pcn_softc *sc;
- int reg;
+static u_int16_t
+pcn_csr_read16(struct pcn_softc *sc, int reg)
{
CSR_WRITE_2(sc, PCN_IO16_RAP, reg);
return(CSR_READ_2(sc, PCN_IO16_RDP));
}
-static void pcn_csr_write(sc, reg, val)
- struct pcn_softc *sc;
- int reg;
+static void
+pcn_csr_write(struct pcn_softc *sc, int reg, int val)
{
CSR_WRITE_4(sc, PCN_IO32_RAP, reg);
CSR_WRITE_4(sc, PCN_IO32_RDP, val);
return;
}
-static u_int32_t pcn_bcr_read(sc, reg)
- struct pcn_softc *sc;
- int reg;
+static u_int32_t
+pcn_bcr_read(struct pcn_softc *sc, int reg)
{
CSR_WRITE_4(sc, PCN_IO32_RAP, reg);
return(CSR_READ_4(sc, PCN_IO32_BDP));
}
-static u_int16_t pcn_bcr_read16(sc, reg)
- struct pcn_softc *sc;
- int reg;
+static u_int16_t
+pcn_bcr_read16(struct pcn_softc *sc, int reg)
{
CSR_WRITE_2(sc, PCN_IO16_RAP, reg);
return(CSR_READ_2(sc, PCN_IO16_BDP));
}
-static void pcn_bcr_write(sc, reg, val)
- struct pcn_softc *sc;
- int reg;
+static void
+pcn_bcr_write(struct pcn_softc *sc, int reg, int val)
{
CSR_WRITE_4(sc, PCN_IO32_RAP, reg);
CSR_WRITE_4(sc, PCN_IO32_BDP, val);
return;
}
-static int pcn_miibus_readreg(dev, phy, reg)
- device_t dev;
- int phy, reg;
+static int
+pcn_miibus_readreg(device_t dev, int phy, int reg)
{
struct pcn_softc *sc;
int val;
@@ -268,9 +261,8 @@
return(val);
}
-static int pcn_miibus_writereg(dev, phy, reg, data)
- device_t dev;
- int phy, reg, data;
+static int
+pcn_miibus_writereg(device_t dev, int phy, int reg, int data)
{
struct pcn_softc *sc;
@@ -282,8 +274,8 @@
return(0);
}
-static void pcn_miibus_statchg(dev)
- device_t dev;
+static void
+pcn_miibus_statchg(device_t dev)
{
struct pcn_softc *sc;
struct mii_data *mii;
@@ -302,8 +294,8 @@
#define DC_POLY 0xEDB88320
-static u_int32_t pcn_crc(addr)
- caddr_t addr;
+static u_int32_t
+pcn_crc(caddr_t addr)
{
u_int32_t idx, bit, data, crc;
@@ -318,8 +310,8 @@
return ((crc >> 26) & 0x3F);
}
-static void pcn_setmulti(sc)
- struct pcn_softc *sc;
+static void
+pcn_setmulti(struct pcn_softc *sc)
{
struct ifnet *ifp;
struct ifmultiaddr *ifma;
@@ -357,8 +349,8 @@
return;
}
-static void pcn_reset(sc)
- struct pcn_softc *sc;
+static void
+pcn_reset(struct pcn_softc *sc)
{
/*
* Issue a reset by reading from the RESET register.
@@ -386,8 +378,8 @@
* 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)
- device_t dev;
+static int
+pcn_probe(device_t dev)
{
struct pcn_type *t;
struct pcn_softc *sc;
@@ -485,8 +477,8 @@
* Attach the interface. Allocate softc structures, do ifmedia
* setup and ethernet/BPF attach.
*/
-static int pcn_attach(dev)
- device_t dev;
+static int
+pcn_attach(device_t dev)
{
uint8_t eaddr[ETHER_ADDR_LEN];
u_int32_t command;
@@ -634,8 +626,8 @@
return(error);
}
-static int pcn_detach(dev)
- device_t dev;
+static int
+pcn_detach(device_t dev)
{
struct pcn_softc *sc = device_get_softc(dev);
struct ifnet *ifp = &sc->arpcom.ac_if;
@@ -673,8 +665,8 @@
/*
* Initialize the transmit descriptors.
*/
-static int pcn_list_tx_init(sc)
- struct pcn_softc *sc;
+static int
+pcn_list_tx_init(struct pcn_softc *sc)
{
struct pcn_list_data *ld;
struct pcn_ring_data *cd;
@@ -699,8 +691,8 @@
/*
* Initialize the RX descriptors and allocate mbufs for them.
*/
-static int pcn_list_rx_init(sc)
- struct pcn_softc *sc;
+static int
+pcn_list_rx_init(struct pcn_softc *sc)
{
struct pcn_list_data *ld;
struct pcn_ring_data *cd;
@@ -722,10 +714,8 @@
/*
* Initialize an RX descriptor and attach an MBUF cluster.
*/
-static int pcn_newbuf(sc, idx, m)
- struct pcn_softc *sc;
- int idx;
- struct mbuf *m;
+static int
+pcn_newbuf(struct pcn_softc *sc, int idx, struct mbuf *m)
{
struct mbuf *m_new = NULL;
struct pcn_rx_desc *c;
@@ -764,8 +754,8 @@
* A frame has been uploaded: pass the resulting mbuf chain up to
* the higher level protocols.
*/
-static void pcn_rxeof(sc)
- struct pcn_softc *sc;
+static void
+pcn_rxeof(struct pcn_softc *sc)
{
struct mbuf *m;
struct ifnet *ifp;
@@ -822,8 +812,8 @@
* the list buffers.
*/
-static void pcn_txeof(sc)
- struct pcn_softc *sc;
+static void
+pcn_txeof(struct pcn_softc *sc)
{
struct pcn_tx_desc *cur_tx = NULL;
struct ifnet *ifp;
@@ -879,8 +869,8 @@
return;
}
-static void pcn_tick(xsc)
- void *xsc;
+static void
+pcn_tick(void *xsc)
{
struct pcn_softc *sc = xsc;
struct mii_data *mii;
@@ -908,8 +898,8 @@
crit_exit();
}
-static void pcn_intr(arg)
- void *arg;
+static void
+pcn_intr(void *arg)
{
struct pcn_softc *sc;
struct ifnet *ifp;
@@ -951,10 +941,8 @@
* 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)
- struct pcn_softc *sc;
- struct mbuf *m_head;
- u_int32_t *txidx;
+static int
+pcn_encap(struct pcn_softc *sc, struct mbuf *m_head, u_int32_t *txidx)
{
struct pcn_tx_desc *f = NULL;
struct mbuf *m;
@@ -1006,8 +994,8 @@
* copy of the pointers since the transmit list fragment pointers are
* physical addresses.
*/
-static void pcn_start(ifp)
- struct ifnet *ifp;
+static void
+pcn_start(struct ifnet *ifp)
{
struct pcn_softc *sc;
struct mbuf *m_head = NULL;
@@ -1053,8 +1041,8 @@
ifp->if_timer = 5;
}
-void pcn_setfilt(ifp)
- struct ifnet *ifp;
+void
+pcn_setfilt(struct ifnet *ifp)
{
struct pcn_softc *sc;
@@ -1077,8 +1065,8 @@
return;
}
-static void pcn_init(xsc)
- void *xsc;
+static void
+pcn_init(void *xsc)
{
struct pcn_softc *sc = xsc;
struct ifnet *ifp = &sc->arpcom.ac_if;
@@ -1187,8 +1175,8 @@
/*
* Set media options.
*/
-static int pcn_ifmedia_upd(ifp)
- struct ifnet *ifp;
+static int
+pcn_ifmedia_upd(struct ifnet *ifp)
{
struct pcn_softc *sc;
struct mii_data *mii;
@@ -1211,9 +1199,8 @@
/*
* Report current media status.
*/
-static void pcn_ifmedia_sts(ifp, ifmr)
- struct ifnet *ifp;
- struct ifmediareq *ifmr;
+static void
+pcn_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr)
{
struct pcn_softc *sc;
struct mii_data *mii;
@@ -1228,11 +1215,8 @@
return;
}
-static int pcn_ioctl(ifp, command, data, cr)
- struct ifnet *ifp;
- u_long command;
- caddr_t data;
- struct ucred *cr;
+static int
+pcn_ioctl(struct ifnet *ifp, u_long command, caddr_t data, struct ucred *cr)
{
struct pcn_softc *sc = ifp->if_softc;
struct ifreq *ifr = (struct ifreq *) data;
@@ -1293,8 +1277,8 @@
return(error);
}
-static void pcn_watchdog(ifp)
- struct ifnet *ifp;
+static void
+pcn_watchdog(struct ifnet *ifp)
{
struct pcn_softc *sc;
@@ -1317,8 +1301,8 @@
* Stop the adapter and free any mbufs allocated to the
* RX and TX lists.
*/
-static void pcn_stop(sc)
- struct pcn_softc *sc;
+static void
+pcn_stop(struct pcn_softc *sc)
{
int i;
struct ifnet *ifp;
@@ -1364,8 +1348,8 @@
* 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)
- device_t dev;
+static void
+pcn_shutdown(device_t dev)
{
struct pcn_softc *sc;
Index: sf/if_sf.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/sf/if_sf.c,v
retrieving revision 1.24
diff -u -r1.24 if_sf.c
--- sf/if_sf.c 22 Nov 2005 00:24:34 -0000 1.24
+++ sf/if_sf.c 22 Nov 2005 01:19:12 -0000
@@ -215,9 +215,8 @@
#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)
- struct sf_softc *sc;
- int reg;
+static u_int32_t
+csr_read_4(struct sf_softc *sc, int reg)
{
u_int32_t val;
@@ -231,9 +230,8 @@
return(val);
}
-static u_int8_t sf_read_eeprom(sc, reg)
- struct sf_softc *sc;
- int reg;
+static u_int8_t
+sf_read_eeprom(struct sf_softc *sc, int reg)
{
u_int8_t val;
@@ -243,10 +241,8 @@
return(val);
}
-static void csr_write_4(sc, reg, val)
- struct sf_softc *sc;
- int reg;
- u_int32_t val;
+static void
+csr_write_4(struct sf_softc *sc, int reg, u_int32_t val)
{
#ifdef SF_USEIOSPACE
CSR_WRITE_4(sc, SF_INDIRECTIO_ADDR, reg + SF_RMAP_INTREG_BASE);
@@ -257,8 +253,8 @@
return;
}
-static u_int32_t sf_calchash(addr)
- caddr_t addr;
+static u_int32_t
+sf_calchash(caddr_t addr)
{
u_int32_t crc, carry;
int i, j;
@@ -287,10 +283,8 @@
* offset 'idx.' The perfect filter only has 16 entries so do
* some sanity tests.
*/
-static int sf_setperf(sc, idx, mac)
- struct sf_softc *sc;
- int idx;
- caddr_t mac;
+static int
{
u_int16_t *p;
@@ -317,10 +311,8 @@
* 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)
- struct sf_softc *sc;
- caddr_t mac;
- int prio;
+static int
+sf_sethash(struct sf_softc *sc, caddr_t mac, int prio)
{
u_int32_t h = 0;
@@ -344,10 +336,8 @@
/*
* Set a VLAN tag in the receive filter.
*/
-static int sf_setvlan(sc, idx, vlan)
- struct sf_softc *sc;
- int idx;
- u_int32_t vlan;
+static int
+sf_setvlan(struct sf_softc *sc, int idx, u_int32_t vlan)
{
if (idx < 0 || idx >> SF_RXFILT_HASH_CNT)
return(EINVAL);
@@ -359,9 +349,8 @@
}
#endif
-static int sf_miibus_readreg(dev, phy, reg)
- device_t dev;
- int phy, reg;
+static int
+sf_miibus_readreg(device_t dev, int phy, int reg)
{
struct sf_softc *sc;
int i;
@@ -384,9 +373,8 @@
return(val & 0x0000FFFF);
}
-static int sf_miibus_writereg(dev, phy, reg, val)
- device_t dev;
- int phy, reg, val;
+static int
+sf_miibus_writereg(device_t dev, int phy, int reg, int val)
{
struct sf_softc *sc;
int i;
@@ -405,8 +393,8 @@
return(0);
}
-static void sf_miibus_statchg(dev)
- device_t dev;
+static void
+sf_miibus_statchg(device_t dev)
{
struct sf_softc *sc;
struct mii_data *mii;
@@ -425,8 +413,8 @@
return;
}
-static void sf_setmulti(sc)
- struct sf_softc *sc;
+static void
+sf_setmulti(struct sf_softc *sc)
{
struct ifnet *ifp;
int i;
@@ -482,8 +470,8 @@
/*
* Set media options.
*/
-static int sf_ifmedia_upd(ifp)
- struct ifnet *ifp;
+static int
+sf_ifmedia_upd(struct ifnet *ifp)
{
struct sf_softc *sc;
struct mii_data *mii;
@@ -505,9 +493,8 @@
/*
* Report current media status.
*/
-static void sf_ifmedia_sts(ifp, ifmr)
- struct ifnet *ifp;
- struct ifmediareq *ifmr;
+static void
+sf_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr)
{
struct sf_softc *sc;
struct mii_data *mii;
@@ -522,11 +509,8 @@
return;
}
-static int sf_ioctl(ifp, command, data, cr)
- struct ifnet *ifp;
- u_long command;
- caddr_t data;
- struct ucred *cr;
+static int
+sf_ioctl(struct ifnet *ifp, u_long command, caddr_t data, struct ucred *cr)
{
struct sf_softc *sc = ifp->if_softc;
struct ifreq *ifr = (struct ifreq *) data;
@@ -575,8 +559,8 @@
return(error);
}
-static void sf_reset(sc)
- struct sf_softc *sc;
+static void
+sf_reset(struct sf_softc *sc)
{
int i;
@@ -607,8 +591,8 @@
* We also check the subsystem ID so that we can identify exactly which
* NIC has been found, if possible.
*/
-static int sf_probe(dev)
- device_t dev;
+static int
+sf_probe(device_t dev)
{
struct sf_type *t;
@@ -662,8 +646,8 @@
* Attach the interface. Allocate softc structures, do ifmedia
* setup and ethernet/BPF attach.
*/
-static int sf_attach(dev)
- device_t dev;
+static int
+sf_attach(device_t dev)
{
int i;
u_int32_t command;
@@ -815,8 +799,8 @@
return(error);
}
-static int sf_detach(dev)
- device_t dev;
+static int
+sf_detach(device_t dev)
{
struct sf_softc *sc = device_get_softc(dev);
struct ifnet *ifp = &sc->arpcom.ac_if;
@@ -850,8 +834,8 @@
return(0);
}
-static int sf_init_rx_ring(sc)
- struct sf_softc *sc;
+static int
+sf_init_rx_ring(struct sf_softc *sc)
{
struct sf_list_data *ld;
int i;
@@ -871,8 +855,8 @@
return(0);
}
-static void sf_init_tx_ring(sc)
- struct sf_softc *sc;
+static void
+sf_init_tx_ring(struct sf_softc *sc)
{
struct sf_list_data *ld;
int i;
@@ -895,10 +879,9 @@
return;
}
-static int sf_newbuf(sc, c, m)
- struct sf_softc *sc;
- struct sf_rx_bufdesc_type0 *c;
- struct mbuf *m;
+static int
+sf_newbuf(struct sf_softc *sc, struct sf_rx_bufdesc_type0 *c,
+ struct mbuf *m)
{
struct mbuf *m_new = NULL;
@@ -947,8 +930,8 @@
* packets into properly aligned buffers before handing them off.
*/
-static void sf_rxeof(sc)
- struct sf_softc *sc;
+static void
+sf_rxeof(struct sf_softc *sc)
{
struct mbuf *m;
struct ifnet *ifp;
@@ -1011,8 +994,8 @@
* gives the impression that it should match the producer/consumer
* index, which is the offset in 8 byte blocks.
*/
-static void sf_txeof(sc)
- struct sf_softc *sc;
+static void
+sf_txeof(struct sf_softc *sc)
{
int txcons, cmpprodidx, cmpconsidx;
struct sf_tx_cmpdesc_type1 *cur_cmp;
@@ -1056,8 +1039,8 @@
return;
}
-static void sf_txthresh_adjust(sc)
- struct sf_softc *sc;
+static void
+sf_txthresh_adjust(struct sf_softc *sc)
{
u_int32_t txfctl;
u_int8_t txthresh;
@@ -1079,8 +1062,8 @@
return;
}
-static void sf_intr(arg)
- void *arg;
+static void
+sf_intr(void *arg)
{
struct sf_softc *sc;
struct ifnet *ifp;
@@ -1132,8 +1115,8 @@
return;
}
-static void sf_init(xsc)
- void *xsc;
+static void
+sf_init(void *xsc)
{
struct sf_softc *sc = xsc;
struct ifnet *ifp = &sc->arpcom.ac_if;
@@ -1240,10 +1223,9 @@
crit_exit();
}
-static int sf_encap(sc, c, m_head)
- struct sf_softc *sc;
- struct sf_tx_bufdesc_type0 *c;
- struct mbuf *m_head;
+static int
+sf_encap(struct sf_softc *sc, struct sf_tx_bufdesc_type0 *c,
+ struct mbuf *m_head)
{
int frag = 0;
struct sf_frag *f = NULL;
@@ -1303,8 +1285,8 @@
return(0);
}
-static void sf_start(ifp)
- struct ifnet *ifp;
+static void
+sf_start(struct ifnet *ifp)
{
struct sf_softc *sc;
struct sf_tx_bufdesc_type0 *cur_tx = NULL;
@@ -1370,8 +1352,8 @@
return;
}
-static void sf_stop(sc)
- struct sf_softc *sc;
+static void
+sf_stop(struct sf_softc *sc)
{
int i;
struct ifnet *ifp;
@@ -1419,8 +1401,8 @@
* indirect data register, the contents of the address register could
* be changed out from under us.
*/
-static void sf_stats_update(xsc)
- void *xsc;
+static void
+sf_stats_update(void *xsc)
{
struct sf_softc *sc = xsc;
struct ifnet *ifp = &sc->arpcom.ac_if;
@@ -1458,8 +1440,8 @@
crit_exit();
}
-static void sf_watchdog(ifp)
- struct ifnet *ifp;
+static void
+sf_watchdog(struct ifnet *ifp)
{
struct sf_softc *sc;
@@ -1478,8 +1460,8 @@
return;
}
-static void sf_shutdown(dev)
- device_t dev;
+static void
+sf_shutdown(device_t dev)
{
struct sf_softc *sc;
Index: ste/if_ste.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/ste/if_ste.c,v
retrieving revision 1.30
diff -u -r1.30 if_ste.c
--- ste/if_ste.c 22 Nov 2005 00:24:34 -0000 1.30
+++ ste/if_ste.c 22 Nov 2005 01:19:14 -0000
@@ -189,8 +189,8 @@
/*
* Sync the PHYs by setting data bit and strobing the clock 32 times.
*/
-static void ste_mii_sync(sc)
- struct ste_softc *sc;
+static void
+ste_mii_sync(struct ste_softc *sc)
{
int i;
@@ -209,10 +209,8 @@
/*
* Clock a series of bits through the MII.
*/
-static void ste_mii_send(sc, bits, cnt)
- struct ste_softc *sc;
- u_int32_t bits;
- int cnt;
+static void
+ste_mii_send(struct ste_softc *sc, u_int32_t bits, int cnt)
{
int i;
@@ -234,10 +232,8 @@
/*
* Read an PHY register through the MII.
*/
-static int ste_mii_readreg(sc, frame)
- struct ste_softc *sc;
- struct ste_mii_frame *frame;
-
+static int
+ste_mii_readreg(struct ste_softc *sc, struct ste_mii_frame *frame)
{
int i, ack;
@@ -326,10 +322,8 @@
/*
* Write to a PHY register through the MII.
*/
-static int ste_mii_writereg(sc, frame)
- struct ste_softc *sc;
- struct ste_mii_frame *frame;
-
+static int
+ste_mii_writereg(struct ste_softc *sc, struct ste_mii_frame *frame)
{
crit_enter();
@@ -371,9 +365,8 @@
return(0);
}
-static int ste_miibus_readreg(dev, phy, reg)
- device_t dev;
- int phy, reg;
+static int
+ste_miibus_readreg(device_t dev, int phy, int reg)
{
struct ste_softc *sc;
struct ste_mii_frame frame;
@@ -392,9 +385,8 @@
return(frame.mii_data);
}
-static int ste_miibus_writereg(dev, phy, reg, data)
- device_t dev;
- int phy, reg, data;
+static int
+ste_miibus_writereg(device_t dev, int phy, int reg, int data)
{
struct ste_softc *sc;
struct ste_mii_frame frame;
@@ -411,8 +403,8 @@
return(0);
}
-static void ste_miibus_statchg(dev)
- device_t dev;
+static void
+ste_miibus_statchg(device_t dev)
{
struct ste_softc *sc;
struct mii_data *mii;
@@ -439,8 +431,8 @@
return;
}
-static int ste_ifmedia_upd(ifp)
- struct ifnet *ifp;
+static int
+ste_ifmedia_upd(struct ifnet *ifp)
{
struct ste_softc *sc;
struct mii_data *mii;
@@ -459,9 +451,8 @@
return(0);
}
-static void ste_ifmedia_sts(ifp, ifmr)
- struct ifnet *ifp;
- struct ifmediareq *ifmr;
+static void
+ste_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr)
{
struct ste_softc *sc;
struct mii_data *mii;
@@ -476,8 +467,8 @@
return;
}
-static void ste_wait(sc)
- struct ste_softc *sc;
+static void
+ste_wait(struct ste_softc *sc)
{
int i;
@@ -496,8 +487,8 @@
* The EEPROM is slow: give it time to come ready after issuing
* it a command.
*/
-static int ste_eeprom_wait(sc)
- struct ste_softc *sc;
+static int
+ste_eeprom_wait(struct ste_softc *sc)
{
int i;
@@ -522,12 +513,8 @@
* 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)
- struct ste_softc *sc;
- caddr_t dest;
- int off;
- int cnt;
- int swap;
+static int
+ste_read_eeprom(struct ste_softc *sc, caddr_t dest, int off, int cnt, int swap)
{
int err = 0, i;
u_int16_t word = 0, *ptr;
@@ -551,8 +538,8 @@
return(err ? 1 : 0);
}
-static void ste_setmulti(sc)
- struct ste_softc *sc;
+static void
+ste_setmulti(struct ste_softc *sc)
{
struct ifnet *ifp;
int h = 0;
@@ -595,8 +582,8 @@
return;
}
-static void ste_intr(xsc)
- void *xsc;
+static void
+ste_intr(void *xsc)
{
struct ste_softc *sc;
struct ifnet *ifp;
@@ -651,8 +638,8 @@
* A frame has been uploaded: pass the resulting mbuf chain up to
* the higher level protocols.
*/
-static void ste_rxeof(sc)
- struct ste_softc *sc;
+static void
+ste_rxeof(struct ste_softc *sc)
{
struct mbuf *m;
struct ifnet *ifp;
@@ -725,8 +712,8 @@
return;
}
-static void ste_txeoc(sc)
- struct ste_softc *sc;
+static void
+ste_txeoc(struct ste_softc *sc)
{
u_int8_t txstat;
struct ifnet *ifp;
@@ -762,8 +749,8 @@
return;
}
-static void ste_txeof(sc)
- struct ste_softc *sc;
+static void
+ste_txeof(struct ste_softc *sc)
{
struct ste_chain *cur_tx = NULL;
struct ifnet *ifp;
@@ -798,8 +785,8 @@
return;
}
-static void ste_stats_update(xsc)
- void *xsc;
+static void
+ste_stats_update(void *xsc)
{
struct ste_softc *sc;
struct ifnet *ifp;
@@ -841,8 +828,8 @@
* 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)
- device_t dev;
+static int
+ste_probe(device_t dev)
{
struct ste_type *t;
@@ -864,8 +851,8 @@
* Attach the interface. Allocate softc structures, do ifmedia
* setup and ethernet/BPF attach.
*/
-static int ste_attach(dev)
- device_t dev;
+static int
+ste_attach(device_t dev)
{
struct ste_softc *sc;
struct ifnet *ifp;
@@ -1009,8 +996,8 @@
return(error);
}
-static int ste_detach(dev)
- device_t dev;
+static int
+ste_detach(device_t dev)
{
struct ste_softc *sc;
struct ifnet *ifp;
@@ -1046,10 +1033,9 @@
return(0);
}
-static int ste_newbuf(sc, c, m)
- struct ste_softc *sc;
- struct ste_chain_onefrag *c;
- struct mbuf *m;
+static int
+ste_newbuf(struct ste_softc *sc, struct ste_chain_onefrag *c,
+ struct mbuf *m)
{
struct mbuf *m_new = NULL;
@@ -1079,8 +1065,8 @@
return(0);
}
-static int ste_init_rx_list(sc)
- struct ste_softc *sc;
+static int
+ste_init_rx_list(struct ste_softc *sc)
{
struct ste_chain_data *cd;
struct ste_list_data *ld;
@@ -1112,8 +1098,8 @@
return(0);
}
-static void ste_init_tx_list(sc)
- struct ste_softc *sc;
+static void
+ste_init_tx_list(struct ste_softc *sc)
{
struct ste_chain_data *cd;
struct ste_list_data *ld;
@@ -1147,8 +1133,8 @@
return;
}
-static void ste_init(xsc)
- void *xsc;
+static void
+ste_init(void *xsc)
{
struct ste_softc *sc;
int i;
@@ -1259,8 +1245,8 @@
return;
}
-static void ste_stop(sc)
- struct ste_softc *sc;
+static void
+ste_stop(struct ste_softc *sc)
{
int i;
struct ifnet *ifp;
@@ -1305,8 +1291,8 @@
return;
}
-static void ste_reset(sc)
- struct ste_softc *sc;
+static void
+ste_reset(struct ste_softc *sc)
{
int i;
@@ -1330,11 +1316,8 @@
return;
}
-static int ste_ioctl(ifp, command, data, cr)
- struct ifnet *ifp;
- u_long command;
- caddr_t data;
- struct ucred *cr;
+static int
+ste_ioctl(struct ifnet *ifp, u_long command, caddr_t data, struct ucred *cr)
{
struct ste_softc *sc;
struct ifreq *ifr;
@@ -1391,10 +1374,8 @@
return(error);
}
-static int ste_encap(sc, c, m_head)
- struct ste_softc *sc;
- struct ste_chain *c;
- struct mbuf *m_head;
+static int
+ste_encap(struct ste_softc *sc, struct ste_chain *c, struct mbuf *m_head)
{
int frag = 0;
struct ste_frag *f = NULL;
@@ -1454,8 +1435,8 @@
return(0);
}
-static void ste_start(ifp)
- struct ifnet *ifp;
+static void
+ste_start(struct ifnet *ifp)
{
struct ste_softc *sc;
struct mbuf *m_head = NULL;
@@ -1524,8 +1505,8 @@
return;
}
-static void ste_watchdog(ifp)
- struct ifnet *ifp;
+static void
+ste_watchdog(struct ifnet *ifp)
{
struct ste_softc *sc;
@@ -1546,8 +1527,8 @@
return;
}
-static void ste_shutdown(dev)
- device_t dev;
+static void
+ste_shutdown(device_t dev)
{
struct ste_softc *sc;
Index: tl/if_tl.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/tl/if_tl.c,v
retrieving revision 1.32
diff -u -r1.32 if_tl.c
--- tl/if_tl.c 22 Nov 2005 00:24:34 -0000 1.32
+++ tl/if_tl.c 22 Nov 2005 01:19:14 -0000
@@ -359,64 +359,53 @@
DRIVER_MODULE(if_tl, pci, tl_driver, tl_devclass, 0, 0);
DRIVER_MODULE(miibus, tl, miibus_driver, miibus_devclass, 0, 0);
-static u_int8_t tl_dio_read8(sc, reg)
- struct tl_softc *sc;
- int reg;
+static u_int8_t
+tl_dio_read8(struct tl_softc *sc, int reg)
{
CSR_WRITE_2(sc, TL_DIO_ADDR, reg);
return(CSR_READ_1(sc, TL_DIO_DATA + (reg & 3)));
}
-static u_int16_t tl_dio_read16(sc, reg)
- struct tl_softc *sc;
- int reg;
+static u_int16_t
+tl_dio_read16(struct tl_softc *sc, int reg)
{
CSR_WRITE_2(sc, TL_DIO_ADDR, reg);
return(CSR_READ_2(sc, TL_DIO_DATA + (reg & 3)));
}
-static u_int32_t tl_dio_read32(sc, reg)
- struct tl_softc *sc;
- int reg;
+static u_int32_t
+tl_dio_read32(struct tl_softc *sc, int reg)
{
CSR_WRITE_2(sc, TL_DIO_ADDR, reg);
return(CSR_READ_4(sc, TL_DIO_DATA + (reg & 3)));
}
-static void tl_dio_write8(sc, reg, val)
- struct tl_softc *sc;
- int reg;
- int val;
+static void
+tl_dio_write8(struct tl_softc *sc, int reg, int val)
{
CSR_WRITE_2(sc, TL_DIO_ADDR, reg);
CSR_WRITE_1(sc, TL_DIO_DATA + (reg & 3), val);
return;
}
-static void tl_dio_write16(sc, reg, val)
- struct tl_softc *sc;
- int reg;
- int val;
+static void
+tl_dio_write16(struct tl_softc *sc, int reg, int val)
{
CSR_WRITE_2(sc, TL_DIO_ADDR, reg);
CSR_WRITE_2(sc, TL_DIO_DATA + (reg & 3), val);
return;
}
-static void tl_dio_write32(sc, reg, val)
- struct tl_softc *sc;
- int reg;
- int val;
+static void
+tl_dio_write32(struct tl_softc *sc, int reg, int val)
{
CSR_WRITE_2(sc, TL_DIO_ADDR, reg);
CSR_WRITE_4(sc, TL_DIO_DATA + (reg & 3), val);
return;
}
-static void tl_dio_setbit(sc, reg, bit)
- struct tl_softc *sc;
- int reg;
- int bit;
+static void
+tl_dio_setbit(struct tl_softc *sc, int reg, int bit)
{
u_int8_t f;
@@ -428,10 +417,8 @@
return;
}
-static void tl_dio_clrbit(sc, reg, bit)
- struct tl_softc *sc;
- int reg;
- int bit;
+static void
+tl_dio_clrbit(struct tl_softc *sc, int reg, int bit)
{
u_int8_t f;
@@ -443,10 +430,8 @@
return;
}
-static void tl_dio_setbit16(sc, reg, bit)
- struct tl_softc *sc;
- int reg;
- int bit;
+static void
+tl_dio_setbit16(struct tl_softc *sc, int reg, int bit)
{
u_int16_t f;
@@ -458,10 +443,8 @@
return;
}
-static void tl_dio_clrbit16(sc, reg, bit)
- struct tl_softc *sc;
- int reg;
- int bit;
+static void
+tl_dio_clrbit16(struct tl_softc *sc, int reg, int bit)
{
u_int16_t f;
@@ -476,9 +459,8 @@
/*
* Send an instruction or address to the EEPROM, check for ACK.
*/
-static u_int8_t tl_eeprom_putbyte(sc, byte)
- struct tl_softc *sc;
- int byte;
+static u_int8_t
+tl_eeprom_putbyte(struct tl_softc *sc, int byte)
{
int i, ack = 0;
@@ -520,10 +502,8 @@
/*
* Read a byte of data stored in the EEPROM at address 'addr.'
*/
-static u_int8_t tl_eeprom_getbyte(sc, addr, dest)
- struct tl_softc *sc;
- int addr;
- u_int8_t *dest;
+static u_int8_t
+tl_eeprom_getbyte(struct tl_softc *sc, int addr, u_int8_t *dest)
{
int i;
u_int8_t byte = 0;
@@ -588,11 +568,8 @@
/*
* Read a sequence of bytes from the EEPROM.
*/
-static int tl_read_eeprom(sc, dest, off, cnt)
- struct tl_softc *sc;
- caddr_t dest;
- int off;
- int cnt;
+static int
+tl_read_eeprom(struct tl_softc *sc, caddr_t dest, int off, int cnt)
{
int err = 0, i;
u_int8_t byte = 0;
@@ -607,8 +584,8 @@
return(err ? 1 : 0);
}
-static void tl_mii_sync(sc)
- struct tl_softc *sc;
+static void
+tl_mii_sync(struct tl_softc *sc)
{
int i;
@@ -622,10 +599,8 @@
return;
}
-static void tl_mii_send(sc, bits, cnt)
- struct tl_softc *sc;
- u_int32_t bits;
- int cnt;
+static void
+tl_mii_send(struct tl_softc *sc, u_int32_t bits, int cnt)
{
int i;
@@ -640,10 +615,8 @@
}
}
-static int tl_mii_readreg(sc, frame)
- struct tl_softc *sc;
- struct tl_mii_frame *frame;
-
+static int
+tl_mii_readreg(struct tl_softc *sc, struct tl_mii_frame *frame)
{
int i, ack;
int minten = 0;
@@ -735,10 +708,8 @@
return(0);
}
-static int tl_mii_writereg(sc, frame)
- struct tl_softc *sc;
- struct tl_mii_frame *frame;
-
+static int
+tl_mii_writereg(struct tl_softc *sc, struct tl_mii_frame *frame)
{
int minten;
@@ -790,9 +761,8 @@
return(0);
}
-static int tl_miibus_readreg(dev, phy, reg)
- device_t dev;
- int phy, reg;
+static int
+tl_miibus_readreg(device_t dev, int phy, int reg)
{
struct tl_softc *sc;
struct tl_mii_frame frame;
@@ -807,9 +777,8 @@
return(frame.mii_data);
}
-static int tl_miibus_writereg(dev, phy, reg, data)
- device_t dev;
- int phy, reg, data;
+static int
+tl_miibus_writereg(device_t dev, int phy, int reg, int data)
{
struct tl_softc *sc;
struct tl_mii_frame frame;
@@ -826,8 +795,8 @@
return(0);
}
-static void tl_miibus_statchg(dev)
- device_t dev;
+static void
+tl_miibus_statchg(device_t dev)
{
struct tl_softc *sc;
struct mii_data *mii;
@@ -847,9 +816,8 @@
/*
* Set modes for bitrate devices.
*/
-static void tl_setmode(sc, media)
- struct tl_softc *sc;
- int media;
+static void
+tl_setmode(struct tl_softc *sc, int media)
{
if (IFM_SUBTYPE(media) == IFM_10_5)
tl_dio_setbit(sc, TL_ACOMMIT, TL_AC_MTXD1);
@@ -876,8 +844,8 @@
* Bytes 0-2 and 3-5 are symmetrical, so are folded together. Then
* the folded 24-bit value is split into 6-bit portions and XOR'd.
*/
-static int tl_calchash(addr)
- caddr_t addr;
+static int
+tl_calchash(caddr_t addr)
{
int t;
@@ -893,10 +861,8 @@
* hold the station address, which leaves us free to use the other
* three for multicast addresses.
*/
-static void tl_setfilt(sc, addr, slot)
- struct tl_softc *sc;
- caddr_t addr;
- int slot;
+static void
+tl_setfilt(struct tl_softc *sc, caddr_t addr, int slot)
{
int i;
u_int16_t regaddr;
@@ -925,8 +891,8 @@
* the list once to find the tail, then traverse it again backwards to
* update the multicast filter.
*/
-static void tl_setmulti(sc)
- struct tl_softc *sc;
+static void
+tl_setmulti(struct tl_softc *sc)
{
struct ifnet *ifp;
u_int32_t hashes[2] = { 0, 0 };
@@ -991,8 +957,8 @@
* second pause at the end to 'wait for the clocks to start' but in my
* experience this isn't necessary.
*/
-static void tl_hardreset(dev)
- device_t dev;
+static void
+tl_hardreset(device_t dev)
{
struct tl_softc *sc;
int i;
@@ -1017,9 +983,8 @@
return;
}
-static void tl_softreset(sc, internal)
- struct tl_softc *sc;
- int internal;
+static void
+tl_softreset(struct tl_softc *sc, int internal)
{
u_int32_t cmd, dummy, i;
@@ -1079,8 +1044,8 @@
* Probe for a ThunderLAN chip. Check the PCI vendor and device IDs
* against our list and return its name if we find a match.
*/
-static int tl_probe(dev)
- device_t dev;
+static int
+tl_probe(device_t dev)
{
struct tl_type *t;
@@ -1098,8 +1063,8 @@
return(ENXIO);
}
-static int tl_attach(dev)
- device_t dev;
+static int
+tl_attach(device_t dev)
{
int i;
u_int16_t did, vid;
@@ -1299,8 +1264,8 @@
return(error);
}
-static int tl_detach(dev)
- device_t dev;
+static int
+tl_detach(device_t dev)
{
struct tl_softc *sc = device_get_softc(dev);
struct ifnet *ifp = &sc->arpcom.ac_if;
@@ -1335,8 +1300,8 @@
/*
* Initialize the transmit lists.
*/
-static int tl_list_tx_init(sc)
- struct tl_softc *sc;
+static int
+tl_list_tx_init(struct tl_softc *sc)
{
struct tl_chain_data *cd;
struct tl_list_data *ld;
@@ -1362,8 +1327,8 @@
/*
* Initialize the RX lists and allocate mbufs for them.
*/
-static int tl_list_rx_init(sc)
- struct tl_softc *sc;
+static int
+tl_list_rx_init(struct tl_softc *sc)
{
struct tl_chain_data *cd;
struct tl_list_data *ld;
@@ -1393,9 +1358,8 @@
return(0);
}
-static int tl_newbuf(sc, c)
- struct tl_softc *sc;
- struct tl_chain_onefrag *c;
+static int
+tl_newbuf(struct tl_softc *sc, struct tl_chain_onefrag *c)
{
struct mbuf *m_new;
@@ -1413,6 +1377,7 @@
return(0);
}
+
/*
* Interrupt handler for RX 'end of frame' condition (EOF). This
* tells us that a full ethernet frame has been captured and we need
@@ -1436,9 +1401,8 @@
* the buffers, it will generate an end of channel interrupt and wait
* for us to empty the chain and restart the receiver.
*/
-static int tl_intvec_rxeof(xsc, type)
- void *xsc;
- u_int32_t type;
+static int
+tl_intvec_rxeof(void *xsc, u_int32_t type)
{
struct tl_softc *sc;
int r = 0, total_len = 0;
@@ -1501,9 +1465,8 @@
* the card has hit the end of the receive buffer chain and we need to
* empty out the buffers and shift the pointer back to the beginning again.
*/
-static int tl_intvec_rxeoc(xsc, type)
- void *xsc;
- u_int32_t type;
+static int
+tl_intvec_rxeoc(void *xsc, u_int32_t type)
{
struct tl_softc *sc;
int r;
@@ -1524,9 +1487,8 @@
return(r);
}
-static int tl_intvec_txeof(xsc, type)
- void *xsc;
- u_int32_t type;
+static int
+tl_intvec_txeof(void *xsc, u_int32_t type)
{
struct tl_softc *sc;
int r = 0;
@@ -1576,9 +1538,8 @@
* if the tl_txeoc flag is set, and only the TXEOC interrupt handler
* can set this flag once tl_start() has cleared it.
*/
-static int tl_intvec_txeoc(xsc, type)
- void *xsc;
- u_int32_t type;
+static int
+tl_intvec_txeoc(void *xsc, u_int32_t type)
{
struct tl_softc *sc;
struct ifnet *ifp;
@@ -1612,9 +1573,8 @@
return(1);
}
-static int tl_intvec_adchk(xsc, type)
- void *xsc;
- u_int32_t type;
+static int
+tl_intvec_adchk(void *xsc, u_int32_t type)
{
struct tl_softc *sc;
@@ -1633,9 +1593,8 @@
return(0);
}
-static int tl_intvec_netsts(xsc, type)
- void *xsc;
- u_int32_t type;
+static int
+tl_intvec_netsts(void *xsc, u_int32_t type)
{
struct tl_softc *sc;
u_int16_t netsts;
@@ -1650,8 +1609,8 @@
return(1);
}
-static void tl_intr(xsc)
- void *xsc;
+static void
+tl_intr(void *xsc)
{
struct tl_softc *sc;
struct ifnet *ifp;
@@ -1722,8 +1681,8 @@
return;
}
-static void tl_stats_update(xsc)
- void *xsc;
+static void
+tl_stats_update(void *xsc)
{
struct tl_softc *sc;
struct ifnet *ifp;
@@ -1785,10 +1744,8 @@
* Encapsulate an mbuf chain in a list by coupling the mbuf data
* pointers to the fragment pointers.
*/
-static int tl_encap(sc, c, m_head)
- struct tl_softc *sc;
- struct tl_chain *c;
- struct mbuf *m_head;
+static int
+tl_encap(struct tl_softc *sc, struct tl_chain *c, struct mbuf *m_head)
{
int frag = 0;
struct tl_frag *f = NULL;
@@ -1875,8 +1832,8 @@
* copy of the pointers since the transmit list fragment pointers are
* physical addresses.
*/
-static void tl_start(ifp)
- struct ifnet *ifp;
+static void
+tl_start(struct ifnet *ifp)
{
struct tl_softc *sc;
struct mbuf *m_head = NULL;
@@ -1958,8 +1915,8 @@
return;
}
-static void tl_init(xsc)
- void *xsc;
+static void
+tl_init(void *xsc)
{
struct tl_softc *sc = xsc;
struct ifnet *ifp = &sc->arpcom.ac_if;
@@ -2043,8 +2000,8 @@
/*
* Set media options.
*/
-static int tl_ifmedia_upd(ifp)
- struct ifnet *ifp;
+static int
+tl_ifmedia_upd(struct ifnet *ifp)
{
struct tl_softc *sc;
struct mii_data *mii = NULL;
@@ -2064,9 +2021,8 @@
/*
* Report current media status.
*/
-static void tl_ifmedia_sts(ifp, ifmr)
- struct ifnet *ifp;
- struct ifmediareq *ifmr;
+static void
+tl_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr)
{
struct tl_softc *sc;
struct mii_data *mii;
@@ -2095,11 +2051,8 @@
return;
}
-static int tl_ioctl(ifp, command, data, cr)
- struct ifnet *ifp;
- u_long command;
- caddr_t data;
- struct ucred *cr;
+static int
+tl_ioctl(struct ifnet *ifp, u_long command, caddr_t data, struct ucred *cr)
{
struct tl_softc *sc = ifp->if_softc;
struct ifreq *ifr = (struct ifreq *) data;
@@ -2156,8 +2109,8 @@
return(error);
}
-static void tl_watchdog(ifp)
- struct ifnet *ifp;
+static void
+tl_watchdog(struct ifnet *ifp)
{
struct tl_softc *sc;
@@ -2177,8 +2130,8 @@
* Stop the adapter and free any mbufs allocated to the
* RX and TX lists.
*/
-static void tl_stop(sc)
- struct tl_softc *sc;
+static void
+tl_stop(struct tl_softc *sc)
{
int i;
struct ifnet *ifp;
@@ -2241,8 +2194,8 @@
* Stop all chip I/O so that the kernel's probe routines don't
* get confused by errant DMAs when rebooting.
*/
-static void tl_shutdown(dev)
- device_t dev;
+static void
+tl_shutdown(device_t dev)
{
struct tl_softc *sc;
Index: tx/if_tx.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/tx/if_tx.c,v
retrieving revision 1.32
diff -u -r1.32 if_tx.c
--- tx/if_tx.c 22 Nov 2005 00:24:34 -0000 1.32
+++ tx/if_tx.c 22 Nov 2005 01:19:14 -0000
@@ -166,12 +166,36 @@
struct epic_type *t;
uint16_t vid, did;
+<<<<<<< if_tx.c
+ t = epic_devtype(dev);
+
+ if (t != NULL) {
+ device_set_desc(dev, t->name);
+ return(0);
+ }
+
+ return(ENXIO);
+}
+
+static struct epic_type *
+epic_devtype(device_t dev)
+{
+ struct epic_type *t;
+
+ t = epic_devs;
+
+ while(t->name != NULL) {
+ if ((pci_get_vendor(dev) == t->ven_id) &&
+ (pci_get_device(dev) == t->dev_id)) {
+ return(t);
+=======
vid = pci_get_vendor(dev);
did = pci_get_device(dev);
for (t = epic_devs; t->name != NULL; ++t) {
if (vid == t->ven_id && did == t->dev_id) {
device_set_desc(dev, t->name);
return 0;
+>>>>>>> 1.32
}
}
return ENXIO;
@@ -1232,7 +1256,11 @@
* Synopsis: Start receive process and transmit one, if they need.
*/
static void
+<<<<<<< if_tx.c
+epic_start_activity(epic_softc_t * sc)
+=======
epic_start_activity(epic_softc_t *sc)
+>>>>>>> 1.32
{
/* Start rx process */
CSR_WRITE_4(sc, COMMAND,
Index: txp/if_txp.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/txp/if_txp.c,v
retrieving revision 1.32
diff -u -r1.32 if_txp.c
--- txp/if_txp.c 22 Nov 2005 00:24:34 -0000 1.32
+++ txp/if_txp.c 22 Nov 2005 01:19:15 -0000
@@ -181,8 +181,7 @@
DRIVER_MODULE(if_txp, pci, txp_driver, txp_devclass, 0, 0);
static int
-txp_probe(dev)
- device_t dev;
+txp_probe(device_t dev)
{
struct txp_type *t;
uint16_t vid, did;
@@ -201,8 +200,7 @@
}
static int
-txp_attach(dev)
- device_t dev;
+txp_attach(device_t dev)
{
struct txp_softc *sc;
struct ifnet *ifp;
@@ -330,8 +328,7 @@
}
static int
-txp_detach(dev)
- device_t dev;
+txp_detach(device_t dev)
{
struct txp_softc *sc;
struct ifnet *ifp;
@@ -381,8 +378,7 @@
}
static int
-txp_chip_init(sc)
- struct txp_softc *sc;
+txp_chip_init(struct txp_softc *sc)
{
/* disable interrupts */
WRITE_REG(sc, TXP_IER, 0);
@@ -419,8 +415,7 @@
}
static int
-txp_reset_adapter(sc)
- struct txp_softc *sc;
+txp_reset_adapter(struct txp_softc *sc)
{
u_int32_t r;
int i;
@@ -446,8 +441,7 @@
}
static int
-txp_download_fw(sc)
- struct txp_softc *sc;
+txp_download_fw(struct txp_softc *sc)
{
struct txp_fw_file_header *fileheader;
struct txp_fw_section_header *secthead;
@@ -521,8 +515,7 @@
}
static int
-txp_download_fw_wait(sc)
- struct txp_softc *sc;
+txp_download_fw_wait(struct txp_softc *sc)
{
u_int32_t i, r;
@@ -549,10 +542,8 @@
}
static int
-txp_download_fw_section(sc, sect, sectnum)
- struct txp_softc *sc;
- struct txp_fw_section_header *sect;
- int sectnum;
+txp_download_fw_section(struct txp_softc *sc, struct txp_fw_section_header *sect,
+ int sectnum)
{
vm_offset_t dma;
int rseg, err = 0;
@@ -617,8 +608,7 @@
}
static void
-txp_intr(vsc)
- void *vsc;
+txp_intr(void *vsc)
{
struct txp_softc *sc = vsc;
struct txp_hostvar *hv = sc->sc_hostvar;
@@ -663,9 +653,7 @@
}
static void
-txp_rx_reclaim(sc, r)
- struct txp_softc *sc;
- struct txp_rx_ring *r;
+txp_rx_reclaim(struct txp_softc *sc, struct txp_rx_ring *r)
{
struct ifnet *ifp = &sc->sc_arpcom.ac_if;
struct txp_rx_desc *rxd;
@@ -760,8 +748,7 @@
}
static void
-txp_rxbuf_reclaim(sc)
- struct txp_softc *sc;
+txp_rxbuf_reclaim(struct txp_softc *sc)
{
struct ifnet *ifp = &sc->sc_arpcom.ac_if;
struct txp_hostvar *hv = sc->sc_hostvar;
@@ -817,9 +804,7 @@
* Reclaim mbufs and entries from a transmit ring.
*/
static void
-txp_tx_reclaim(sc, r)
- struct txp_softc *sc;
- struct txp_tx_ring *r;
+txp_tx_reclaim(struct txp_softc *sc, struct txp_tx_ring *r)
{
struct ifnet *ifp = &sc->sc_arpcom.ac_if;
u_int32_t idx = TXP_OFFSET2IDX(*(r->r_off));
@@ -863,8 +848,7 @@
}
static int
-txp_shutdown(dev)
- device_t dev;
+txp_shutdown(device_t dev)
{
struct txp_softc *sc;
@@ -884,8 +868,7 @@
}
static int
-txp_alloc_rings(sc)
- struct txp_softc *sc;
+txp_alloc_rings(struct txp_softc *sc)
{
struct txp_boot_record *boot;
struct txp_ldata *ld;
@@ -1019,11 +1002,7 @@
}
static int
-txp_ioctl(ifp, command, data, cr)
- struct ifnet *ifp;
- u_long command;
- caddr_t data;
- struct ucred *cr;
+txp_ioctl(struct ifnet *ifp, u_long command, caddr_t data, struct ucred *cr)
{
struct txp_softc *sc = ifp->if_softc;
struct ifreq *ifr = (struct ifreq *)data;
@@ -1064,8 +1043,7 @@
}
static int
-txp_rxring_fill(sc)
- struct txp_softc *sc;
+txp_rxring_fill(struct txp_softc *sc)
{
int i;
struct ifnet *ifp;
@@ -1099,8 +1077,7 @@
}
static void
-txp_rxring_empty(sc)
- struct txp_softc *sc;
+txp_rxring_empty(struct txp_softc *sc)
{
int i;
struct txp_swdesc *sd;
@@ -1124,8 +1101,7 @@
}
static void
-txp_init(xsc)
- void *xsc;
+txp_init(void *xsc)
{
struct txp_softc *sc;
struct ifnet *ifp;
@@ -1179,8 +1155,7 @@
}
static void
-txp_tick(vsc)
- void *vsc;
+txp_tick(void *vsc)
{
struct txp_softc *sc = vsc;
struct ifnet *ifp = &sc->sc_arpcom.ac_if;
@@ -1218,8 +1193,7 @@
}
static void
-txp_start(ifp)
- struct ifnet *ifp;
+txp_start(struct ifnet *ifp)
{
struct txp_softc *sc = ifp->if_softc;
struct txp_tx_ring *r = &sc->sc_txhir;
@@ -1328,11 +1302,9 @@
* Handle simple commands sent to the typhoon
*/
static int
-txp_command(sc, id, in1, in2, in3, out1, out2, out3, wait)
- struct txp_softc *sc;
- u_int16_t id, in1, *out1;
- u_int32_t in2, in3, *out2, *out3;
- int wait;
+txp_command(struct txp_softc *sc, u_int16_t id, u_int16_t in1, u_int32_t in2,
+ u_int32_t in3, u_int16_t *out1, u_int32_t *out2, u_int32_t *out3,
+ int wait)
{
struct txp_rsp_desc *rsp = NULL;
@@ -1353,14 +1325,9 @@
}
static int
-txp_command2(sc, id, in1, in2, in3, in_extp, in_extn, rspp, wait)
- struct txp_softc *sc;
- u_int16_t id, in1;
- u_int32_t in2, in3;
- struct txp_ext_desc *in_extp;
- u_int8_t in_extn;
- struct txp_rsp_desc **rspp;
- int wait;
+txp_command2(struct txp_softc *sc, u_int16_t id, u_int16_t in1, u_int32_t in2,
+ u_int32_t in3, struct txp_ext_desc *in_extp, u_int8_t in_extn,
+ struct txp_rsp_desc **rspp, int wait)
{
struct txp_hostvar *hv = sc->sc_hostvar;
struct txp_cmd_desc *cmd;
@@ -1426,12 +1393,8 @@
}
static int
-txp_response(sc, ridx, id, seq, rspp)
- struct txp_softc *sc;
- u_int32_t ridx;
- u_int16_t id;
- u_int16_t seq;
- struct txp_rsp_desc **rspp;
+txp_response(struct txp_softc *sc, u_int32_t ridx, u_int16_t id, u_int16_t seq,
+ struct txp_rsp_desc **rspp)
{
struct txp_hostvar *hv = sc->sc_hostvar;
struct txp_rsp_desc *rsp;
@@ -1477,9 +1440,7 @@
}
static void
-txp_rsp_fixup(sc, rsp, dst)
- struct txp_softc *sc;
- struct txp_rsp_desc *rsp, *dst;
+txp_rsp_fixup(struct txp_softc *sc, struct txp_rsp_desc *rsp, struct txp_rsp_desc *dst)
{
struct txp_rsp_desc *src = rsp;
struct txp_hostvar *hv = sc->sc_hostvar;
@@ -1503,8 +1464,7 @@
}
static int
-txp_cmd_desc_numfree(sc)
- struct txp_softc *sc;
+txp_cmd_desc_numfree(struct txp_softc *sc)
{
struct txp_hostvar *hv = sc->sc_hostvar;
struct txp_boot_record *br = sc->sc_boot;
@@ -1528,8 +1488,7 @@
}
static void
-txp_stop(sc)
- struct txp_softc *sc;
+txp_stop(struct txp_softc *sc)
{
struct ifnet *ifp;
@@ -1548,15 +1507,13 @@
}
static void
-txp_watchdog(ifp)
- struct ifnet *ifp;
+txp_watchdog(struct ifnet *ifp)
{
return;
}
static int
-txp_ifmedia_upd(ifp)
- struct ifnet *ifp;
+txp_ifmedia_upd(struct ifnet *ifp)
{
struct txp_softc *sc = ifp->if_softc;
struct ifmedia *ifm = &sc->sc_ifmedia;
@@ -1592,9 +1549,7 @@
}
static void
-txp_ifmedia_sts(ifp, ifmr)
- struct ifnet *ifp;
- struct ifmediareq *ifmr;
+txp_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr)
{
struct txp_softc *sc = ifp->if_softc;
struct ifmedia *ifm = &sc->sc_ifmedia;
@@ -1659,8 +1614,7 @@
#ifdef TXP_DEBUG
static void
-txp_show_descriptor(d)
- void *d;
+txp_show_descriptor(void *d)
{
struct txp_cmd_desc *cmd = d;
struct txp_rsp_desc *rsp = d;
@@ -1703,8 +1657,7 @@
#endif
static void
-txp_set_filter(sc)
- struct txp_softc *sc;
+txp_set_filter(struct txp_softc *sc)
{
struct ifnet *ifp = &sc->sc_arpcom.ac_if;
uint16_t filter;
@@ -1752,8 +1705,7 @@
}
static void
-txp_capabilities(sc)
- struct txp_softc *sc;
+txp_capabilities(struct txp_softc *sc)
{
struct ifnet *ifp = &sc->sc_arpcom.ac_if;
struct txp_rsp_desc *rsp = NULL;
Index: vx/if_vx.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/vx/if_vx.c,v
retrieving revision 1.24
diff -u -r1.24 if_vx.c
--- vx/if_vx.c 22 Nov 2005 00:24:34 -0000 1.24
+++ vx/if_vx.c 22 Nov 2005 01:19:15 -0000
@@ -183,8 +183,7 @@
* interrupts. ?!
*/
static void
-vxinit(xsc)
- void *xsc;
+vxinit(void *xsc)
{
struct vx_softc *sc = (struct vx_softc *) xsc;
struct ifnet *ifp = &sc->arpcom.ac_if;
@@ -236,8 +235,7 @@
}
static void
-vxsetfilter(sc)
- struct vx_softc *sc;
+vxsetfilter(struct vx_softc *sc)
{
struct ifnet *ifp = &sc->arpcom.ac_if;
@@ -248,8 +246,7 @@
}
static void
-vxgetlink(sc)
- struct vx_softc *sc;
+vxgetlink(struct vx_softc *sc)
{
int n, k;
@@ -282,8 +279,7 @@
}
static void
-vxsetlink(sc)
- struct vx_softc *sc;
+vxsetlink(struct vx_softc *sc)
{
struct ifnet *ifp = &sc->arpcom.ac_if;
int i, j, k;
@@ -388,8 +384,7 @@
}
static void
-vxstart(ifp)
- struct ifnet *ifp;
+vxstart(struct ifnet *ifp)
{
struct vx_softc *sc = ifp->if_softc;
struct mbuf *m0;
@@ -502,8 +497,7 @@
* on the cable (once in a blue moon).
*/
static int
-vxstatus(sc)
- struct vx_softc *sc;
+vxstatus(struct vx_softc *sc)
{
int fifost;
struct ifnet *ifp = &sc->arpcom.ac_if;
@@ -584,8 +578,7 @@
}
void
-vxintr(voidsc)
- void *voidsc;
+vxintr(void *voidsc)
{
short status;
struct vx_softc *sc = voidsc;
@@ -631,8 +624,7 @@
}
static void
-vxread(sc)
- struct vx_softc *sc;
+vxread(struct vx_softc *sc)
{
struct ifnet *ifp = &sc->arpcom.ac_if;
struct mbuf *m;
@@ -737,9 +729,7 @@
}
static struct mbuf *
-vxget(sc, totlen)
- struct vx_softc *sc;
- u_int totlen;
+vxget(struct vx_softc *sc, u_int totlen)
{
struct ifnet *ifp = &sc->arpcom.ac_if;
struct mbuf *top, **mp, *m;
@@ -827,11 +817,7 @@
static int
-vxioctl(ifp, cmd, data, cr)
- struct ifnet *ifp;
- u_long cmd;
- caddr_t data;
- struct ucred *cr;
+vxioctl(struct ifnet *ifp, u_long cmd, caddr_t data, struct ucred *cr)
{
struct vx_softc *sc = ifp->if_softc;
struct ifreq *ifr = (struct ifreq *) data;
@@ -900,8 +886,7 @@
}
static void
-vxreset(sc)
- struct vx_softc *sc;
+vxreset(struct vx_softc *sc)
{
crit_enter();
@@ -912,8 +897,7 @@
}
static void
-vxwatchdog(ifp)
- struct ifnet *ifp;
+vxwatchdog(struct ifnet *ifp)
{
struct vx_softc *sc = ifp->if_softc;
@@ -925,8 +909,7 @@
}
void
-vxstop(sc)
- struct vx_softc *sc;
+vxstop(struct vx_softc *sc)
{
struct ifnet *ifp = &sc->arpcom.ac_if;
@@ -951,8 +934,7 @@
}
int
-vxbusyeeprom(sc)
- struct vx_softc *sc;
+vxbusyeeprom(struct vx_softc *sc)
{
int j, i = 100;
@@ -971,8 +953,7 @@
}
static void
-vxmbuffill(sp)
- void *sp;
+vxmbuffill(void *sp)
{
struct vx_softc *sc = (struct vx_softc *) sp;
int i;
@@ -998,8 +979,7 @@
}
static void
-vxmbufempty(sc)
- struct vx_softc *sc;
+vxmbufempty(struct vx_softc *sc)
{
int i;
Index: wi/if_wi_pccard.c
===================================================================
RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/wi/if_wi_pccard.c,v
retrieving revision 1.7
diff -u -r1.7 if_wi_pccard.c
--- wi/if_wi_pccard.c 30 Jun 2005 17:11:28 -0000 1.7
+++ wi/if_wi_pccard.c 22 Nov 2005 00:31:22 -0000
@@ -160,8 +160,7 @@
};
static int
-wi_pccard_match(dev)
- device_t dev;
+wi_pccard_match(device_t dev)
{
const struct pccard_product *pp;
u_int32_t fcn;
@@ -181,8 +180,7 @@
}
static int
-wi_pccard_probe(dev)
- device_t dev;
+wi_pccard_probe(device_t dev)
{
struct wi_softc *sc;
int error;
[
Date Prev][
Date Next]
[
Thread Prev][
Thread Next]
[
Date Index][
Thread Index]
