forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-13 9d77db3c730780c8ef5ccd4b66403ff5675cfe4e
kernel/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_config.h
old mode 100644new mode 100755
....@@ -187,10 +187,9 @@
187187 CONN_STATE_4WAY_M2 = 19,
188188 CONN_STATE_4WAY_M3 = 20,
189189 CONN_STATE_4WAY_M4 = 21,
190
- CONN_STATE_ADD_KEY = 22,
191
- CONN_STATE_CONNECTED = 23,
192
- CONN_STATE_GROUPKEY_M1 = 24,
193
- CONN_STATE_GROUPKEY_M2 = 25,
190
+ CONN_STATE_CONNECTED = 22,
191
+ CONN_STATE_GROUPKEY_M1 = 23,
192
+ CONN_STATE_GROUPKEY_M2 = 24,
194193 };
195194
196195 enum enq_pkt_type {
....@@ -219,7 +218,6 @@
219218 #endif
220219 wl_chip_nv_path_list_ctrl_t nv_by_chip;
221220 country_list_t *country_head;
222
- int ioctl_ver;
223221 int band;
224222 int bw_cap[2];
225223 wl_country_t cspec;
....@@ -299,8 +297,6 @@
299297 int d2h_intr_method;
300298 int d2h_intr_control;
301299 int enq_hdr_pkt;
302
- int aspm;
303
- int l1ss;
304300 #endif
305301 int dpc_cpucore;
306302 int rxf_cpucore;
....@@ -349,9 +345,6 @@
349345 uint war;
350346 #ifdef WL_EXT_WOWL
351347 uint wowl;
352
-#ifdef BCMDBUS
353
- uint wowl_dngldown;
354
-#endif
355348 #endif
356349 #ifdef GET_CUSTOM_MAC_FROM_CONFIG
357350 char hw_ether[62];
....@@ -407,20 +400,17 @@
407400 int dhd_conf_get_otp(dhd_pub_t *dhd, si_t *sih);
408401 bool dhd_conf_legacy_msi_chip(dhd_pub_t *dhd);
409402 #endif
410
-#ifdef WL_CFG80211
411
-bool dhd_conf_legacy_chip_check(dhd_pub_t *dhd);
412
-bool dhd_conf_new_chip_check(dhd_pub_t *dhd);
413
-bool dhd_conf_extsae_chip(dhd_pub_t *dhd);
414
-#endif
415403 void dhd_conf_set_path_params(dhd_pub_t *dhd, char *fw_path, char *nv_path);
416404 int dhd_conf_set_intiovar(dhd_pub_t *dhd, int ifidx, uint cmd, char *name,
417405 int val, int def, bool down);
418406 int dhd_conf_get_band(dhd_pub_t *dhd);
419
-int dhd_conf_country(dhd_pub_t *dhd, char *cmd, char *buf);
407
+int dhd_conf_set_country(dhd_pub_t *dhd, wl_country_t *cspec);
420408 int dhd_conf_get_country(dhd_pub_t *dhd, wl_country_t *cspec);
409
+int dhd_conf_map_country_list(dhd_pub_t *dhd, wl_country_t *cspec);
421410 #ifdef CCODE_LIST
422411 int dhd_ccode_map_country_list(dhd_pub_t *dhd, wl_country_t *cspec);
423412 #endif
413
+int dhd_conf_fix_country(dhd_pub_t *dhd);
424414 bool dhd_conf_match_channel(dhd_pub_t *dhd, uint32 channel);
425415 void dhd_conf_set_wme(dhd_pub_t *dhd, int ifidx, int mode);
426416 void dhd_conf_set_mchan_bw(dhd_pub_t *dhd, int go, int source);
....@@ -432,7 +422,6 @@
432422 uint dhd_conf_get_chip(void *context);
433423 uint dhd_conf_get_chiprev(void *context);
434424 int dhd_conf_get_pm(dhd_pub_t *dhd);
435
-int dhd_conf_reg2args(dhd_pub_t *dhd, char *cmd, bool set, uint32 index, uint32 *val);
436425 int dhd_conf_check_hostsleep(dhd_pub_t *dhd, int cmd, void *buf, int len,
437426 int *hostsleep_set, int *hostsleep_val, int *ret);
438427 void dhd_conf_get_hostsleep(dhd_pub_t *dhd,
....@@ -451,9 +440,6 @@
451440 uint dhd_conf_get_insuspend(dhd_pub_t *dhd, uint mask);
452441 int dhd_conf_set_suspend_resume(dhd_pub_t *dhd, int suspend);
453442 void dhd_conf_postinit_ioctls(dhd_pub_t *dhd);
454
-#ifdef WL_STATIC_IF
455
-void dhd_conf_preinit_ioctls_sta(dhd_pub_t *dhd, int ifidx);
456
-#endif /* WL_STATIC_IF */
457443 int dhd_conf_preinit(dhd_pub_t *dhd);
458444 int dhd_conf_reset(dhd_pub_t *dhd);
459445 int dhd_conf_attach(dhd_pub_t *dhd);
....@@ -463,10 +449,7 @@
463449 int dhd_conf_suspend_resume_sta(dhd_pub_t *dhd, int ifidx, int suspend);
464450 /* Add to adjust 802.1x priority */
465451 extern void pktset8021xprio(void *pkt, int prio);
466
-#if defined(BCMSDIO) || defined(BCMPCIE) || defined(BCMDBUS)
452
+#ifdef BCMSDIO
467453 extern int dhd_bus_sleep(dhd_pub_t *dhdp, bool sleep, uint32 *intstatus);
468
-#endif
469
-#ifdef WL_EXT_WOWL
470
-int dhd_conf_wowl_dngldown(dhd_pub_t *dhd);
471454 #endif
472455 #endif /* _dhd_config_ */