Deleted Added
full compact
if_media.h (60938) if_media.h (77217)
1/* $NetBSD: if_media.h,v 1.3 1997/03/26 01:19:27 thorpej Exp $ */
1/* $NetBSD: if_media.h,v 1.3 1997/03/26 01:19:27 thorpej Exp $ */
2/* $FreeBSD: head/sys/net/if_media.h 60938 2000-05-26 02:09:24Z jake $ */
2/* $FreeBSD: head/sys/net/if_media.h 77217 2001-05-26 09:27:08Z phk $ */
3
4/*
5 * Copyright (c) 1997
6 * Jonathan Stone and Jason R. Thorpe. All rights reserved.
7 *
8 * This software is derived from information provided by Matt Thomas.
9 *
10 * Redistribution and use in source and binary forms, with or without

--- 151 unchanged lines hidden (view full) ---

162 */
163#define IFM_FDDI 0x00000060
164#define IFM_FDDI_SMF 3 /* Single-mode fiber */
165#define IFM_FDDI_MMF 4 /* Multi-mode fiber */
166#define IFM_FDDI_UTP 5 /* CDDI / UTP */
167#define IFM_FDDI_DA 0x00000100 /* Dual attach / single attach */
168
169/*
3
4/*
5 * Copyright (c) 1997
6 * Jonathan Stone and Jason R. Thorpe. All rights reserved.
7 *
8 * This software is derived from information provided by Matt Thomas.
9 *
10 * Redistribution and use in source and binary forms, with or without

--- 151 unchanged lines hidden (view full) ---

162 */
163#define IFM_FDDI 0x00000060
164#define IFM_FDDI_SMF 3 /* Single-mode fiber */
165#define IFM_FDDI_MMF 4 /* Multi-mode fiber */
166#define IFM_FDDI_UTP 5 /* CDDI / UTP */
167#define IFM_FDDI_DA 0x00000100 /* Dual attach / single attach */
168
169/*
170 * IEEE 802.11 Wireless
171 */
172#define IFM_IEEE80211 0x00000080
173#define IFM_IEEE80211_FH1 3 /* Frequency Hopping 1Mbps */
174#define IFM_IEEE80211_FH2 4 /* Frequency Hopping 2Mbps */
175#define IFM_IEEE80211_DS1 5 /* Direct Sequence 1Mbps */
176#define IFM_IEEE80211_DS2 6 /* Direct Sequence 2Mbps */
177#define IFM_IEEE80211_DS5 7 /* Direct Sequence 5.5Mbps */
178#define IFM_IEEE80211_DS11 8 /* Direct Sequence 11Mbps */
179#define IFM_IEEE80211_DS22 9 /* Direct Sequence 22Mbps */
180#define IFM_IEEE80211_ADHOC 0x00000100 /* Operate in Adhoc mode */
181
182/*
170 * Shared media sub-types
171 */
172#define IFM_AUTO 0 /* Autoselect best media */
173#define IFM_MANUAL 1 /* Jumper/dipswitch selects media */
174#define IFM_NONE 2 /* Deselect all media */
175
176/*
177 * Shared options

--- 46 unchanged lines hidden (view full) ---

224 * Otherwise, parsing these in ifconfig(8) would be a nightmare.
225 */
226struct ifmedia_description {
227 int ifmt_word; /* word value; may be masked */
228 const char *ifmt_string; /* description */
229};
230
231#define IFM_TYPE_DESCRIPTIONS { \
183 * Shared media sub-types
184 */
185#define IFM_AUTO 0 /* Autoselect best media */
186#define IFM_MANUAL 1 /* Jumper/dipswitch selects media */
187#define IFM_NONE 2 /* Deselect all media */
188
189/*
190 * Shared options

--- 46 unchanged lines hidden (view full) ---

237 * Otherwise, parsing these in ifconfig(8) would be a nightmare.
238 */
239struct ifmedia_description {
240 int ifmt_word; /* word value; may be masked */
241 const char *ifmt_string; /* description */
242};
243
244#define IFM_TYPE_DESCRIPTIONS { \
232 { IFM_ETHER, "Ethernet" }, \
233 { IFM_TOKEN, "Token ring" }, \
234 { IFM_FDDI, "FDDI" }, \
245 { IFM_ETHER, "Ethernet" }, \
246 { IFM_TOKEN, "Token ring" }, \
247 { IFM_FDDI, "FDDI" }, \
248 { IFM_IEEE80211, "IEEE 802.11 Wireless Ethernet" }, \
235 { 0, NULL }, \
236}
237
238#define IFM_SUBTYPE_ETHERNET_DESCRIPTIONS { \
239 { IFM_10_T, "10baseT/UTP" }, \
240 { IFM_10_2, "10base2/BNC" }, \
241 { IFM_10_5, "10base5/AUI" }, \
242 { IFM_100_TX, "100baseTX" }, \

--- 82 unchanged lines hidden (view full) ---

325 { 0, NULL }, \
326}
327
328#define IFM_SUBTYPE_FDDI_OPTION_DESCRIPTIONS { \
329 { IFM_FDDI_DA, "Dual-attach" }, \
330 { 0, NULL }, \
331}
332
249 { 0, NULL }, \
250}
251
252#define IFM_SUBTYPE_ETHERNET_DESCRIPTIONS { \
253 { IFM_10_T, "10baseT/UTP" }, \
254 { IFM_10_2, "10base2/BNC" }, \
255 { IFM_10_5, "10base5/AUI" }, \
256 { IFM_100_TX, "100baseTX" }, \

--- 82 unchanged lines hidden (view full) ---

339 { 0, NULL }, \
340}
341
342#define IFM_SUBTYPE_FDDI_OPTION_DESCRIPTIONS { \
343 { IFM_FDDI_DA, "Dual-attach" }, \
344 { 0, NULL }, \
345}
346
347#define IFM_SUBTYPE_IEEE80211_DESCRIPTIONS { \
348 { IFM_IEEE80211_FH1, "FH/1Mbps" }, \
349 { IFM_IEEE80211_FH2, "FH/2Mbps" }, \
350 { IFM_IEEE80211_DS1, "DS/1Mbps" }, \
351 { IFM_IEEE80211_DS2, "DS/2Mbps" }, \
352 { IFM_IEEE80211_DS5, "DS/5.5Mbps" }, \
353 { IFM_IEEE80211_DS11, "DS/11Mbps" }, \
354 { IFM_IEEE80211_DS22, "DS/22Mbps" }, \
355 { 0, NULL }, \
356}
357
358#define IFM_SUBTYPE_IEEE80211_ALIASES { \
359 { IFM_IEEE80211_FH1, "FH1" }, \
360 { IFM_IEEE80211_FH2, "FH2" }, \
361 { IFM_IEEE80211_FH1, "FrequencyHopping/1Mbps" }, \
362 { IFM_IEEE80211_FH2, "FrequencyHopping/2Mbps" }, \
363 { IFM_IEEE80211_DS1, "DS1" }, \
364 { IFM_IEEE80211_DS2, "DS2" }, \
365 { IFM_IEEE80211_DS5, "DS5.5" }, \
366 { IFM_IEEE80211_DS11, "DS11" }, \
367 { IFM_IEEE80211_DS22, "DS22" }, \
368 { IFM_IEEE80211_DS1, "DirectSequence/1Mbps" }, \
369 { IFM_IEEE80211_DS2, "DirectSequence/2Mbps" }, \
370 { IFM_IEEE80211_DS5, "DirectSequence/5.5Mbps" }, \
371 { IFM_IEEE80211_DS11, "DirectSequence/11Mbps" }, \
372 { IFM_IEEE80211_DS22, "DirectSequence/22Mbps" }, \
373 { 0, NULL }, \
374}
375
376#define IFM_SUBTYPE_IEEE80211_OPTION_DESCRIPTIONS { \
377 { IFM_IEEE80211_ADHOC, "adhoc" }, \
378 { 0, NULL }, \
379}
380
333#define IFM_SUBTYPE_SHARED_DESCRIPTIONS { \
334 { IFM_AUTO, "autoselect" }, \
335 { IFM_MANUAL, "manual" }, \
336 { IFM_NONE, "none" }, \
337 { 0, NULL }, \
338}
339
340#define IFM_SUBTYPE_SHARED_ALIASES { \

--- 15 unchanged lines hidden ---
381#define IFM_SUBTYPE_SHARED_DESCRIPTIONS { \
382 { IFM_AUTO, "autoselect" }, \
383 { IFM_MANUAL, "manual" }, \
384 { IFM_NONE, "none" }, \
385 { 0, NULL }, \
386}
387
388#define IFM_SUBTYPE_SHARED_ALIASES { \

--- 15 unchanged lines hidden ---