forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-13 9d77db3c730780c8ef5ccd4b66403ff5675cfe4e
kernel/drivers/net/wireless/ath/wcn36xx/wcn36xx.h
....@@ -83,7 +83,11 @@
8383 WCN36XX_AMPDU_OPERATIONAL,
8484 };
8585
86
-#define WCN36XX_HW_CHANNEL(__wcn) (__wcn->hw->conf.chandef.chan->hw_value)
86
+#define HW_VALUE_PHY_SHIFT 8
87
+#define HW_VALUE_PHY(hw_value) ((hw_value) >> HW_VALUE_PHY_SHIFT)
88
+#define HW_VALUE_CHANNEL(hw_value) ((hw_value) & 0xFF)
89
+#define WCN36XX_HW_CHANNEL(__wcn)\
90
+ HW_VALUE_CHANNEL(__wcn->hw->conf.chandef.chan->hw_value)
8791 #define WCN36XX_BAND(__wcn) (__wcn->hw->conf.chandef.chan->band)
8892 #define WCN36XX_CENTER_FREQ(__wcn) (__wcn->hw->conf.chandef.chan->center_freq)
8993 #define WCN36XX_LISTEN_INTERVAL(__wcn) (__wcn->hw->conf.listen_interval)
....@@ -92,6 +96,8 @@
9296
9397 #define RF_UNKNOWN 0x0000
9498 #define RF_IRIS_WCN3620 0x3620
99
+#define RF_IRIS_WCN3660 0x3660
100
+#define RF_IRIS_WCN3680 0x3680
95101
96102 static inline void buff_to_be(u32 *buf, size_t len)
97103 {
....@@ -167,7 +173,7 @@
167173 u8 bss_dpu_desc_index;
168174 bool is_data_encrypted;
169175 /* Rates */
170
- struct wcn36xx_hal_supported_rates supported_rates;
176
+ struct wcn36xx_hal_supported_rates_v1 supported_rates;
171177
172178 spinlock_t ampdu_lock; /* protects next two fields */
173179 enum wcn36xx_ampdu_state ampdu_state[16];
....@@ -223,10 +229,12 @@
223229 spinlock_t hal_ind_lock;
224230 struct list_head hal_ind_queue;
225231
226
- struct work_struct scan_work;
227232 struct cfg80211_scan_request *scan_req;
228
- int scan_freq;
229
- int scan_band;
233
+ bool sw_scan;
234
+ u8 sw_scan_opchannel;
235
+ bool sw_scan_init;
236
+ u8 sw_scan_channel;
237
+ struct ieee80211_vif *sw_scan_vif;
230238 struct mutex scan_lock;
231239 bool scan_aborted;
232240
....@@ -245,6 +253,7 @@
245253 struct wcn36xx_dxe_mem_pool data_mem_pool;
246254
247255 struct sk_buff *tx_ack_skb;
256
+ struct timer_list tx_ack_timer;
248257
249258 /* RF module */
250259 unsigned rf_id;
....@@ -268,6 +277,7 @@
268277 wcn->fw_revision == revision);
269278 }
270279 void wcn36xx_set_default_rates(struct wcn36xx_hal_supported_rates *rates);
280
+void wcn36xx_set_default_rates_v1(struct wcn36xx_hal_supported_rates_v1 *rates);
271281
272282 static inline
273283 struct ieee80211_sta *wcn36xx_priv_to_sta(struct wcn36xx_sta *sta_priv)