Fix usage in wicontrol.c to agree with man page.

Update documentation for -f frequency selection option to include complete
list of channel numbers and frequencies.

2 files changed, 39 insertions, 14 deletions

diff --git a/usr.sbin/wicontrol/wicontrol.8 b/usr.sbin/wicontrol/wicontrol.8
index b004ecf..7ce5c04 100644
--- a/usr.sbin/wicontrol/wicontrol.8
+++ b/usr.sbin/wicontrol/wicontrol.8
@@ -171,14 +171,39 @@ number of bytes used for the RTS/CTS handhake boundary. The
 .Ar RTS threshold
 can be any value between 0 and 2047. The default is 2347.
 .It Fl i Ar iface Fl f Ar frequency
-Specify the radio frequency to use for a given interface. There are
-a small number of different channels available use in different geographical
-areas. Known values are 3 (2422Mhz) for the United States, 11 (2462Mhz)
-for France and 14 (2484Mhz) for Japan, however the NIC may accept any
-channel number between 0 and 14. If an illegal channel is specified, the
-NIC will revert to its default channel. For NIC sold in the United States,
-the default channel is 3. Note that two stations must be
-set to the same channel in order to communicate.
+Set the radio frequency of a given interface. The
+.Ar frequency
+should be specfied as a channel ID as shown in the table below. The
+list of available frequencies is dependent on radio regulations specified
+by regional authorities. Recognized regulatory authorities include
+the FCC (United States), ETSI (Europe), France and Japan. Frequencies
+in the table are specified in Mhz.
+.Bd -filled -offset indent
+.Bl -column "Channel ID " "FCC " "ETSI " "France " "Japan "
+.Em "Channel ID	FCC	ETSI	France	Japan"
+1	2412	2412	-	-
+2	2417	2417	-	-
+3	2422	2422	-	-
+4	2427	2427	-	-
+5	2432	2432	-	-
+6	2437	2437	-	-
+7	2442	2442	-	-
+8	2447	2447	-	-
+9	2452	2452	-	-
+10	2457	2457	2457	-
+11	2462	2462	2462	-
+12	-	2467	2467	-
+13	-	2472	2472	-
+14	-	-	-	2484
+.El
+.Ed
+.Pp
+If an illegal channel is specified, the
+NIC will revert to its default channel. For NICs sold in the United States
+and Europe, the default channel is 3. For NICs sold in France, the default
+channel is 11. For NICs sold in Japan, the only available channel is 14.
+Note that two stations must be set to the same channel in order to
+communicate.
 .It Fl i Ar iface Fl P Ar 0|1
 Enable or disable power management on a given interface. Enabling
 power management uses an alternating sleep/wake protocol to help
diff --git a/usr.sbin/wicontrol/wicontrol.c b/usr.sbin/wicontrol/wicontrol.c
index 33a0855..08009f9 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.17 1999/05/07 03:14:21 wpaul Exp $
+ *	$Id: wicontrol.c,v 1.18 1999/05/14 15:40:19 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.17 1999/05/07 03:14:21 wpaul Exp $";
+	"@(#) $Id: wicontrol.c,v 1.18 1999/05/14 15:40:19 wpaul Exp $";
 #endif
 
 static void wi_getval		__P((char *, struct wi_req *));
@@ -421,15 +421,15 @@ static void usage(p)
 	fprintf(stderr, "\t%s -i iface -t tx rate\n", p);
 	fprintf(stderr, "\t%s -i iface -n network name\n", p);
 	fprintf(stderr, "\t%s -i iface -s station name\n", p);
-	fprintf(stderr, "\t%s -i iface -c create IBSS\n", p);
-	fprintf(stderr, "\t%s -i iface -q SSID of IBSS to create\n", p);
+	fprintf(stderr, "\t%s -i iface -c 0|1\n", p);
+	fprintf(stderr, "\t%s -i iface -q SSID\n", p);
 	fprintf(stderr, "\t%s -i iface -p port type\n", p);
 	fprintf(stderr, "\t%s -i iface -a access point density\n", p);
 	fprintf(stderr, "\t%s -i iface -m mac address\n", p);
 	fprintf(stderr, "\t%s -i iface -d max data length\n", p);
 	fprintf(stderr, "\t%s -i iface -r RTS threshold\n", p);
-	fprintf(stderr, "\t%s -i iface -f frequenct\n", p);
-	fprintf(stderr, "\t%s -i iface -P power mgmt\n", p);
+	fprintf(stderr, "\t%s -i iface -f frequency\n", p);
+	fprintf(stderr, "\t%s -i iface -P 0|1t\n", p);
 	fprintf(stderr, "\t%s -i iface -S max sleep duration\n", p);
 
 	exit(1);