From 3d0f5f54307bd97ebe09c4f531552b1c6763a6ab Mon Sep 17 00:00:00 2001 From: Robert Garrett Date: Sat, 26 Jul 2003 21:56:10 +0000 Subject: [PATCH] Register keyword removal Approved by: Matt Dillon --- sys/dev/disk/ncr/ncr.c | 4 ++-- sys/dev/netif/dc/if_dc.c | 20 ++++++++++---------- sys/dev/netif/pcn/if_pcn.c | 4 ++-- sys/dev/netif/rl/if_rl.c | 16 ++++++++-------- sys/dev/netif/sis/if_sis.c | 14 +++++++------- sys/dev/netif/sk/if_sk.c | 6 +++--- sys/dev/netif/ste/if_ste.c | 6 +++--- sys/dev/netif/ti/if_ti.c | 26 +++++++++++++------------- sys/dev/netif/tl/if_tl.c | 10 +++++----- sys/dev/netif/vr/if_vr.c | 8 ++++---- sys/dev/netif/wb/if_wb.c | 12 ++++++------ sys/dev/netif/xl/if_xl.c | 10 +++++----- sys/dev/video/meteor/meteor.c | 8 ++++---- 13 files changed, 72 insertions(+), 72 deletions(-) diff --git a/sys/dev/disk/ncr/ncr.c b/sys/dev/disk/ncr/ncr.c index 26e2acf9c2..bcc8daa2b2 100644 --- a/sys/dev/disk/ncr/ncr.c +++ b/sys/dev/disk/ncr/ncr.c @@ -1,7 +1,7 @@ /************************************************************************** ** ** $FreeBSD: src/sys/pci/ncr.c,v 1.155.2.3 2001/03/05 13:09:10 obrien Exp $ -** $DragonFly: src/sys/dev/disk/ncr/ncr.c,v 1.2 2003/06/17 04:28:57 dillon Exp $ +** $DragonFly: src/sys/dev/disk/ncr/ncr.c,v 1.3 2003/07/26 21:56:10 rob Exp $ ** ** Device driver for the NCR 53C8XX PCI-SCSI-Controller Family. ** @@ -6733,7 +6733,7 @@ static int ncr_scatter #ifndef NCR_IOMAPPED static int ncr_regtest (struct ncb* np) { - register volatile u_int32_t data; + volatile u_int32_t data; /* ** ncr registers may NOT be cached. ** write 0xffffffff to a read only register area, diff --git a/sys/dev/netif/dc/if_dc.c b/sys/dev/netif/dc/if_dc.c index d8f2bcb1f8..b579bbb9ab 100644 --- a/sys/dev/netif/dc/if_dc.c +++ b/sys/dev/netif/dc/if_dc.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_dc.c,v 1.9.2.45 2003/06/08 14:31:53 mux Exp $ - * $DragonFly: src/sys/dev/netif/dc/if_dc.c,v 1.2 2003/06/17 04:28:56 dillon Exp $ + * $DragonFly: src/sys/dev/netif/dc/if_dc.c,v 1.3 2003/07/26 21:56:10 rob Exp $ * * $FreeBSD: src/sys/pci/if_dc.c,v 1.9.2.45 2003/06/08 14:31:53 mux Exp $ */ @@ -393,7 +393,7 @@ static void dc_eeprom_width(sc) static void dc_eeprom_idle(sc) struct dc_softc *sc; { - register int i; + int i; CSR_WRITE_4(sc, DC_SIO, DC_SIO_EESEL); dc_delay(sc); @@ -427,7 +427,7 @@ static void dc_eeprom_putbyte(sc, addr) struct dc_softc *sc; int addr; { - register int d, i; + int d, i; d = DC_EECMD_READ >> 6; for (i = 3; i--; ) { @@ -471,7 +471,7 @@ static void dc_eeprom_getword_pnic(sc, addr, dest) int addr; u_int16_t *dest; { - register int i; + int i; u_int32_t r; CSR_WRITE_4(sc, DC_PN_SIOCTL, DC_PN_EEOPCODE_READ|addr); @@ -496,7 +496,7 @@ static void dc_eeprom_getword(sc, addr, dest) int addr; u_int16_t *dest; { - register int i; + int i; u_int16_t word = 0; /* Force EEPROM to idle state. */ @@ -611,7 +611,7 @@ static int dc_mii_readbit(sc) static void dc_mii_sync(sc) struct dc_softc *sc; { - register int i; + int i; CSR_WRITE_4(sc, DC_SIO, DC_SIO_ROMCTL_WRITE); @@ -1441,7 +1441,7 @@ static void dc_setcfg(sc, media) static void dc_reset(sc) struct dc_softc *sc; { - register int i; + int i; DC_SETBIT(sc, DC_BUSCTL, DC_BUSCTL_RESET); @@ -3452,7 +3452,7 @@ static void dc_watchdog(ifp) static void dc_stop(sc) struct dc_softc *sc; { - register int i; + int i; struct ifnet *ifp; ifp = &sc->arpcom.ac_if; @@ -3528,7 +3528,7 @@ static void dc_shutdown(dev) static int dc_suspend(dev) device_t dev; { - register int i; + int i; int s; struct dc_softc *sc; @@ -3559,7 +3559,7 @@ static int dc_suspend(dev) static int dc_resume(dev) device_t dev; { - register int i; + int i; int s; struct dc_softc *sc; struct ifnet *ifp; diff --git a/sys/dev/netif/pcn/if_pcn.c b/sys/dev/netif/pcn/if_pcn.c index 77cf672181..c103fc0608 100644 --- a/sys/dev/netif/pcn/if_pcn.c +++ b/sys/dev/netif/pcn/if_pcn.c @@ -31,7 +31,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_pcn.c,v 1.5.2.10 2003/03/05 18:42:33 njl Exp $ - * $DragonFly: src/sys/dev/netif/pcn/if_pcn.c,v 1.2 2003/06/17 04:28:57 dillon Exp $ + * $DragonFly: src/sys/dev/netif/pcn/if_pcn.c,v 1.3 2003/07/26 21:56:10 rob Exp $ * * $FreeBSD: src/sys/pci/if_pcn.c,v 1.5.2.10 2003/03/05 18:42:33 njl Exp $ */ @@ -1356,7 +1356,7 @@ static void pcn_watchdog(ifp) static void pcn_stop(sc) struct pcn_softc *sc; { - register int i; + int i; struct ifnet *ifp; ifp = &sc->arpcom.ac_if; diff --git a/sys/dev/netif/rl/if_rl.c b/sys/dev/netif/rl/if_rl.c index 0d9913c13c..3eb09643c1 100644 --- a/sys/dev/netif/rl/if_rl.c +++ b/sys/dev/netif/rl/if_rl.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_rl.c,v 1.38.2.16 2003/03/05 18:42:33 njl Exp $ - * $DragonFly: src/sys/dev/netif/rl/if_rl.c,v 1.2 2003/06/17 04:28:57 dillon Exp $ + * $DragonFly: src/sys/dev/netif/rl/if_rl.c,v 1.3 2003/07/26 21:56:10 rob Exp $ * * $FreeBSD: src/sys/pci/if_rl.c,v 1.38.2.16 2003/03/05 18:42:33 njl Exp $ */ @@ -250,7 +250,7 @@ static void rl_eeprom_putbyte(sc, addr) struct rl_softc *sc; int addr; { - register int d, i; + int d, i; d = addr | RL_EECMD_READ; @@ -281,7 +281,7 @@ static void rl_eeprom_getword(sc, addr, dest) int addr; u_int16_t *dest; { - register int i; + int i; u_int16_t word = 0; /* Enter EEPROM access mode. */ @@ -360,7 +360,7 @@ static void rl_read_eeprom(sc, dest, off, cnt, swap) static void rl_mii_sync(sc) struct rl_softc *sc; { - register int i; + int i; MII_SET(RL_MII_DIR|RL_MII_DATAOUT); @@ -747,7 +747,7 @@ static void rl_setmulti(sc) static void rl_reset(sc) struct rl_softc *sc; { - register int i; + int i; CSR_WRITE_1(sc, RL_COMMAND, RL_CMD_RESET); @@ -1682,7 +1682,7 @@ static void rl_watchdog(ifp) static void rl_stop(sc) struct rl_softc *sc; { - register int i; + int i; struct ifnet *ifp; ifp = &sc->arpcom.ac_if; @@ -1736,7 +1736,7 @@ static void rl_shutdown(dev) static int rl_suspend(dev) device_t dev; { - register int i; + int i; struct rl_softc *sc; sc = device_get_softc(dev); @@ -1763,7 +1763,7 @@ static int rl_suspend(dev) static int rl_resume(dev) device_t dev; { - register int i; + int i; struct rl_softc *sc; struct ifnet *ifp; diff --git a/sys/dev/netif/sis/if_sis.c b/sys/dev/netif/sis/if_sis.c index 0c72d29bf9..811ca28e04 100644 --- a/sys/dev/netif/sis/if_sis.c +++ b/sys/dev/netif/sis/if_sis.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_sis.c,v 1.13.4.24 2003/03/05 18:42:33 njl Exp $ - * $DragonFly: src/sys/dev/netif/sis/if_sis.c,v 1.2 2003/06/17 04:28:57 dillon Exp $ + * $DragonFly: src/sys/dev/netif/sis/if_sis.c,v 1.3 2003/07/26 21:56:10 rob Exp $ * * $FreeBSD: src/sys/pci/if_sis.c,v 1.13.4.24 2003/03/05 18:42:33 njl Exp $ */ @@ -245,7 +245,7 @@ static void sis_delay(sc) static void sis_eeprom_idle(sc) struct sis_softc *sc; { - register int i; + int i; SIO_SET(SIS_EECTL_CSEL); sis_delay(sc); @@ -275,7 +275,7 @@ static void sis_eeprom_putbyte(sc, addr) struct sis_softc *sc; int addr; { - register int d, i; + int d, i; d = addr | SIS_EECMD_READ; @@ -306,7 +306,7 @@ static void sis_eeprom_getword(sc, addr, dest) int addr; u_int16_t *dest; { - register int i; + int i; u_int16_t word = 0; /* Force EEPROM to idle state. */ @@ -471,7 +471,7 @@ static void sis_read_mac(sc, dev, dest) static void sis_mii_sync(sc) struct sis_softc *sc; { - register int i; + int i; SIO_SET(SIS_MII_DIR|SIS_MII_DATA); @@ -918,7 +918,7 @@ static void sis_setmulti_sis(sc) static void sis_reset(sc) struct sis_softc *sc; { - register int i; + int i; SIS_SETBIT(sc, SIS_CSR, SIS_CSR_RESET); @@ -2073,7 +2073,7 @@ static void sis_watchdog(ifp) static void sis_stop(sc) struct sis_softc *sc; { - register int i; + int i; struct ifnet *ifp; ifp = &sc->arpcom.ac_if; diff --git a/sys/dev/netif/sk/if_sk.c b/sys/dev/netif/sk/if_sk.c index e6444729fa..9cdb6bc360 100644 --- a/sys/dev/netif/sk/if_sk.c +++ b/sys/dev/netif/sk/if_sk.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_sk.c,v 1.19.2.9 2003/03/05 18:42:34 njl Exp $ - * $DragonFly: src/sys/dev/netif/sk/if_sk.c,v 1.2 2003/06/17 04:28:57 dillon Exp $ + * $DragonFly: src/sys/dev/netif/sk/if_sk.c,v 1.3 2003/07/26 21:56:10 rob Exp $ * * $FreeBSD: src/sys/pci/if_sk.c,v 1.19.2.9 2003/03/05 18:42:34 njl Exp $ */ @@ -730,7 +730,7 @@ static int sk_alloc_jumbo_mem(sc_if) struct sk_if_softc *sc_if; { caddr_t ptr; - register int i; + int i; struct sk_jpool_entry *entry; /* Grab a big chunk o' storage. */ @@ -813,7 +813,7 @@ static void sk_jref(buf, size) { struct sk_if_softc *sc_if; u_int64_t **aptr; - register int i; + int i; /* Extract the softc struct pointer. */ aptr = (u_int64_t **)(buf - sizeof(u_int64_t)); diff --git a/sys/dev/netif/ste/if_ste.c b/sys/dev/netif/ste/if_ste.c index dcbc4f9c2a..429d1266fd 100644 --- a/sys/dev/netif/ste/if_ste.c +++ b/sys/dev/netif/ste/if_ste.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_ste.c,v 1.14.2.9 2003/02/05 22:03:57 mbr Exp $ - * $DragonFly: src/sys/dev/netif/ste/if_ste.c,v 1.2 2003/06/17 04:28:57 dillon Exp $ + * $DragonFly: src/sys/dev/netif/ste/if_ste.c,v 1.3 2003/07/26 21:56:10 rob Exp $ * * $FreeBSD: src/sys/pci/if_ste.c,v 1.14.2.9 2003/02/05 22:03:57 mbr Exp $ */ @@ -192,7 +192,7 @@ DRIVER_MODULE(miibus, ste, miibus_driver, miibus_devclass, 0, 0); static void ste_mii_sync(sc) struct ste_softc *sc; { - register int i; + int i; MII_SET(STE_PHYCTL_MDIR|STE_PHYCTL_MDATA); @@ -480,7 +480,7 @@ static void ste_ifmedia_sts(ifp, ifmr) static void ste_wait(sc) struct ste_softc *sc; { - register int i; + int i; for (i = 0; i < STE_TIMEOUT; i++) { if (!(CSR_READ_4(sc, STE_DMACTL) & STE_DMACTL_DMA_HALTINPROG)) diff --git a/sys/dev/netif/ti/if_ti.c b/sys/dev/netif/ti/if_ti.c index b1204f7e9b..318efed85c 100644 --- a/sys/dev/netif/ti/if_ti.c +++ b/sys/dev/netif/ti/if_ti.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_ti.c,v 1.25.2.14 2002/02/15 04:20:20 silby Exp $ - * $DragonFly: src/sys/dev/netif/ti/if_ti.c,v 1.2 2003/06/17 04:28:57 dillon Exp $ + * $DragonFly: src/sys/dev/netif/ti/if_ti.c,v 1.3 2003/07/26 21:56:10 rob Exp $ * * $FreeBSD: src/sys/pci/if_ti.c,v 1.25.2.14 2002/02/15 04:20:20 silby Exp $ */ @@ -239,7 +239,7 @@ static u_int32_t ti_eeprom_putbyte(sc, byte) struct ti_softc *sc; int byte; { - register int i, ack = 0; + int i, ack = 0; /* * Make sure we're in TX mode. @@ -286,7 +286,7 @@ static u_int8_t ti_eeprom_getbyte(sc, addr, dest) int addr; u_int8_t *dest; { - register int i; + int i; u_int8_t byte = 0; EEPROM_START; @@ -504,7 +504,7 @@ static void ti_cmd_ext(sc, cmd, arg, len) int len; { u_int32_t index; - register int i; + int i; if (sc->ti_rdata->ti_cmd_ring == NULL) return; @@ -604,7 +604,7 @@ static int ti_alloc_jumbo_mem(sc) struct ti_softc *sc; { caddr_t ptr; - register int i; + int i; struct ti_jpool_entry *entry; /* Grab a big chunk o' storage. */ @@ -685,7 +685,7 @@ static void ti_jref(buf, size) { struct ti_softc *sc; u_int64_t **aptr; - register int i; + int i; /* Extract the softc struct pointer. */ aptr = (u_int64_t **)(buf - sizeof(u_int64_t)); @@ -909,7 +909,7 @@ static int ti_newbuf_jumbo(sc, i, m) static int ti_init_rx_ring_std(sc) struct ti_softc *sc; { - register int i; + int i; struct ti_cmd_desc cmd; for (i = 0; i < TI_SSLOTS; i++) { @@ -926,7 +926,7 @@ static int ti_init_rx_ring_std(sc) static void ti_free_rx_ring_std(sc) struct ti_softc *sc; { - register int i; + int i; for (i = 0; i < TI_STD_RX_RING_CNT; i++) { if (sc->ti_cdata.ti_rx_std_chain[i] != NULL) { @@ -943,7 +943,7 @@ static void ti_free_rx_ring_std(sc) static int ti_init_rx_ring_jumbo(sc) struct ti_softc *sc; { - register int i; + int i; struct ti_cmd_desc cmd; for (i = 0; i < TI_JUMBO_RX_RING_CNT; i++) { @@ -960,7 +960,7 @@ static int ti_init_rx_ring_jumbo(sc) static void ti_free_rx_ring_jumbo(sc) struct ti_softc *sc; { - register int i; + int i; for (i = 0; i < TI_JUMBO_RX_RING_CNT; i++) { if (sc->ti_cdata.ti_rx_jumbo_chain[i] != NULL) { @@ -977,7 +977,7 @@ static void ti_free_rx_ring_jumbo(sc) static int ti_init_rx_ring_mini(sc) struct ti_softc *sc; { - register int i; + int i; for (i = 0; i < TI_MSLOTS; i++) { if (ti_newbuf_mini(sc, i, NULL) == ENOBUFS) @@ -993,7 +993,7 @@ static int ti_init_rx_ring_mini(sc) static void ti_free_rx_ring_mini(sc) struct ti_softc *sc; { - register int i; + int i; for (i = 0; i < TI_MINI_RX_RING_CNT; i++) { if (sc->ti_cdata.ti_rx_mini_chain[i] != NULL) { @@ -1010,7 +1010,7 @@ static void ti_free_rx_ring_mini(sc) static void ti_free_tx_ring(sc) struct ti_softc *sc; { - register int i; + int i; if (sc->ti_rdata->ti_tx_ring == NULL) return; diff --git a/sys/dev/netif/tl/if_tl.c b/sys/dev/netif/tl/if_tl.c index a5d71d72d2..f412935d5d 100644 --- a/sys/dev/netif/tl/if_tl.c +++ b/sys/dev/netif/tl/if_tl.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_tl.c,v 1.51.2.5 2001/12/16 15:46:08 luigi Exp $ - * $DragonFly: src/sys/dev/netif/tl/if_tl.c,v 1.2 2003/06/17 04:28:57 dillon Exp $ + * $DragonFly: src/sys/dev/netif/tl/if_tl.c,v 1.3 2003/07/26 21:56:10 rob Exp $ * * $FreeBSD: src/sys/pci/if_tl.c,v 1.51.2.5 2001/12/16 15:46:08 luigi Exp $ */ @@ -479,7 +479,7 @@ static u_int8_t tl_eeprom_putbyte(sc, byte) struct tl_softc *sc; int byte; { - register int i, ack = 0; + int i, ack = 0; /* * Make sure we're in TX mode. @@ -524,7 +524,7 @@ static u_int8_t tl_eeprom_getbyte(sc, addr, dest) int addr; u_int8_t *dest; { - register int i; + int i; u_int8_t byte = 0; tl_dio_write8(sc, TL_NETSIO, 0); @@ -609,7 +609,7 @@ static int tl_read_eeprom(sc, dest, off, cnt) static void tl_mii_sync(sc) struct tl_softc *sc; { - register int i; + int i; tl_dio_clrbit(sc, TL_NETSIO, TL_SIO_MTXEN); @@ -2254,7 +2254,7 @@ static void tl_watchdog(ifp) static void tl_stop(sc) struct tl_softc *sc; { - register int i; + int i; struct ifnet *ifp; ifp = &sc->arpcom.ac_if; diff --git a/sys/dev/netif/vr/if_vr.c b/sys/dev/netif/vr/if_vr.c index f852676304..96a76949b9 100644 --- a/sys/dev/netif/vr/if_vr.c +++ b/sys/dev/netif/vr/if_vr.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_vr.c,v 1.26.2.13 2003/02/06 04:46:20 silby Exp $ - * $DragonFly: src/sys/dev/netif/vr/if_vr.c,v 1.2 2003/06/17 04:28:57 dillon Exp $ + * $DragonFly: src/sys/dev/netif/vr/if_vr.c,v 1.3 2003/07/26 21:56:10 rob Exp $ * * $FreeBSD: src/sys/pci/if_vr.c,v 1.26.2.13 2003/02/06 04:46:20 silby Exp $ */ @@ -243,7 +243,7 @@ DRIVER_MODULE(miibus, vr, miibus_driver, miibus_devclass, 0, 0); static void vr_mii_sync(sc) struct vr_softc *sc; { - register int i; + int i; SIO_SET(VR_MIICMD_DIR|VR_MIICMD_DATAIN); @@ -666,7 +666,7 @@ static void vr_setcfg(sc, media) static void vr_reset(sc) struct vr_softc *sc; { - register int i; + int i; VR_SETBIT16(sc, VR_COMMAND, VR_CMD_RESET); @@ -1740,7 +1740,7 @@ static void vr_watchdog(ifp) static void vr_stop(sc) struct vr_softc *sc; { - register int i; + int i; struct ifnet *ifp; ifp = &sc->arpcom.ac_if; diff --git a/sys/dev/netif/wb/if_wb.c b/sys/dev/netif/wb/if_wb.c index 7a89234f06..a3795b7273 100644 --- a/sys/dev/netif/wb/if_wb.c +++ b/sys/dev/netif/wb/if_wb.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_wb.c,v 1.26.2.6 2003/03/05 18:42:34 njl Exp $ - * $DragonFly: src/sys/dev/netif/wb/if_wb.c,v 1.2 2003/06/17 04:28:57 dillon Exp $ + * $DragonFly: src/sys/dev/netif/wb/if_wb.c,v 1.3 2003/07/26 21:56:10 rob Exp $ * * $FreeBSD: src/sys/pci/if_wb.c,v 1.26.2.6 2003/03/05 18:42:34 njl Exp $ */ @@ -246,7 +246,7 @@ static void wb_eeprom_putbyte(sc, addr) struct wb_softc *sc; int addr; { - register int d, i; + int d, i; d = addr | WB_EECMD_READ; @@ -277,7 +277,7 @@ static void wb_eeprom_getword(sc, addr, dest) int addr; u_int16_t *dest; { - register int i; + int i; u_int16_t word = 0; /* Enter EEPROM access mode. */ @@ -341,7 +341,7 @@ static void wb_read_eeprom(sc, dest, off, cnt, swap) static void wb_mii_sync(sc) struct wb_softc *sc; { - register int i; + int i; SIO_SET(WB_SIO_MII_DIR|WB_SIO_MII_DATAIN); @@ -707,7 +707,7 @@ static void wb_setcfg(sc, media) static void wb_reset(sc) struct wb_softc *sc; { - register int i; + int i; struct mii_data *mii; CSR_WRITE_4(sc, WB_NETCFG, 0); @@ -1818,7 +1818,7 @@ static void wb_watchdog(ifp) static void wb_stop(sc) struct wb_softc *sc; { - register int i; + int i; struct ifnet *ifp; ifp = &sc->arpcom.ac_if; diff --git a/sys/dev/netif/xl/if_xl.c b/sys/dev/netif/xl/if_xl.c index 7a61c89bf3..4e851cf422 100644 --- a/sys/dev/netif/xl/if_xl.c +++ b/sys/dev/netif/xl/if_xl.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_xl.c,v 1.72.2.25 2003/02/05 22:03:58 mbr Exp $ - * $DragonFly: src/sys/dev/netif/xl/if_xl.c,v 1.2 2003/06/17 04:28:57 dillon Exp $ + * $DragonFly: src/sys/dev/netif/xl/if_xl.c,v 1.3 2003/07/26 21:56:10 rob Exp $ * * $FreeBSD: src/sys/pci/if_xl.c,v 1.72.2.25 2003/02/05 22:03:58 mbr Exp $ */ @@ -326,7 +326,7 @@ static void xl_wait(sc) struct xl_softc *sc; { - register int i; + int i; for (i = 0; i < XL_TIMEOUT; i++) { if (!(CSR_READ_2(sc, XL_STATUS) & XL_STAT_CMDBUSY)) @@ -363,7 +363,7 @@ static void xl_mii_sync(sc) struct xl_softc *sc; { - register int i; + int i; XL_SEL_WIN(4); MII_SET(XL_MII_DIR|XL_MII_DATA); @@ -1040,7 +1040,7 @@ static void xl_reset(sc) struct xl_softc *sc; { - register int i; + int i; XL_SEL_WIN(0); CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_RESET | @@ -2959,7 +2959,7 @@ static void xl_stop(sc) struct xl_softc *sc; { - register int i; + int i; struct ifnet *ifp; ifp = &sc->arpcom.ac_if; diff --git a/sys/dev/video/meteor/meteor.c b/sys/dev/video/meteor/meteor.c index c2e781d0c3..d1d8e4957a 100644 --- a/sys/dev/video/meteor/meteor.c +++ b/sys/dev/video/meteor/meteor.c @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/meteor.c,v 1.49 1999/09/25 18:24:41 phk Exp $ - * $DragonFly: src/sys/dev/video/meteor/meteor.c,v 1.5 2003/07/21 07:57:52 dillon Exp $ + * $DragonFly: src/sys/dev/video/meteor/meteor.c,v 1.6 2003/07/26 21:56:10 rob Exp $ */ /* Change History: @@ -481,9 +481,9 @@ static int i2c_print_err = 1; static int i2c_write(meteor_reg_t * mtr, u_char slave, u_char rw, u_char reg, u_char data) { -register unsigned long wait_counter = 0x0001ffff; -register mreg_t * iic_write_loc = &mtr->base->i2c_write; -register int err = 0; +unsigned long wait_counter = 0x0001ffff; +mreg_t * iic_write_loc = &mtr->base->i2c_write; +int err = 0; /* Write the data the the i2c write register */ -- 2.41.0