- Fix up some comments in if_wi.c (no code changes)

- Mention that the 6Mbps turbo adapters are supported in HARDWARE.TXT
  and RELNOTES.TXT and the wi.4 man page
- Mention turbo adapters in the wicontrol.8 man page and provide a
  complete table of available transmit speed settings

8 files changed, 72 insertions, 36 deletions

diff --git a/release/texts/HARDWARE.TXT b/release/texts/HARDWARE.TXT
index 7b3cf34..3118250 100644
--- a/release/texts/HARDWARE.TXT
+++ b/release/texts/HARDWARE.TXT
@@ -706,7 +706,11 @@ Genius and Mustek hand scanners.
 
 Floppy tape drives (some rather old models only, driver rather stale)
 
-Lucent Technologies WaveLAN/IEEE 802.11 PCMCIA network adapters and
-workalikes (NCR WaveLAN/IEEE 802.11, Cabletron RoamAbout)
+Lucent Technologies WaveLAN/IEEE 802.11 PCMCIA and ISA standard speed
+(2Mbps) and turbo speed (6Mbps) wireless network adapters and workalikes
+(NCR WaveLAN/IEEE 802.11, Cabletron RoamAbout 802.11 DS). Note: the
+ISA versions of these adapters are actually PCMCIA cards combined with
+an ISA to PCMCIA bridge card, so both kinds of devices work with
+the same driver.
 
 FreeBSD currently does NOT support IBM's microchannel (MCA) bus.
diff --git a/release/texts/RELNOTES.TXT b/release/texts/RELNOTES.TXT
index 334e8c3..8bab4e6 100644
--- a/release/texts/RELNOTES.TXT
+++ b/release/texts/RELNOTES.TXT
@@ -66,7 +66,8 @@ the Alteon AceNIC, 3Com 3c985 and Netgear GA620.
 
 Driver support has been added for IEEE 802.11 PCMCIA wireless network
 adapters based on the Lucent Hermes chipset, including the Lucent
-WaveLAN/IEEE 802.11 and the Cabletron RoamAbout.
+WaveLAN/IEEE 802.11 and the Cabletron RoamAbout. Both 2Mbps and
+6Mbps Turbo adapters are supported.
 
 Driver support has been added for PCI fast ethernet cards based
 on the ADMtek Inc. AL981 Comet chipset.
@@ -408,6 +409,13 @@ the HOT1 from Virtual Computers (www.vcc.com)
 
 Support for Dave Mills experimental Loran-C receiver.
 
+Lucent Technologies WaveLAN/IEEE 802.11 PCMCIA and ISA standard speed
+(2Mbps) and turbo speed (6Mbps) wireless network adapters and workalikes
+(NCR WaveLAN/IEEE 802.11, Cabletron RoamAbout 802.11 DS). Note: the
+ISA versions of these adapters are actually PCMCIA cards combined with
+an ISA to PCMCIA bridge card, so both kinds of devices work with
+the same driver.
+
 FreeBSD currently does NOT support IBM's microchannel (MCA) bus.
 
 3. Obtaining FreeBSD
diff --git a/share/man/man4/man4.i386/wi.4 b/share/man/man4/man4.i386/wi.4
index bf859d0..5ef273a 100644
--- a/share/man/man4/man4.i386/wi.4
+++ b/share/man/man4/man4.i386/wi.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: wi.4,v 1.1 1999/05/05 07:36:59 wpaul Exp $
+.\"	$Id$
 .\"
 .Dd April 21, 1999
 .Dt WI 4 i386
@@ -45,9 +45,11 @@ The
 driver provides support for WaveLAN/IEEE PCCARD adapters (also known
 as WaveLAN II cards). Note that while Lucent sells both ISA and PCMCIA
 WaveLAN/IEEE devices, the ISA product is actually a PCMCIA card in an
-ISA to PCMCIA bridge adapter. The
+ISA to PCMCIA bridge adapter. Consequently, the
 .Nm
-driver supports both the ISA and PCMCIA devices.
+driver is required for both the ISA and PCMCIA NICs. Both the original
+2Mbps WaveLAN/IEEE cards and the newer 6Mbps WaveLAN/IEEE Turbo
+adapters are supported.
 .Pp
 The core of the WaveLAN/IEEE is the Lucent Hermes controller. All
 host/device interaction is via programmed I/O with the Hermes. The
@@ -57,6 +59,7 @@ and ad-hoc operation modes. The
 driver encapsulates all IP and ARP traffic as 802.11 frames, however
 it can receive either 802.11 or 802.3 frames. Transmit speed is
 selectable between 1Mbps fixed, 2Mbps fixed or 2Mbps with auto fallback.
+For WaveLAN/IEEE Turbo adapters, speeds up to 6Mbps are available.
 .Pp
 By default, the
 .Nm
diff --git a/share/man/man4/wi.4 b/share/man/man4/wi.4
index bf859d0..5ef273a 100644
--- a/share/man/man4/wi.4
+++ b/share/man/man4/wi.4
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: wi.4,v 1.1 1999/05/05 07:36:59 wpaul Exp $
+.\"	$Id$
 .\"
 .Dd April 21, 1999
 .Dt WI 4 i386
@@ -45,9 +45,11 @@ The
 driver provides support for WaveLAN/IEEE PCCARD adapters (also known
 as WaveLAN II cards). Note that while Lucent sells both ISA and PCMCIA
 WaveLAN/IEEE devices, the ISA product is actually a PCMCIA card in an
-ISA to PCMCIA bridge adapter. The
+ISA to PCMCIA bridge adapter. Consequently, the
 .Nm
-driver supports both the ISA and PCMCIA devices.
+driver is required for both the ISA and PCMCIA NICs. Both the original
+2Mbps WaveLAN/IEEE cards and the newer 6Mbps WaveLAN/IEEE Turbo
+adapters are supported.
 .Pp
 The core of the WaveLAN/IEEE is the Lucent Hermes controller. All
 host/device interaction is via programmed I/O with the Hermes. The
@@ -57,6 +59,7 @@ and ad-hoc operation modes. The
 driver encapsulates all IP and ARP traffic as 802.11 frames, however
 it can receive either 802.11 or 802.3 frames. Transmit speed is
 selectable between 1Mbps fixed, 2Mbps fixed or 2Mbps with auto fallback.
+For WaveLAN/IEEE Turbo adapters, speeds up to 6Mbps are available.
 .Pp
 By default, the
 .Nm
diff --git a/sys/dev/wi/if_wi.c b/sys/dev/wi/if_wi.c
index 90c2587..a60ca36 100644
--- a/sys/dev/wi/if_wi.c
+++ b/sys/dev/wi/if_wi.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_wi.c,v 1.53 1999/05/07 03:14:21 wpaul Exp $
+ *	$Id: if_wi.c,v 1.54 1999/05/20 04:10:40 wpaul Exp $
  */
 
 /*
@@ -41,7 +41,7 @@
  */
 
 /*
- * The WaveLAN IEEE adapter is the second generation of the WaveLAN
+ * The WaveLAN/IEEE adapter is the second generation of the WaveLAN
  * from Lucent. Unlike the older cards, the new ones are programmed
  * entirely via a firmware-driven controller called the Hermes.
  * Unfortunately, Lucent will not release the Hermes programming manual
@@ -49,7 +49,7 @@
  * called the HCF (Hardware Control Functions) which is supposed to
  * do the device-specific operations of a device driver for you. The
  * publically available version of the HCF library (the 'HCF Light') is 
- * a) extremely gross, b) lacks certain fearures, particularly support
+ * a) extremely gross, b) lacks certain features, particularly support
  * for 802.11 frames, and c) is contaminated by the GNU Public License.
  *
  * This driver does not use the HCF or HCF Light at all. Instead, it
@@ -116,13 +116,13 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id: if_wi.c,v 1.53 1999/05/07 03:14:21 wpaul Exp $";
+	"$Id: if_wi.c,v 1.54 1999/05/20 04:10:40 wpaul Exp $";
 #endif
 
 static struct wi_softc wi_softc[NWI];
 
 #ifdef foo
-static u_int8_t	wi_mcast_addr[6] = { 0x00, 0x60, 0x1D, 0x00, 0x01, 0x00 };
+static u_int8_t	wi_mcast_addr[6] = { 0x01, 0x60, 0x1D, 0x00, 0x01, 0x00 };
 #endif
 
 static int wi_probe		__P((struct isa_device *));
@@ -262,7 +262,7 @@ static int wi_probe(isa_dev)
 {
 	/*
 	 * The ISA WaveLAN/IEEE card is actually not an ISA card:
-	 * it's a PCMCIA card plugged into a PCMCIA expander card
+	 * it's a PCMCIA card plugged into a PCMCIA bridge adapter
 	 * that fits into an ISA slot. Consequently, we will always
 	 * be using the pccard support to probe and attach these
 	 * devices, so we can never actually probe one from here.
@@ -688,7 +688,7 @@ static int wi_read_record(sc, ltv)
 	/*
 	 * Read the length and record type and make sure they
 	 * match what we expect (this verifies that we have enough
-	 * room to hold all of the returned data.
+	 * room to hold all of the returned data).
 	 */
 	len = CSR_READ_2(sc, WI_DATA1);
 	if (len > ltv->wi_len)
@@ -1099,7 +1099,7 @@ static void wi_init(xsc)
 	/* Program max data length. */
 	WI_SETVAL(WI_RID_MAX_DATALEN, sc->wi_max_data_len);
 
-	/* Enable/disable IBSS ctration. */
+	/* Enable/disable IBSS creation. */
 	WI_SETVAL(WI_RID_CREATE_IBSS, sc->wi_create_ibss);
 
 	/* Set the port type. */
@@ -1199,7 +1199,7 @@ static void wi_start(ifp)
 	eh = mtod(m0, struct ether_header *);
 
 	/*
-	 * Use RFC1042 encoding for IP and ARP datagrames,
+	 * Use RFC1042 encoding for IP and ARP datagrams,
 	 * 802.3 for anything else.
 	 */
 	if (ntohs(eh->ether_type) == ETHERTYPE_IP ||
diff --git a/sys/i386/isa/if_wi.c b/sys/i386/isa/if_wi.c
index 90c2587..a60ca36 100644
--- a/sys/i386/isa/if_wi.c
+++ b/sys/i386/isa/if_wi.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_wi.c,v 1.53 1999/05/07 03:14:21 wpaul Exp $
+ *	$Id: if_wi.c,v 1.54 1999/05/20 04:10:40 wpaul Exp $
  */
 
 /*
@@ -41,7 +41,7 @@
  */
 
 /*
- * The WaveLAN IEEE adapter is the second generation of the WaveLAN
+ * The WaveLAN/IEEE adapter is the second generation of the WaveLAN
  * from Lucent. Unlike the older cards, the new ones are programmed
  * entirely via a firmware-driven controller called the Hermes.
  * Unfortunately, Lucent will not release the Hermes programming manual
@@ -49,7 +49,7 @@
  * called the HCF (Hardware Control Functions) which is supposed to
  * do the device-specific operations of a device driver for you. The
  * publically available version of the HCF library (the 'HCF Light') is 
- * a) extremely gross, b) lacks certain fearures, particularly support
+ * a) extremely gross, b) lacks certain features, particularly support
  * for 802.11 frames, and c) is contaminated by the GNU Public License.
  *
  * This driver does not use the HCF or HCF Light at all. Instead, it
@@ -116,13 +116,13 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id: if_wi.c,v 1.53 1999/05/07 03:14:21 wpaul Exp $";
+	"$Id: if_wi.c,v 1.54 1999/05/20 04:10:40 wpaul Exp $";
 #endif
 
 static struct wi_softc wi_softc[NWI];
 
 #ifdef foo
-static u_int8_t	wi_mcast_addr[6] = { 0x00, 0x60, 0x1D, 0x00, 0x01, 0x00 };
+static u_int8_t	wi_mcast_addr[6] = { 0x01, 0x60, 0x1D, 0x00, 0x01, 0x00 };
 #endif
 
 static int wi_probe		__P((struct isa_device *));
@@ -262,7 +262,7 @@ static int wi_probe(isa_dev)
 {
 	/*
 	 * The ISA WaveLAN/IEEE card is actually not an ISA card:
-	 * it's a PCMCIA card plugged into a PCMCIA expander card
+	 * it's a PCMCIA card plugged into a PCMCIA bridge adapter
 	 * that fits into an ISA slot. Consequently, we will always
 	 * be using the pccard support to probe and attach these
 	 * devices, so we can never actually probe one from here.
@@ -688,7 +688,7 @@ static int wi_read_record(sc, ltv)
 	/*
 	 * Read the length and record type and make sure they
 	 * match what we expect (this verifies that we have enough
-	 * room to hold all of the returned data.
+	 * room to hold all of the returned data).
 	 */
 	len = CSR_READ_2(sc, WI_DATA1);
 	if (len > ltv->wi_len)
@@ -1099,7 +1099,7 @@ static void wi_init(xsc)
 	/* Program max data length. */
 	WI_SETVAL(WI_RID_MAX_DATALEN, sc->wi_max_data_len);
 
-	/* Enable/disable IBSS ctration. */
+	/* Enable/disable IBSS creation. */
 	WI_SETVAL(WI_RID_CREATE_IBSS, sc->wi_create_ibss);
 
 	/* Set the port type. */
@@ -1199,7 +1199,7 @@ static void wi_start(ifp)
 	eh = mtod(m0, struct ether_header *);
 
 	/*
-	 * Use RFC1042 encoding for IP and ARP datagrames,
+	 * Use RFC1042 encoding for IP and ARP datagrams,
 	 * 802.3 for anything else.
 	 */
 	if (ntohs(eh->ether_type) == ETHERTYPE_IP ||
diff --git a/usr.sbin/wicontrol/wicontrol.8 b/usr.sbin/wicontrol/wicontrol.8
index 7ce5c04..d0310d0 100644
--- a/usr.sbin/wicontrol/wicontrol.8
+++ b/usr.sbin/wicontrol/wicontrol.8
@@ -98,10 +98,28 @@ flag will cause
 .Nm
 to print out the statistics counters instead of the card settings.
 .It Fl i Ar iface Fl t Ar tx rate
-Set the transmit rate of the specified interface. The permitted values
-for the transmit rate are 1, 2 and 3, where 1 is fixed 1Mbps, 2 is
-fixed 2Mbps and 3 is 2Mbps with automatic fallback to 1Mbps. The default
-driver setting is 3.
+Set the transmit rate of the specified interface. The legal values
+for the transmit rate vary depending on whether the interface is a
+standard WaveLAN/IEEE or a WaveLAN/IEEE Turbo adapter. The standard
+NICs support a maximum transmit rate of 2Mbps while the turbo NICs
+support a maximum speed of 6Mbps. The following table shows the
+legal transmit rate settings and the corresponding transmit speeds:
+.Bd -filled -offset indent
+.Bl -column "TX rate " "NIC speed "
+.Em "TX rate	NIC speed"
+1	Fixed Low (1Mbps)
+2	Fixed Standard (2Mbps)
+3	Auto Rate Select (High)
+4	Fixed Medium (4Mbps)
+5	Fixed High (6Mbps)
+6	Auto Rate Select (Standard)
+7	Auto Rate Select (Medium)
+.El
+.Ed
+.Pp
+The standard NICs support only settings 1 through 3. Turbo NICs support
+all the above listed speed settings.
+The default driver setting is 3 (auto rate select).
 .It Fl i Ar iface Fl n Ar network name
 Set the name of the service set (IBSS) that this station wishes to
 join. The
@@ -122,7 +140,7 @@ Sets the
 for the specified interface. The
 .Ar station name
 is used for diagnostic purposes. The Lucent WaveMANAGER sofware can
-poll the names of remove hosts.
+poll the names of remote hosts.
 .It Fl i Ar iface Fl c Ar 0|1
 Allow the station to create a service set (IBSS). Permitted values
 are 0 (don't create IBSS) and 1 (enable creation of IBSS). The default
@@ -215,7 +233,7 @@ is only implemented in Lucent WavePOINT firmware version 2.03 or
 later, and in WaveLAN PCMCIA adapter firmware 2.00 or later. Older
 revisions will silently ignore the power management setting. Legal
 values for this parameter are 0 (off) and 1 (on).
-.It Fl i Ar iface Fl S Ar max sleep interval
+.It Fl i Ar iface Fl S Ar max_sleep_interval
 Specify the sleep interval to use when power management is enabled.
 The
 .Are max sleep interval
diff --git a/usr.sbin/wicontrol/wicontrol.c b/usr.sbin/wicontrol/wicontrol.c
index 08009f9..e22d3da 100644
--- a/usr.sbin/wicontrol/wicontrol.c
+++ b/usr.sbin/wicontrol/wicontrol.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: wicontrol.c,v 1.18 1999/05/14 15:40:19 wpaul Exp $
+ *	$Id: wicontrol.c,v 1.19 1999/05/22 15:43:02 wpaul Exp $
  */
 
 #include <sys/types.h>
@@ -56,7 +56,7 @@
 static const char copyright[] = "@(#) Copyright (c) 1997, 1998, 1999\
 	Bill Paul. All rights reserved.";
 static const char rcsid[] =
-	"@(#) $Id: wicontrol.c,v 1.18 1999/05/14 15:40:19 wpaul Exp $";
+	"@(#) $Id: wicontrol.c,v 1.19 1999/05/22 15:43:02 wpaul Exp $";
 #endif
 
 static void wi_getval		__P((char *, struct wi_req *));
@@ -304,7 +304,7 @@ static struct wi_table wi_table[] = {
 	{ WI_RID_PROMISC, WI_BOOL, "Promiscuous mode:\t\t\t" },
 	{ WI_RID_PORTTYPE, WI_WORDS, "Port type (1=BSS, 3=ad-hoc):\t\t"},
 	{ WI_RID_MAC_NODE, WI_HEXBYTES, "MAC address:\t\t\t\t"},
-	{ WI_RID_TX_RATE, WI_WORDS, "TX rate (1=1Mbps, 2=2Mbps, 3=auto):\t"},
+	{ WI_RID_TX_RATE, WI_WORDS, "TX rate:\t\t\t\t"},
 	{ WI_RID_RTS_THRESH, WI_WORDS, "RTS/CTS handshake threshold:\t\t"},
 	{ WI_RID_CREATE_IBSS, WI_BOOL, "Create IBSS:\t\t\t\t" },
 	{ WI_RID_SYSTEM_SCALE, WI_WORDS, "Access point density:\t\t\t" },