Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/net Put spaces either side of '|' for clarity ('|' looks...
details: https://anonhg.NetBSD.org/src/rev/adc8455c8814
branches: trunk
changeset: 570528:adc8455c8814
user: dsl <dsl%NetBSD.org@localhost>
date: Sat Oct 16 11:11:04 2004 +0000
description:
Put spaces either side of '|' for clarity ('|' looks too much like 'I' or 'l')
diffstat:
sys/net/if_media.h | 302 ++++++++++++++++++++++++++--------------------------
1 files changed, 151 insertions(+), 151 deletions(-)
diffs (truncated from 367 to 300 lines):
diff -r 37f172c155a4 -r adc8455c8814 sys/net/if_media.h
--- a/sys/net/if_media.h Sat Oct 16 09:58:38 2004 +0000
+++ b/sys/net/if_media.h Sat Oct 16 11:11:04 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_media.h,v 1.40 2004/04/09 20:44:57 thorpej Exp $ */
+/* $NetBSD: if_media.h,v 1.41 2004/10/16 11:11:04 dsl Exp $ */
/*-
* Copyright (c) 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -266,7 +266,7 @@
#define IFM_GMASK 0x0ff00000 /* Global options */
/* Ethernet flow control mask */
-#define IFM_ETH_FMASK (IFM_FLOW|IFM_ETH_RXPAUSE|IFM_ETH_TXPAUSE)
+#define IFM_ETH_FMASK (IFM_FLOW | IFM_ETH_RXPAUSE | IFM_ETH_TXPAUSE)
#define IFM_NMIN IFM_ETHER /* lowest Network type */
#define IFM_NMAX IFM_NMASK /* highest Network type */
@@ -292,7 +292,7 @@
#define IFM_TYPE(x) ((x) & IFM_NMASK)
#define IFM_SUBTYPE(x) ((x) & IFM_TMASK)
#define IFM_INST(x) (((x) & IFM_IMASK) >> IFM_ISHIFT)
-#define IFM_OPTIONS(x) ((x) & (IFM_OMASK|IFM_GMASK))
+#define IFM_OPTIONS(x) ((x) & (IFM_OMASK | IFM_GMASK))
#define IFM_MODE(x) ((x) & IFM_MMASK)
#define IFM_INST_MAX IFM_INST(IFM_IMASK)
@@ -343,105 +343,105 @@
{ IFM_MANUAL, "manual" }, \
{ IFM_NONE, "none" }, \
\
- { IFM_ETHER|IFM_10_T, "10baseT" }, \
- { IFM_ETHER|IFM_10_T, "10baseT/UTP" }, \
- { IFM_ETHER|IFM_10_T, "UTP" }, \
- { IFM_ETHER|IFM_10_T, "10UTP" }, \
- { IFM_ETHER|IFM_10_T, "10BASE-T" }, \
- { IFM_ETHER|IFM_10_2, "10base2" }, \
- { IFM_ETHER|IFM_10_2, "10base2/BNC" }, \
- { IFM_ETHER|IFM_10_2, "BNC" }, \
- { IFM_ETHER|IFM_10_2, "10BNC" }, \
- { IFM_ETHER|IFM_10_2, "10BASE2" }, \
- { IFM_ETHER|IFM_10_5, "10base5" }, \
- { IFM_ETHER|IFM_10_5, "10base5/AUI" }, \
- { IFM_ETHER|IFM_10_5, "AUI" }, \
- { IFM_ETHER|IFM_10_5, "10AUI" }, \
- { IFM_ETHER|IFM_10_5, "10BASE5" }, \
- { IFM_ETHER|IFM_100_TX, "100baseTX" }, \
- { IFM_ETHER|IFM_100_TX, "100TX" }, \
- { IFM_ETHER|IFM_100_TX, "100BASE-TX" }, \
- { IFM_ETHER|IFM_100_FX, "100baseFX" }, \
- { IFM_ETHER|IFM_100_FX, "100FX" }, \
- { IFM_ETHER|IFM_100_FX, "100BASE-FX" }, \
- { IFM_ETHER|IFM_100_T4, "100baseT4" }, \
- { IFM_ETHER|IFM_100_T4, "100T4" }, \
- { IFM_ETHER|IFM_100_T4, "100BASE-T4" }, \
- { IFM_ETHER|IFM_100_VG, "100baseVG" }, \
- { IFM_ETHER|IFM_100_VG, "100VG" }, \
- { IFM_ETHER|IFM_100_VG, "100VG-AnyLAN" }, \
- { IFM_ETHER|IFM_100_T2, "100baseT2" }, \
- { IFM_ETHER|IFM_100_T2, "100T2" }, \
- { IFM_ETHER|IFM_100_T2, "100BASE-T2" }, \
- { IFM_ETHER|IFM_1000_SX, "1000baseSX" }, \
- { IFM_ETHER|IFM_1000_SX, "1000SX" }, \
- { IFM_ETHER|IFM_1000_SX, "1000BASE-SX" }, \
- { IFM_ETHER|IFM_10_STP, "10baseSTP" }, \
- { IFM_ETHER|IFM_10_STP, "STP" }, \
- { IFM_ETHER|IFM_10_STP, "10STP" }, \
- { IFM_ETHER|IFM_10_STP, "10BASE-STP" }, \
- { IFM_ETHER|IFM_10_FL, "10baseFL" }, \
- { IFM_ETHER|IFM_10_FL, "FL" }, \
- { IFM_ETHER|IFM_10_FL, "10FL" }, \
- { IFM_ETHER|IFM_10_FL, "10BASE-FL" }, \
- { IFM_ETHER|IFM_1000_LX, "1000baseLX" }, \
- { IFM_ETHER|IFM_1000_LX, "1000LX" }, \
- { IFM_ETHER|IFM_1000_LX, "1000BASE-LX" }, \
- { IFM_ETHER|IFM_1000_CX, "1000baseCX" }, \
- { IFM_ETHER|IFM_1000_CX, "1000CX" }, \
- { IFM_ETHER|IFM_1000_CX, "1000BASE-CX" }, \
- { IFM_ETHER|IFM_1000_T, "1000baseT" }, \
- { IFM_ETHER|IFM_1000_T, "1000T" }, \
- { IFM_ETHER|IFM_1000_T, "1000BASE-T" }, \
- { IFM_ETHER|IFM_HPNA_1, "HomePNA1" }, \
- { IFM_ETHER|IFM_HPNA_1, "HPNA1" }, \
- { IFM_ETHER|IFM_10G_LR, "10GbaseLR" }, \
- { IFM_ETHER|IFM_10G_LR, "10GLR" }, \
- { IFM_ETHER|IFM_10G_LR, "10GBASE-LR" }, \
+ { IFM_ETHER | IFM_10_T, "10baseT" }, \
+ { IFM_ETHER | IFM_10_T, "10baseT/UTP" }, \
+ { IFM_ETHER | IFM_10_T, "UTP" }, \
+ { IFM_ETHER | IFM_10_T, "10UTP" }, \
+ { IFM_ETHER | IFM_10_T, "10BASE-T" }, \
+ { IFM_ETHER | IFM_10_2, "10base2" }, \
+ { IFM_ETHER | IFM_10_2, "10base2/BNC" }, \
+ { IFM_ETHER | IFM_10_2, "BNC" }, \
+ { IFM_ETHER | IFM_10_2, "10BNC" }, \
+ { IFM_ETHER | IFM_10_2, "10BASE2" }, \
+ { IFM_ETHER | IFM_10_5, "10base5" }, \
+ { IFM_ETHER | IFM_10_5, "10base5/AUI" }, \
+ { IFM_ETHER | IFM_10_5, "AUI" }, \
+ { IFM_ETHER | IFM_10_5, "10AUI" }, \
+ { IFM_ETHER | IFM_10_5, "10BASE5" }, \
+ { IFM_ETHER | IFM_100_TX, "100baseTX" }, \
+ { IFM_ETHER | IFM_100_TX, "100TX" }, \
+ { IFM_ETHER | IFM_100_TX, "100BASE-TX" }, \
+ { IFM_ETHER | IFM_100_FX, "100baseFX" }, \
+ { IFM_ETHER | IFM_100_FX, "100FX" }, \
+ { IFM_ETHER | IFM_100_FX, "100BASE-FX" }, \
+ { IFM_ETHER | IFM_100_T4, "100baseT4" }, \
+ { IFM_ETHER | IFM_100_T4, "100T4" }, \
+ { IFM_ETHER | IFM_100_T4, "100BASE-T4" }, \
+ { IFM_ETHER | IFM_100_VG, "100baseVG" }, \
+ { IFM_ETHER | IFM_100_VG, "100VG" }, \
+ { IFM_ETHER | IFM_100_VG, "100VG-AnyLAN" }, \
+ { IFM_ETHER | IFM_100_T2, "100baseT2" }, \
+ { IFM_ETHER | IFM_100_T2, "100T2" }, \
+ { IFM_ETHER | IFM_100_T2, "100BASE-T2" }, \
+ { IFM_ETHER | IFM_1000_SX, "1000baseSX" }, \
+ { IFM_ETHER | IFM_1000_SX, "1000SX" }, \
+ { IFM_ETHER | IFM_1000_SX, "1000BASE-SX" }, \
+ { IFM_ETHER | IFM_10_STP, "10baseSTP" }, \
+ { IFM_ETHER | IFM_10_STP, "STP" }, \
+ { IFM_ETHER | IFM_10_STP, "10STP" }, \
+ { IFM_ETHER | IFM_10_STP, "10BASE-STP" }, \
+ { IFM_ETHER | IFM_10_FL, "10baseFL" }, \
+ { IFM_ETHER | IFM_10_FL, "FL" }, \
+ { IFM_ETHER | IFM_10_FL, "10FL" }, \
+ { IFM_ETHER | IFM_10_FL, "10BASE-FL" }, \
+ { IFM_ETHER | IFM_1000_LX, "1000baseLX" }, \
+ { IFM_ETHER | IFM_1000_LX, "1000LX" }, \
+ { IFM_ETHER | IFM_1000_LX, "1000BASE-LX" }, \
+ { IFM_ETHER | IFM_1000_CX, "1000baseCX" }, \
+ { IFM_ETHER | IFM_1000_CX, "1000CX" }, \
+ { IFM_ETHER | IFM_1000_CX, "1000BASE-CX" }, \
+ { IFM_ETHER | IFM_1000_T, "1000baseT" }, \
+ { IFM_ETHER | IFM_1000_T, "1000T" }, \
+ { IFM_ETHER | IFM_1000_T, "1000BASE-T" }, \
+ { IFM_ETHER | IFM_HPNA_1, "HomePNA1" }, \
+ { IFM_ETHER | IFM_HPNA_1, "HPNA1" }, \
+ { IFM_ETHER | IFM_10G_LR, "10GbaseLR" }, \
+ { IFM_ETHER | IFM_10G_LR, "10GLR" }, \
+ { IFM_ETHER | IFM_10G_LR, "10GBASE-LR" }, \
\
- { IFM_TOKEN|IFM_TOK_STP4, "DB9/4Mbit" }, \
- { IFM_TOKEN|IFM_TOK_STP4, "4STP" }, \
- { IFM_TOKEN|IFM_TOK_STP16, "DB9/16Mbit" }, \
- { IFM_TOKEN|IFM_TOK_STP16, "16STP" }, \
- { IFM_TOKEN|IFM_TOK_UTP4, "UTP/4Mbit" }, \
- { IFM_TOKEN|IFM_TOK_UTP4, "4UTP" }, \
- { IFM_TOKEN|IFM_TOK_UTP16, "UTP/16Mbit" }, \
- { IFM_TOKEN|IFM_TOK_UTP16, "16UTP" }, \
+ { IFM_TOKEN | IFM_TOK_STP4, "DB9/4Mbit" }, \
+ { IFM_TOKEN | IFM_TOK_STP4, "4STP" }, \
+ { IFM_TOKEN | IFM_TOK_STP16, "DB9/16Mbit" }, \
+ { IFM_TOKEN | IFM_TOK_STP16, "16STP" }, \
+ { IFM_TOKEN | IFM_TOK_UTP4, "UTP/4Mbit" }, \
+ { IFM_TOKEN | IFM_TOK_UTP4, "4UTP" }, \
+ { IFM_TOKEN | IFM_TOK_UTP16, "UTP/16Mbit" }, \
+ { IFM_TOKEN | IFM_TOK_UTP16, "16UTP" }, \
\
- { IFM_FDDI|IFM_FDDI_SMF, "Single-mode" }, \
- { IFM_FDDI|IFM_FDDI_SMF, "SMF" }, \
- { IFM_FDDI|IFM_FDDI_MMF, "Multi-mode" }, \
- { IFM_FDDI|IFM_FDDI_MMF, "MMF" }, \
- { IFM_FDDI|IFM_FDDI_UTP, "UTP" }, \
- { IFM_FDDI|IFM_FDDI_UTP, "CDDI" }, \
+ { IFM_FDDI | IFM_FDDI_SMF, "Single-mode" }, \
+ { IFM_FDDI | IFM_FDDI_SMF, "SMF" }, \
+ { IFM_FDDI | IFM_FDDI_MMF, "Multi-mode" }, \
+ { IFM_FDDI | IFM_FDDI_MMF, "MMF" }, \
+ { IFM_FDDI | IFM_FDDI_UTP, "UTP" }, \
+ { IFM_FDDI | IFM_FDDI_UTP, "CDDI" }, \
\
/* \
* Short-hand for common media+option combos. \
*/ \
- { IFM_ETHER|IFM_10_T|IFM_FDX, "10baseT-FDX" }, \
- { IFM_ETHER|IFM_10_T|IFM_FDX, "10BASE-T-FDX" }, \
- { IFM_ETHER|IFM_100_TX|IFM_FDX, "100baseTX-FDX" }, \
- { IFM_ETHER|IFM_100_TX|IFM_FDX, "100BASE-TX-FDX" }, \
+ { IFM_ETHER | IFM_10_T | IFM_FDX, "10baseT-FDX" }, \
+ { IFM_ETHER | IFM_10_T | IFM_FDX, "10BASE-T-FDX" }, \
+ { IFM_ETHER | IFM_100_TX | IFM_FDX, "100baseTX-FDX" }, \
+ { IFM_ETHER | IFM_100_TX | IFM_FDX, "100BASE-TX-FDX" }, \
\
/* \
* IEEE 802.11 \
*/ \
- { IFM_IEEE80211|IFM_IEEE80211_FH1, "FH1" }, \
- { IFM_IEEE80211|IFM_IEEE80211_FH2, "FH2" }, \
- { IFM_IEEE80211|IFM_IEEE80211_DS1, "DS1" }, \
- { IFM_IEEE80211|IFM_IEEE80211_DS2, "DS2" }, \
- { IFM_IEEE80211|IFM_IEEE80211_DS5, "DS5" }, \
- { IFM_IEEE80211|IFM_IEEE80211_DS11, "DS11" }, \
- { IFM_IEEE80211|IFM_IEEE80211_DS22, "DS22" }, \
- { IFM_IEEE80211|IFM_IEEE80211_OFDM6, "OFDM6" }, \
- { IFM_IEEE80211|IFM_IEEE80211_OFDM9, "OFDM9" }, \
- { IFM_IEEE80211|IFM_IEEE80211_OFDM12, "OFDM12" }, \
- { IFM_IEEE80211|IFM_IEEE80211_OFDM18, "OFDM18" }, \
- { IFM_IEEE80211|IFM_IEEE80211_OFDM24, "OFDM24" }, \
- { IFM_IEEE80211|IFM_IEEE80211_OFDM36, "OFDM36" }, \
- { IFM_IEEE80211|IFM_IEEE80211_OFDM48, "OFDM48" }, \
- { IFM_IEEE80211|IFM_IEEE80211_OFDM54, "OFDM54" }, \
- { IFM_IEEE80211|IFM_IEEE80211_OFDM72, "OFDM72" }, \
+ { IFM_IEEE80211 | IFM_IEEE80211_FH1, "FH1" }, \
+ { IFM_IEEE80211 | IFM_IEEE80211_FH2, "FH2" }, \
+ { IFM_IEEE80211 | IFM_IEEE80211_DS1, "DS1" }, \
+ { IFM_IEEE80211 | IFM_IEEE80211_DS2, "DS2" }, \
+ { IFM_IEEE80211 | IFM_IEEE80211_DS5, "DS5" }, \
+ { IFM_IEEE80211 | IFM_IEEE80211_DS11, "DS11" }, \
+ { IFM_IEEE80211 | IFM_IEEE80211_DS22, "DS22" }, \
+ { IFM_IEEE80211 | IFM_IEEE80211_OFDM6, "OFDM6" }, \
+ { IFM_IEEE80211 | IFM_IEEE80211_OFDM9, "OFDM9" }, \
+ { IFM_IEEE80211 | IFM_IEEE80211_OFDM12, "OFDM12" }, \
+ { IFM_IEEE80211 | IFM_IEEE80211_OFDM18, "OFDM18" }, \
+ { IFM_IEEE80211 | IFM_IEEE80211_OFDM24, "OFDM24" }, \
+ { IFM_IEEE80211 | IFM_IEEE80211_OFDM36, "OFDM36" }, \
+ { IFM_IEEE80211 | IFM_IEEE80211_OFDM48, "OFDM48" }, \
+ { IFM_IEEE80211 | IFM_IEEE80211_OFDM54, "OFDM54" }, \
+ { IFM_IEEE80211 | IFM_IEEE80211_OFDM72, "OFDM72" }, \
\
{ 0, NULL }, \
}
@@ -449,10 +449,10 @@
#define IFM_MODE_DESCRIPTIONS { \
{ IFM_AUTO, "autoselect" }, \
{ IFM_AUTO, "auto" }, \
- { IFM_IEEE80211|IFM_IEEE80211_11A, "11a" }, \
- { IFM_IEEE80211|IFM_IEEE80211_11B, "11b" }, \
- { IFM_IEEE80211|IFM_IEEE80211_11G, "11g" }, \
- { IFM_IEEE80211|IFM_IEEE80211_FH, "fh" }, \
+ { IFM_IEEE80211 | IFM_IEEE80211_11A, "11a" }, \
+ { IFM_IEEE80211 | IFM_IEEE80211_11B, "11b" }, \
+ { IFM_IEEE80211 | IFM_IEEE80211_11G, "11g" }, \
+ { IFM_IEEE80211 | IFM_IEEE80211_FH, "fh" }, \
{ 0, NULL }, \
}
@@ -470,25 +470,25 @@
{ IFM_LOOP, "hw-loopback"}, \
{ IFM_LOOP, "loop" }, \
\
- { IFM_ETHER|IFM_ETH_MASTER, "master" }, \
- { IFM_ETHER|IFM_ETH_RXPAUSE, "rxpause" }, \
- { IFM_ETHER|IFM_ETH_TXPAUSE, "txpause" }, \
+ { IFM_ETHER | IFM_ETH_MASTER, "master" }, \
+ { IFM_ETHER | IFM_ETH_RXPAUSE, "rxpause" }, \
+ { IFM_ETHER | IFM_ETH_TXPAUSE, "txpause" }, \
\
- { IFM_TOKEN|IFM_TOK_ETR, "EarlyTokenRelease" }, \
- { IFM_TOKEN|IFM_TOK_ETR, "ETR" }, \
- { IFM_TOKEN|IFM_TOK_SRCRT, "SourceRouting" }, \
- { IFM_TOKEN|IFM_TOK_SRCRT, "SRCRT" }, \
- { IFM_TOKEN|IFM_TOK_ALLR, "AllRoutes" }, \
- { IFM_TOKEN|IFM_TOK_ALLR, "ALLR" }, \
+ { IFM_TOKEN | IFM_TOK_ETR, "EarlyTokenRelease" }, \
+ { IFM_TOKEN | IFM_TOK_ETR, "ETR" }, \
+ { IFM_TOKEN | IFM_TOK_SRCRT, "SourceRouting" }, \
+ { IFM_TOKEN | IFM_TOK_SRCRT, "SRCRT" }, \
+ { IFM_TOKEN | IFM_TOK_ALLR, "AllRoutes" }, \
+ { IFM_TOKEN | IFM_TOK_ALLR, "ALLR" }, \
\
- { IFM_FDDI|IFM_FDDI_DA, "dual-attach" }, \
- { IFM_FDDI|IFM_FDDI_DA, "das" }, \
+ { IFM_FDDI | IFM_FDDI_DA, "dual-attach" }, \
+ { IFM_FDDI | IFM_FDDI_DA, "das" }, \
\
- { IFM_IEEE80211|IFM_IEEE80211_ADHOC, "adhoc" }, \
- { IFM_IEEE80211|IFM_IEEE80211_ADHOC, "ibss" }, \
- { IFM_IEEE80211|IFM_IEEE80211_HOSTAP, "hostap" }, \
- { IFM_IEEE80211|IFM_IEEE80211_MONITOR, "monitor" }, \
- { IFM_IEEE80211|IFM_IEEE80211_TURBO, "turbo" }, \
+ { IFM_IEEE80211 | IFM_IEEE80211_ADHOC, "adhoc" }, \
+ { IFM_IEEE80211 | IFM_IEEE80211_ADHOC, "ibss" }, \
+ { IFM_IEEE80211 | IFM_IEEE80211_HOSTAP, "hostap" }, \
+ { IFM_IEEE80211 | IFM_IEEE80211_MONITOR,"monitor" }, \
+ { IFM_IEEE80211 | IFM_IEEE80211_TURBO, "turbo" }, \
\
{ 0, NULL }, \
}
@@ -502,48 +502,48 @@
};
#define IFM_BAUDRATE_DESCRIPTIONS { \
- { IFM_ETHER|IFM_10_T, IF_Mbps(10) }, \
- { IFM_ETHER|IFM_10_2, IF_Mbps(10) }, \
- { IFM_ETHER|IFM_10_5, IF_Mbps(10) }, \
- { IFM_ETHER|IFM_100_TX, IF_Mbps(100) }, \
- { IFM_ETHER|IFM_100_FX, IF_Mbps(100) }, \
- { IFM_ETHER|IFM_100_T4, IF_Mbps(100) }, \
- { IFM_ETHER|IFM_100_VG, IF_Mbps(100) }, \
- { IFM_ETHER|IFM_100_T2, IF_Mbps(100) }, \
- { IFM_ETHER|IFM_1000_SX, IF_Mbps(1000) }, \
- { IFM_ETHER|IFM_10_STP, IF_Mbps(10) }, \
- { IFM_ETHER|IFM_10_FL, IF_Mbps(10) }, \
- { IFM_ETHER|IFM_1000_LX, IF_Mbps(1000) }, \
- { IFM_ETHER|IFM_1000_CX, IF_Mbps(1000) }, \
- { IFM_ETHER|IFM_1000_T, IF_Mbps(1000) }, \
- { IFM_ETHER|IFM_HPNA_1, IF_Mbps(1) }, \
- { IFM_ETHER|IFM_10G_LR, IF_Gbps(10ULL) }, \
+ { IFM_ETHER | IFM_10_T, IF_Mbps(10) }, \
Home |
Main Index |
Thread Index |
Old Index