some space and tab cleanup.

18 files changed, 61 insertions, 60 deletions

diff --git a/sys/dev/mii/brgphy.c b/sys/dev/mii/brgphy.c
index 9f8eb768aed..fed598a3e4d 100644
--- a/sys/dev/mii/brgphy.c
+++ b/sys/dev/mii/brgphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: brgphy.c,v 1.10 2002/04/08 20:55:29 nate Exp $	*/
+/*	$OpenBSD: brgphy.c,v 1.11 2002/05/04 11:30:06 fgsch Exp $	*/
 
 /*
  * Copyright (c) 2000
@@ -258,7 +258,7 @@ brgphy_service(sc, mii, cmd)
 		 */
 		if (++sc->mii_ticks != sc->mii_anegticks)
 			return (0);
-		
+
 		sc->mii_ticks = 0;
 
 		/*
diff --git a/sys/dev/mii/dcphy.c b/sys/dev/mii/dcphy.c
index b0131f99637..10916328794 100644
--- a/sys/dev/mii/dcphy.c
+++ b/sys/dev/mii/dcphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dcphy.c,v 1.6 2002/03/14 01:26:57 millert Exp $	*/
+/*	$OpenBSD: dcphy.c,v 1.7 2002/05/04 11:30:06 fgsch Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -92,7 +92,7 @@ struct cfattach dcphy_ca = {
 	sizeof(struct mii_softc), dcphy_match, dcphy_attach, mii_phy_detach,
 	    mii_phy_activate
 };
-	  
+
 struct cfdriver dcphy_cd = {
 	NULL, "dcphy", DV_DULL
 };
@@ -371,7 +371,7 @@ dcphy_status(sc)
 		/*
 		 * If the other side doesn't support NWAY, then the
 		 * best we can do is determine if we have a 10Mbps or
-		 * 100Mbps link. There's no way to know if the link 
+		 * 100Mbps link. There's no way to know if the link
 		 * is full or half duplex, so we default to half duplex
 		 * and hope that the user is clever enough to manually
 		 * change the media settings if we're wrong.
diff --git a/sys/dev/mii/eephy.c b/sys/dev/mii/eephy.c
index 74a46210ee0..64ce3c1e7e3 100644
--- a/sys/dev/mii/eephy.c
+++ b/sys/dev/mii/eephy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eephy.c,v 1.6 2002/04/26 03:34:35 nate Exp $ */
+/*	$OpenBSD: eephy.c,v 1.7 2002/05/04 11:30:06 fgsch Exp $	*/
 /*
  * Principal Author: Parag Patel
  * Copyright (c) 2001
@@ -412,7 +412,7 @@ eephy_mii_phy_auto(struct mii_softc *sc, int waitfor)
 
 	if ((sc->mii_flags & MIIF_DOINGAUTO) == 0) {
 		PHY_WRITE(sc, E1000_AR, E1000_AR_10T | E1000_AR_10T_FD |
-		    E1000_AR_100TX | E1000_AR_100TX_FD | 
+		    E1000_AR_100TX | E1000_AR_100TX_FD |
 		    E1000_AR_PAUSE | E1000_AR_ASM_DIR);
 		PHY_WRITE(sc, E1000_1GCR, E1000_1GCR_1000T_FD);
 		PHY_WRITE(sc, E1000_CR,
diff --git a/sys/dev/mii/eephyreg.h b/sys/dev/mii/eephyreg.h
index 1684b3317b6..c5e2467d606 100644
--- a/sys/dev/mii/eephyreg.h
+++ b/sys/dev/mii/eephyreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: eephyreg.h,v 1.1 2001/04/13 00:25:02 mjacob Exp $ */
+/*	$OpenBSD: eephyreg.h,v 1.2 2002/05/04 11:30:06 fgsch Exp $	*/
 /*
  * Principal Author: Parag Patel
  * Copyright (c) 2001
@@ -33,24 +33,24 @@
 /*
  * Derived by information released by Intel under the following license:
  *
- * Copyright (c) 1999 - 2001, Intel Corporation 
- * 
+ * Copyright (c) 1999 - 2001, Intel Corporation
+ *
  * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without 
+ *
+ * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
- *  1. Redistributions of source code must retain the above copyright notice, 
+ *
+ *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
- * 
+ *
  *  2. Redistributions in binary form must reproduce the above copyright notice,
  *     this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
- * 
- *  3. Neither the name of Intel Corporation nor the names of its contributors 
- *     may be used to endorse or promote products derived from this software 
+ *
+ *  3. Neither the name of Intel Corporation nor the names of its contributors
+ *     may be used to endorse or promote products derived from this software
  *     without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -61,7 +61,7 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  */
 
 /*
diff --git a/sys/dev/mii/icsphy.c b/sys/dev/mii/icsphy.c
index 0a572c18448..880b6122a9c 100644
--- a/sys/dev/mii/icsphy.c
+++ b/sys/dev/mii/icsphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: icsphy.c,v 1.8 2002/03/14 01:26:57 millert Exp $	*/
+/*	$OpenBSD: icsphy.c,v 1.9 2002/05/04 11:30:06 fgsch Exp $	*/
 /*	$NetBSD: icsphy.c,v 1.17 2000/02/02 23:34:56 thorpej Exp $	*/
 
 /*-
@@ -37,7 +37,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
- 
+
 /*
  * Copyright (c) 1997 Manuel Bouyer.  All rights reserved.
  *
@@ -116,7 +116,7 @@ icsphymatch(parent, match, aux)
 	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxICS &&
 	    MII_MODEL(ma->mii_id2) == MII_MODEL_xxICS_1890)
 		return (10);
-   
+
         if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxICS &&
 	    MII_MODEL(ma->mii_id2) == MII_MODEL_xxICS_1892)
 		return (10);
@@ -278,7 +278,7 @@ icsphy_reset(sc)
 
 	mii_phy_reset(sc);
 	PHY_WRITE(sc, MII_ICSPHY_ECR2, ECR2_10TPROT|ECR2_Q10T);
-   
+
 	/*
 	 * XXX the ICS1892 doesn't set the BMCR properly after
 	 * XXX reset, which breaks autonegotiation.
diff --git a/sys/dev/mii/lxtphy.c b/sys/dev/mii/lxtphy.c
index 2b6cd17b330..f4310408b21 100644
--- a/sys/dev/mii/lxtphy.c
+++ b/sys/dev/mii/lxtphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lxtphy.c,v 1.8 2002/03/14 01:26:57 millert Exp $	*/
+/*	$OpenBSD: lxtphy.c,v 1.9 2002/05/04 11:30:06 fgsch Exp $	*/
 /*	$NetBSD: lxtphy.c,v 1.19 2000/02/02 23:34:57 thorpej Exp $	*/
 
 /*-
@@ -37,7 +37,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
- 
+
 /*
  * Copyright (c) 1997 Manuel Bouyer.  All rights reserved.
  *
@@ -120,7 +120,7 @@ lxtphymatch(parent, match, aux)
 	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxLEVEL1a &&
 	    MII_MODEL(ma->mii_id2) == MII_MODEL_xxLEVEL1a_LXT971)
 		return (10);
-   
+
 	return (0);
 }
 
@@ -145,7 +145,7 @@ lxtphyattach(parent, self, aux)
 		    MII_REV(ma->mii_id2));
 		sc->mii_status = ukphy_status;
 	}
-   
+
 	sc->mii_inst = mii->mii_instance;
 	sc->mii_phy = ma->mii_phyno;
 	sc->mii_service = lxtphy_service;
diff --git a/sys/dev/mii/mii.h b/sys/dev/mii/mii.h
index 2e51e3eefdd..c1ba9cf4245 100644
--- a/sys/dev/mii/mii.h
+++ b/sys/dev/mii/mii.h
@@ -1,6 +1,6 @@
-/*	$OpenBSD: mii.h,v 1.5 2001/11/17 21:07:16 aaron Exp $	*/
+/*	$OpenBSD: mii.h,v 1.6 2002/05/04 11:30:06 fgsch Exp $	*/
 /*	$NetBSD: mii.h,v 1.8 2001/05/31 03:06:46 thorpej Exp $	*/
- 
+
 /*
  * Copyright (c) 1997 Manuel Bouyer.  All rights reserved.
  *
diff --git a/sys/dev/mii/mii_physubr.c b/sys/dev/mii/mii_physubr.c
index 1959f61c274..320b40e1b62 100644
--- a/sys/dev/mii/mii_physubr.c
+++ b/sys/dev/mii/mii_physubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mii_physubr.c,v 1.12 2002/03/14 01:26:57 millert Exp $	*/
+/*	$OpenBSD: mii_physubr.c,v 1.13 2002/05/04 11:30:06 fgsch Exp $	*/
 /*	$NetBSD: mii_physubr.c,v 1.20 2001/04/13 23:30:09 thorpej Exp $	*/
 
 /*-
@@ -206,7 +206,7 @@ mii_phy_tick(sc)
 	 */
 	if (!sc->mii_anegticks)
 		sc->mii_anegticks = 5;
-	
+
 	if (++sc->mii_ticks != sc->mii_anegticks)
 		return (EJUSTRETURN);
 
@@ -237,7 +237,7 @@ mii_phy_reset(sc)
 
 	/* Wait 100ms for it to complete. */
 	for (i = 0; i < 100; i++) {
-		reg = PHY_READ(sc, MII_BMCR); 
+		reg = PHY_READ(sc, MII_BMCR);
 		if ((reg & BMCR_RESET) == 0)
 			break;
 		delay(1000);
@@ -386,7 +386,7 @@ mii_phy_add_media(sc)
 			    sc->mii_inst), MII_MEDIA_1000_T_FDX);
 		}
 	}
-	
+
 	if (sc->mii_capabilities & BMSR_ANEG) {
 		ADD(IFM_MAKEWORD(IFM_ETHER, IFM_AUTO, 0, sc->mii_inst),
 		    MII_NMEDIA);	/* intentionally invalid index */
diff --git a/sys/dev/mii/miivar.h b/sys/dev/mii/miivar.h
index 4e3f8924999..15f6a806006 100644
--- a/sys/dev/mii/miivar.h
+++ b/sys/dev/mii/miivar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: miivar.h,v 1.14 2002/03/14 01:26:57 millert Exp $	*/
+/*	$OpenBSD: miivar.h,v 1.15 2002/05/04 11:30:06 fgsch Exp $	*/
 /*	$NetBSD: miivar.h,v 1.17 2000/03/06 20:56:57 thorpej Exp $	*/
 
 /*-
@@ -125,7 +125,7 @@ typedef void (*mii_statusreq_t)(struct mii_softc *);
  */
 struct mii_softc {
 	struct device mii_dev;		/* generic device glue */
-	
+
 	LIST_ENTRY(mii_softc) mii_list;	/* entry on parent's PHY list */
 
 	int mii_phy;			/* our MII address */
diff --git a/sys/dev/mii/nsgphy.c b/sys/dev/mii/nsgphy.c
index 2bd68625065..ff7504e661a 100644
--- a/sys/dev/mii/nsgphy.c
+++ b/sys/dev/mii/nsgphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nsgphy.c,v 1.7 2002/03/14 01:26:58 millert Exp $	*/
+/*	$OpenBSD: nsgphy.c,v 1.8 2002/05/04 11:30:06 fgsch Exp $	*/
 /*
  * Copyright (c) 2001 Wind River Systems
  * Copyright (c) 2001
@@ -260,7 +260,7 @@ nsgphy_service(sc, mii, cmd)
 		 */
 		if (++sc->mii_ticks != sc->mii_anegticks)
 			return (0);
-		
+
 		sc->mii_ticks = 0;
 
 		/*
diff --git a/sys/dev/mii/qsphy.c b/sys/dev/mii/qsphy.c
index 27e8873e361..33e9a4538d4 100644
--- a/sys/dev/mii/qsphy.c
+++ b/sys/dev/mii/qsphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qsphy.c,v 1.7 2002/03/14 01:26:58 millert Exp $	*/
+/*	$OpenBSD: qsphy.c,v 1.8 2002/05/04 11:30:06 fgsch Exp $	*/
 /*	$NetBSD: qsphy.c,v 1.19 2000/02/02 23:34:57 thorpej Exp $	*/
 
 /*-
@@ -37,7 +37,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
- 
+
 /*
  * Copyright (c) 1997 Manuel Bouyer.  All rights reserved.
  *
diff --git a/sys/dev/mii/sqphy.c b/sys/dev/mii/sqphy.c
index ff26e0823b3..0ab3b419464 100644
--- a/sys/dev/mii/sqphy.c
+++ b/sys/dev/mii/sqphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sqphy.c,v 1.7 2002/03/14 01:26:58 millert Exp $	*/
+/*	$OpenBSD: sqphy.c,v 1.8 2002/05/04 11:30:06 fgsch Exp $	*/
 /*	$NetBSD: sqphy.c,v 1.17 2000/02/02 23:34:57 thorpej Exp $	*/
 
 /*-
@@ -37,7 +37,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
- 
+
 /*
  * Copyright (c) 1997 Manuel Bouyer.  All rights reserved.
  *
@@ -136,13 +136,13 @@ sqphyattach(parent, self, aux)
 	    MII_MODEL(ma->mii_id2) == MII_MODEL_xxSEEQ_80220)
            printf(": %s, rev. %d\n", MII_STR_xxSEEQ_80220,
 	            MII_REV(ma->mii_id2));
-		
+
 
    	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxSEEQ &&
 	    MII_MODEL(ma->mii_id2) == MII_MODEL_xxSEEQ_84220)
            printf(": %s, rev. %d\n", MII_STR_xxSEEQ_84220,
 	            MII_REV(ma->mii_id2));
-		
+
 
 	sc->mii_inst = mii->mii_instance;
 	sc->mii_phy = ma->mii_phyno;
diff --git a/sys/dev/mii/tlphy.c b/sys/dev/mii/tlphy.c
index dd3cd7f565a..b7318ac12e5 100644
--- a/sys/dev/mii/tlphy.c
+++ b/sys/dev/mii/tlphy.c
@@ -123,7 +123,7 @@ tlphymatch(parent, match, aux)
 	struct device *parent;
 	void *match, *aux;
 {
-	struct mii_attach_args *ma = aux;       
+	struct mii_attach_args *ma = aux;
 
 	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxTI &&
 	    MII_MODEL(ma->mii_id2) == MII_MODEL_xxTI_TLAN10T)
@@ -216,7 +216,7 @@ tlphy_service(self, mii, cmd)
 			PHY_WRITE(&sc->sc_mii, MII_BMCR, reg | BMCR_ISO);
 			return (0);
 		}
-		
+
 		/*
 		 * If the interface is not up, don't do anything.
 		 */
@@ -299,7 +299,7 @@ tlphy_status(physc)
 	bmcr = PHY_READ(&sc->sc_mii, MII_BMCR);
 	if (bmcr & BMCR_ISO) {
 		mii->mii_media_active |= IFM_NONE;
-		mii->mii_media_status = 0;  
+		mii->mii_media_status = 0;
 		return;
 	}
 
@@ -312,7 +312,7 @@ tlphy_status(physc)
 
 	bmsr = PHY_READ(&sc->sc_mii, MII_BMSR) |
 	    PHY_READ(&sc->sc_mii, MII_BMSR);
-	if (bmsr & BMSR_LINK)   
+	if (bmsr & BMSR_LINK)
 		mii->mii_media_status |= IFM_ACTIVE;
 
 	if (bmcr & BMCR_LOOP)
diff --git a/sys/dev/mii/tlphyreg.h b/sys/dev/mii/tlphyreg.h
index 8c9d3593aa0..5d739574ea7 100644
--- a/sys/dev/mii/tlphyreg.h
+++ b/sys/dev/mii/tlphyreg.h
@@ -1,6 +1,6 @@
-/*	$OpenBSD: tlphyreg.h,v 1.1 1998/09/10 17:17:34 jason Exp $	*/
+/*	$OpenBSD: tlphyreg.h,v 1.2 2002/05/04 11:30:06 fgsch Exp $	*/
 /*	$NetBSD: tlphyreg.h,v 1.1 1998/08/10 23:59:58 thorpej Exp $	*/
- 
+
 /*
  * Copyright (c) 1997 Manuel Bouyer.  All rights reserved.
  *
diff --git a/sys/dev/mii/tqphy.c b/sys/dev/mii/tqphy.c
index 09c74634410..2a1feec3c48 100644
--- a/sys/dev/mii/tqphy.c
+++ b/sys/dev/mii/tqphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tqphy.c,v 1.4 2002/03/14 01:26:58 millert Exp $	*/
+/*	$OpenBSD: tqphy.c,v 1.5 2002/05/04 11:30:06 fgsch Exp $	*/
 /*	$NetBSD: tqphy.c,v 1.9 2000/02/02 23:34:57 thorpej Exp $	*/
 
 /*
@@ -235,19 +235,19 @@ tqphy_status(sc)
 	    PHY_READ(sc, MII_BMSR);
 	if (bmsr & BMSR_LINK)
 		mii->mii_media_status |= IFM_ACTIVE;
- 
+
 	bmcr = PHY_READ(sc, MII_BMCR);
 	if (bmcr & BMCR_ISO) {
 		mii->mii_media_active |= IFM_NONE;
 		mii->mii_media_status = 0;
 		return;
 	}
- 
+
 	if (bmcr & BMCR_LOOP)
 		mii->mii_media_active |= IFM_LOOP;
- 
+
 	if (bmcr & BMCR_AUTOEN) {
-		if ((bmsr & BMSR_ACOMP) == 0) { 
+		if ((bmsr & BMSR_ACOMP) == 0) {
 			/* Erg, still trying, I guess... */
 			mii->mii_media_active |= IFM_NONE;
 			return;
@@ -259,6 +259,6 @@ tqphy_status(sc)
 			mii->mii_media_active |= IFM_10_T;
 		if (diag & DIAG_DPLX)
 			mii->mii_media_active |= IFM_FDX;
-	} else 
+	} else
 		mii->mii_media_active = ife->ifm_media;
 }
diff --git a/sys/dev/mii/tqphyreg.h b/sys/dev/mii/tqphyreg.h
index 9ddd14ead81..292811ca115 100644
--- a/sys/dev/mii/tqphyreg.h
+++ b/sys/dev/mii/tqphyreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tqphyreg.h,v 1.1 1999/12/07 22:01:33 jason Exp $	*/
+/*	$OpenBSD: tqphyreg.h,v 1.2 2002/05/04 11:30:06 fgsch Exp $	*/
 /*	$NetBSD: tqphyreg.h,v 1.2 1999/09/16 05:58:18 soren Exp $	*/
 
 /*
@@ -45,7 +45,7 @@
  * is 00:c0:39, models 20 and 21.  Warning: The older revision 3 part has
  * several bugs. It always responds to MDIO address 0, and has clear-only
  * semantics for the capability-advertise registers. The current (3/99)
- * revision 11 part, shipping since 8/98, has reportedly fixed these problems. 
+ * revision 11 part, shipping since 8/98, has reportedly fixed these problems.
  */
 
 #define MII_TQPHY_VENDOR	0x10	/* Vendor specific register */
diff --git a/sys/dev/mii/xmphy.c b/sys/dev/mii/xmphy.c
index 3c49bc0d884..34a44c99f45 100644
--- a/sys/dev/mii/xmphy.c
+++ b/sys/dev/mii/xmphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xmphy.c,v 1.5 2002/03/14 01:26:58 millert Exp $	*/
+/*	$OpenBSD: xmphy.c,v 1.6 2002/05/04 11:30:06 fgsch Exp $	*/
 
 /*
  * Copyright (c) 2000
@@ -211,7 +211,7 @@ xmphy_service(sc, mii, cmd)
 		 */
 		if (++sc->mii_ticks != sc->mii_anegticks)
 			return (0);
-		
+
 		sc->mii_ticks = 0;
 
 		/*
diff --git a/sys/dev/mii/xmphyreg.h b/sys/dev/mii/xmphyreg.h
index 0527b634fae..48121cd5c03 100644
--- a/sys/dev/mii/xmphyreg.h
+++ b/sys/dev/mii/xmphyreg.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: xmphyreg.h,v 1.5 2002/05/04 11:30:06 fgsch Exp $	*/
 /*
  * Copyright (c) 2000
  *	Bill Paul <wpaul@ee.columbia.edu>.  All rights reserved.