iwn: Sync the iwn(4) "enhanced Tx power" eeprom data structure with L…

…inux. openbsd/src@1f94d8c
OpenIntelWireless · Mar 16, 2024 · fa34242 · fa34242
1 parent 44a6708
commit fa34242
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/itlwm/hal_iwn/ItlIwn.cpp b/itlwm/hal_iwn/ItlIwn.cpp
@@ -1755,7 +1755,7 @@ iwn_read_eeprom_enhinfo(struct iwn_softc *sc)
 
     memset(sc->enh_maxpwr, 0, sizeof sc->enh_maxpwr);
     for (i = 0; i < nitems(enhinfo); i++) {
-        if (enhinfo[i].chan == 0 || enhinfo[i].reserved != 0)
+        if ((enhinfo[i].flags & IWN_TXP_VALID) == 0)
             continue;    /* Skip invalid entries. */
 
         maxpwr = 0;

diff --git a/itlwm/hal_iwn/if_iwnreg.h b/itlwm/hal_iwn/if_iwnreg.h
@@ -1727,9 +1727,18 @@ struct iwn_eeprom_chan {
 } __packed;
 
 struct iwn_eeprom_enhinfo {
-    uint16_t    chan;
+    uint8_t        flags;
+#define IWN_TXP_VALID        (1 << 0)
+#define IWN_TXP_BAND_52G    (1 << 1)
+#define IWN_TXP_OFDM        (1 << 2)
+#define IWN_TXP_40MHZ        (1 << 3)
+#define IWN_TXP_HT_AP        (1 << 4)
+#define IWN_TXP_RES1        (1 << 5)
+#define IWN_TXP_RES2        (1 << 6)
+#define IWN_TXP_COMMON_TYPE    (1 << 7)
+    uint8_t        chan;
     int8_t        chain[3];    /* max power in half-dBm */
-    uint8_t        reserved;
+    uint8_t        delta_20_in_40;
     int8_t        mimo2;        /* max power in half-dBm */
     int8_t        mimo3;        /* max power in half-dBm */
 } __packed;