Bladeren bron

fw-api: CL 7132419 - update fw common interface files

Change-Id: I24de5e3e14dd59a837f19f6bef64a6c3a15b96d8
WMI: change channel metric size+units in WMI_CHAN_RF_CHARACTERIZATION_INFO
CRs-Fixed: 2262693
spuligil 5 jaren geleden
bovenliggende
commit
141b5440f3
2 gewijzigde bestanden met toevoegingen van 13 en 13 verwijderingen
  1. 12 12
      fw/wmi_unified.h
  2. 1 1
      fw/wmi_version.h

+ 12 - 12
fw/wmi_unified.h

@@ -24880,8 +24880,8 @@ typedef struct {
     A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUCT_ wmi_chan_rf_characterization_info */
 
     /**
-     * [3:0]  : channel metric -  0 = unusable, 1 = worst, 10 = best
-     * [4:7]  : channel BW -
+     * [7:0]  : channel metric -  0 = unusable, 1 = worst, 100 = best
+     * [11:8] : channel BW -
      *          0 = 20MHz
      *          1 = 40MHz
      *          2 = 80MHz
@@ -24890,37 +24890,37 @@ typedef struct {
      *          11 = 5MHz
      *          12 = 10MHz
      *          (13-15 unused)
-     * [15:8 ]: Reserved
+     * [15:12]: Reserved
      * [31:16]: Frequency - Center frequency of the channel for which
      *          the RF characterisation info applies (MHz)
      */
     A_UINT32 freq_info;
 } WMI_CHAN_RF_CHARACTERIZATION_INFO;
 
-#define WMI_CHAN_RF_CHARACTERIZATION_FREQ_INFO_CHAN_METRIC   0x0000000f
+#define WMI_CHAN_RF_CHARACTERIZATION_FREQ_INFO_CHAN_METRIC   0x000000ff
 #define WMI_CHAN_RF_CHARACTERIZATION_FREQ_INFO_CHAN_METRIC_S 0
-#define WMI_CHAN_RF_CHARACTERIZATION_FREQ_INFO_BW            0x000000f0
-#define WMI_CHAN_RF_CHARACTERIZATION_FREQ_INFO_BW_S          4
+#define WMI_CHAN_RF_CHARACTERIZATION_FREQ_INFO_BW            0x00000f00
+#define WMI_CHAN_RF_CHARACTERIZATION_FREQ_INFO_BW_S          8
 #define WMI_CHAN_RF_CHARACTERIZATION_FREQ_INFO_FREQ          0xffff0000
 #define WMI_CHAN_RF_CHARACTERIZATION_FREQ_INFO_FREQ_S        16
 
 #define WMI_CHAN_RF_CHARACTERIZATION_CHAN_METRIC_SET(dword,val) \
-            WMI_F_RMW((dword)->freq_info,(val) & 0xff,          \
+            WMI_F_RMW((dword)->freq_info,(val), \
             WMI_CHAN_RF_CHARACTERIZATION_FREQ_INFO_CHAN_METRIC)
-#define WMI_CHAN_RF_CHARACTERIZATION_CHAN_METRIC_GET(dword)     \
+#define WMI_CHAN_RF_CHARACTERIZATION_CHAN_METRIC_GET(dword) \
             WMI_F_MS((dword)->freq_info,WMI_CHAN_RF_CHARACTERIZATION_FREQ_INFO_CHAN_METRIC)
 
 #define WMI_CHAN_RF_CHARACTERIZATION_BW_SET(dword, val) \
-            WMI_F_RMW((dword)->freq_info,(val) & 0xf0, \
+            WMI_F_RMW((dword)->freq_info,(val), \
             WMI_CHAN_RF_CHARACTERIZATION_FREQ_INFO_BW)
-#define WMI_CHAN_RF_CHARACTERIZATION_BW_GET(dword)      \
+#define WMI_CHAN_RF_CHARACTERIZATION_BW_GET(dword) \
             WMI_F_MS((dword)->freq_info,WMI_CHAN_RF_CHARACTERIZATION_FREQ_INFO_BW)
 
 #define WMI_CHAN_RF_CHARACTERIZATION_FREQ_SET(dword, val) \
-            WMI_F_RMW((dword)->freq_info,(val) & 0xffff, \
+            WMI_F_RMW((dword)->freq_info,(val), \
             WMI_CHAN_RF_CHARACTERIZATION_FREQ_INFO_FREQ)
 
-#define WMI_CHAN_RF_CHARACTERIZATION_FREQ_GET(dword)      \
+#define WMI_CHAN_RF_CHARACTERIZATION_FREQ_GET(dword) \
             WMI_F_MS((dword)->freq_info,WMI_CHAN_RF_CHARACTERIZATION_FREQ_INFO_FREQ)
 
 

+ 1 - 1
fw/wmi_version.h

@@ -36,7 +36,7 @@
 #define __WMI_VER_MINOR_    0
 /** WMI revision number has to be incremented when there is a
  *  change that may or may not break compatibility. */
-#define __WMI_REVISION_ 663
+#define __WMI_REVISION_ 664
 
 /** The Version Namespace should not be normally changed. Only
  *  host and firmware of the same WMI namespace will work