From 94332c293f1b354994d2e0a56ff84749286c4e3c Mon Sep 17 00:00:00 2001
From: Robert Garrett <rob@dragonflybsd.org>
Date: Sat, 26 Jul 2003 19:20:33 +0000
Subject: [PATCH] Register keyword removal

Approved by: Matt Dillon
---
 sys/net/i4b/driver/i4b_bsdi_ibc.c           |   6 +-
 sys/net/i4b/driver/i4b_ing.c                |  10 +-
 sys/net/i4b/driver/i4b_ipr.c                |  10 +-
 sys/net/i4b/driver/i4b_rbch.c               |   4 +-
 sys/net/i4b/driver/i4b_tel.c                |   6 +-
 sys/net/i4b/layer1/i4b_l1dmux.c             |  24 ++--
 sys/net/i4b/layer1/i4b_l1lib.c              |   6 +-
 sys/net/i4b/layer1/ifpi/i4b_ifpi_isac.c     |  18 +--
 sys/net/i4b/layer1/ifpi/i4b_ifpi_pci.c      |  10 +-
 sys/net/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c |  20 +--
 sys/net/i4b/layer1/ifpi2/i4b_ifpi2_pci.c    |  10 +-
 sys/net/i4b/layer1/ifpnp/i4b_ifpnp_avm.c    |  10 +-
 sys/net/i4b/layer1/ifpnp/i4b_ifpnp_isac.c   |  18 +--
 sys/net/i4b/layer1/ihfc/i4b_ihfc_drv.c      | 138 ++++++++++----------
 sys/net/i4b/layer1/ihfc/i4b_ihfc_l1if.c     |   4 +-
 sys/net/i4b/layer1/isic/i4b_bchan.c         |   8 +-
 sys/net/i4b/layer1/isic/i4b_hscx.c          |   8 +-
 sys/net/i4b/layer1/isic/i4b_isac.c          |  18 +--
 sys/net/i4b/layer1/isic/i4b_isic.c          |  10 +-
 sys/net/i4b/layer1/isic/i4b_usr_sti.c       |  14 +-
 sys/net/i4b/layer1/itjc/i4b_itjc_isac.c     |  18 +--
 sys/net/i4b/layer1/iwic/i4b_iwic_bchan.c    |  10 +-
 sys/net/i4b/layer2/i4b_tei.c                |   6 +-
 sys/net/i4b/layer3/i4b_l2if.c               |   4 +-
 sys/net/i4b/layer4/i4b_l4mgmt.c             |   4 +-
 25 files changed, 197 insertions(+), 197 deletions(-)

diff --git a/sys/net/i4b/driver/i4b_bsdi_ibc.c b/sys/net/i4b/driver/i4b_bsdi_ibc.c
index 7a23761ee5..f30ac98f55 100644
--- a/sys/net/i4b/driver/i4b_bsdi_ibc.c
+++ b/sys/net/i4b/driver/i4b_bsdi_ibc.c
@@ -33,7 +33,7 @@
  *	$Id: i4b_bsdi_ibc.c,v 1.3 2000/08/21 07:21:07 hm Exp $
  *
  * $FreeBSD: src/sys/i4b/driver/i4b_bsdi_ibc.c,v 1.3.2.1 2001/08/10 14:08:35 obrien Exp $
- * $DragonFly: src/sys/net/i4b/driver/Attic/i4b_bsdi_ibc.c,v 1.2 2003/06/17 04:28:39 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/driver/Attic/i4b_bsdi_ibc.c,v 1.3 2003/07/26 19:20:29 rob Exp $
  *
  *	last edit-date: [Tue Dec 14 21:55:24 1999]
  *
@@ -529,7 +529,7 @@ ibc_mdmctl(pp, flag)
 	struct p2pcom *pp;
 	int flag;
 {
-	register struct ifnet *ifp = &pp->p2p_if;
+	struct ifnet *ifp = &pp->p2p_if;
 	struct ibc_softc *sc = (struct ibc_softc *)&ibc_softc[ifp->if_unit];
 
 	DBG(("ibc%d: ibc_mdmctl called flags=%d\n", IFP2UNIT(ifp), flag));
@@ -549,7 +549,7 @@ ibc_getmdm(pp, arg)
 	struct p2pcom *pp;
 	caddr_t arg;
 {
-	register struct ifnet *ifp = &pp->p2p_if;
+	struct ifnet *ifp = &pp->p2p_if;
 	struct ibc_softc *sc = (struct ibc_softc *)&ibc_softc[ifp->if_unit];
 
 	if (sc->sc_state == ST_CONNECTED)
diff --git a/sys/net/i4b/driver/i4b_ing.c b/sys/net/i4b/driver/i4b_ing.c
index a0c3ac9624..3b92275e00 100644
--- a/sys/net/i4b/driver/i4b_ing.c
+++ b/sys/net/i4b/driver/i4b_ing.c
@@ -28,7 +28,7 @@
  *	-------------------------------------------------
  *
  * $FreeBSD: src/sys/i4b/driver/i4b_ing.c,v 1.10.2.4 2002/07/02 23:44:02 archie Exp $
- * $DragonFly: src/sys/net/i4b/driver/i4b_ing.c,v 1.2 2003/06/17 04:28:39 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/driver/i4b_ing.c,v 1.3 2003/07/26 19:20:29 rob Exp $
  *
  *	last edit-date: [Tue Jan  1 10:43:58 2002]
  *
@@ -470,8 +470,8 @@ ing_updown(int unit, int updown)
 static void
 ing_rx_data_rdy(int unit)
 {
-	register struct ing_softc *sc = &ing_softc[unit];
-	register struct mbuf *m;
+	struct ing_softc *sc = &ing_softc[unit];
+	struct mbuf *m;
 	
 	if((m = *isdn_linktab[unit]->rx_mbuf) == NULL)
 		return;
@@ -495,8 +495,8 @@ ing_rx_data_rdy(int unit)
 static void
 ing_tx_queue_empty(int unit)
 {
-	register struct ing_softc *sc = &ing_softc[unit];
-	register struct mbuf *m;
+	struct ing_softc *sc = &ing_softc[unit];
+	struct mbuf *m;
 	int x = 0;
 
 	if(sc->sc_state != ST_CONNECTED)
diff --git a/sys/net/i4b/driver/i4b_ipr.c b/sys/net/i4b/driver/i4b_ipr.c
index df6b20fd2e..2de822c968 100644
--- a/sys/net/i4b/driver/i4b_ipr.c
+++ b/sys/net/i4b/driver/i4b_ipr.c
@@ -28,7 +28,7 @@
  *	---------------------------------------------------------
  *
  * $FreeBSD: src/sys/i4b/driver/i4b_ipr.c,v 1.8.2.3 2001/10/27 15:48:17 hm Exp $
- * $DragonFly: src/sys/net/i4b/driver/i4b_ipr.c,v 1.4 2003/07/21 07:57:46 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/driver/i4b_ipr.c,v 1.5 2003/07/26 19:20:29 rob Exp $
  *
  *	last edit-date: [Fri Oct 26 19:32:38 2001]
  *
@@ -903,8 +903,8 @@ ipr_updown(int unit, int updown)
 static void
 ipr_rx_data_rdy(int unit)
 {
-	register struct ipr_softc *sc = &ipr_softc[unit];
-	register struct mbuf *m;
+	struct ipr_softc *sc = &ipr_softc[unit];
+	struct mbuf *m;
 #ifdef IPR_VJ
 #ifdef IPR_VJ_USEBUFFER
 	u_char *cp = sc->sc_cbuf;
@@ -1107,8 +1107,8 @@ error:
 static void
 ipr_tx_queue_empty(int unit)
 {
-	register struct ipr_softc *sc = &ipr_softc[unit];
-	register struct mbuf *m;
+	struct ipr_softc *sc = &ipr_softc[unit];
+	struct mbuf *m;
 #ifdef	IPR_VJ	
 	struct ip *ip;	
 #endif
diff --git a/sys/net/i4b/driver/i4b_rbch.c b/sys/net/i4b/driver/i4b_rbch.c
index f2bafc79c8..7a1dbc8cb1 100644
--- a/sys/net/i4b/driver/i4b_rbch.c
+++ b/sys/net/i4b/driver/i4b_rbch.c
@@ -28,7 +28,7 @@
  *	---------------------------------------------------
  *
  * $FreeBSD: src/sys/i4b/driver/i4b_rbch.c,v 1.10.2.3 2001/08/12 16:22:48 hm Exp $
- * $DragonFly: src/sys/net/i4b/driver/i4b_rbch.c,v 1.5 2003/07/21 07:57:46 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/driver/i4b_rbch.c,v 1.6 2003/07/26 19:20:29 rob Exp $
  *
  *	last edit-date: [Sat Aug 11 18:06:57 2001]
  *
@@ -920,7 +920,7 @@ rbch_rx_data_rdy(int unit)
 {
 	if(rbch_softc[unit].sc_bprot == BPROT_RHDLC)
 	{
-		register struct mbuf *m;
+		struct mbuf *m;
 		
 		if((m = *isdn_linktab[unit]->rx_mbuf) == NULL)
 			return;
diff --git a/sys/net/i4b/driver/i4b_tel.c b/sys/net/i4b/driver/i4b_tel.c
index 9f29bc8e83..42accdd8a3 100644
--- a/sys/net/i4b/driver/i4b_tel.c
+++ b/sys/net/i4b/driver/i4b_tel.c
@@ -28,7 +28,7 @@
  *	--------------------------------------------
  *
  * $FreeBSD: src/sys/i4b/driver/i4b_tel.c,v 1.10.2.4 2001/12/16 15:12:57 hm Exp $
- * $DragonFly: src/sys/net/i4b/driver/i4b_tel.c,v 1.5 2003/07/21 07:57:46 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/driver/i4b_tel.c,v 1.6 2003/07/26 19:20:29 rob Exp $
  *
  *	last edit-date: [Sat Aug 11 18:07:05 2001]
  *
@@ -494,7 +494,7 @@ i4btelread(dev_t dev, struct uio *uio, int ioflag)
 		
 		if(m && m->m_len > 0)
 		{
-			register int i;
+			int i;
 
 		        for(i = 0; i < m->m_len; i++)
 		        {
@@ -622,7 +622,7 @@ i4btelwrite(dev_t dev, struct uio * uio, int ioflag)
 
 		if((m = i4b_Bgetmbuf(BCH_MAX_DATALEN)) != NULL)
 		{
-			register int i;
+			int i;
 			
 			m->m_len = min(BCH_MAX_DATALEN, uio->uio_resid);
 	
diff --git a/sys/net/i4b/layer1/i4b_l1dmux.c b/sys/net/i4b/layer1/i4b_l1dmux.c
index 1cfe41f62e..e7bd4b4a23 100644
--- a/sys/net/i4b/layer1/i4b_l1dmux.c
+++ b/sys/net/i4b/layer1/i4b_l1dmux.c
@@ -28,7 +28,7 @@
  *	--------------------------------------------------
  *
  * $FreeBSD: src/sys/i4b/layer1/i4b_l1dmux.c,v 1.3.2.2 2002/04/25 12:29:55 gj Exp $
- * $DragonFly: src/sys/net/i4b/layer1/i4b_l1dmux.c,v 1.2 2003/06/17 04:28:39 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/i4b_l1dmux.c,v 1.3 2003/07/26 19:20:29 rob Exp $
  *
  *      last edit-date: [Wed Jan 10 16:43:24 2001]
  *
@@ -263,7 +263,7 @@ i4b_l1_set_linktab(int unit, int channel, drvr_link_t *dlt)
 int
 i4b_l1_trace_ind(i4b_trace_hdr_t *hdr, int len, u_char *data)
 {
-	register int *tab;
+	int *tab;
 	
 	if((tab = getl1tab(L0DRVR(hdr->unit))) == NULL)
 		panic("i4b_l1_trace_ind: unknown driver type %d\n", L0DRVR(hdr->unit));
@@ -285,7 +285,7 @@ i4b_l1_trace_ind(i4b_trace_hdr_t *hdr, int len, u_char *data)
 int
 i4b_l1_mph_status_ind(int drv_unit, int status, int parm, struct i4b_l1mux_func *l1mux_func_p)
 {
-	register int *tab;
+	int *tab;
 	
 	/*
 	 * in case the status STI_ATTACH is sent from the hardware, the
@@ -368,7 +368,7 @@ i4b_l1_mph_status_ind(int drv_unit, int status, int parm, struct i4b_l1mux_func
 int
 i4b_l1_ph_data_ind(int drv_unit, struct mbuf *data)
 {
-	register int *tab;
+	int *tab;
 
 	if((tab = getl1tab(L0DRVR(drv_unit))) == NULL)	
 		panic("i4b_l1_ph_data_ind: unknown driver type %d\n", L0DRVR(drv_unit));
@@ -386,7 +386,7 @@ i4b_l1_ph_data_ind(int drv_unit, struct mbuf *data)
 int
 i4b_l1_ph_activate_ind(int drv_unit)
 {
-	register int *tab;
+	int *tab;
 
 	if((tab = getl1tab(L0DRVR(drv_unit))) == NULL)	
 		panic("i4b_l1_ph_activate_ind: unknown driver type %d\n", L0DRVR(drv_unit));
@@ -402,7 +402,7 @@ i4b_l1_ph_activate_ind(int drv_unit)
 int
 i4b_l1_ph_deactivate_ind(int drv_unit)
 {
-	register int *tab;
+	int *tab;
 	
 	if((tab = getl1tab(L0DRVR(drv_unit))) == NULL)
 		panic("i4b_l1_ph_deactivate_ind: unknown driver type %d\n", L0DRVR(drv_unit));
@@ -418,8 +418,8 @@ i4b_l1_ph_deactivate_ind(int drv_unit)
 int
 i4b_l1_mph_command_req(int unit, int command, void * parm)
 {
-	register int drv_unit = L0DRVR(l1drvunittab[unit]);
-	register int ch_unit = L0UNIT(l1drvunittab[unit]);
+	int drv_unit = L0DRVR(l1drvunittab[unit]);
+	int ch_unit = L0UNIT(l1drvunittab[unit]);
  
 	NDBGL1(L1_PRIM, "unit %d -> drv %d / drvunit %d", unit, drv_unit, ch_unit);
 
@@ -436,8 +436,8 @@ i4b_l1_mph_command_req(int unit, int command, void * parm)
 int
 i4b_l1_ph_data_req(int unit, struct mbuf *data, int flag)
 {
-	register int drv_unit = L0DRVR(l1drvunittab[unit]);
-	register int ch_unit = L0UNIT(l1drvunittab[unit]);
+	int drv_unit = L0DRVR(l1drvunittab[unit]);
+	int ch_unit = L0UNIT(l1drvunittab[unit]);
 
 #if 0
 	NDBGL1(L1_PRIM, "unit %d -> drv %d / drvunit %d", unit, drv_unit, ch_unit);
@@ -456,8 +456,8 @@ i4b_l1_ph_data_req(int unit, struct mbuf *data, int flag)
 int
 i4b_l1_ph_activate_req(int unit)
 {
-	register int drv_unit = L0DRVR(l1drvunittab[unit]);
-	register int ch_unit = L0UNIT(l1drvunittab[unit]);
+	int drv_unit = L0DRVR(l1drvunittab[unit]);
+	int ch_unit = L0UNIT(l1drvunittab[unit]);
  
 	NDBGL1(L1_PRIM, "unit %d -> drv %d / drvunit %d", unit, drv_unit, ch_unit);
 
diff --git a/sys/net/i4b/layer1/i4b_l1lib.c b/sys/net/i4b/layer1/i4b_l1lib.c
index 6ff75df79d..1279db1c12 100644
--- a/sys/net/i4b/layer1/i4b_l1lib.c
+++ b/sys/net/i4b/layer1/i4b_l1lib.c
@@ -30,7 +30,7 @@
  *	$Id: i4b_l1lib.c,v 1.3 2000/05/29 15:41:41 hm Exp $
  *
  * $FreeBSD: src/sys/i4b/layer1/i4b_l1lib.c,v 1.3.2.1 2001/08/10 14:08:36 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/i4b_l1lib.c,v 1.2 2003/06/17 04:28:39 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/i4b_l1lib.c,v 1.3 2003/07/26 19:20:29 rob Exp $
  *
  *      last edit-date: [Mon May 29 15:24:21 2000]
  *
@@ -53,8 +53,8 @@
 int
 i4b_l1_bchan_tel_silence(unsigned char *data, int len)
 {
-	register int i = 0;
-	register int j = 0;
+	int i = 0;
+	int j = 0;
 
 	/* count idle bytes */
 	
diff --git a/sys/net/i4b/layer1/ifpi/i4b_ifpi_isac.c b/sys/net/i4b/layer1/ifpi/i4b_ifpi_isac.c
index 48edd62367..70e637c9e7 100644
--- a/sys/net/i4b/layer1/ifpi/i4b_ifpi_isac.c
+++ b/sys/net/i4b/layer1/ifpi/i4b_ifpi_isac.c
@@ -30,7 +30,7 @@
  *	$Id: i4b_ifpi_isac.c,v 1.3 2000/05/29 15:41:41 hm Exp $ 
  *
  * $FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c,v 1.4.2.1 2001/08/10 14:08:36 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/ifpi/i4b_ifpi_isac.c,v 1.2 2003/06/17 04:28:39 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/ifpi/i4b_ifpi_isac.c,v 1.3 2003/07/26 19:20:30 rob Exp $
  *
  *      last edit-date: [Mon May 29 15:22:52 2000]
  *
@@ -66,8 +66,8 @@
 #include <i4b/include/i4b_global.h>
 #include <i4b/include/i4b_mbuf.h>
 
-static u_char ifpi_isac_exir_hdlr(register struct l1_softc *sc, u_char exir);
-static void ifpi_isac_ind_hdlr(register struct l1_softc *sc, int ind);
+static u_char ifpi_isac_exir_hdlr(struct l1_softc *sc, u_char exir);
+static void ifpi_isac_ind_hdlr(struct l1_softc *sc, int ind);
 
 /*---------------------------------------------------------------------------*
  *	ISAC interrupt service routine
@@ -75,7 +75,7 @@ static void ifpi_isac_ind_hdlr(register struct l1_softc *sc, int ind);
 void
 ifpi_isac_irq(struct l1_softc *sc, int ista)
 {
-	register u_char c = 0;
+	u_char c = 0;
 	NDBGL1(L1_F_MSG, "unit %d: ista = 0x%02x", sc->sc_unit, ista);
 
 	if(ista & ISAC_ISTA_EXI)	/* extended interrupt */
@@ -85,7 +85,7 @@ ifpi_isac_irq(struct l1_softc *sc, int ista)
 	
 	if(ista & ISAC_ISTA_RME)	/* receive message end */
 	{
-		register int rest;
+		int rest;
 		u_char rsta;
 
 		/* get rx status register */
@@ -277,7 +277,7 @@ ifpi_isac_irq(struct l1_softc *sc, int ista)
 	
 	if(ista & ISAC_ISTA_CISQ)	/* channel status change CISQ */
 	{
-		register u_char ci;
+		u_char ci;
 	
 		/* get command/indication rx register*/
 	
@@ -305,7 +305,7 @@ ifpi_isac_irq(struct l1_softc *sc, int ista)
  *	ISAC L1 Extended IRQ handler
  *---------------------------------------------------------------------------*/
 static u_char
-ifpi_isac_exir_hdlr(register struct l1_softc *sc, u_char exir)
+ifpi_isac_exir_hdlr(struct l1_softc *sc, u_char exir)
 {
 	u_char c = 0;
 	
@@ -366,9 +366,9 @@ ifpi_isac_exir_hdlr(register struct l1_softc *sc, u_char exir)
  *	ISAC L1 Indication handler
  *---------------------------------------------------------------------------*/
 static void
-ifpi_isac_ind_hdlr(register struct l1_softc *sc, int ind)
+ifpi_isac_ind_hdlr(struct l1_softc *sc, int ind)
 {
-	register int event;
+	int event;
 	
 	switch(ind)
 	{
diff --git a/sys/net/i4b/layer1/ifpi/i4b_ifpi_pci.c b/sys/net/i4b/layer1/ifpi/i4b_ifpi_pci.c
index 02054200f1..22114a6696 100644
--- a/sys/net/i4b/layer1/ifpi/i4b_ifpi_pci.c
+++ b/sys/net/i4b/layer1/ifpi/i4b_ifpi_pci.c
@@ -36,7 +36,7 @@
  *	$Id: i4b_ifpi_pci.c,v 1.4 2000/06/02 11:58:56 hm Exp $
  *
  * $FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c,v 1.6.2.1 2001/08/10 14:08:37 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/ifpi/i4b_ifpi_pci.c,v 1.2 2003/06/17 04:28:39 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/ifpi/i4b_ifpi_pci.c,v 1.3 2003/07/26 19:20:30 rob Exp $
  *
  *      last edit-date: [Fri Jan 12 17:01:26 2001]
  *
@@ -705,7 +705,7 @@ avma1pp_attach_avma1pp(device_t dev)
 static void
 avma1pp_hscx_intr(int h_chan, u_int stat, struct l1_softc *sc)
 {
-	register l1_bchan_state_t *chan = &sc->sc_chan[h_chan];
+	l1_bchan_state_t *chan = &sc->sc_chan[h_chan];
 	int activity = -1;
 	u_int param = 0;
 	
@@ -747,7 +747,7 @@ avma1pp_hscx_intr(int h_chan, u_int stat, struct l1_softc *sc)
 	
 	if(stat & HSCX_INT_RPR)
 	{
-		register int fifo_data_len;
+		int fifo_data_len;
 		int error = 0;
 		/* always have to read the FIFO, so use a scratch buffer */
 		u_char scrbuf[HSCX_FIFO_LEN];
@@ -1184,7 +1184,7 @@ avma1pp_bchannel_start(int unit, int h_chan)
 #else
 	struct l1_softc *sc = isic_find_sc(unit);
 #endif
-	register l1_bchan_state_t *chan = &sc->sc_chan[h_chan];
+	l1_bchan_state_t *chan = &sc->sc_chan[h_chan];
 	int s;
 	int activity = -1;
 
@@ -1441,7 +1441,7 @@ avma1pp_hscx_fifo(l1_bchan_state_t *chan, struct l1_softc *sc)
 static void
 ifpi_isac_intr(struct l1_softc *sc)
 {
-	register u_char isac_irq_stat;
+	u_char isac_irq_stat;
 
 	for(;;)
 	{
diff --git a/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c b/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c
index a16417dfd1..e0485ce656 100644
--- a/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c
+++ b/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c
@@ -31,7 +31,7 @@
  *	$Id$ 
  *
  * $FreeBSD: src/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c,v 1.1.2.1 2002/04/25 20:26:50 gj Exp $
- * $DragonFly: src/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c,v 1.2 2003/06/17 04:28:39 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c,v 1.3 2003/07/26 19:20:30 rob Exp $
  *
  *      last edit-date: [Mon May 29 15:22:52 2000]
  *
@@ -67,8 +67,8 @@
 #include <i4b/include/i4b_global.h>
 #include <i4b/include/i4b_mbuf.h>
 
-static u_char ifpi2_isacsx_exir_hdlr(register struct l1_softc *sc, u_char exir);
-static void ifpi2_isacsx_ind_hdlr(register struct l1_softc *sc, int ind);
+static u_char ifpi2_isacsx_exir_hdlr(struct l1_softc *sc, u_char exir);
+static void ifpi2_isacsx_ind_hdlr(struct l1_softc *sc, int ind);
 
 /* the ISACSX has 2 mask registers of interest - cannot use ISAC_IMASK */
 unsigned char isacsx_imaskd;
@@ -80,8 +80,8 @@ unsigned char isacsx_imask;
 void
 ifpi2_isacsx_irq(struct l1_softc *sc, int ista)
 {
-	register u_char c = 0;
-	register u_char istad = 0;
+	u_char c = 0;
+	u_char istad = 0;
 
 	NDBGL1(L1_F_MSG, "unit %d: ista = 0x%02x", sc->sc_unit, ista);
 
@@ -100,7 +100,7 @@ ifpi2_isacsx_irq(struct l1_softc *sc, int ista)
 	
 	if(istad & ISACSX_ISTAD_RME)	/* receive message end */
 	{
-		register int rest;
+		int rest;
 		u_char rsta;
 
 		/* get rx status register */
@@ -299,7 +299,7 @@ ifpi2_isacsx_irq(struct l1_softc *sc, int ista)
 	
 	if(ista & ISACSX_ISTA_CIC)	/* channel status change CISQ */
 	{
-		register u_char ci;
+		u_char ci;
 	
 		/* get command/indication rx register*/
 	
@@ -321,7 +321,7 @@ ifpi2_isacsx_irq(struct l1_softc *sc, int ista)
  *	ISACSX L1 Extended IRQ handler
  *---------------------------------------------------------------------------*/
 static u_char
-ifpi2_isacsx_exir_hdlr(register struct l1_softc *sc, u_char exir)
+ifpi2_isacsx_exir_hdlr(struct l1_softc *sc, u_char exir)
 {
 	u_char c = 0;
 	
@@ -379,9 +379,9 @@ ifpi2_isacsx_exir_hdlr(register struct l1_softc *sc, u_char exir)
  *	ISACSX L1 Indication handler
  *---------------------------------------------------------------------------*/
 static void
-ifpi2_isacsx_ind_hdlr(register struct l1_softc *sc, int ind)
+ifpi2_isacsx_ind_hdlr(struct l1_softc *sc, int ind)
 {
-	register int event;
+	int event;
 	
 	switch(ind)
 	{
diff --git a/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_pci.c b/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
index 438a308cd6..2bc0c3093c 100644
--- a/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
+++ b/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
@@ -36,7 +36,7 @@
  *	$Id$
  *
  * $FreeBSD: src/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c,v 1.6.2.2 2002/05/15 08:12:42 gj Exp $
- * $DragonFly: src/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_pci.c,v 1.2 2003/06/17 04:28:39 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_pci.c,v 1.3 2003/07/26 19:20:30 rob Exp $
  *
  *      last edit-date: [Fri Jan 12 17:01:26 2001]
  *
@@ -636,7 +636,7 @@ avma1pp2_attach_avma1pp(device_t dev)
 static void
 avma1pp2_hscx_intr(int h_chan, u_int stat, struct l1_softc *sc)
 {
-	register l1_bchan_state_t *chan = &sc->sc_chan[h_chan];
+	l1_bchan_state_t *chan = &sc->sc_chan[h_chan];
 	int activity = -1;
 	u_int param = 0;
 	
@@ -678,7 +678,7 @@ avma1pp2_hscx_intr(int h_chan, u_int stat, struct l1_softc *sc)
 	
 	if(stat & HSCX_INT_RPR)
 	{
-		register int fifo_data_len;
+		int fifo_data_len;
 		int error = 0;
 		/* always have to read the FIFO, so use a scratch buffer */
 		u_char scrbuf[HSCX_FIFO_LEN];
@@ -1125,7 +1125,7 @@ avma1pp2_bchannel_start(int unit, int h_chan)
 #else
 	struct l1_softc *sc = isic_find_sc(unit);
 #endif
-	register l1_bchan_state_t *chan = &sc->sc_chan[h_chan];
+	l1_bchan_state_t *chan = &sc->sc_chan[h_chan];
 	int s;
 	int activity = -1;
 
@@ -1382,7 +1382,7 @@ avma1pp2_hscx_fifo(l1_bchan_state_t *chan, struct l1_softc *sc)
 static void
 ifpi2_isacsx_intr(struct l1_softc *sc)
 {
-	register u_char isacsx_irq_stat;
+	u_char isacsx_irq_stat;
 
 	for(;;)
 	{
diff --git a/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_avm.c b/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_avm.c
index d58e36c555..59192db39b 100644
--- a/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_avm.c
+++ b/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_avm.c
@@ -34,7 +34,7 @@
  *	---------------------------------------------------
  *
  * $FreeBSD: src/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c,v 1.5.2.1 2001/08/10 14:08:37 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_avm.c,v 1.2 2003/06/17 04:28:39 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_avm.c,v 1.3 2003/07/26 19:20:31 rob Exp $
  *
  *      last edit-date: [Fri Jan 12 17:05:28 2001]
  *
@@ -630,7 +630,7 @@ avm_pnp_attach(device_t dev)
 static void
 avm_pnp_hscx_intr(int h_chan, u_int stat, u_int cnt, struct l1_softc *sc)
 {
-	register l1_bchan_state_t *chan = &sc->sc_chan[h_chan];
+	l1_bchan_state_t *chan = &sc->sc_chan[h_chan];
 	int activity = -1;
 	
 	NDBGL1(L1_H_IRQ, "%#x", stat);
@@ -669,7 +669,7 @@ avm_pnp_hscx_intr(int h_chan, u_int stat, u_int cnt, struct l1_softc *sc)
 	
 	if(stat & HSCX_INT_RPR)
 	{
-		register int fifo_data_len;
+		int fifo_data_len;
 		int error = 0;
 		/* always have to read the FIFO, so use a scratch buffer */
 		u_char scrbuf[HSCX_FIFO_LEN];
@@ -1092,7 +1092,7 @@ static void
 avm_pnp_bchannel_start(int unit, int h_chan)
 {
 	struct l1_softc *sc = ifpnp_scp[unit];
-	register l1_bchan_state_t *chan = &sc->sc_chan[h_chan];
+	l1_bchan_state_t *chan = &sc->sc_chan[h_chan];
 	int s;
 	int activity = -1;
 
@@ -1337,7 +1337,7 @@ avm_pnp_hscx_fifo(l1_bchan_state_t *chan, struct l1_softc *sc)
 static void
 ifpnp_isac_intr(struct l1_softc *sc)
 {
-	register u_char isac_irq_stat;
+	u_char isac_irq_stat;
 
 	for(;;)
 	{
diff --git a/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_isac.c b/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_isac.c
index 3d2322f1de..647d689444 100644
--- a/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_isac.c
+++ b/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_isac.c
@@ -31,7 +31,7 @@
  *	$Ust: src/i4b/layer1-nb/ifpnp/i4b_ifpnp_isac.c,v 1.4 2000/04/18 08:03:05 ust Exp $
  *
  * $FreeBSD: src/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c,v 1.4.2.1 2001/08/10 14:08:37 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_isac.c,v 1.2 2003/06/17 04:28:39 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_isac.c,v 1.3 2003/07/26 19:20:31 rob Exp $
  *
  *      last edit-date: [Mon May 29 15:24:49 2000]
  *
@@ -66,8 +66,8 @@
 #include <i4b/include/i4b_global.h>
 #include <i4b/include/i4b_mbuf.h>
 
-static u_char ifpnp_isac_exir_hdlr(register struct l1_softc *sc, u_char exir);
-static void ifpnp_isac_ind_hdlr(register struct l1_softc *sc, int ind);
+static u_char ifpnp_isac_exir_hdlr(struct l1_softc *sc, u_char exir);
+static void ifpnp_isac_ind_hdlr(struct l1_softc *sc, int ind);
 
 /*---------------------------------------------------------------------------*
  *	ISAC interrupt service routine
@@ -75,7 +75,7 @@ static void ifpnp_isac_ind_hdlr(register struct l1_softc *sc, int ind);
 void
 ifpnp_isac_irq(struct l1_softc *sc, int ista)
 {
-	register u_char c = 0;
+	u_char c = 0;
 	NDBGL1(L1_F_MSG, "unit %d: ista = 0x%02x", sc->sc_unit, ista);
 
 	if(ista & ISAC_ISTA_EXI)	/* extended interrupt */
@@ -85,7 +85,7 @@ ifpnp_isac_irq(struct l1_softc *sc, int ista)
 	
 	if(ista & ISAC_ISTA_RME)	/* receive message end */
 	{
-		register int rest;
+		int rest;
 		u_char rsta;
 
 		/* get rx status register */
@@ -277,7 +277,7 @@ ifpnp_isac_irq(struct l1_softc *sc, int ista)
 	
 	if(ista & ISAC_ISTA_CISQ)	/* channel status change CISQ */
 	{
-		register u_char ci;
+		u_char ci;
 	
 		/* get command/indication rx register*/
 	
@@ -305,7 +305,7 @@ ifpnp_isac_irq(struct l1_softc *sc, int ista)
  *	ISAC L1 Extended IRQ handler
  *---------------------------------------------------------------------------*/
 static u_char
-ifpnp_isac_exir_hdlr(register struct l1_softc *sc, u_char exir)
+ifpnp_isac_exir_hdlr(struct l1_softc *sc, u_char exir)
 {
 	u_char c = 0;
 	
@@ -366,9 +366,9 @@ ifpnp_isac_exir_hdlr(register struct l1_softc *sc, u_char exir)
  *	ISAC L1 Indication handler
  *---------------------------------------------------------------------------*/
 static void
-ifpnp_isac_ind_hdlr(register struct l1_softc *sc, int ind)
+ifpnp_isac_ind_hdlr(struct l1_softc *sc, int ind)
 {
-	register int event;
+	int event;
 	
 	switch(ind)
 	{
diff --git a/sys/net/i4b/layer1/ihfc/i4b_ihfc_drv.c b/sys/net/i4b/layer1/ihfc/i4b_ihfc_drv.c
index 5269000f6a..013a1d1ef8 100644
--- a/sys/net/i4b/layer1/ihfc/i4b_ihfc_drv.c
+++ b/sys/net/i4b/layer1/ihfc/i4b_ihfc_drv.c
@@ -33,7 +33,7 @@
  *	last edit-date: [Fri Jan 12 17:06:52 2001]
  *
  * $FreeBSD: src/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c,v 1.9.2.1 2001/08/10 14:08:37 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/ihfc/i4b_ihfc_drv.c,v 1.2 2003/06/17 04:28:40 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/ihfc/i4b_ihfc_drv.c,v 1.3 2003/07/26 19:20:31 rob Exp $
  *
  *---------------------------------------------------------------------------*/
 
@@ -113,8 +113,8 @@ u_int32_t	ihfc_Dsel_fifo	  (ihfc_sc_t *sc, u_char chan, u_char flag);
 {									\
 	if (GET_STAT & 1)						\
 	{								\
-		register u_char a;					\
-		register u_int to = IHFC_DISBUSYTO;			\
+		u_char a;					\
+		u_int to = IHFC_DISBUSYTO;			\
 									\
 		while(((a = GET_STAT) & 1) && --to);			\
 									\
@@ -137,8 +137,8 @@ u_int32_t	ihfc_Dsel_fifo	  (ihfc_sc_t *sc, u_char chan, u_char flag);
 
 #define WAITBUSY_2(okcmd, tocmd)					\
 	{								\
-		register u_short a;					\
-		register u_int to = IHFC_NONBUSYTO;			\
+		u_short a;					\
+		u_int to = IHFC_NONBUSYTO;			\
 									\
 		while((~(a = READ_BOTH_2) & 0x100) && --to);		\
 									\
@@ -636,7 +636,7 @@ void
 ihfc_sq (ihfc_sc_t *sc)
 {
 	const struct ihfc_SQtable *SQtab;
-	register u_char a = 0;
+	u_char a = 0;
 	BUS_VAR;
 
 	if (S_HFC & HFC_1)
@@ -797,10 +797,10 @@ ihfc_intr2 (ihfc_sc_t *sc)
 u_short
 ihfc_Bsel_fifo(ihfc_sc_t *sc, u_char chan, u_char flag)
 {
-	register u_char	 reg = 0x7e + chan;
-	register u_short tmp = 0x100;
-	register u_short z1;
-	register u_short z2;
+	u_char	 reg = 0x7e + chan;
+	u_short tmp = 0x100;
+	u_short z1;
+	u_short z2;
 
 	BUS_VAR;
 
@@ -858,12 +858,12 @@ ihfc_Bsel_fifo(ihfc_sc_t *sc, u_char chan, u_char flag)
 u_int32_t
 ihfc_Dsel_fifo(ihfc_sc_t *sc, u_char chan, u_char flag)
 {
-	register u_char	 reg = 0x90 + chan;
-	register u_short tmp = 0x100;
-	register u_char  f1;
-	register u_char  f2;
-	register u_short z1;
-	register u_short z2;
+	u_char	 reg = 0x90 + chan;
+	u_short tmp = 0x100;
+	u_char  f1;
+	u_char  f2;
+	u_short z1;
+	u_short z2;
 
 	BUS_VAR;
 
@@ -973,9 +973,9 @@ ihfc_Dsel_fifo(ihfc_sc_t *sc, u_char chan, u_char flag)
 void
 ihfc_hdlc_Dwrite (ihfc_sc_t *sc, u_char chan)
 {
-	register u_int32_t  sendlen;
-	register u_short    len;
-	register u_char	  * src;
+	u_int32_t  sendlen;
+	u_short    len;
+	u_char	  * src;
 
 	BUS_VAR;
 
@@ -1033,12 +1033,12 @@ ihfc_hdlc_Dwrite (ihfc_sc_t *sc, u_char chan)
 void
 ihfc_hdlc_Dread (ihfc_sc_t *sc, u_char chan)
 {
-	register u_char	    tmp = -1;
-	register u_char	    to = 15;
-	register u_int32_t  reclen;
-	register u_short    crc;
-	register u_short    len;
-	register u_char	  * dst;
+	u_char	    tmp = -1;
+	u_char	    to = 15;
+	u_int32_t  reclen;
+	u_short    crc;
+	u_short    len;
+	u_char	  * dst;
 
 	BUS_VAR;
 
@@ -1115,8 +1115,8 @@ ihfc_hdlc_Dread (ihfc_sc_t *sc, u_char chan)
 void
 ihfc_exir_hdlr (ihfc_sc_t *sc, u_char exir)
 {
-	register u_char a;
-	register u_char cmd;
+	u_char a;
+	u_char cmd;
 
 	for (a = 0, cmd = 0; exir; a++, exir >>= 1)
 	{
@@ -1148,10 +1148,10 @@ ihfc_cmdr_hdlr (ihfc_sc_t *sc, u_char cmdr)
 void
 ihfc_isac_Dwrite (ihfc_sc_t *sc, u_char chan)
 {
-	register u_char   sendlen = 32;
-	register u_char   cmd = 0;
-	register u_short  len;
-	register u_char * src;
+	u_char   sendlen = 32;
+	u_char   cmd = 0;
+	u_short  len;
+	u_char * src;
 
 	BUS_VAR;
 
@@ -1199,11 +1199,11 @@ ihfc_isac_Dwrite (ihfc_sc_t *sc, u_char chan)
 void
 ihfc_isac_Dread (ihfc_sc_t *sc, u_char chan)
 {
-	register u_char   cmd = 0;
-	register u_char   reclen;
-	register u_short  tmp;
-	register u_short  len;
-	register u_char * dst;
+	u_char   cmd = 0;
+	u_char   reclen;
+	u_short  tmp;
+	u_short  len;
+	u_char * dst;
 
 	BUS_VAR;
 
@@ -1282,9 +1282,9 @@ ihfc_isac_Dread (ihfc_sc_t *sc, u_char chan)
 void
 ihfc_trans_Bwrite (ihfc_sc_t *sc, u_char chan)
 {
-	register u_short  sendlen;
-	register u_short  len;
-	register u_char * src;
+	u_short  sendlen;
+	u_short  len;
+	u_char * src;
 
 	BUS_VAR;
 
@@ -1331,10 +1331,10 @@ ihfc_trans_Bwrite (ihfc_sc_t *sc, u_char chan)
 void
 ihfc_trans_Bread (ihfc_sc_t *sc, u_char chan)
 {
-	register u_short  reclen;
-	register u_short  tmp;
-	register u_short  len;
-	register u_char	* dst;
+	u_short  reclen;
+	u_short  tmp;
+	u_short  len;
+	u_char	* dst;
 
 	BUS_VAR;
 
@@ -1393,15 +1393,15 @@ ihfc_trans_Bread (ihfc_sc_t *sc, u_char chan)
 void
 ihfc_hdlc_Bwrite (ihfc_sc_t *sc, u_char chan)
 {
-	register u_short  blevel  = S_HDLC_BLEVEL;
-	register u_char   flag    = S_HDLC_FLAG;
-	register u_int    tmp     = S_HDLC_TMP;
-	register u_short  crc     = S_HDLC_CRC;
-	register u_short  ib      = S_HDLC_IB;
-	register u_char * src     = NULL;
-	register u_short  len     = 0;
-	register u_short  sendlen;
-	register u_short  tmp2;
+	u_short  blevel  = S_HDLC_BLEVEL;
+	u_char   flag    = S_HDLC_FLAG;
+	u_int    tmp     = S_HDLC_TMP;
+	u_short  crc     = S_HDLC_CRC;
+	u_short  ib      = S_HDLC_IB;
+	u_char * src     = NULL;
+	u_short  len     = 0;
+	u_short  sendlen;
+	u_short  tmp2;
 
 	BUS_VAR;
 
@@ -1477,15 +1477,15 @@ ihfc_hdlc_Bwrite (ihfc_sc_t *sc, u_char chan)
 void
 ihfc_hdlc_Bread (ihfc_sc_t *sc, u_char chan)
 {
-	register u_char   blevel = S_HDLC_BLEVEL;
+	u_char   blevel = S_HDLC_BLEVEL;
 		 u_char   flag   = S_HDLC_FLAG;
-	register u_short  crc    = S_HDLC_CRC;
-	register u_int    tmp    = S_HDLC_TMP;
-	register u_short  ib     = S_HDLC_IB;
-	register u_char * dst    = NULL;
-	register u_short  tmp2   = 0x100;
-	register u_short  len    = 0;
-	register u_short  reclen;
+	u_short  crc    = S_HDLC_CRC;
+	u_int    tmp    = S_HDLC_TMP;
+	u_short  ib     = S_HDLC_IB;
+	u_char * dst    = NULL;
+	u_short  tmp2   = 0x100;
+	u_short  len    = 0;
+	u_short  reclen;
 
 	BUS_VAR;
 
@@ -1585,9 +1585,9 @@ ihfc_test_Bwrite (ihfc_sc_t *sc, u_char chan)
 {
 	struct mbuf *m;
 
-	register u_char	 fb;
-	register u_short sendlen, tlen;
-	register u_short xlen = S_HDLC_IB;
+	u_char	 fb;
+	u_short sendlen, tlen;
+	u_short xlen = S_HDLC_IB;
 	BUS_VAR;
 
 	goto j0;
@@ -1651,13 +1651,13 @@ ihfc_test_Bread (ihfc_sc_t *sc, u_char chan)
 {
 	static u_short toterrors = 0;
 
-	register u_short reclen, len, tlen;
-	register u_char fb, tmp;
+	u_short reclen, len, tlen;
+	u_char fb, tmp;
 
-	register u_short xlen = S_HDLC_IB;
-	register u_char *dst = NULL;
-	register u_char error = S_HDLC_TMP;
-	register u_char ecount = S_HDLC_FLAG;
+	u_short xlen = S_HDLC_IB;
+	u_char *dst = NULL;
+	u_char error = S_HDLC_TMP;
+	u_char ecount = S_HDLC_FLAG;
 
 	BUS_VAR;
 
diff --git a/sys/net/i4b/layer1/ihfc/i4b_ihfc_l1if.c b/sys/net/i4b/layer1/ihfc/i4b_ihfc_l1if.c
index b1847d90c7..4eec415165 100644
--- a/sys/net/i4b/layer1/ihfc/i4b_ihfc_l1if.c
+++ b/sys/net/i4b/layer1/ihfc/i4b_ihfc_l1if.c
@@ -37,7 +37,7 @@
  *      $Id: i4b_ihfc_l1if.c,v 1.10 2000/09/19 13:50:36 hm Exp $
  *
  * $FreeBSD: src/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c,v 1.7.2.1 2001/08/10 14:08:37 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/ihfc/i4b_ihfc_l1if.c,v 1.2 2003/06/17 04:28:40 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/ihfc/i4b_ihfc_l1if.c,v 1.3 2003/07/26 19:20:31 rob Exp $
  *
  *---------------------------------------------------------------------------*/
 
@@ -334,7 +334,7 @@ ihfc_putmbuf (ihfc_sc_t *sc, u_char chan, struct mbuf *m)
 struct mbuf *
 ihfc_getmbuf (ihfc_sc_t *sc, u_char chan)
 {
-	register struct mbuf  *m;
+	struct mbuf  *m;
 	i4b_trace_hdr_t hdr;
 
 	if (chan < 2)
diff --git a/sys/net/i4b/layer1/isic/i4b_bchan.c b/sys/net/i4b/layer1/isic/i4b_bchan.c
index 3c99f2603a..9196669e05 100644
--- a/sys/net/i4b/layer1/isic/i4b_bchan.c
+++ b/sys/net/i4b/layer1/isic/i4b_bchan.c
@@ -28,7 +28,7 @@
  *	----------------------------------------------
  *
  * $FreeBSD: src/sys/i4b/layer1/isic/i4b_bchan.c,v 1.7.2.1 2001/08/10 14:08:38 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_bchan.c,v 1.2 2003/06/17 04:28:40 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_bchan.c,v 1.3 2003/07/26 19:20:31 rob Exp $
  *
  *      last edit-date: [Wed Jan 24 09:07:12 2001]
  *
@@ -139,9 +139,9 @@ static void
 isic_bchannel_start(int unit, int h_chan)
 {
 	struct l1_softc *sc = &l1_sc[unit];
-	register l1_bchan_state_t *chan = &sc->sc_chan[h_chan];
-	register int next_len;
-	register int len;
+	l1_bchan_state_t *chan = &sc->sc_chan[h_chan];
+	int next_len;
+	int len;
 
 	int s;
 	int activity = -1;
diff --git a/sys/net/i4b/layer1/isic/i4b_hscx.c b/sys/net/i4b/layer1/isic/i4b_hscx.c
index 14945f1f67..3b95548c34 100644
--- a/sys/net/i4b/layer1/isic/i4b_hscx.c
+++ b/sys/net/i4b/layer1/isic/i4b_hscx.c
@@ -28,7 +28,7 @@
  *	--------------------------------------------
  *
  * $FreeBSD: src/sys/i4b/layer1/isic/i4b_hscx.c,v 1.7.2.1 2001/08/10 14:08:38 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_hscx.c,v 1.2 2003/06/17 04:28:40 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_hscx.c,v 1.3 2003/07/26 19:20:31 rob Exp $
  *
  *      last edit-date: [Wed Jan 24 09:09:42 2001]
  *
@@ -61,9 +61,9 @@
  *	HSCX IRQ Handler
  *---------------------------------------------------------------------------*/
 void
-isic_hscx_irq(register struct l1_softc *sc, u_char ista, int h_chan, u_char ex_irq)
+isic_hscx_irq(struct l1_softc *sc, u_char ista, int h_chan, u_char ex_irq)
 {
-	register l1_bchan_state_t *chan = &sc->sc_chan[h_chan];
+	l1_bchan_state_t *chan = &sc->sc_chan[h_chan];
 	u_char exir = 0;
 	int activity = -1;
 	u_char cmd = 0;
@@ -101,7 +101,7 @@ isic_hscx_irq(register struct l1_softc *sc, u_char ista, int h_chan, u_char ex_i
 	
 	if(ista & HSCX_ISTA_RME)
 	{
-		register int fifo_data_len;
+		int fifo_data_len;
 		u_char rsta;		
 		int error = 0;
 
diff --git a/sys/net/i4b/layer1/isic/i4b_isac.c b/sys/net/i4b/layer1/isic/i4b_isac.c
index 608bcbe6d2..6b5aa4b62d 100644
--- a/sys/net/i4b/layer1/isic/i4b_isac.c
+++ b/sys/net/i4b/layer1/isic/i4b_isac.c
@@ -28,7 +28,7 @@
  *	---------------------------------------------------------
  *
  * $FreeBSD: src/sys/i4b/layer1/isic/i4b_isac.c,v 1.5.2.1 2001/08/10 14:08:38 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_isac.c,v 1.2 2003/06/17 04:28:40 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_isac.c,v 1.3 2003/07/26 19:20:31 rob Exp $
  *
  *      last edit-date: [Wed Jan 24 09:10:36 2001]
  *
@@ -60,8 +60,8 @@
 #include <i4b/include/i4b_global.h>
 #include <i4b/include/i4b_mbuf.h>
 
-static u_char isic_isac_exir_hdlr(register struct l1_softc *sc, u_char exir);
-static void isic_isac_ind_hdlr(register struct l1_softc *sc, int ind);
+static u_char isic_isac_exir_hdlr(struct l1_softc *sc, u_char exir);
+static void isic_isac_ind_hdlr(struct l1_softc *sc, int ind);
 
 /*---------------------------------------------------------------------------*
  *	ISAC interrupt service routine
@@ -69,7 +69,7 @@ static void isic_isac_ind_hdlr(register struct l1_softc *sc, int ind);
 void
 isic_isac_irq(struct l1_softc *sc, int ista)
 {
-	register u_char c = 0;
+	u_char c = 0;
 	NDBGL1(L1_F_MSG, "unit %d: ista = 0x%02x", sc->sc_unit, ista);
 
 	if(ista & ISAC_ISTA_EXI)	/* extended interrupt */
@@ -79,7 +79,7 @@ isic_isac_irq(struct l1_softc *sc, int ista)
 	
 	if(ista & ISAC_ISTA_RME)	/* receive message end */
 	{
-		register int rest;
+		int rest;
 		u_char rsta;
 
 		/* get rx status register */
@@ -271,7 +271,7 @@ isic_isac_irq(struct l1_softc *sc, int ista)
 	
 	if(ista & ISAC_ISTA_CISQ)	/* channel status change CISQ */
 	{
-		register u_char ci;
+		u_char ci;
 	
 		/* get command/indication rx register*/
 	
@@ -299,7 +299,7 @@ isic_isac_irq(struct l1_softc *sc, int ista)
  *	ISAC L1 Extended IRQ handler
  *---------------------------------------------------------------------------*/
 static u_char
-isic_isac_exir_hdlr(register struct l1_softc *sc, u_char exir)
+isic_isac_exir_hdlr(struct l1_softc *sc, u_char exir)
 {
 	u_char c = 0;
 	
@@ -360,9 +360,9 @@ isic_isac_exir_hdlr(register struct l1_softc *sc, u_char exir)
  *	ISAC L1 Indication handler
  *---------------------------------------------------------------------------*/
 static void
-isic_isac_ind_hdlr(register struct l1_softc *sc, int ind)
+isic_isac_ind_hdlr(struct l1_softc *sc, int ind)
 {
-	register int event;
+	int event;
 	
 	switch(ind)
 	{
diff --git a/sys/net/i4b/layer1/isic/i4b_isic.c b/sys/net/i4b/layer1/isic/i4b_isic.c
index 7022e2109f..024e375a1e 100644
--- a/sys/net/i4b/layer1/isic/i4b_isic.c
+++ b/sys/net/i4b/layer1/isic/i4b_isic.c
@@ -28,7 +28,7 @@
  *	==============================
  *
  * $FreeBSD: src/sys/i4b/layer1/isic/i4b_isic.c,v 1.4.2.1 2001/08/10 14:08:38 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_isic.c,v 1.2 2003/06/17 04:28:40 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_isic.c,v 1.3 2003/07/26 19:20:31 rob Exp $
  *
  *      last edit-date: [Wed Jan 24 09:29:42 2001]
  *
@@ -96,8 +96,8 @@ isicintr(struct l1_softc *sc)
 		u_char was_hscx_irq = 0;
 		u_char was_isac_irq = 0;
 
-		register u_char hscx_irq_stat;
-		register u_char isac_irq_stat;
+		u_char hscx_irq_stat;
+		u_char isac_irq_stat;
 
 		for(;;)
 		{
@@ -159,8 +159,8 @@ isicintr(struct l1_softc *sc)
 	}
 	else	/* IPAC interrupt routine */
 	{
-		register u_char ipac_irq_stat;
-		register u_char was_ipac_irq = 0;
+		u_char ipac_irq_stat;
+		u_char was_ipac_irq = 0;
 
 		for(;;)
 		{
diff --git a/sys/net/i4b/layer1/isic/i4b_usr_sti.c b/sys/net/i4b/layer1/isic/i4b_usr_sti.c
index 4130d4d364..e13a7a90b8 100644
--- a/sys/net/i4b/layer1/isic/i4b_usr_sti.c
+++ b/sys/net/i4b/layer1/isic/i4b_usr_sti.c
@@ -28,7 +28,7 @@
  *	-------------------------------------------------------------
  *
  * $FreeBSD: src/sys/i4b/layer1/isic/i4b_usr_sti.c,v 1.5.2.1 2001/08/10 14:08:39 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_usr_sti.c,v 1.2 2003/06/17 04:28:40 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_usr_sti.c,v 1.3 2003/07/26 19:20:31 rob Exp $
  *
  *      last edit-date: [Wed Jan 24 09:28:12 2001]
  *
@@ -86,8 +86,8 @@ int debugcntr;
 static void		
 usrtai_read_fifo(struct l1_softc *sc, int what, void *buf, size_t size)
 {
-	register int offset = 0;
-	register unsigned int base = 0;
+	int offset = 0;
+	unsigned int base = 0;
 
 USRTA_DEBUG(("usrtai_read_fifo: what %d size %d\n", what, size))
 	switch (what)
@@ -118,8 +118,8 @@ USRTA_DEBUG(("usrtai_read_fifo: what %d size %d\n", what, size))
 static void
 usrtai_write_fifo(struct l1_softc *sc, int what, void *data, size_t size)
 {
-	register int offset = 0;
-	register unsigned int base = 0;
+	int offset = 0;
+	unsigned int base = 0;
 
 USRTA_DEBUG(("usrtai_write_fifo: what %d size %d\n", what, size))
 	switch (what)
@@ -151,7 +151,7 @@ USRTA_DEBUG(("usrtai_write_fifo: what %d size %d\n", what, size))
 static void
 usrtai_write_reg(struct l1_softc *sc, int what, bus_size_t offs, u_int8_t data)
 {
-	register unsigned int base = 0;
+	unsigned int base = 0;
 
 USRTA_DEBUG(("usrtai_write_reg: what %d ADDR(%d) %d data %#x\n", what, offs, ADDR(offs), data))
 	switch (what)
@@ -179,7 +179,7 @@ USRTA_DEBUG(("usrtai_write_reg: what %d ADDR(%d) %d data %#x\n", what, offs, ADD
 static u_int8_t
 usrtai_read_reg(struct l1_softc *sc, int what, bus_size_t offs)
 {
-	register unsigned int base = 0;
+	unsigned int base = 0;
 	u_int8_t byte;
 
 USRTA_DEBUG(("usrtai_read_reg: what %d ADDR(%d) %d..", what, offs, ADDR(offs)))
diff --git a/sys/net/i4b/layer1/itjc/i4b_itjc_isac.c b/sys/net/i4b/layer1/itjc/i4b_itjc_isac.c
index f794f59ee8..369664ad43 100644
--- a/sys/net/i4b/layer1/itjc/i4b_itjc_isac.c
+++ b/sys/net/i4b/layer1/itjc/i4b_itjc_isac.c
@@ -28,7 +28,7 @@
  *	--------------------------------------------
  *
  * $FreeBSD: src/sys/i4b/layer1/itjc/i4b_itjc_isac.c,v 1.1.2.1 2001/08/10 14:08:39 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/itjc/i4b_itjc_isac.c,v 1.2 2003/06/17 04:28:40 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/itjc/i4b_itjc_isac.c,v 1.3 2003/07/26 19:20:32 rob Exp $
  *
  *      last edit-date: [Wed Jan 10 17:15:54 2001]
  *
@@ -66,8 +66,8 @@
 #include <i4b/include/i4b_global.h>
 #include <i4b/include/i4b_mbuf.h>
 
-static u_char itjc_isac_exir_hdlr(register struct l1_softc *sc, u_char exir);
-static void itjc_isac_ind_hdlr(register struct l1_softc *sc, int ind);
+static u_char itjc_isac_exir_hdlr(struct l1_softc *sc, u_char exir);
+static void itjc_isac_ind_hdlr(struct l1_softc *sc, int ind);
 
 /*---------------------------------------------------------------------------*
  *	ISAC interrupt service routine
@@ -75,7 +75,7 @@ static void itjc_isac_ind_hdlr(register struct l1_softc *sc, int ind);
 void
 itjc_isac_irq(struct l1_softc *sc, int ista)
 {
-	register u_char c = 0;
+	u_char c = 0;
 	NDBGL1(L1_F_MSG, "unit %d: ista = 0x%02x", sc->sc_unit, ista);
 
 	if(ista & ISAC_ISTA_EXI)	/* extended interrupt */
@@ -85,7 +85,7 @@ itjc_isac_irq(struct l1_softc *sc, int ista)
 	
 	if(ista & ISAC_ISTA_RME)	/* receive message end */
 	{
-		register int rest;
+		int rest;
 		u_char rsta;
 
 		/* get rx status register */
@@ -260,7 +260,7 @@ itjc_isac_irq(struct l1_softc *sc, int ista)
 	
 	if(ista & ISAC_ISTA_CISQ)	/* channel status change CISQ */
 	{
-		register u_char ci;
+		u_char ci;
 	
 		/* get command/indication rx register*/
 	
@@ -288,7 +288,7 @@ itjc_isac_irq(struct l1_softc *sc, int ista)
  *	ISAC L1 Extended IRQ handler
  *---------------------------------------------------------------------------*/
 static u_char
-itjc_isac_exir_hdlr(register struct l1_softc *sc, u_char exir)
+itjc_isac_exir_hdlr(struct l1_softc *sc, u_char exir)
 {
 	u_char c = 0;
 	
@@ -349,9 +349,9 @@ itjc_isac_exir_hdlr(register struct l1_softc *sc, u_char exir)
  *	ISAC L1 Indication handler
  *---------------------------------------------------------------------------*/
 static void
-itjc_isac_ind_hdlr(register struct l1_softc *sc, int ind)
+itjc_isac_ind_hdlr(struct l1_softc *sc, int ind)
 {
-	register int event;
+	int event;
 	
 	switch(ind)
 	{
diff --git a/sys/net/i4b/layer1/iwic/i4b_iwic_bchan.c b/sys/net/i4b/layer1/iwic/i4b_iwic_bchan.c
index 755e421ada..2d54045324 100644
--- a/sys/net/i4b/layer1/iwic/i4b_iwic_bchan.c
+++ b/sys/net/i4b/layer1/iwic/i4b_iwic_bchan.c
@@ -30,7 +30,7 @@
  *      ----------------------------------------
  *
  * $FreeBSD: src/sys/i4b/layer1/iwic/i4b_iwic_bchan.c,v 1.7.2.1 2001/08/10 14:08:40 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer1/iwic/i4b_iwic_bchan.c,v 1.2 2003/06/17 04:28:40 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer1/iwic/i4b_iwic_bchan.c,v 1.3 2003/07/26 19:20:32 rob Exp $
  *
  *      last edit-date: [Tue Jan 16 13:21:24 2001]
  *
@@ -123,7 +123,7 @@ iwic_bchan_xirq(struct iwic_softc *sc, int chan_no)
 		
 		if(error == 0)
 		{
-			register int fifo_data_len;
+			int fifo_data_len;
 			fifo_data_len = ((IWIC_READ(sc,chan->offset+B_RBCL)) &
 					((IWIC_BCHAN_FIFO_LEN)-1));
 		
@@ -532,9 +532,9 @@ static void
 iwic_bchannel_start(int unit, int chan_no)
 {
 	struct iwic_softc *sc = &iwic_sc[unit];
-	register struct iwic_bchan *chan = &sc->sc_bchan[chan_no];
-	register int next_len;
-	register int len;
+	struct iwic_bchan *chan = &sc->sc_bchan[chan_no];
+	int next_len;
+	int len;
 
 	int s;
 	int activity = -1;
diff --git a/sys/net/i4b/layer2/i4b_tei.c b/sys/net/i4b/layer2/i4b_tei.c
index 9e6c089f35..e079177fcd 100644
--- a/sys/net/i4b/layer2/i4b_tei.c
+++ b/sys/net/i4b/layer2/i4b_tei.c
@@ -30,7 +30,7 @@
  *	$Id: i4b_tei.c,v 1.25 2000/09/01 14:11:51 hm Exp $ 
  *
  * $FreeBSD: src/sys/i4b/layer2/i4b_tei.c,v 1.6.2.2 2001/08/10 14:08:41 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer2/i4b_tei.c,v 1.2 2003/06/17 04:28:40 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer2/i4b_tei.c,v 1.3 2003/07/26 19:20:32 rob Exp $
  *
  *      last edit-date: [Fri Oct 13 15:56:35 2000]
  *
@@ -296,8 +296,8 @@ i4b_make_rand_ri(l2_softc_t *l2sc)
 
 #else
 
-	register u_short val;
-	register int i;
+	u_short val;
+	int i;
 	static int called = 42;
 	
 	val = (l2sc->last_rih << 8) | l2sc->last_ril;
diff --git a/sys/net/i4b/layer3/i4b_l2if.c b/sys/net/i4b/layer3/i4b_l2if.c
index 0738574907..31f63a87c5 100644
--- a/sys/net/i4b/layer3/i4b_l2if.c
+++ b/sys/net/i4b/layer3/i4b_l2if.c
@@ -30,7 +30,7 @@
  *	$Id: i4b_l2if.c,v 1.23 2000/08/24 11:48:58 hm Exp $ 
  *
  * $FreeBSD: src/sys/i4b/layer3/i4b_l2if.c,v 1.6.2.2 2001/12/16 15:12:58 hm Exp $
- * $DragonFly: src/sys/net/i4b/layer3/i4b_l2if.c,v 1.2 2003/06/17 04:28:40 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer3/i4b_l2if.c,v 1.3 2003/07/26 19:20:33 rob Exp $
  *
  *      last edit-date: [Mon May 29 16:56:22 2000]
  *
@@ -88,7 +88,7 @@ int i4b_status_tab[] = {
 static unsigned char
 make_q931_cause(cause_t cause)
 {
-	register unsigned char ret;
+	unsigned char ret;
 	
 	switch(GET_CAUSE_TYPE(cause))
 	{
diff --git a/sys/net/i4b/layer4/i4b_l4mgmt.c b/sys/net/i4b/layer4/i4b_l4mgmt.c
index 699cf5f1bc..7c2c338b71 100644
--- a/sys/net/i4b/layer4/i4b_l4mgmt.c
+++ b/sys/net/i4b/layer4/i4b_l4mgmt.c
@@ -30,7 +30,7 @@
  *	$Id: i4b_l4mgmt.c,v 1.34 2000/09/01 14:11:51 hm Exp $ 
  *
  * $FreeBSD: src/sys/i4b/layer4/i4b_l4mgmt.c,v 1.6.2.2 2001/08/10 14:08:43 obrien Exp $
- * $DragonFly: src/sys/net/i4b/layer4/i4b_l4mgmt.c,v 1.2 2003/06/17 04:28:40 dillon Exp $
+ * $DragonFly: src/sys/net/i4b/layer4/i4b_l4mgmt.c,v 1.3 2003/07/26 19:20:33 rob Exp $
  *
  *      last edit-date: [Fri Oct 13 15:58:34 2000]
  *
@@ -251,7 +251,7 @@ cd_by_unitcr(int unit, int cr, int crf)
 unsigned char
 get_rand_cr(int unit)
 {
-	register int i, j;
+	int i, j;
 	static u_char val, retval;
 	static int called = 42;
 	
-- 
2.41.0