From 922e111715000f752f794f37432932863a5bde7f Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 1 Apr 2002 18:28:20 +0000
Subject: [PATCH] Merge a little from NetBSD.  This changes reduces the diffs
 between the two a little, but more commits like this will follow.

---
 sys/dev/wi/if_wavelan_ieee.h | 22 +++++++---------------
 sys/dev/wi/if_wireg.h        | 17 +++++++----------
 2 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/sys/dev/wi/if_wavelan_ieee.h b/sys/dev/wi/if_wavelan_ieee.h
index 9695bfd26642..ac3bb2564656 100644
--- a/sys/dev/wi/if_wavelan_ieee.h
+++ b/sys/dev/wi/if_wavelan_ieee.h
@@ -171,20 +171,6 @@ struct wi_counters {
 };
 #endif
 
-/*
- * These are all the LTV record types that we can read or write
- * from the WaveLAN. Not all of them are temendously useful, but I
- * list as many as I know about here for completeness.
- */
-
-#define WI_RID_DNLD_BUF		0xFD01
-#define WI_RID_MEMSZ		0xFD02
-#define WI_RID_DOMAINS		0xFD11
-#define WI_RID_CIS		0xFD13
-#define WI_RID_COMMQUAL		0xFD43
-#define WI_RID_SCALETHRESH	0xFD46
-#define WI_RID_PCF		0xFD87
-
 /*
  * Network parameters, static configuration entities.
  */
@@ -264,7 +250,9 @@ struct wi_ltv_keys {
 /*
  * NIC information
  */
-#define WI_RID_FIRM_ID		0xFD02 /* Primary func firmware ID. */
+#define WI_RID_DNLD_BUF		0xFD01
+#define WI_RID_MEMSZ		0xFD02 /* memory size info (XXX Lucent) */
+#define	WI_RID_PRI_IDENTITY	0xFD02 /* primary funcs firmware ident (PRISM2) */
 #define WI_RID_PRI_SUP_RANGE	0xFD03 /* primary supplier compatibility */
 #define WI_RID_CIF_ACT_RANGE	0xFD04 /* controller sup. compatibility */
 #define WI_RID_SERIALNO		0xFD0A /* card serial number */
@@ -278,7 +266,11 @@ struct wi_ltv_keys {
 #define WI_RID_STA_IDENTITY	0xFD20 /* station funcs firmware ident */
 #define WI_RID_STA_SUP_RANGE	0xFD21 /* station supplier compat */
 #define WI_RID_MFI_ACT_RANGE	0xFD22
+#define WI_RID_SYMBOL_IDENTITY	0xFD24
 #define WI_RID_CFI_ACT_RANGE	0xFD33
+#define WI_RID_COMMQUAL		0xFD43
+#define WI_RID_SCALETHRESH	0xFD46
+#define WI_RID_PCF		0xFD87
 
 /*
  * MAC information
diff --git a/sys/dev/wi/if_wireg.h b/sys/dev/wi/if_wireg.h
index 75e7481f898f..50dfe84a8506 100644
--- a/sys/dev/wi/if_wireg.h
+++ b/sys/dev/wi/if_wireg.h
@@ -561,10 +561,8 @@ struct wi_ltv_commqual {
 };
 
 /*
- * Actual system scale thresholds (0xFD46).
+ * Actual system scale thresholds (0xFC06, 0xFD46).
  */
-#define WI_RID_SYSTEM_SCALE	0xFC06
-#define WI_RID_SCALETHRESH	0xFD46
 struct wi_ltv_scalethresh {
 	u_int16_t		wi_len;
 	u_int16_t		wi_type;
@@ -579,7 +577,6 @@ struct wi_ltv_scalethresh {
 /*
  * PCF info struct (0xFD87).
  */
-#define WI_RID_PCF		0xFD87
 struct wi_ltv_pcf {
 	u_int16_t		wi_len;
 	u_int16_t		wi_type;
@@ -591,21 +588,21 @@ struct wi_ltv_pcf {
 };
 
 /*
- * Connection control characteristics.
+ * Connection control characteristics. (0xFC00)
+ * 0 == IBSS (802.11 compliant mode) (Only PRISM2)
  * 1 == Basic Service Set (BSS)
  * 2 == Wireless Distribudion System (WDS)
- * 3 == Pseudo IBSS
+ * 3 == Pseudo IBSS 
+ *	(Only PRISM2; not 802.11 compliant mode, testing use only)
+ * 6 == HOST AP (Only PRISM2)
  */
-#define WI_RID_PORTTYPE		0xFC00
 #define WI_PORTTYPE_BSS		0x1
 #define WI_PORTTYPE_WDS		0x2
 #define WI_PORTTYPE_ADHOC	0x3
 
 /*
- * Mac addresses.
+ * Mac addresses. (0xFC01, 0xFC08)
  */
-#define WI_RID_MAC_NODE		0xFC01
-#define WI_RID_MAC_WDS		0xFC08
 struct wi_ltv_macaddr {
 	u_int16_t		wi_len;
 	u_int16_t		wi_type;