Index: acpica5/acpi.c =================================================================== RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/acpica5/acpi.c,v retrieving revision 1.18 diff -u -r1.18 acpi.c --- acpica5/acpi.c 1 Nov 2005 23:36:32 -0000 1.18 +++ acpica5/acpi.c 25 Nov 2005 23:57:19 -0000 @@ -640,7 +640,7 @@ } static void -acpi_quirks_set() +acpi_quirks_set(void) { XSDT_DESCRIPTOR *xsdt; struct acpi_quirks *quirk; Index: acpica5/acpi_cpu.c =================================================================== RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/acpica5/acpi_cpu.c,v retrieving revision 1.11 diff -u -r1.11 acpi_cpu.c --- acpica5/acpi_cpu.c 23 Sep 2005 02:28:50 -0000 1.11 +++ acpica5/acpi_cpu.c 25 Nov 2005 23:58:19 -0000 @@ -737,7 +737,7 @@ * port. */ static void -acpi_cpu_startup_throttling() +acpi_cpu_startup_throttling(void) { ACPI_LOCK_DECL; @@ -786,7 +786,7 @@ } static void -acpi_cpu_startup_cx() +acpi_cpu_startup_cx(void) { struct acpi_cpu_softc *sc; struct sbuf sb; @@ -879,7 +879,7 @@ * interrupts are re-enabled. */ static void -acpi_cpu_idle() +acpi_cpu_idle(void) { struct acpi_cpu_softc *sc; struct acpi_cx *cx_next; @@ -984,7 +984,7 @@ /* Put the CPU in C1 in a machine-dependant way. */ static void -acpi_cpu_c1() +acpi_cpu_c1(void) { #ifdef __ia64__ ia64_call_pal_static(PAL_HALT_LIGHT, 0, 0, 0); Index: acpica5/acpi_timer.c =================================================================== RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/acpica5/acpi_timer.c,v retrieving revision 1.7 diff -u -r1.7 acpi_timer.c --- acpica5/acpi_timer.c 30 Oct 2005 04:41:15 -0000 1.7 +++ acpica5/acpi_timer.c 25 Nov 2005 23:58:41 -0000 @@ -109,7 +109,7 @@ MODULE_DEPEND(acpi_timer, acpi, 1, 1, 1); static u_int -acpi_timer_read() +acpi_timer_read(void) { return (bus_space_read_4(acpi_timer_bst, acpi_timer_bsh, 0)); } @@ -329,7 +329,7 @@ */ static int -acpi_timer_test() +acpi_timer_test(void) { uint32_t last, this; int min, max, n, delta; Index: agp/agp.c =================================================================== RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/agp/agp.c,v retrieving revision 1.15 diff -u -r1.15 agp.c --- agp/agp.c 5 May 2005 22:57:44 -0000 1.15 +++ agp/agp.c 26 Nov 2005 00:00:14 -0000 @@ -94,7 +94,7 @@ /* Helper functions for implementing chipset mini drivers. */ void -agp_flush_cache() +agp_flush_cache(void) { #ifdef __i386__ wbinvd(); @@ -816,7 +816,7 @@ /* Implementation of the kernel api */ device_t -agp_find_device() +agp_find_device(void) { if (!agp_devclass) return 0; Index: disk/aic7xxx/aicasm/aicasm.c =================================================================== RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/disk/aic7xxx/aicasm/aicasm.c,v retrieving revision 1.2 diff -u -r1.2 aicasm.c --- disk/aic7xxx/aicasm/aicasm.c 17 Jun 2003 04:28:22 -0000 1.2 +++ disk/aic7xxx/aicasm/aicasm.c 26 Nov 2005 00:03:51 -0000 @@ -306,7 +306,7 @@ } static void -usage() +usage(void) { (void)fprintf(stderr, @@ -318,7 +318,7 @@ } static void -back_patch() +back_patch(void) { struct instruction *cur_instr; @@ -347,7 +347,7 @@ } static void -output_code() +output_code(void) { struct instruction *cur_instr; patch_t *cur_patch; @@ -722,7 +722,7 @@ } struct instruction * -seq_alloc() +seq_alloc(void) { struct instruction *new_instr; @@ -736,7 +736,7 @@ } critical_section_t * -cs_alloc() +cs_alloc(void) { critical_section_t *new_cs; @@ -750,7 +750,7 @@ } scope_t * -scope_alloc() +scope_alloc(void) { scope_t *new_scope; Index: disk/aic7xxx/aicasm/aicasm_macro_scan.l =================================================================== RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/disk/aic7xxx/aicasm/aicasm_macro_scan.l,v retrieving revision 1.2 diff -u -r1.2 aicasm_macro_scan.l --- disk/aic7xxx/aicasm/aicasm_macro_scan.l 17 Jun 2003 04:28:22 -0000 1.2 +++ disk/aic7xxx/aicasm/aicasm_macro_scan.l 8 Dec 2005 22:14:39 -0000 @@ -150,7 +150,7 @@ %% int -mmwrap() +mmwrap(void) { stop("EOF encountered in macro call", EX_DATAERR); } Index: disk/aic7xxx/aicasm/aicasm_scan.l =================================================================== RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/disk/aic7xxx/aicasm/aicasm_scan.l,v retrieving revision 1.2 diff -u -r1.2 aicasm_scan.l --- disk/aic7xxx/aicasm/aicasm_scan.l 17 Jun 2003 04:28:22 -0000 1.2 +++ disk/aic7xxx/aicasm/aicasm_scan.l 8 Dec 2005 22:15:05 -0000 @@ -576,7 +576,7 @@ } int -yywrap() +yywrap(void) { include_t *include; Index: disk/aic7xxx/aicasm/aicasm_symbol.c =================================================================== RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/disk/aic7xxx/aicasm/aicasm_symbol.c,v retrieving revision 1.2 diff -u -r1.2 aicasm_symbol.c --- disk/aic7xxx/aicasm/aicasm_symbol.c 17 Jun 2003 04:28:22 -0000 1.2 +++ disk/aic7xxx/aicasm/aicasm_symbol.c 26 Nov 2005 00:04:15 -0000 @@ -129,7 +129,7 @@ } void -symtable_open() +symtable_open(void) { symtable = dbopen(/*filename*/NULL, O_CREAT | O_NONBLOCK | O_RDWR, /*mode*/0, DB_HASH, @@ -143,7 +143,7 @@ } void -symtable_close() +symtable_close(void) { if (symtable != NULL) { DBT key; Index: disk/ccd/ccd.c =================================================================== RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/disk/ccd/ccd.c,v retrieving revision 1.20 diff -u -r1.20 ccd.c --- disk/ccd/ccd.c 3 Aug 2005 16:36:33 -0000 1.20 +++ disk/ccd/ccd.c 26 Nov 2005 00:09:59 -0000 @@ -302,7 +302,7 @@ * add devsw entries. */ static void -ccdattach() +ccdattach(void) { int i; int num = NCCD; @@ -325,10 +325,7 @@ } static int -ccd_modevent(mod, type, data) - module_t mod; - int type; - void *data; +ccd_modevent(module_t mod, int type, void *data) { int error = 0; @@ -557,9 +554,7 @@ } static void -ccdinterleave(cs, unit) - struct ccd_softc *cs; - int unit; +ccdinterleave(struct ccd_softc *cs, int unit) { struct ccdcinfo *ci, *smallci; struct ccdiinfo *ii; @@ -754,8 +749,7 @@ } static void -ccdstrategy(bp) - struct buf *bp; +ccdstrategy(struct buf *bp) { int unit = ccdunit(bp->b_dev); struct ccd_softc *cs = &ccd_softc[unit]; @@ -830,9 +824,7 @@ } static void -ccdstart(cs, bp) - struct ccd_softc *cs; - struct buf *bp; +ccdstart(struct ccd_softc *cs, struct buf *bp) { long bcount, rcount; struct ccdbuf *cbp[4]; @@ -913,13 +905,8 @@ * Build a component buffer header. */ static void -ccdbuffer(cb, cs, bp, bn, addr, bcount) - struct ccdbuf **cb; - struct ccd_softc *cs; - struct buf *bp; - daddr_t bn; - caddr_t addr; - long bcount; +ccdbuffer(struct ccdbuf **cb, struct ccd_softc *cs, struct buf *bp, daddr_t bn, + caddr_t addr, long bcount) { struct ccdcinfo *ci, *ci2 = NULL; /* XXX */ struct ccdbuf *cbp; @@ -1088,9 +1075,7 @@ } static void -ccdintr(cs, bp) - struct ccd_softc *cs; - struct buf *bp; +ccdintr(struct ccd_softc *cs, struct buf *bp) { #ifdef DEBUG if (ccddebug & CCDB_FOLLOW) @@ -1111,8 +1096,7 @@ * take a ccd interrupt. */ static void -ccdiodone(cbp) - struct ccdbuf *cbp; +ccdiodone(struct ccdbuf *cbp) { struct buf *bp = cbp->cb_obp; int unit = cbp->cb_unit; @@ -1586,8 +1570,7 @@ * up. */ static void -ccdgetdisklabel(dev) - dev_t dev; +ccdgetdisklabel(dev_t dev) { int unit = ccdunit(dev); struct ccd_softc *cs = &ccd_softc[unit]; @@ -1645,8 +1628,7 @@ * that a disklabel isn't present. */ static void -ccdmakedisklabel(cs) - struct ccd_softc *cs; +ccdmakedisklabel(struct ccd_softc *cs) { struct disklabel *lp = &cs->sc_label; @@ -1666,8 +1648,7 @@ * Several drivers do this; it should be abstracted and made MP-safe. */ static int -ccdlock(cs) - struct ccd_softc *cs; +ccdlock(struct ccd_softc *cs) { int error; @@ -1684,8 +1665,7 @@ * Unlock and wake up any waiters. */ static void -ccdunlock(cs) - struct ccd_softc *cs; +ccdunlock(struct ccd_softc *cs) { cs->sc_flags &= ~CCDF_LOCKED; @@ -1697,8 +1677,7 @@ #ifdef DEBUG static void -printiinfo(ii) - struct ccdiinfo *ii; +printiinfo(struct ccdiinfo *ii) { int ix, i; Index: disk/ncv/ncr53c500.c =================================================================== RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/disk/ncv/ncr53c500.c,v retrieving revision 1.8 diff -u -r1.8 ncr53c500.c --- disk/ncv/ncr53c500.c 10 Jun 2005 15:29:16 -0000 1.8 +++ disk/ncv/ncr53c500.c 26 Nov 2005 00:19:10 -0000 @@ -181,31 +181,24 @@ * hwfuncs **************************************************************/ static __inline void -ncvhw_select_register_0(iot, ioh, hw) - bus_space_tag_t iot; - bus_space_handle_t ioh; - struct ncv_hw *hw; +ncvhw_select_register_0(bus_space_tag_t iot, bus_space_handle_t ioh, + struct ncv_hw *hw) { bus_space_write_1(iot, ioh, cr0_cfg4, hw->hw_cfg4); } static __inline void -ncvhw_select_register_1(iot, ioh, hw) - bus_space_tag_t iot; - bus_space_handle_t ioh; - struct ncv_hw *hw; +ncvhw_select_register_1(bus_space_tag_t iot, bus_space_handle_t ioh, + struct ncv_hw *hw) { bus_space_write_1(iot, ioh, cr1_cfg5, hw->hw_cfg5); } static __inline void -ncvhw_fpush(iot, ioh, buf, len) - bus_space_tag_t iot; - bus_space_handle_t ioh; - u_int8_t *buf; - int len; +ncvhw_fpush(bus_space_tag_t iot, bus_space_handle_t ioh, u_int8_t *buf, + int len) { int ptr; @@ -214,10 +207,7 @@ } static __inline void -ncvhw_set_count(iot, ioh, count) - bus_space_tag_t iot; - bus_space_handle_t ioh; - int count; +ncvhw_set_count(bus_space_tag_t iot, bus_space_handle_t ioh, int count) { bus_space_write_1(iot, ioh, cr0_tclsb, (u_int8_t) count); @@ -226,9 +216,7 @@ } static __inline u_int -ncvhw_get_count(iot, ioh) - bus_space_tag_t iot; - bus_space_handle_t ioh; +ncvhw_get_count(bus_space_tag_t iot, bus_space_handle_t ioh) { u_int count; @@ -239,10 +227,7 @@ } static int -ncvhw_check(iot, ioh, hw) - bus_space_tag_t iot; - bus_space_handle_t ioh; - struct ncv_hw *hw; +ncvhw_check(bus_space_tag_t iot, bus_space_handle_t ioh, struct ncv_hw *hw) { u_int8_t stat; @@ -294,10 +279,8 @@ } static void -ncvhw_reset(iot, ioh, hw) - bus_space_tag_t iot; - bus_space_handle_t ioh; - struct ncv_hw *hw; +ncvhw_reset(bus_space_tag_t iot, bus_space_handle_t ioh, + struct ncv_hw *hw) { ncvhw_select_register_0(iot, ioh, hw); @@ -315,10 +298,8 @@ } static void -ncvhw_init(iot, ioh, hw) - bus_space_tag_t iot; - bus_space_handle_t ioh; - struct ncv_hw *hw; +ncvhw_init(bus_space_tag_t iot, bus_space_handle_t ioh, + struct ncv_hw *hw) { ncvhw_select_register_0(iot, ioh, hw); @@ -342,9 +323,7 @@ #ifdef NCV_POWER_CONTROL static int -ncvhw_power(sc, flags) - struct ncv_softc *sc; - u_int flags; +ncvhw_power(struct ncv_softc *sc, u_int flags) { struct scsi_low_softc *slp = &sc->sc_sclow; bus_space_tag_t iot = sc->sc_iot; @@ -382,8 +361,7 @@ * scsi low interface **************************************************************/ static void -ncvhw_attention(sc) - struct ncv_softc *sc; +ncvhw_attention(struct ncv_softc *sc) { bus_space_write_1(sc->sc_iot, sc->sc_ioh, cr0_cmd, CMD_SETATN); @@ -391,8 +369,7 @@ } static void -ncvhw_bus_reset(sc) - struct ncv_softc *sc; +ncvhw_bus_reset(struct ncv_softc *sc) { bus_space_tag_t iot = sc->sc_iot; bus_space_handle_t ioh = sc->sc_ioh; @@ -404,9 +381,7 @@ } static int -ncvhw_start_selection(sc, cb) - struct ncv_softc *sc; - struct slccb *cb; +ncvhw_start_selection(struct ncv_softc *sc, struct slccb *cb) { struct scsi_low_softc *slp = &sc->sc_sclow; bus_space_tag_t iot = sc->sc_iot; @@ -471,9 +446,7 @@ } static int -ncv_world_start(sc, fdone) - struct ncv_softc *sc; - int fdone; +ncv_world_start(struct ncv_softc *sc, int fdone) { struct scsi_low_softc *slp = &sc->sc_sclow; bus_space_tag_t iot = sc->sc_iot; @@ -504,10 +477,7 @@ } static int -ncv_msg(sc, ti, msg) - struct ncv_softc *sc; - struct targ_info *ti; - u_int msg; +ncv_msg(struct ncv_softc *sc, struct targ_info *ti, u_int msg) { bus_space_tag_t iot = sc->sc_iot; bus_space_handle_t ioh = sc->sc_ioh; @@ -547,10 +517,7 @@ } static int -ncv_targ_init(sc, ti, action) - struct ncv_softc *sc; - struct targ_info *ti; - int action; +ncv_targ_init(struct ncv_softc *sc, struct targ_info *ti, int action) { struct ncv_targ_info *nti = (void *) ti; @@ -573,10 +540,7 @@ static int ncv_setup_img (struct ncv_hw *, u_int, int); static int -ncv_setup_img(hw, dvcfg, hostid) - struct ncv_hw *hw; - u_int dvcfg; - int hostid; +ncv_setup_img(struct ncv_hw *hw, u_int dvcfg, int hostid) { if (NCV_CLKFACTOR(dvcfg) > CLK_35M_F) @@ -616,11 +580,8 @@ } int -ncvprobesubr(iot, ioh, dvcfg, hsid) - bus_space_tag_t iot; - bus_space_handle_t ioh; - u_int dvcfg; - int hsid; +ncvprobesubr(bus_space_tag_t iot, bus_space_handle_t ioh, u_int dvcfg, + int hsid) { struct ncv_hw hwtab; @@ -634,9 +595,7 @@ } int -ncvprint(aux, name) - void *aux; - const char *name; +ncvprint(void *aux, const char *name) { if (name != NULL) @@ -645,8 +604,7 @@ } void -ncvattachsubr(sc) - struct ncv_softc *sc; +ncvattachsubr(struct ncv_softc *sc) { struct scsi_low_softc *slp = &sc->sc_sclow; @@ -665,9 +623,7 @@ * PDMA **************************************************************/ static __inline void -ncv_setup_and_start_pio(sc, reqlen) - struct ncv_softc *sc; - u_int reqlen; +ncv_setup_and_start_pio(struct ncv_softc *sc, u_int reqlen) { bus_space_tag_t iot = sc->sc_iot; bus_space_handle_t ioh = sc->sc_ioh; @@ -681,9 +637,7 @@ } static void -ncv_pdma_end(sc, ti) - struct ncv_softc *sc; - struct targ_info *ti; +ncv_pdma_end(struct ncv_softc *sc, struct targ_info *ti) { struct scsi_low_softc *slp = &sc->sc_sclow; bus_space_tag_t iot = sc->sc_iot; @@ -743,10 +697,7 @@ } static void -ncv_pio_read(sc, buf, reqlen) - struct ncv_softc *sc; - u_int8_t *buf; - u_int reqlen; +ncv_pio_read(struct ncv_softc *sc, u_int8_t *buf, u_int reqlen) { struct scsi_low_softc *slp = &sc->sc_sclow; bus_space_tag_t iot = sc->sc_iot; @@ -809,10 +760,7 @@ } static void -ncv_pio_write(sc, buf, reqlen) - struct ncv_softc *sc; - u_int8_t *buf; - u_int reqlen; +ncv_pio_write(struct ncv_softc *sc, u_int8_t *buf, u_int reqlen) { struct scsi_low_softc *slp = &sc->sc_sclow; bus_space_tag_t iot = sc->sc_iot; @@ -874,8 +822,7 @@ * disconnect & reselect (HW low) **************************************************************/ static int -ncv_reselected(sc) - struct ncv_softc *sc; +ncv_reselected(struct ncv_softc *sc) { struct scsi_low_softc *slp = &sc->sc_sclow; bus_space_tag_t iot = sc->sc_iot; @@ -905,9 +852,7 @@ } static int -ncv_disconnected(sc, ti) - struct ncv_softc *sc; - struct targ_info *ti; +ncv_disconnected(struct ncv_softc *sc, struct targ_info *ti) { struct scsi_low_softc *slp = &sc->sc_sclow; bus_space_tag_t iot = sc->sc_iot; @@ -928,8 +873,7 @@ * SEQUENCER **************************************************************/ static int -ncv_target_nexus_establish(sc) - struct ncv_softc *sc; +ncv_target_nexus_establish(struct ncv_softc *sc) { struct scsi_low_softc *slp = &sc->sc_sclow; struct targ_info *ti = slp->sl_Tnexus; @@ -944,16 +888,14 @@ } static int -ncv_lun_nexus_establish(sc) - struct ncv_softc *sc; +ncv_lun_nexus_establish(struct ncv_softc *sc) { return 0; } static int -ncv_ccb_nexus_establish(sc) - struct ncv_softc *sc; +ncv_ccb_nexus_establish(struct ncv_softc *sc) { struct scsi_low_softc *slp = &sc->sc_sclow; struct slccb *cb = slp->sl_Qnexus; @@ -963,8 +905,7 @@ } static int -ncv_catch_intr(sc) - struct ncv_softc *sc; +ncv_catch_intr(struct ncv_softc *sc) { bus_space_tag_t iot = sc->sc_iot; bus_space_handle_t ioh = sc->sc_ioh; @@ -983,8 +924,7 @@ } int -ncvintr(arg) - void *arg; +ncvintr(void *arg) { struct ncv_softc *sc = arg; struct scsi_low_softc *slp = &sc->sc_sclow; Index: disk/nsp/nsp.c =================================================================== RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/disk/nsp/nsp.c,v retrieving revision 1.7 diff -u -r1.7 nsp.c --- disk/nsp/nsp.c 6 Jun 2005 21:48:16 -0000 1.7 +++ disk/nsp/nsp.c 26 Nov 2005 00:38:58 -0000 @@ -211,10 +211,7 @@ static __inline void nsp_cr_write_1 (bus_space_tag_t bst, bus_space_handle_t bsh, bus_addr_t ofs, u_int8_t va); static __inline u_int8_t -nsp_cr_read_1(bst, bsh, ofs) - bus_space_tag_t bst; - bus_space_handle_t bsh; - bus_addr_t ofs; +nsp_cr_read_1(bus_space_tag_t bst, bus_space_handle_t bsh, bus_addr_t ofs) { bus_space_write_1(bst, bsh, nsp_idxr, ofs); @@ -222,11 +219,8 @@ } static __inline void -nsp_cr_write_1(bst, bsh, ofs, va) - bus_space_tag_t bst; - bus_space_handle_t bsh; - bus_addr_t ofs; - u_int8_t va; +nsp_cr_write_1(bus_space_tag_t bst, bus_space_handle_t bsh, bus_addr_t ofs, + u_int8_t va) { bus_space_write_1(bst, bsh, nsp_idxr, ofs); @@ -234,9 +228,7 @@ } static int -nsp_expect_signal(sc, curphase, mask) - struct nsp_softc *sc; - u_int8_t curphase, mask; +nsp_expect_signal(struct nsp_softc *sc, u_int8_t curphase, u_int8_t mask) { struct scsi_low_softc *slp = &sc->sc_sclow; bus_space_tag_t bst = sc->sc_iot; @@ -265,8 +257,7 @@ } static void -nsphw_init(sc) - struct nsp_softc *sc; +nsphw_init(struct nsp_softc *sc) { bus_space_tag_t bst = sc->sc_iot; bus_space_handle_t bsh = sc->sc_ioh; @@ -312,8 +303,7 @@ * scsi low interface ****************************************************/ static void -nsphw_attention(sc) - struct nsp_softc *sc; +nsphw_attention(struct nsp_softc *sc) { bus_space_tag_t bst = sc->sc_iot; bus_space_handle_t bsh = sc->sc_ioh; @@ -325,8 +315,7 @@ } static void -nsphw_bus_reset(sc) - struct nsp_softc *sc; +nsphw_bus_reset(struct nsp_softc *sc) { bus_space_tag_t bst = sc->sc_iot; bus_space_handle_t bsh = sc->sc_ioh; @@ -344,8 +333,7 @@ } static void -nsphw_selection_done_and_expect_msgout(sc) - struct nsp_softc *sc; +nsphw_selection_done_and_expect_msgout(struct nsp_softc *sc) { struct scsi_low_softc *slp = &sc->sc_sclow; bus_space_tag_t bst = sc->sc_iot; @@ -366,9 +354,7 @@ } static int -nsphw_start_selection(sc, cb) - struct nsp_softc *sc; - struct slccb *cb; +nsphw_start_selection(struct nsp_softc *sc, struct slccb *cb) { struct scsi_low_softc *slp = &sc->sc_sclow; bus_space_tag_t bst = sc->sc_iot; @@ -470,9 +456,7 @@ } static int -nsp_world_start(sc, fdone) - struct nsp_softc *sc; - int fdone; +nsp_world_start(struct nsp_softc *sc, int fdone) { struct scsi_low_softc *slp = &sc->sc_sclow; @@ -521,10 +505,7 @@ }; static int -nsp_msg(sc, ti, msg) - struct nsp_softc *sc; - struct targ_info *ti; - u_int msg; +nsp_msg(struct nsp_softc *sc, struct targ_info *ti, u_int msg) { bus_space_tag_t bst = sc->sc_iot; bus_space_handle_t bsh = sc->sc_ioh; @@ -585,10 +566,7 @@ } static int -nsp_targ_init(sc, ti, action) - struct nsp_softc *sc; - struct targ_info *ti; - int action; +nsp_targ_init(struct nsp_softc *sc, struct targ_info *ti, int action) { struct nsp_targ_info *nti = (void *) ti; @@ -604,9 +582,7 @@ } static void -nsp_start_timer(sc, time) - struct nsp_softc *sc; - int time; +nsp_start_timer(struct nsp_softc *sc, int time) { bus_space_tag_t bst = sc->sc_iot; bus_space_handle_t bsh = sc->sc_ioh; @@ -619,10 +595,7 @@ * General probe attach **************************************************************/ int -nspprobesubr(iot, ioh, dvcfg) - bus_space_tag_t iot; - bus_space_handle_t ioh; - u_int dvcfg; +nspprobesubr(bus_space_tag_t iot, bus_space_handle_t ioh, u_int dvcfg) { u_int8_t regv; @@ -633,9 +606,7 @@ } int -nspprint(aux, name) - void *aux; - const char *name; +nspprint(void *aux, const char *name) { if (name != NULL) @@ -644,8 +615,7 @@ } void -nspattachsubr(sc) - struct nsp_softc *sc; +nspattachsubr(struct nsp_softc *sc) { struct scsi_low_softc *slp = &sc->sc_sclow; @@ -664,8 +634,7 @@ * PDMA functions **************************************************************/ static u_int -nsp_fifo_count(sc) - struct nsp_softc *sc; +nsp_fifo_count(struct nsp_softc *sc) { bus_space_tag_t bst = sc->sc_iot; bus_space_handle_t bsh = sc->sc_ioh; @@ -679,8 +648,7 @@ } static u_int -nsp_request_count(sc) - struct nsp_softc *sc; +nsp_request_count(struct nsp_softc *sc) { bus_space_tag_t bst = sc->sc_iot; bus_space_handle_t bsh = sc->sc_ioh; @@ -694,11 +662,7 @@ } static void -nsp_setup_fifo(sc, on, direction, datalen) - struct nsp_softc *sc; - int on; - int direction; - int datalen; +nsp_setup_fifo(struct nsp_softc *sc, int on, int direction, int datalen) { u_int8_t xfermode; @@ -753,9 +717,7 @@ } static void -nsp_pdma_end(sc, ti) - struct nsp_softc *sc; - struct targ_info *ti; +nsp_pdma_end(struct nsp_softc *sc, struct targ_info *ti) { struct scsi_low_softc *slp = &sc->sc_sclow; struct slccb *cb = slp->sl_Qnexus; @@ -823,10 +785,7 @@ #define WFIFO_CRIT 32 static void -nsp_data_padding(sc, direction, count) - struct nsp_softc *sc; - int direction; - u_int count; +nsp_data_padding(struct nsp_softc *sc, int direction, u_int count) { bus_space_tag_t bst = sc->sc_iot; bus_space_handle_t bsh = sc->sc_ioh; @@ -849,9 +808,7 @@ } static int -nsp_read_fifo(sc, suspendio) - struct nsp_softc *sc; - int suspendio; +nsp_read_fifo(struct nsp_softc *sc, int suspendio) { struct scsi_low_softc *slp = &sc->sc_sclow; bus_space_tag_t bst = sc->sc_iot; @@ -940,9 +897,7 @@ } static int -nsp_write_fifo(sc, suspendio) - struct nsp_softc *sc; - int suspendio; +nsp_write_fifo(struct nsp_softc *sc, int suspendio) { struct scsi_low_softc *slp = &sc->sc_sclow; bus_space_tag_t bst = sc->sc_iot; @@ -1012,8 +967,7 @@ } static int -nsp_wait_interrupt(sc) - struct nsp_softc *sc; +nsp_wait_interrupt(struct nsp_softc *sc) { bus_space_tag_t bst = sc->sc_iot; bus_space_handle_t bsh = sc->sc_ioh; @@ -1038,9 +992,7 @@ } static void -nsp_pio_read(sc, suspendio) - struct nsp_softc *sc; - int suspendio; +nsp_pio_read(struct nsp_softc *sc, int suspendio) { struct scsi_low_softc *slp = &sc->sc_sclow; bus_space_tag_t bst = sc->sc_iot; @@ -1117,9 +1069,7 @@ } static void -nsp_pio_write(sc, suspendio) - struct nsp_softc *sc; - int suspendio; +nsp_pio_write(struct nsp_softc *sc, int suspendio) { struct scsi_low_softc *slp = &sc->sc_sclow; bus_space_tag_t bst = sc->sc_iot; @@ -1228,10 +1178,7 @@ } static int -nsp_negate_signal(sc, mask, s) - struct nsp_softc *sc; - u_int8_t mask; - u_char *s; +nsp_negate_signal(struct nsp_softc *sc, u_int8_t mask, u_char *s) { struct scsi_low_softc *slp = &sc->sc_sclow; bus_space_tag_t bst = sc->sc_iot; @@ -1254,12 +1201,8 @@ } static int -nsp_xfer(sc, buf, len, phase, clear_atn) - struct nsp_softc *sc; - u_int8_t *buf; - int len; - int phase; - int clear_atn; +nsp_xfer(struct nsp_softc *sc, u_int8_t *buf, int len, int phase, + int clear_atn) { bus_space_tag_t bst = sc->sc_iot; bus_space_handle_t bsh = sc->sc_ioh; @@ -1297,8 +1240,7 @@ * disconnect & reselect (HW low) **************************************************************/ static int -nsp_reselected(sc) - struct nsp_softc *sc; +nsp_reselected(struct nsp_softc *sc) { struct scsi_low_softc *slp = &sc->sc_sclow; bus_space_tag_t bst = sc->sc_iot; @@ -1328,9 +1270,7 @@ } static int -nsp_disconnected(sc, ti) - struct nsp_softc *sc; - struct targ_info *ti; +nsp_disconnected(struct nsp_softc *sc, struct targ_info *ti) { struct scsi_low_softc *slp = &sc->sc_sclow; bus_space_tag_t bst = sc->sc_iot; @@ -1358,10 +1298,8 @@ static void nsp_error (struct nsp_softc *, u_char *, u_int8_t, u_int8_t, u_int8_t); static void -nsp_error(sc, s, isrc, ph, irqphs) - struct nsp_softc *sc; - u_char *s; - u_int8_t isrc, ph, irqphs; +nsp_error(struct nsp_softc *sc, u_char *s, u_int8_t isrc, u_int8_t ph, + u_int8_t irqphs) { struct scsi_low_softc *slp = &sc->sc_sclow; @@ -1371,8 +1309,7 @@ } static int -nsp_target_nexus_establish(sc) - struct nsp_softc *sc; +nsp_target_nexus_establish(struct nsp_softc *sc) { struct scsi_low_softc *slp = &sc->sc_sclow; bus_space_tag_t bst = sc->sc_iot; @@ -1390,16 +1327,14 @@ } static int -nsp_lun_nexus_establish(sc) - struct nsp_softc *sc; +nsp_lun_nexus_establish(struct nsp_softc *sc) { return 0; } static int -nsp_ccb_nexus_establish(sc) - struct nsp_softc *sc; +nsp_ccb_nexus_establish(struct nsp_softc *sc) { struct scsi_low_softc *slp = &sc->sc_sclow; struct slccb *cb = slp->sl_Qnexus; @@ -1434,10 +1369,7 @@ } static int -nsp_phase_match(sc, phase, stat) - struct nsp_softc *sc; - u_int8_t phase; - u_int8_t stat; +nsp_phase_match(struct nsp_softc *sc, u_int8_t phase, u_int8_t stat) { struct scsi_low_softc *slp = &sc->sc_sclow; @@ -1455,8 +1387,7 @@ } int -nspintr(arg) - void *arg; +nspintr(void *arg) { struct nsp_softc *sc = arg; struct scsi_low_softc *slp = &sc->sc_sclow; @@ -1867,8 +1798,7 @@ } static int -nsp_timeout(sc) - struct nsp_softc *sc; +nsp_timeout(struct nsp_softc *sc) { struct scsi_low_softc *slp = &sc->sc_sclow; bus_space_tag_t iot = sc->sc_iot; Index: disk/stg/tmc18c30.c =================================================================== RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/disk/stg/tmc18c30.c,v retrieving revision 1.9 diff -u -r1.9 tmc18c30.c --- disk/stg/tmc18c30.c 10 Jun 2005 15:29:16 -0000 1.9 +++ disk/stg/tmc18c30.c 26 Nov 2005 00:45:22 -0000 @@ -191,9 +191,7 @@ * hwfuncs ****************************************************/ static __inline void -stghw_bcr_write_1(sc, bcv) - struct stg_softc *sc; - u_int8_t bcv; +stghw_bcr_write_1(struct stg_softc *sc, u_int8_t bcv) { bus_space_write_1(sc->sc_iot, sc->sc_ioh, tmc_bctl, bcv); @@ -201,8 +199,7 @@ } static int -stghw_check(sc) - struct stg_softc *sc; +stghw_check(struct stg_softc *sc) { struct scsi_low_softc *slp = &sc->sc_sclow; bus_space_tag_t iot = sc->sc_iot; @@ -258,8 +255,7 @@ } static void -stghw_init(sc) - struct stg_softc *sc; +stghw_init(struct stg_softc *sc) { bus_space_tag_t iot = sc->sc_iot; bus_space_handle_t ioh = sc->sc_ioh; @@ -275,10 +271,7 @@ } static int -stg_targ_init(sc, ti, action) - struct stg_softc *sc; - struct targ_info *ti; - int action; +stg_targ_init(struct stg_softc *sc, struct targ_info *ti, int action) { struct stg_targ_info *sti = (void *) ti; @@ -296,8 +289,7 @@ * scsi low interface ****************************************************/ static void -stghw_attention(sc) - struct stg_softc *sc; +stghw_attention(struct stg_softc *sc) { sc->sc_busc |= BCTL_ATN; @@ -307,8 +299,7 @@ } static void -stghw_bus_reset(sc) - struct stg_softc *sc; +stghw_bus_reset(struct stg_softc *sc) { bus_space_tag_t iot = sc->sc_iot; bus_space_handle_t ioh = sc->sc_ioh; @@ -321,9 +312,7 @@ } static int -stghw_start_selection(sc, cb) - struct stg_softc *sc; - struct slccb *cb; +stghw_start_selection(struct stg_softc *sc, struct slccb *cb) { bus_space_tag_t iot = sc->sc_iot; bus_space_handle_t ioh = sc->sc_ioh; @@ -353,9 +342,7 @@ } static int -stg_world_start(sc, fdone) - struct stg_softc *sc; - int fdone; +stg_world_start(struct stg_softc *sc, int fdone) { struct scsi_low_softc *slp = &sc->sc_sclow; int error; @@ -377,10 +364,7 @@ } static int -stg_msg(sc, ti, msg) - struct stg_softc *sc; - struct targ_info *ti; - u_int msg; +stg_msg(struct stg_softc *sc, struct targ_info *ti, u_int msg) { bus_space_tag_t iot = sc->sc_iot; bus_space_handle_t ioh = sc->sc_ioh; @@ -425,10 +409,7 @@ * General probe attach **************************************************************/ int -stgprobesubr(iot, ioh, dvcfg) - bus_space_tag_t iot; - bus_space_handle_t ioh; - u_int dvcfg; +stgprobesubr(bus_space_tag_t iot, bus_space_handle_t ioh, u_int dvcfg) { u_int16_t lsb, msb; @@ -448,9 +429,7 @@ } int -stgprint(aux, name) - void *aux; - const char *name; +stgprint(void *aux, const char *name) { if (name != NULL) @@ -459,8 +438,7 @@ } void -stgattachsubr(sc) - struct stg_softc *sc; +stgattachsubr(struct stg_softc *sc) { struct scsi_low_softc *slp = &sc->sc_sclow; @@ -481,9 +459,7 @@ * PDMA functions **************************************************************/ static __inline void -stg_pdma_end(sc, ti) - struct stg_softc *sc; - struct targ_info *ti; +stg_pdma_end(struct stg_softc *sc, struct targ_info *ti) { struct scsi_low_softc *slp = &sc->sc_sclow; bus_space_tag_t iot = sc->sc_iot; @@ -546,10 +522,7 @@ } static void -stg_pio_read(sc, ti, thold) - struct stg_softc *sc; - struct targ_info *ti; - u_int thold; +stg_pio_read(struct stg_softc *sc, struct targ_info *ti, u_int thold) { struct scsi_low_softc *slp = &sc->sc_sclow; bus_space_tag_t iot = sc->sc_iot; @@ -639,10 +612,7 @@ } static void -stg_pio_write(sc, ti, thold) - struct stg_softc *sc; - struct targ_info *ti; - u_int thold; +stg_pio_write(struct stg_softc *sc, struct targ_info *ti, u_int thold) { struct scsi_low_softc *slp = &sc->sc_sclow; bus_space_tag_t iot = sc->sc_iot; @@ -721,10 +691,7 @@ } static int -stg_negate_signal(sc, mask, s) - struct stg_softc *sc; - u_int8_t mask; - u_char *s; +stg_negate_signal(struct stg_softc *sc, u_int8_t mask, u_char *s) { struct scsi_low_softc *slp = &sc->sc_sclow; bus_space_tag_t bst = sc->sc_iot; @@ -748,9 +715,7 @@ } static int -stg_expect_signal(sc, phase, mask) - struct stg_softc *sc; - u_int8_t phase, mask; +stg_expect_signal(struct stg_softc *sc, u_int8_t phase, u_int8_t mask) { struct scsi_low_softc *slp = &sc->sc_sclow; bus_space_tag_t bst = sc->sc_iot; @@ -777,12 +742,8 @@ } static int -stg_xfer(sc, buf, len, phase, clear_atn) - struct stg_softc *sc; - u_int8_t *buf; - int len; - int phase; - int clear_atn; +stg_xfer(struct stg_softc *sc, u_int8_t *buf, int len, int phase, + int clear_atn) { bus_space_tag_t iot = sc->sc_iot; bus_space_handle_t ioh = sc->sc_ioh; @@ -827,8 +788,7 @@ * disconnect & reselect (HW low) **************************************************************/ static int -stg_reselected(sc) - struct stg_softc *sc; +stg_reselected(struct stg_softc *sc) { struct scsi_low_softc *slp = &sc->sc_sclow; bus_space_tag_t iot = sc->sc_iot; @@ -910,9 +870,7 @@ } static int -stg_disconnected(sc, ti) - struct stg_softc *sc; - struct targ_info *ti; +stg_disconnected(struct stg_softc *sc, struct targ_info *ti) { struct scsi_low_softc *slp = &sc->sc_sclow; bus_space_tag_t iot = sc->sc_iot; @@ -938,8 +896,7 @@ * SEQUENCER **************************************************************/ static int -stg_target_nexus_establish(sc) - struct stg_softc *sc; +stg_target_nexus_establish(struct stg_softc *sc) { struct scsi_low_softc *slp = &sc->sc_sclow; bus_space_tag_t iot = sc->sc_iot; @@ -956,16 +913,14 @@ } static int -stg_lun_nexus_establish(sc) - struct stg_softc *sc; +stg_lun_nexus_establish(struct stg_softc *sc) { return 0; } static int -stg_ccb_nexus_establish(sc) - struct stg_softc *sc; +stg_ccb_nexus_establish(struct stg_softc *sc) { struct scsi_low_softc *slp = &sc->sc_sclow; struct slccb *cb = slp->sl_Qnexus; @@ -977,9 +932,7 @@ #define STGHW_SELECT_INTERVAL 10 static int -stghw_select_targ_wait(sc, mu) - struct stg_softc *sc; - int mu; +stghw_select_targ_wait(struct stg_softc *sc, int mu) { bus_space_tag_t iot = sc->sc_iot; bus_space_handle_t ioh = sc->sc_ioh; @@ -1002,8 +955,7 @@ } static void -stg_selection_done_and_expect_msgout(sc) - struct stg_softc *sc; +stg_selection_done_and_expect_msgout(struct stg_softc *sc) { struct scsi_low_softc *slp = &sc->sc_sclow; bus_space_tag_t iot = sc->sc_iot; @@ -1016,8 +968,7 @@ } int -stgintr(arg) - void *arg; +stgintr(void *arg) { struct stg_softc *sc = arg; struct scsi_low_softc *slp = &sc->sc_sclow; @@ -1348,8 +1299,7 @@ } static int -stg_timeout(sc) - struct stg_softc *sc; +stg_timeout(struct stg_softc *sc) { struct scsi_low_softc *slp = &sc->sc_sclow; bus_space_tag_t iot = sc->sc_iot; Index: disk/trm/trm.c =================================================================== RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/disk/trm/trm.c,v retrieving revision 1.9 diff -u -r1.9 trm.c --- disk/trm/trm.c 12 Oct 2005 17:35:50 -0000 1.9 +++ disk/trm/trm.c 26 Nov 2005 00:45:55 -0000 @@ -1262,8 +1262,7 @@ } static void -trm_Interrupt(vpACB) -void *vpACB; +trm_Interrupt(void *vpACB) { PACB pACB; PDCB pDCB; Index: disk/vn/vn.c =================================================================== RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/disk/vn/vn.c,v retrieving revision 1.14 diff -u -r1.14 vn.c --- disk/vn/vn.c 6 Sep 2005 01:21:26 -0000 1.14 +++ disk/vn/vn.c 26 Nov 2005 00:47:16 -0000 @@ -540,12 +540,8 @@ */ static int -vniocattach_file(vn, vio, dev, flag, td) - struct vn_softc *vn; - struct vn_ioctl *vio; - dev_t dev; - int flag; - struct thread *td; +vniocattach_file(struct vn_softc *vn, struct vn_ioctl *vio, dev_t dev, + int flag, struct thread *td) { struct vattr vattr; struct nlookupdata nd; @@ -628,12 +624,8 @@ */ static int -vniocattach_swap(vn, vio, dev, flag, td) - struct vn_softc *vn; - struct vn_ioctl *vio; - dev_t dev; - int flag; - struct thread *td; +vniocattach_swap(struct vn_softc *vn, struct vn_ioctl *vio, dev_t dev, + int flag, struct thread *td) { int error; struct proc *p = td->td_proc; Index: misc/gpib/gpib.c =================================================================== RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/misc/gpib/gpib.c,v retrieving revision 1.9 diff -u -r1.9 gpib.c --- misc/gpib/gpib.c 19 May 2004 22:52:42 -0000 1.9 +++ misc/gpib/gpib.c 8 Dec 2005 21:27:36 -0000 @@ -123,8 +123,7 @@ * Attach device and print the type of card to the screen. */ static int -gpattach(isdp) - struct isa_device *isdp; +gpattach(struct isa_device *isdp) { struct gpib_softc *sc = &gpib_sc; @@ -150,11 +149,7 @@ * i.e. even if gpib5 is open, we can't open another minor device */ static int -gpopen(dev, flags, fmt, td) - dev_t dev; - int flags; - int fmt; - struct thread *td; +gpopen(dev_t dev, int flags, int fmt, struct thread *td) { struct gpib_softc *sc = &gpib_sc; u_char unit; @@ -228,11 +223,7 @@ * Close gpib device. */ static int -gpclose(dev, flags, fmt, td) - dev_t dev; - int flags; - int fmt; - struct thread *td; +gpclose(dev_t dev, int flags, int fmt, struct thread *td) { struct gpib_softc *sc = &gpib_sc; unsigned char unit; @@ -331,10 +322,7 @@ * by minor(dev). */ static int -gpwrite(dev, uio, ioflag) - dev_t dev; - struct uio *uio; - int ioflag; +gpwrite(dev_t dev, struct uio *uio, int ioflag) { int err,count; @@ -479,7 +467,7 @@ National Instruments. They should give you one if you call them*/ static int -initgpib() { +initgpib(void) { outb(CMDR,0x20); outb(CFG,0x16); outb(IMR3,0); @@ -529,7 +517,7 @@ /*This is kind of Brute force.. But it works*/ static void -closegpib() +closegpib(void) { outb(AUXMR,chip_reset); } Index: misc/mse/mse.c =================================================================== RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/misc/mse/mse.c,v retrieving revision 1.14 diff -u -r1.14 mse.c --- misc/mse/mse.c 12 Oct 2005 17:35:50 -0000 1.14 +++ misc/mse/mse.c 8 Dec 2005 21:38:42 -0000 @@ -279,8 +279,7 @@ }; static int -mse_probe(dev) - device_t dev; +mse_probe(device_t dev) { mse_softc_t *sc; int error; @@ -325,8 +324,7 @@ } static int -mse_attach(dev) - device_t dev; +mse_attach(device_t dev) { mse_softc_t *sc; int flags; @@ -369,8 +367,7 @@ } static int -mse_detach(dev) - device_t dev; +mse_detach(device_t dev) { mse_softc_t *sc; int rid; @@ -392,11 +389,7 @@ * Exclusive open the mouse, initialize it and enable interrupts. */ static int -mseopen(dev, flags, fmt, td) - dev_t dev; - int flags; - int fmt; - struct thread *td; +mseopen(dev_t dev, int flags, int fmt, struct thread *td) { mse_softc_t *sc; @@ -431,11 +424,7 @@ * mseclose: just turn off mouse innterrupts. */ static int -mseclose(dev, flags, fmt, td) - dev_t dev; - int flags; - int fmt; - struct thread *td; +mseclose(dev_t dev, int flags, int fmt, struct thread *td) { mse_softc_t *sc = devclass_get_softc(mse_devclass, MSE_UNIT(dev)); @@ -453,10 +442,7 @@ * (Yes this is cheesy, but it makes the X386 server happy, so...) */ static int -mseread(dev, uio, ioflag) - dev_t dev; - struct uio *uio; - int ioflag; +mseread(dev_t dev, struct uio *uio, int ioflag) { mse_softc_t *sc = devclass_get_softc(mse_devclass, MSE_UNIT(dev)); int xfer, error; @@ -519,12 +505,7 @@ * mseioctl: process ioctl commands. */ static int -mseioctl(dev, cmd, addr, flag, td) - dev_t dev; - u_long cmd; - caddr_t addr; - int flag; - struct thread *td; +mseioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td) { mse_softc_t *sc = devclass_get_softc(mse_devclass, MSE_UNIT(dev)); mousestatus_t status; @@ -635,10 +616,7 @@ * msepoll: check for mouse input to be processed. */ static int -msepoll(dev, events, td) - dev_t dev; - int events; - struct thread *td; +msepoll(dev_t dev, int events, struct thread *td) { mse_softc_t *sc = devclass_get_softc(mse_devclass, MSE_UNIT(dev)); int revents = 0; @@ -665,8 +643,7 @@ * msetimeout: watchdog timer routine. */ static void -msetimeout(arg) - void *arg; +msetimeout(void *arg) { dev_t dev; mse_softc_t *sc; @@ -686,8 +663,7 @@ * mseintr: update mouse status. sc_deltax and sc_deltay are accumulative. */ static void -mseintr(arg) - void *arg; +mseintr(void *arg) { /* * the table to turn MouseSystem button bits (MOUSE_MSC_BUTTON?UP) @@ -765,9 +741,7 @@ * interrupts and return 1) */ static int -mse_probelogi(dev, sc) - device_t dev; - mse_softc_t *sc; +mse_probelogi(device_t dev, mse_softc_t *sc) { int sig; @@ -793,9 +767,7 @@ * Initialize Logitech mouse and enable interrupts. */ static void -mse_enablelogi(tag, handle) - bus_space_tag_t tag; - bus_space_handle_t handle; +mse_enablelogi(bus_space_tag_t tag, bus_space_handle_t handle) { int dx, dy, but; @@ -807,9 +779,7 @@ * Disable interrupts for Logitech mouse. */ static void -mse_disablelogi(tag, handle) - bus_space_tag_t tag; - bus_space_handle_t handle; +mse_disablelogi(bus_space_tag_t tag, bus_space_handle_t handle) { bus_space_write_1(tag, handle, MSE_PORTC, MSE_DISINTR); @@ -819,12 +789,7 @@ * Get the current dx, dy and button up/down state. */ static void -mse_getlogi(tag, handle, dx, dy, but) - bus_space_tag_t tag; - bus_space_handle_t handle; - int *dx; - int *dy; - int *but; +mse_getlogi(bus_space_tag_t tag, bus_space_handle_t handle, int *dx, int *dy, int *but) { char x, y; @@ -851,9 +816,7 @@ * (do not enable interrupts) */ static int -mse_probeati(dev, sc) - device_t dev; - mse_softc_t *sc; +mse_probeati(device_t dev, mse_softc_t *sc) { int i; @@ -867,9 +830,7 @@ * Initialize ATI Inport mouse and enable interrupts. */ static void -mse_enableati(tag, handle) - bus_space_tag_t tag; - bus_space_handle_t handle; +mse_enableati(bus_space_tag_t tag, bus_space_handle_t handle) { bus_space_write_1(tag, handle, MSE_PORTA, MSE_INPORT_RESET); @@ -881,9 +842,7 @@ * Disable interrupts for ATI Inport mouse. */ static void -mse_disableati(tag, handle) - bus_space_tag_t tag; - bus_space_handle_t handle; +mse_disableati(bus_space_tag_t tag, bus_space_handle_t handle) { bus_space_write_1(tag, handle, MSE_PORTA, MSE_INPORT_MODE); @@ -894,12 +853,7 @@ * Get current dx, dy and up/down button state. */ static void -mse_getati(tag, handle, dx, dy, but) - bus_space_tag_t tag; - bus_space_handle_t handle; - int *dx; - int *dy; - int *but; +mse_getati(bus_space_tag_t tag, bus_space_handle_t handle, int *dx, int *dy, int *but) { char byte; Index: misc/nmdm/nmdm.c =================================================================== RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/misc/nmdm/nmdm.c,v retrieving revision 1.11 diff -u -r1.11 nmdm.c --- misc/nmdm/nmdm.c 16 Jun 2005 16:31:34 -0000 1.11 +++ misc/nmdm/nmdm.c 26 Nov 2005 00:57:51 -0000 @@ -125,8 +125,7 @@ * This function creates and initializes a pair of ttys. */ static void -nmdminit(n) - int n; +nmdminit(int n) { dev_t dev1, dev2; struct nm_softc *pt; @@ -304,10 +303,7 @@ } static int -nmdmread(dev, uio, flag) - dev_t dev; - struct uio *uio; - int flag; +nmdmread(dev_t dev, struct uio *uio, int flag) { int error = 0; struct tty *tp, *tp2; @@ -341,10 +337,7 @@ * indirectly, when tty driver calls nmdmstart. */ static int -nmdmwrite(dev, uio, flag) - dev_t dev; - struct uio *uio; - int flag; +nmdmwrite(dev_t dev, struct uio *uio, int flag) { u_char *cp = 0; int cc = 0; @@ -438,8 +431,7 @@ * Wake up process selecting or sleeping for input from controlling tty. */ static void -nmdmstart(tp) - struct tty *tp; +nmdmstart(struct tty *tp) { struct nm_softc *pti = tp->t_dev->si_drv1; @@ -451,9 +443,7 @@ /* Wakes up the OTHER tty;*/ static void -wakeup_other(tp, flag) - struct tty *tp; - int flag; +wakeup_other(struct tty *tp, int flag) { struct softpart *ourpart, *otherpart; @@ -469,9 +459,7 @@ } static void -nmdmstop(tp, flush) - struct tty *tp; - int flush; +nmdmstop(struct tty *tp, int flush) { struct nm_softc *pti = tp->t_dev->si_drv1; int flag; @@ -571,8 +559,7 @@ static void nmdm_drvinit (void *unused); static void -nmdm_drvinit(unused) - void *unused; +nmdm_drvinit(void *unused) { /* XXX: Gross hack for DEVFS */ nmdminit(0); Index: misc/ppc/ppc.c =================================================================== RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/misc/ppc/ppc.c,v retrieving revision 1.10 diff -u -r1.10 ppc.c --- misc/ppc/ppc.c 12 Oct 2005 17:35:50 -0000 1.10 +++ misc/ppc/ppc.c 8 Dec 2005 21:42:53 -0000 @@ -151,8 +151,8 @@ * ppc_ecp_sync() XXX */ static void -ppc_ecp_sync(device_t dev) { - +ppc_ecp_sync(device_t dev) +{ int i, r; struct ppc_data *ppc = DEVTOSOFTC(dev); @@ -1279,8 +1279,8 @@ * mode is the mode suggested at boot */ static int -ppc_detect(struct ppc_data *ppc, int chipset_mode) { - +ppc_detect(struct ppc_data *ppc, int chipset_mode) +{ #ifdef PPC_PROBE_CHIPSET int i, mode; Index: misc/snp/snp.c =================================================================== RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/misc/snp/snp.c,v retrieving revision 1.11 diff -u -r1.11 snp.c --- misc/snp/snp.c 16 Jun 2005 16:27:05 -0000 1.11 +++ misc/snp/snp.c 26 Nov 2005 01:00:14 -0000 @@ -120,9 +120,7 @@ static int snp_modevent (module_t mod, int what, void *arg); static int -snplclose(tp, flag) - struct tty *tp; - int flag; +snplclose(struct tty *tp, int flag) { struct snoop *snp; int error; @@ -136,10 +134,7 @@ } static int -snplwrite(tp, uio, flag) - struct tty *tp; - struct uio *uio; - int flag; +snplwrite(struct tty *tp, struct uio *uio, int flag) { struct iovec iov; struct uio uio2; @@ -179,8 +174,7 @@ } static struct tty * -snpdevtotty(dev) - dev_t dev; +snpdevtotty(dev_t dev) { if ((dev_dflags(dev) & D_TTY) == 0) return (NULL); @@ -193,10 +187,7 @@ */ static int -snpwrite(dev, uio, flag) - dev_t dev; - struct uio *uio; - int flag; +snpwrite(dev_t dev, struct uio *uio, int flag) { struct snoop *snp; struct tty *tp; @@ -232,10 +223,7 @@ static int -snpread(dev, uio, flag) - dev_t dev; - struct uio *uio; - int flag; +snpread(dev_t dev, struct uio *uio, int flag) { struct snoop *snp; int error, len, n, nblen; @@ -297,10 +285,7 @@ } static int -snp_in(snp, buf, n) - struct snoop *snp; - char *buf; - int n; +snp_in(struct snoop *snp, char *buf, int n) { int s_free, s_tail; int len, nblen; @@ -414,8 +399,7 @@ static int -snp_detach(snp) - struct snoop *snp; +snp_detach(struct snoop *snp) { struct tty *tp; @@ -466,8 +450,7 @@ } static int -snp_down(snp) - struct snoop *snp; +snp_down(struct snoop *snp) { if (snp->snp_blen != SNOOP_MINLEN) { @@ -588,10 +571,7 @@ } static int -snp_modevent(mod, type, data) - module_t mod; - int type; - void *data; +snp_modevent(module_t mod, int type, void *data) { switch (type) { Index: misc/streams/streams.c =================================================================== RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/misc/streams/streams.c,v retrieving revision 1.21 diff -u -r1.21 streams.c --- misc/streams/streams.c 9 Oct 2005 18:07:55 -0000 1.21 +++ misc/streams/streams.c 26 Nov 2005 00:49:43 -0000 @@ -316,8 +316,7 @@ struct svr4_strm * -svr4_stream_get(fp) - struct file *fp; +svr4_stream_get(struct file *fp) { struct socket *so; struct svr4_strm *st; Index: misc/tw/tw.c =================================================================== RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/misc/tw/tw.c,v retrieving revision 1.14 diff -u -r1.14 tw.c --- misc/tw/tw.c 13 Oct 2005 08:50:33 -0000 1.14 +++ misc/tw/tw.c 8 Dec 2005 21:54:29 -0000 @@ -307,7 +307,8 @@ * fairly forgiving. */ -static void twdelay25(void) +static void +twdelay25(void) { int cnt; for(cnt = twdelaycount; cnt; cnt--); /* Should take about 25us */ @@ -320,7 +321,8 @@ * if we happen to be interrupted during the delay. */ -static void twdelayn(int n) +static void +twdelayn(int n) { #ifdef HIRESTIME int t, d; @@ -342,8 +344,8 @@ } } -static int twprobe(idp) - struct isa_device *idp; +static int +twprobe(struct isa_device *idp) { struct tw_sc sc; int d; @@ -392,8 +394,8 @@ return(0); } -static int twattach(idp) - struct isa_device *idp; +static int +twattach(struct isa_device *idp) { struct tw_sc *sc; int unit; @@ -409,11 +411,8 @@ return (1); } -int twopen(dev, flag, mode, td) - dev_t dev; - int flag; - int mode; - struct thread *td; +int +twopen(dev_t dev, int flag, int mode, struct thread *td) { struct tw_sc *sc = &tw_sc[TWUNIT(dev)]; @@ -428,11 +427,8 @@ return(0); } -int twclose(dev, flag, mode, td) - dev_t dev; - int flag; - int mode; - struct thread *td; +int +twclose(dev_t dev, int flag, int mode, struct thread *td) { struct tw_sc *sc = &tw_sc[TWUNIT(dev)]; @@ -443,10 +439,8 @@ return(0); } -int twread(dev, uio, ioflag) - dev_t dev; - struct uio *uio; - int ioflag; +int +twread(dev_t dev, struct uio *uio, int ioflag) { u_char buf[3]; struct tw_sc *sc = &tw_sc[TWUNIT(dev)]; @@ -461,10 +455,8 @@ return(error); } -int twwrite(dev, uio, ioflag) - dev_t dev; - struct uio *uio; - int ioflag; +int +twwrite(dev_t dev, struct uio *uio, int ioflag) { struct tw_sc *sc; int house, key, reps; @@ -533,10 +525,8 @@ * Determine if there is data available for reading */ -int twpoll(dev, events, td) - dev_t dev; - int events; - struct thread *td; +int +twpoll(dev_t dev, int events, struct thread *td) { struct tw_sc *sc; int revents = 0; @@ -680,9 +670,8 @@ #define TWRETRY 10 /* Try 10 times to sync with AC line */ -static int twsend(sc, h, k, cnt) -struct tw_sc *sc; -int h, k, cnt; +static int +twsend(struct tw_sc *sc, int h, int k, int cnt) { int i; int port = sc->sc_port; @@ -766,8 +755,8 @@ * X-10 packet. */ -static int wait_for_zero(sc) -struct tw_sc *sc; +static int +wait_for_zero(struct tw_sc *sc) { int i, old, new, max; int port = sc->sc_port + tw_zcport; @@ -798,8 +787,8 @@ * last bit was transmitted. */ -static int next_zero(sc) -struct tw_sc *sc; +static int +next_zero(struct tw_sc *sc) { int d; #ifdef HIRESTIME @@ -819,9 +808,8 @@ * Should be called from a critical section. */ -static int twputpkt(sc, p) -struct tw_sc *sc; -u_char *p; +static int +twputpkt(struct tw_sc *sc, u_char *p) { int i, next; @@ -850,10 +838,8 @@ * Should be called from a critical section. */ -static int twgetbytes(sc, p, cnt) -struct tw_sc *sc; -u_char *p; -int cnt; +static int +twgetbytes(struct tw_sc *sc, u_char *p, int cnt) { int error; @@ -876,8 +862,7 @@ */ static void -twabortrcv(arg) - void *arg; +twabortrcv(void *arg) { struct tw_sc *sc = arg; u_char pkt[3]; @@ -918,7 +903,8 @@ * reconstruct the transmission without having to poll. */ -static void twintr(void *arg) +static void +twintr(void *arg) { int unit = (int)arg; struct tw_sc *sc = &tw_sc[unit]; @@ -1094,7 +1080,8 @@ } } -static void twdebugtimes(struct tw_sc *sc) +static void +twdebugtimes(struct tw_sc *sc) { int i; for (i = 0; (i < sc->sc_no_rcv) && (i < SC_RCV_TIME_LEN); i++) @@ -1110,7 +1097,8 @@ * or reception is on schedule. */ -static void twsetuptimes(int *a) +static void +twsetuptimes(int *a) { struct timeval tv; int i, t; @@ -1130,7 +1118,8 @@ * on schedule. */ -static int twchecktime(int target, int tol) +static int +twchecktime(int target, int tol) { struct timeval tv; int t, d; Index: netif/an/if_an.c =================================================================== RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/an/if_an.c,v retrieving revision 1.34 diff -u -r1.34 if_an.c --- netif/an/if_an.c 28 Nov 2005 17:13:38 -0000 1.34 +++ netif/an/if_an.c 29 Nov 2005 08:36:19 -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; @@ -823,8 +803,7 @@ } static void -an_rxeof(sc) - struct an_softc *sc; +an_rxeof(struct an_softc *sc) { struct ifnet *ifp; struct ether_header *eh; @@ -1067,9 +1046,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; @@ -1117,8 +1094,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; @@ -1150,8 +1126,7 @@ } void -an_intr(xsc) - void *xsc; +an_intr(void *xsc) { struct an_softc *sc; struct ifnet *ifp; @@ -1212,10 +1187,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; @@ -1259,10 +1232,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; @@ -1307,8 +1277,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); @@ -1326,9 +1295,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; @@ -1439,9 +1406,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; @@ -1540,10 +1505,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; @@ -1585,9 +1547,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; @@ -1621,11 +1581,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; @@ -1648,11 +1604,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; @@ -1679,10 +1631,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; @@ -1713,9 +1662,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; @@ -1824,9 +1771,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); @@ -1842,11 +1787,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; @@ -2422,8 +2363,7 @@ } static int -an_init_tx_ring(sc) - struct an_softc *sc; +an_init_tx_ring(struct an_softc *sc) { int i; int id; @@ -2446,8 +2386,7 @@ } static void -an_init(xsc) - void *xsc; +an_init(void *xsc) { struct an_softc *sc = xsc; struct ifnet *ifp = &sc->arpcom.ac_if; @@ -2540,8 +2479,7 @@ } static void -an_start(ifp) - struct ifnet *ifp; +an_start(struct ifnet *ifp) { struct an_softc *sc; struct mbuf *m0 = NULL; @@ -2709,8 +2647,7 @@ } void -an_stop(sc) - struct an_softc *sc; +an_stop(struct an_softc *sc) { struct ifnet *ifp; int i; @@ -2735,8 +2672,7 @@ } static void -an_watchdog(ifp) - struct ifnet *ifp; +an_watchdog(struct ifnet *ifp) { struct an_softc *sc; @@ -2753,8 +2689,7 @@ } void -an_shutdown(dev) - device_t dev; +an_shutdown(device_t dev) { struct an_softc *sc; @@ -2765,8 +2700,7 @@ } void -an_resume(dev) - device_t dev; +an_resume(device_t dev) { struct an_softc *sc; struct ifnet *ifp; @@ -2856,11 +2790,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; @@ -2998,8 +2929,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; @@ -3053,9 +2983,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; @@ -3103,9 +3031,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; @@ -3174,9 +3100,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; @@ -3277,8 +3201,7 @@ #define FLASH_SIZE 32 * 1024 static int -unstickbusy(ifp) - struct ifnet *ifp; +unstickbusy(struct ifnet *ifp) { struct an_softc *sc = ifp->if_softc; @@ -3296,9 +3219,7 @@ */ static int -WaitBusy(ifp, uSec) - struct ifnet *ifp; - int uSec; +WaitBusy(struct ifnet *ifp, int uSec) { int statword = 0xffff; int delay = 0; @@ -3322,8 +3243,7 @@ */ static int -cmdreset(ifp) - struct ifnet *ifp; +cmdreset(struct ifnet *ifp) { int status; struct an_softc *sc = ifp->if_softc; @@ -3353,8 +3273,7 @@ */ static int -setflashmode(ifp) - struct ifnet *ifp; +setflashmode(struct ifnet *ifp) { int status; struct an_softc *sc = ifp->if_softc; @@ -3382,10 +3301,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; @@ -3421,10 +3337,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; @@ -3480,8 +3393,7 @@ */ static int -flashputbuf(ifp) - struct ifnet *ifp; +flashputbuf(struct ifnet *ifp) { unsigned short *bufp; int nwords; @@ -3515,8 +3427,7 @@ */ static int -flashrestart(ifp) - struct ifnet *ifp; +flashrestart(struct ifnet *ifp) { int status = 0; struct an_softc *sc = ifp->if_softc; @@ -3534,9 +3445,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: netif/an/if_an_isa.c =================================================================== RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/an/if_an_isa.c,v retrieving revision 1.14 diff -u -r1.14 if_an_isa.c --- netif/an/if_an_isa.c 28 Nov 2005 17:13:38 -0000 1.14 +++ netif/an/if_an_isa.c 29 Nov 2005 08:36:19 -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: netif/an/if_an_pci.c =================================================================== RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/an/if_an_pci.c,v retrieving revision 1.18 diff -u -r1.18 if_an_pci.c --- netif/an/if_an_pci.c 28 Nov 2005 17:13:38 -0000 1.18 +++ netif/an/if_an_pci.c 29 Nov 2005 08:36:19 -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: netif/ep/if_ep.c =================================================================== RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/ep/if_ep.c,v retrieving revision 1.22 diff -u -r1.22 if_ep.c --- netif/ep/if_ep.c 28 Nov 2005 17:13:42 -0000 1.22 +++ netif/ep/if_ep.c 29 Nov 2005 08:36:22 -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: netif/ep/if_ep_isa.c =================================================================== RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/ep/if_ep_isa.c,v retrieving revision 1.10 diff -u -r1.10 if_ep_isa.c --- netif/ep/if_ep_isa.c 28 Nov 2005 17:13:42 -0000 1.10 +++ netif/ep/if_ep_isa.c 29 Nov 2005 08:36:22 -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: netif/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 --- netif/ep/if_epvar.h 31 May 2005 08:10:44 -0000 1.3 +++ netif/ep/if_epvar.h 23 Nov 2005 16:16:48 -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: netif/lnc/if_lnc.c =================================================================== RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/lnc/if_lnc.c,v retrieving revision 1.24 diff -u -r1.24 if_lnc.c --- netif/lnc/if_lnc.c 28 Nov 2005 17:13:43 -0000 1.24 +++ netif/lnc/if_lnc.c 29 Nov 2005 08:36:24 -0000 @@ -886,8 +886,7 @@ } static void -lnc_init(xsc) - void *xsc; +lnc_init(void *xsc) { struct lnc_softc *sc = xsc; int i; Index: netif/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 --- netif/mii_layer/acphy.c 24 Oct 2005 16:55:40 -0000 1.7 +++ netif/mii_layer/acphy.c 23 Nov 2005 16:16:48 -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: netif/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 --- netif/mii_layer/amphy.c 24 Oct 2005 16:55:40 -0000 1.8 +++ netif/mii_layer/amphy.c 23 Nov 2005 16:16:48 -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; - int cmd; +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: netif/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 --- netif/mii_layer/brgphy.c 31 Oct 2005 12:49:05 -0000 1.11 +++ netif/mii_layer/brgphy.c 23 Nov 2005 16:16:48 -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: netif/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 --- netif/mii_layer/dcphy.c 24 Oct 2005 16:55:40 -0000 1.7 +++ netif/mii_layer/dcphy.c 23 Nov 2005 16:16:48 -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: netif/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 --- netif/mii_layer/exphy.c 24 Oct 2005 16:55:40 -0000 1.7 +++ netif/mii_layer/exphy.c 23 Nov 2005 16:16:48 -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: netif/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 --- netif/mii_layer/lxtphy.c 24 Oct 2005 16:55:40 -0000 1.7 +++ netif/mii_layer/lxtphy.c 23 Nov 2005 16:16:48 -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: netif/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 --- netif/mii_layer/mii.c 24 Oct 2005 16:45:19 -0000 1.7 +++ netif/mii_layer/mii.c 23 Nov 2005 16:16:48 -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: netif/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 --- netif/mii_layer/mii_physubr.c 31 Oct 2005 12:49:05 -0000 1.10 +++ netif/mii_layer/mii_physubr.c 23 Nov 2005 16:16:48 -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: netif/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 --- netif/mii_layer/mlphy.c 24 Oct 2005 16:55:40 -0000 1.7 +++ netif/mii_layer/mlphy.c 23 Nov 2005 16:16:48 -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: netif/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 --- netif/mii_layer/nsgphy.c 31 Oct 2005 12:49:05 -0000 1.11 +++ netif/mii_layer/nsgphy.c 23 Nov 2005 16:16:48 -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: netif/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 --- netif/mii_layer/nsphy.c 24 Oct 2005 16:55:40 -0000 1.7 +++ netif/mii_layer/nsphy.c 23 Nov 2005 16:16:48 -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: netif/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 --- netif/mii_layer/pnaphy.c 24 Oct 2005 16:55:40 -0000 1.8 +++ netif/mii_layer/pnaphy.c 23 Nov 2005 16:16:48 -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: netif/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 --- netif/mii_layer/pnphy.c 24 Oct 2005 16:55:40 -0000 1.8 +++ netif/mii_layer/pnphy.c 23 Nov 2005 16:16:48 -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: netif/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 --- netif/mii_layer/qsphy.c 24 Oct 2005 16:55:40 -0000 1.7 +++ netif/mii_layer/qsphy.c 23 Nov 2005 16:16:48 -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: netif/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 --- netif/mii_layer/tlphy.c 24 Oct 2005 16:55:40 -0000 1.7 +++ netif/mii_layer/tlphy.c 23 Nov 2005 16:16:48 -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: netif/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 --- netif/mii_layer/ukphy_subr.c 24 Oct 2005 15:55:32 -0000 1.5 +++ netif/mii_layer/ukphy_subr.c 23 Nov 2005 16:16:48 -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: netif/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 --- netif/mii_layer/xmphy.c 24 Oct 2005 16:55:40 -0000 1.7 +++ netif/mii_layer/xmphy.c 23 Nov 2005 16:16:48 -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: netif/owi/if_owi.c =================================================================== RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/owi/if_owi.c,v retrieving revision 1.13 diff -u -r1.13 if_owi.c --- netif/owi/if_owi.c 28 Nov 2005 17:13:43 -0000 1.13 +++ netif/owi/if_owi.c 29 Nov 2005 08:36:26 -0000 @@ -178,8 +178,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; @@ -453,8 +452,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; @@ -545,8 +543,7 @@ } static void -wi_rxeof(sc) - struct wi_softc *sc; +wi_rxeof(struct wi_softc *sc) { struct ifnet *ifp; struct ether_header *eh; @@ -799,9 +796,7 @@ } static void -wi_txeof(sc, status) - struct wi_softc *sc; - int status; +wi_txeof(struct wi_softc *sc, int status) { struct ifnet *ifp; @@ -819,8 +814,7 @@ } static void -wi_inquire(xsc) - void *xsc; +wi_inquire(void *xsc) { struct wi_softc *sc = xsc; struct ifnet *ifp = &sc->arpcom.ac_if; @@ -838,8 +832,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; @@ -891,8 +884,7 @@ } static void -wi_intr(xsc) - void *xsc; +wi_intr(void *xsc) { struct wi_softc *sc = xsc; struct ifnet *ifp = &sc->arpcom.ac_if; @@ -952,12 +944,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; @@ -1017,8 +1004,7 @@ } static void -wi_reset(sc) - struct wi_softc *sc; +wi_reset(struct wi_softc *sc) { #define WI_INIT_TRIES 3 int i; @@ -1057,9 +1043,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; @@ -1170,9 +1154,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; @@ -1300,9 +1282,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; @@ -1342,11 +1322,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; @@ -1374,11 +1350,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; @@ -1420,10 +1392,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; @@ -1459,8 +1428,7 @@ } static void -wi_setmulti(sc) - struct wi_softc *sc; +wi_setmulti(struct wi_softc *sc) { struct ifnet *ifp; int i = 0; @@ -1503,9 +1471,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; @@ -1586,11 +1552,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; @@ -1972,8 +1934,7 @@ } static void -wi_init(xsc) - void *xsc; +wi_init(void *xsc) { struct wi_softc *sc = xsc; struct ifnet *ifp = &sc->arpcom.ac_if; @@ -2187,8 +2148,7 @@ } static void -wi_start(ifp) - struct ifnet *ifp; +wi_start(struct ifnet *ifp) { struct wi_softc *sc = ifp->if_softc; struct mbuf *m0; @@ -2319,10 +2279,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; @@ -2358,8 +2315,7 @@ } static void -wi_stop(sc) - struct wi_softc *sc; +wi_stop(struct wi_softc *sc) { struct ifnet *ifp; @@ -2386,8 +2342,7 @@ } static void -wi_watchdog(ifp) - struct ifnet *ifp; +wi_watchdog(struct ifnet *ifp) { struct wi_softc *sc; @@ -2403,9 +2358,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); @@ -2455,8 +2408,7 @@ } void -owi_free(dev) - device_t dev; +owi_free(device_t dev) { struct wi_softc *sc = device_get_softc(dev); @@ -2477,8 +2429,7 @@ } void -owi_shutdown(dev) - device_t dev; +owi_shutdown(device_t dev) { struct wi_softc *sc; struct ifnet *ifp; @@ -2694,10 +2645,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; @@ -2751,8 +2699,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; @@ -2815,9 +2762,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; @@ -2877,9 +2822,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; @@ -2936,9 +2879,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: netif/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 --- netif/owi/if_owi_pccard.c 5 Sep 2004 13:34:56 -0000 1.1 +++ netif/owi/if_owi_pccard.c 23 Nov 2005 16:16:48 -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: netif/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 --- netif/owi/if_owi_pci.c 24 May 2005 09:52:14 -0000 1.2 +++ netif/owi/if_owi_pci.c 23 Nov 2005 16:16:48 -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: netif/pcn/if_pcn.c =================================================================== RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/pcn/if_pcn.c,v retrieving revision 1.26 diff -u -r1.26 if_pcn.c --- netif/pcn/if_pcn.c 28 Nov 2005 17:13:43 -0000 1.26 +++ netif/pcn/if_pcn.c 29 Nov 2005 08:36:26 -0000 @@ -197,59 +197,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; @@ -269,9 +262,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; @@ -283,8 +275,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; @@ -303,8 +295,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; @@ -319,8 +311,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; @@ -358,8 +350,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. @@ -387,8 +379,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; @@ -486,8 +478,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; @@ -636,8 +628,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; @@ -674,8 +666,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; @@ -700,8 +692,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; @@ -723,10 +715,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; @@ -765,8 +755,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; @@ -823,8 +813,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; @@ -880,8 +870,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 @@ lwkt_serialize_exit(ifp->if_serializer); } -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; @@ -1182,8 +1170,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; @@ -1206,9 +1194,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; @@ -1223,11 +1210,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; @@ -1283,8 +1267,8 @@ return(error); } -static void pcn_watchdog(ifp) - struct ifnet *ifp; +static void +pcn_watchdog(struct ifnet *ifp) { struct pcn_softc *sc; @@ -1307,8 +1291,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; @@ -1354,8 +1338,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 = device_get_softc(dev); struct ifnet *ifp = &sc->arpcom.ac_if; Index: netif/sf/if_sf.c =================================================================== RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/sf/if_sf.c,v retrieving revision 1.25 diff -u -r1.25 if_sf.c --- netif/sf/if_sf.c 28 Nov 2005 17:13:44 -0000 1.25 +++ netif/sf/if_sf.c 29 Nov 2005 08:36:28 -0000 @@ -217,9 +217,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; @@ -233,9 +232,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; @@ -245,10 +243,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); @@ -259,8 +255,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; @@ -289,10 +285,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 +sf_setperf(struct sf_softc *sc, int idx, caddr_t mac) { u_int16_t *p; @@ -319,10 +313,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; @@ -346,10 +338,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); @@ -361,9 +351,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; @@ -386,9 +375,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; @@ -407,8 +395,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; @@ -427,8 +415,8 @@ return; } -static void sf_setmulti(sc) - struct sf_softc *sc; +static void +sf_setmulti(struct sf_softc *sc) { struct ifnet *ifp; int i; @@ -484,8 +472,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; @@ -507,9 +495,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; @@ -524,11 +511,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; @@ -573,8 +557,8 @@ return(error); } -static void sf_reset(sc) - struct sf_softc *sc; +static void +sf_reset(struct sf_softc *sc) { int i; @@ -605,8 +589,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; @@ -660,8 +644,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; @@ -814,8 +798,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; @@ -848,8 +832,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; @@ -869,8 +853,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; @@ -893,10 +877,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; @@ -945,8 +928,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; @@ -1009,8 +992,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; @@ -1054,8 +1037,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; @@ -1077,8 +1060,8 @@ return; } -static void sf_intr(arg) - void *arg; +static void +sf_intr(void *arg) { struct sf_softc *sc; struct ifnet *ifp; @@ -1130,8 +1113,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; @@ -1233,10 +1216,9 @@ callout_reset(&sc->sf_stat_timer, hz, sf_stats_update, sc); } -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; @@ -1296,8 +1278,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; @@ -1363,8 +1345,8 @@ return; } -static void sf_stop(sc) - struct sf_softc *sc; +static void +sf_stop(struct sf_softc *sc) { int i; struct ifnet *ifp; @@ -1412,8 +1394,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; @@ -1451,8 +1433,8 @@ lwkt_serialize_exit(ifp->if_serializer); } -static void sf_watchdog(ifp) - struct ifnet *ifp; +static void +sf_watchdog(struct ifnet *ifp) { struct sf_softc *sc; @@ -1471,8 +1453,8 @@ return; } -static void sf_shutdown(dev) - device_t dev; +static void +sf_shutdown(device_t dev) { struct sf_softc *sc; struct ifnet *ifp; Index: netif/ste/if_ste.c =================================================================== RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/ste/if_ste.c,v retrieving revision 1.31 diff -u -r1.31 if_ste.c --- netif/ste/if_ste.c 28 Nov 2005 17:13:44 -0000 1.31 +++ netif/ste/if_ste.c 29 Nov 2005 08:36:29 -0000 @@ -190,8 +190,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; @@ -210,10 +210,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; @@ -235,10 +233,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; @@ -323,10 +319,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) { /* * Set up frame for TX. @@ -364,9 +358,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; @@ -385,9 +378,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; @@ -404,8 +396,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; @@ -432,8 +424,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; @@ -452,9 +444,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; @@ -469,8 +460,8 @@ return; } -static void ste_wait(sc) - struct ste_softc *sc; +static void +ste_wait(struct ste_softc *sc) { int i; @@ -489,8 +480,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; @@ -515,12 +506,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; @@ -544,8 +531,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; @@ -588,8 +575,8 @@ return; } -static void ste_intr(xsc) - void *xsc; +static void +ste_intr(void *xsc) { struct ste_softc *sc; struct ifnet *ifp; @@ -644,8 +631,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; @@ -718,8 +705,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; @@ -755,8 +742,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; @@ -791,8 +778,8 @@ return; } -static void ste_stats_update(xsc) - void *xsc; +static void +ste_stats_update(void *xsc) { struct ste_softc *sc; struct ifnet *ifp; @@ -832,8 +819,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; @@ -855,8 +842,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; @@ -1001,8 +988,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; @@ -1036,10 +1023,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; @@ -1069,8 +1055,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; @@ -1102,8 +1088,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; @@ -1137,8 +1123,8 @@ return; } -static void ste_init(xsc) - void *xsc; +static void +ste_init(void *xsc) { struct ste_softc *sc; int i; @@ -1242,8 +1228,8 @@ callout_reset(&sc->ste_stat_timer, hz, ste_stats_update, sc); } -static void ste_stop(sc) - struct ste_softc *sc; +static void +ste_stop(struct ste_softc *sc) { int i; struct ifnet *ifp; @@ -1288,8 +1274,8 @@ return; } -static void ste_reset(sc) - struct ste_softc *sc; +static void +ste_reset(struct ste_softc *sc) { int i; @@ -1313,11 +1299,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; @@ -1369,10 +1352,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; @@ -1432,8 +1413,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; @@ -1502,8 +1483,8 @@ return; } -static void ste_watchdog(ifp) - struct ifnet *ifp; +static void +ste_watchdog(struct ifnet *ifp) { struct ste_softc *sc; @@ -1524,8 +1505,8 @@ return; } -static void ste_shutdown(dev) - device_t dev; +static void +ste_shutdown(device_t dev) { struct ste_softc *sc; Index: netif/tl/if_tl.c =================================================================== RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/tl/if_tl.c,v retrieving revision 1.33 diff -u -r1.33 if_tl.c --- netif/tl/if_tl.c 28 Nov 2005 17:13:44 -0000 1.33 +++ netif/tl/if_tl.c 29 Nov 2005 08:42:33 -0000 @@ -361,64 +361,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; @@ -430,10 +419,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; @@ -445,10 +432,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; @@ -460,10 +445,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; @@ -478,9 +461,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; @@ -522,10 +504,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; @@ -590,11 +570,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; @@ -609,8 +586,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; @@ -624,10 +601,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; @@ -642,10 +617,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; @@ -733,10 +706,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; @@ -785,9 +756,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; @@ -802,9 +772,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; @@ -821,8 +790,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; @@ -842,9 +811,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); @@ -871,8 +839,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; @@ -888,10 +856,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; @@ -920,8 +886,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 }; @@ -986,8 +952,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; @@ -1012,9 +978,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; @@ -1074,8 +1039,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; @@ -1093,8 +1058,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; @@ -1295,8 +1260,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; @@ -1330,8 +1295,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; @@ -1357,8 +1322,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; @@ -1388,9 +1353,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; @@ -1408,6 +1372,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 @@ -1431,9 +1396,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; @@ -1496,9 +1460,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; @@ -1519,9 +1482,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; @@ -1571,9 +1533,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; @@ -1607,9 +1568,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; @@ -1628,9 +1588,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; @@ -1645,8 +1604,8 @@ return(1); } -static void tl_intr(xsc) - void *xsc; +static void +tl_intr(void *xsc) { struct tl_softc *sc; struct ifnet *ifp; @@ -1787,10 +1746,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; @@ -1877,8 +1834,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; @@ -1960,8 +1917,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; @@ -2041,8 +1998,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; @@ -2062,9 +2019,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; @@ -2093,11 +2049,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; @@ -2149,8 +2102,8 @@ return(error); } -static void tl_watchdog(ifp) - struct ifnet *ifp; +static void +tl_watchdog(struct ifnet *ifp) { struct tl_softc *sc; @@ -2170,8 +2123,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; @@ -2234,8 +2187,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: netif/txp/if_txp.c =================================================================== RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/txp/if_txp.c,v retrieving revision 1.33 diff -u -r1.33 if_txp.c --- netif/txp/if_txp.c 28 Nov 2005 17:13:44 -0000 1.33 +++ netif/txp/if_txp.c 29 Nov 2005 08:36:29 -0000 @@ -182,8 +182,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; @@ -202,8 +201,7 @@ } static int -txp_attach(dev) - device_t dev; +txp_attach(device_t dev) { struct txp_softc *sc; struct ifnet *ifp; @@ -332,8 +330,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; @@ -762,8 +750,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; @@ -819,9 +806,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)); @@ -865,8 +850,7 @@ } static int -txp_shutdown(dev) - device_t dev; +txp_shutdown(device_t dev) { struct txp_softc *sc; struct ifnet *ifp; @@ -890,8 +874,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; @@ -1025,11 +1008,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; @@ -1065,8 +1044,7 @@ } static int -txp_rxring_fill(sc) - struct txp_softc *sc; +txp_rxring_fill(struct txp_softc *sc) { int i; struct ifnet *ifp; @@ -1100,8 +1078,7 @@ } static void -txp_rxring_empty(sc) - struct txp_softc *sc; +txp_rxring_empty(struct txp_softc *sc) { int i; struct txp_swdesc *sd; @@ -1125,8 +1102,7 @@ } static void -txp_init(xsc) - void *xsc; +txp_init(void *xsc) { struct txp_softc *sc; struct ifnet *ifp; @@ -1176,8 +1152,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; @@ -1215,8 +1190,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; @@ -1325,11 +1299,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; @@ -1350,14 +1322,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; @@ -1423,12 +1390,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; @@ -1474,9 +1437,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; @@ -1500,8 +1461,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; @@ -1525,8 +1485,7 @@ } static void -txp_stop(sc) - struct txp_softc *sc; +txp_stop(struct txp_softc *sc) { struct ifnet *ifp; @@ -1545,15 +1504,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; @@ -1589,9 +1546,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; @@ -1656,8 +1611,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; @@ -1700,8 +1654,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; @@ -1749,8 +1702,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: netif/vx/if_vx.c =================================================================== RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/netif/vx/if_vx.c,v retrieving revision 1.25 diff -u -r1.25 if_vx.c --- netif/vx/if_vx.c 28 Nov 2005 17:13:44 -0000 1.25 +++ netif/vx/if_vx.c 29 Nov 2005 08:42:57 -0000 @@ -185,8 +185,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; @@ -238,8 +237,7 @@ } static void -vxsetfilter(sc) - struct vx_softc *sc; +vxsetfilter(struct vx_softc *sc) { struct ifnet *ifp = &sc->arpcom.ac_if; @@ -250,8 +248,7 @@ } static void -vxgetlink(sc) - struct vx_softc *sc; +vxgetlink(struct vx_softc *sc) { int n, k; @@ -284,8 +281,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; @@ -390,8 +386,7 @@ } static void -vxstart(ifp) - struct ifnet *ifp; +vxstart(struct ifnet *ifp) { struct vx_softc *sc = ifp->if_softc; struct mbuf *m0; @@ -504,8 +499,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; @@ -586,8 +580,7 @@ } void -vxintr(voidsc) - void *voidsc; +vxintr(void *voidsc) { short status; struct vx_softc *sc = voidsc; @@ -633,8 +626,7 @@ } static void -vxread(sc) - struct vx_softc *sc; +vxread(struct vx_softc *sc) { struct ifnet *ifp = &sc->arpcom.ac_if; struct mbuf *m; @@ -739,9 +731,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; @@ -829,11 +819,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; @@ -897,16 +883,14 @@ } static void -vxreset(sc) - struct vx_softc *sc; +vxreset(struct vx_softc *sc) { vxstop(sc); vxinit(sc); } static void -vxwatchdog(ifp) - struct ifnet *ifp; +vxwatchdog(struct ifnet *ifp) { struct vx_softc *sc = ifp->if_softc; @@ -918,8 +902,7 @@ } void -vxstop(sc) - struct vx_softc *sc; +vxstop(struct vx_softc *sc) { struct ifnet *ifp = &sc->arpcom.ac_if; @@ -944,8 +927,7 @@ } int -vxbusyeeprom(sc) - struct vx_softc *sc; +vxbusyeeprom(struct vx_softc *sc) { int j, i = 100; @@ -999,8 +981,7 @@ } static void -vxmbufempty(sc) - struct vx_softc *sc; +vxmbufempty(struct vx_softc *sc) { int i; Index: netif/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 --- netif/wi/if_wi_pccard.c 30 Jun 2005 17:11:28 -0000 1.7 +++ netif/wi/if_wi_pccard.c 23 Nov 2005 16:16:49 -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; Index: raid/iir/iir.c =================================================================== RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/raid/iir/iir.c,v retrieving revision 1.10 diff -u -r1.10 iir.c --- raid/iir/iir.c 10 Jun 2005 15:46:31 -0000 1.10 +++ raid/iir/iir.c 8 Dec 2005 22:01:35 -0000 @@ -125,7 +125,8 @@ } } -int ser_printf(const char *fmt, ...) +int +ser_printf(const char *fmt, ...) { __va_list args; int i; @@ -1889,8 +1890,8 @@ } /* Controller event handling functions */ -gdt_evt_str *gdt_store_event(u_int16_t source, u_int16_t idx, - gdt_evt_data *evt) +gdt_evt_str * +gdt_store_event(u_int16_t source, u_int16_t idx, gdt_evt_data *evt) { gdt_evt_str *e; struct timeval tv; @@ -1934,7 +1935,8 @@ return e; } -int gdt_read_event(int handle, gdt_evt_str *estr) +int +gdt_read_event(int handle, gdt_evt_str *estr) { gdt_evt_str *e; int eindex; @@ -1965,7 +1967,8 @@ return eindex; } -void gdt_readapp_event(u_int8_t application, gdt_evt_str *estr) +void +gdt_readapp_event(u_int8_t application, gdt_evt_str *estr) { gdt_evt_str *e; int found = FALSE; @@ -1995,7 +1998,8 @@ crit_exit(); } -void gdt_clear_events() +void +gdt_clear_events(void) { GDT_DPRINTF(GDT_D_MISC, ("gdt_clear_events\n")); Index: raid/iir/iir.h =================================================================== RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/raid/iir/iir.h,v retrieving revision 1.4 diff -u -r1.4 iir.h --- raid/iir/iir.h 5 May 2005 22:57:45 -0000 1.4 +++ raid/iir/iir.h 8 Dec 2005 21:58:01 -0000 @@ -661,31 +661,25 @@ static __inline__ u_int32_t gdt_dec32(u_int8_t *); static __inline__ void -gdt_enc16(addr, value) - u_int8_t *addr; - u_int16_t value; +gdt_enc16(u_int8_t *addr, u_int16_t value) { *(u_int16_t *)addr = htole16(value); } static __inline__ void -gdt_enc32(addr, value) - u_int8_t *addr; - u_int32_t value; +gdt_enc32(u_int8_t *addr, u_int32_t value) { *(u_int32_t *)addr = htole32(value); } static __inline__ u_int16_t -gdt_dec16(addr) - u_int8_t *addr; +gdt_dec16(u_int8_t *addr) { return letoh16(*(u_int16_t *)addr); } static __inline__ u_int32_t -gdt_dec32(addr) - u_int8_t *addr; +gdt_dec32(u_int8_t *addr) { return letoh32(*(u_int32_t *)addr); } Index: raid/vinum/vinumdaemon.c =================================================================== RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/raid/vinum/vinumdaemon.c,v retrieving revision 1.6 diff -u -r1.6 vinumdaemon.c --- raid/vinum/vinumdaemon.c 14 Nov 2005 18:49:54 -0000 1.6 +++ raid/vinum/vinumdaemon.c 8 Dec 2005 21:58:25 -0000 @@ -251,7 +251,7 @@ * if it is, ESRCH otherwise */ int -vinum_finddaemon() +vinum_finddaemon(void) { int result; Index: serial/rp/rp.c =================================================================== RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/serial/rp/rp.c,v retrieving revision 1.14 diff -u -r1.14 rp.c --- serial/rp/rp.c 8 Jun 2005 08:25:50 -0000 1.14 +++ serial/rp/rp.c 8 Dec 2005 22:05:38 -0000 @@ -1173,10 +1173,7 @@ static int -rpwrite(dev, uio, flag) - dev_t dev; - struct uio *uio; - int flag; +rpwrite(dev_t dev, struct uio *uio, int flag) { struct rp_port *rp; struct tty *tp; @@ -1420,9 +1417,7 @@ }; static int -rpparam(tp, t) - struct tty *tp; - struct termios *t; +rpparam(struct tty *tp, struct termios *t) { struct rp_port *rp; CHANNEL_t *cp; @@ -1551,9 +1546,7 @@ } static void -rp_disc_optim(tp, t) -struct tty *tp; -struct termios *t; +rp_disc_optim(struct tty *tp, struct termios *t) { if(!(t->c_iflag & (ICRNL | IGNCR | IMAXBEL | INLCR | ISTRIP | IXON)) &&(!(t->c_iflag & BRKINT) || (t->c_iflag & IGNBRK)) @@ -1567,8 +1560,7 @@ } static void -rpstart(tp) - struct tty *tp; +rpstart(struct tty *tp) { struct rp_port *rp; CHANNEL_t *cp; @@ -1629,9 +1621,7 @@ static void -rpstop(tp, flag) - struct tty *tp; - int flag; +rpstop(struct tty *tp, int flag) { struct rp_port *rp; CHANNEL_t *cp; Index: usbmisc/ums/ums.c =================================================================== RCS file: /mnt/share/dragonfly-cvs/src/sys/dev/usbmisc/ums/ums.c,v retrieving revision 1.15 diff -u -r1.15 ums.c --- usbmisc/ums/ums.c 25 Aug 2005 18:48:19 -0000 1.15 +++ usbmisc/ums/ums.c 8 Dec 2005 22:10:03 -0000 @@ -136,25 +136,25 @@ #define MOUSE_FLAGS_MASK (HIO_CONST|HIO_RELATIVE) #define MOUSE_FLAGS (HIO_RELATIVE) -Static void ums_intr(usbd_xfer_handle xfer, +static void ums_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status); -Static void ums_add_to_queue(struct ums_softc *sc, +static void ums_add_to_queue(struct ums_softc *sc, int dx, int dy, int dz, int buttons); -Static void ums_add_to_queue_timeout(void *priv); +static void ums_add_to_queue_timeout(void *priv); -Static int ums_enable(void *); -Static void ums_disable(void *); +static int ums_enable(void *); +static void ums_disable(void *); -Static d_open_t ums_open; -Static d_close_t ums_close; -Static d_read_t ums_read; -Static d_ioctl_t ums_ioctl; -Static d_poll_t ums_poll; +static d_open_t ums_open; +static d_close_t ums_close; +static d_read_t ums_read; +static d_ioctl_t ums_ioctl; +static d_poll_t ums_poll; #define UMS_CDEV_MAJOR 111 -Static struct cdevsw ums_cdevsw = { +static struct cdevsw ums_cdevsw = { /* name */ "ums", /* maj */ UMS_CDEV_MAJOR, /* flags */ 0, @@ -363,7 +363,7 @@ } -Static int +static int ums_detach(device_t self) { struct ums_softc *sc = device_get_softc(self); @@ -398,10 +398,8 @@ } void -ums_intr(xfer, addr, status) - usbd_xfer_handle xfer; - usbd_private_handle addr; - usbd_status status; +ums_intr(usbd_xfer_handle xfer, usbd_private_handle addr, + usbd_status status) { struct ums_softc *sc = addr; u_char *ibuf; @@ -473,7 +471,7 @@ } } -Static void +static void ums_add_to_queue_timeout(void *priv) { struct ums_softc *sc = priv; @@ -483,7 +481,7 @@ crit_exit(); } -Static void +static void ums_add_to_queue(struct ums_softc *sc, int dx, int dy, int dz, int buttons) { /* Discard data in case of full buffer */ @@ -529,9 +527,9 @@ selwakeuppri(&sc->rsel, 0); } } -Static int -ums_enable(v) - void *v; + +static int +ums_enable(void *v) { struct ums_softc *sc = v; @@ -563,9 +561,8 @@ return (0); } -Static void -ums_disable(priv) - void *priv; +static void +ums_disable(void *priv) { struct ums_softc *sc = priv; @@ -581,7 +578,7 @@ DPRINTF(("Discarded %d bytes in queue\n", sc->qcount)); } -Static int +static int ums_open(dev_t dev, int flag, int fmt, usb_proc_ptr p) { struct ums_softc *sc; @@ -591,7 +588,7 @@ return ums_enable(sc); } -Static int +static int ums_close(dev_t dev, int flag, int fmt, usb_proc_ptr p) { struct ums_softc *sc; @@ -607,7 +604,7 @@ return 0; } -Static int +static int ums_read(dev_t dev, struct uio *uio, int flag) { struct ums_softc *sc; @@ -675,7 +672,7 @@ return 0; } -Static int +static int ums_poll(dev_t dev, int events, usb_proc_ptr p) { struct ums_softc *sc;