Upgrade rt2x00 to a more recent snapshot, master mode now working, thanks to Daniel...

[openwrt.git] / package / rt2x00 / src / rt61pci.h

diff --git a/package/rt2x00/src/rt61pci.h b/package/rt2x00/src/rt61pci.h
index 6834732..9dfd293 100644 (file)
--- a/package/rt2x00/src/rt61pci.h
+++ b/package/rt2x00/src/rt61pci.h
@@ -36,10 +36,11 @@
 #define RF2529                         0x0004
 
 /*
- * Max RSSI value, required for RSSI <-> dBm conversion.
+ * Signal information.
  */
-#define MAX_RX_SSI                     120
+#define MAX_RX_SSI                     -1
 #define MAX_RX_NOISE                   -110
+#define DEFAULT_RSSI_OFFSET            120
 
 /*
  * Register layout information.
@@ -1102,6 +1103,20 @@ struct hw_pairwise_ta_entry {
 #define EEPROM_TXPOWER_A_1             FIELD16(0x00ff)
 #define EEPROM_TXPOWER_A_2             FIELD16(0xff00)
 
+/*
+ * EEPROM RSSI offset 802.11BG
+ */
+#define EEPROM_RSSI_OFFSET_BG          0x004d
+#define EEPROM_RSSI_OFFSET_BG_1                FIELD16(0x00ff)
+#define EEPROM_RSSI_OFFSET_BG_2                FIELD16(0xff00)
+
+/*
+ * EEPROM RSSI offset 802.11A
+ */
+#define EEPROM_RSSI_OFFSET_A           0x004e
+#define EEPROM_RSSI_OFFSET_A_1         FIELD16(0x00ff)
+#define EEPROM_RSSI_OFFSET_A_2         FIELD16(0xff00)
+
 /*
  * BBP content.
  * The wordsize of the BBP is 8 bits.
@@ -1285,10 +1300,10 @@ struct hw_pairwise_ta_entry {
 /*
  * Word1
  * SIGNAL: RX raw data rate reported by BBP.
- * RSSI: RSSI reported by BBP.
  */
 #define RXD_W1_SIGNAL                  FIELD32(0x000000ff)
-#define RXD_W1_RSSI                    FIELD32(0x0000ff00)
+#define RXD_W1_RSSI_AGC                        FIELD32(0x00001f00)
+#define RXD_W1_RSSI_LNA                        FIELD32(0x00006000)
 #define RXD_W1_FRAME_OFFSET            FIELD32(0x7f000000)
 
 /*