From 202d20077c97634c1406a51d3ebf2e74e8867df3 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Wed, 17 Dec 2014 17:13:53 -0600 Subject: [PATCH] rtl8192eu: Replace typedefs for struct adapter Signed-off-by: Larry Finger --- core/rtw_ap.c | 80 +- core/rtw_br_ext.c | 58 +- core/rtw_cmd.c | 136 +-- core/rtw_debug.c | 92 +- core/rtw_efuse.c | 88 +- core/rtw_io.c | 50 +- core/rtw_ioctl_set.c | 44 +- core/rtw_iol.c | 14 +- core/rtw_led.c | 40 +- core/rtw_mlme.c | 144 +-- core/rtw_mlme_ext.c | 310 +++--- core/rtw_odm.c | 18 +- core/rtw_p2p.c | 128 +-- core/rtw_pwrctrl.c | 96 +- core/rtw_recv.c | 114 +-- core/rtw_security.c | 22 +- core/rtw_sreset.c | 24 +- core/rtw_sta_mgt.c | 10 +- core/rtw_wlan_util.c | 152 +-- core/rtw_xmit.c | 84 +- hal/HalPhyRf.c | 32 +- hal/HalPhyRf_8188e.c | 60 +- hal/HalPhyRf_8188e.h | 18 +- hal/HalPwrSeqCmd.c | 2 +- hal/hal_com.c | 22 +- hal/hal_intf.c | 120 +-- hal/odm.c | 218 ++-- hal/odm.h | 28 +- hal/odm_RTL8188E.c | 18 +- hal/odm_interface.c | 58 +- hal/rtl8188e_cmd.c | 46 +- hal/rtl8188e_dm.c | 30 +- hal/rtl8188e_hal_init.c | 176 ++-- hal/rtl8188e_phycfg.c | 148 +-- hal/rtl8188e_rf6052.c | 48 +- hal/rtl8188e_rxdesc.c | 10 +- hal/rtl8188e_sreset.c | 4 +- hal/rtl8188e_xmit.c | 6 +- hal/rtl8188eu_led.c | 8 +- hal/rtl8188eu_recv.c | 6 +- hal/rtl8188eu_xmit.c | 32 +- hal/usb_halinit.c | 204 ++-- hal/usb_ops_linux.c | 32 +- include/Hal8188EPhyCfg.h | 64 +- include/Hal8192CPhyCfg.h | 60 +- include/Hal8192DPhyCfg.h | 76 +- include/Hal8723APhyCfg.h | 6 +- include/HalPwrSeqCmd.h | 2 +- include/drv_types.h | 28 +- include/gspi_hal.h | 4 +- include/gspi_ops.h | 24 +- include/gspi_osintf.h | 6 +- include/h2clbk.h | 6 +- include/hal_com.h | 16 +- include/hal_intf.h | 284 +++--- include/ioctl_cfg80211.h | 34 +- include/mlme_osdep.h | 12 +- include/osdep_intf.h | 42 +- include/pci_hal.h | 2 +- include/pci_ops.h | 10 +- include/pci_osintf.h | 4 +- include/recv_osdep.h | 20 +- include/rtl8188e_cmd.h | 26 +- include/rtl8188e_dm.h | 16 +- include/rtl8188e_hal.h | 64 +- include/rtl8188e_led.h | 14 +- include/rtl8188e_recv.h | 20 +- include/rtl8188e_rf.h | 10 +- include/rtl8188e_sreset.h | 4 +- include/rtl8188e_xmit.h | 42 +- include/rtl8192c_cmd.h | 20 +- include/rtl8192c_dm.h | 12 +- include/rtl8192c_hal.h | 22 +- include/rtl8192c_led.h | 10 +- include/rtl8192c_recv.h | 10 +- include/rtl8192c_rf.h | 10 +- include/rtl8192c_sreset.h | 4 +- include/rtl8192c_xmit.h | 26 +- include/rtl8192d_cmd.h | 14 +- include/rtl8192d_dm.h | 8 +- include/rtl8192d_hal.h | 26 +- include/rtl8192d_led.h | 10 +- include/rtl8192d_recv.h | 10 +- include/rtl8192d_rf.h | 14 +- include/rtl8192d_xmit.h | 26 +- include/rtl8723a_bt-coexist.h | 1816 --------------------------------- include/rtl8723a_cmd.h | 229 ----- include/rtl8723a_dm.h | 194 ---- include/rtl8723a_hal.h | 849 --------------- include/rtl8723a_led.h | 50 - include/rtl8723a_pg.h | 146 --- include/rtl8723a_recv.h | 41 - include/rtl8723a_rf.h | 27 - include/rtl8723a_spec.h | 538 ---------- include/rtl8723a_sreset.h | 33 - include/rtl8723a_xmit.h | 238 ----- include/rtw_ap.h | 54 +- include/rtw_br_ext.h | 2 +- include/rtw_bt_mp.h | 8 +- include/rtw_cmd.h | 108 +- include/rtw_eeprom.h | 10 +- include/rtw_efuse.h | 38 +- include/rtw_event.h | 2 +- include/rtw_io.h | 116 +-- include/rtw_ioctl_set.h | 30 +- include/rtw_iol.h | 14 +- include/rtw_led.h | 8 +- include/rtw_mlme.h | 112 +- include/rtw_mlme_ext.h | 372 +++---- include/rtw_mp.h | 154 +-- include/rtw_mp_ioctl.h | 2 +- include/rtw_odm.h | 18 +- include/rtw_p2p.h | 26 +- include/rtw_pwrctrl.h | 60 +- include/rtw_recv.h | 12 +- include/rtw_security.h | 20 +- include/rtw_sreset.h | 14 +- include/rtw_tdls.h | 86 +- include/rtw_wapi.h | 40 +- include/rtw_xmit.h | 44 +- include/sdio_hal.h | 10 +- include/sdio_ops.h | 40 +- include/sdio_ops_ce.h | 55 - include/sdio_ops_xp.h | 55 - include/sdio_osintf.h | 12 +- include/sta_info.h | 14 +- include/usb_hal.h | 4 +- include/usb_ops.h | 4 +- include/usb_osintf.h | 4 +- include/xmit_osdep.h | 10 +- os_dep/ioctl_cfg80211.c | 96 +- os_dep/ioctl_linux.c | 330 +++--- os_dep/mlme_linux.c | 58 +- os_dep/os_intfs.c | 611 +---------- os_dep/osdep_service.c | 2 +- os_dep/recv_linux.c | 20 +- os_dep/rtw_android.c | 20 +- os_dep/usb_intf.c | 46 +- os_dep/usb_ops_linux.c | 12 +- os_dep/xmit_linux.c | 18 +- 140 files changed, 3132 insertions(+), 7948 deletions(-) delete mode 100755 include/rtl8723a_bt-coexist.h delete mode 100755 include/rtl8723a_cmd.h delete mode 100755 include/rtl8723a_dm.h delete mode 100755 include/rtl8723a_hal.h delete mode 100755 include/rtl8723a_led.h delete mode 100755 include/rtl8723a_pg.h delete mode 100755 include/rtl8723a_recv.h delete mode 100755 include/rtl8723a_rf.h delete mode 100755 include/rtl8723a_spec.h delete mode 100755 include/rtl8723a_sreset.h delete mode 100755 include/rtl8723a_xmit.h delete mode 100755 include/sdio_ops_ce.h delete mode 100755 include/sdio_ops_xp.h diff --git a/core/rtw_ap.c b/core/rtw_ap.c index 70df9b1..2f21480 100755 --- a/core/rtw_ap.c +++ b/core/rtw_ap.c @@ -33,7 +33,7 @@ extern unsigned char WPS_OUI[]; extern unsigned char P2P_OUI[]; extern unsigned char WFD_OUI[]; -void init_mlme_ap_info(_adapter *padapter) +void init_mlme_ap_info(struct adapter *padapter) { struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); @@ -51,7 +51,7 @@ void init_mlme_ap_info(_adapter *padapter) start_ap_mode(padapter); } -void free_mlme_ap_info(_adapter *padapter) +void free_mlme_ap_info(struct adapter *padapter) { _irqL irqL; struct sta_info *psta=NULL; @@ -81,7 +81,7 @@ void free_mlme_ap_info(_adapter *padapter) } -static void update_BCNTIM(_adapter *padapter) +static void update_BCNTIM(struct adapter *padapter) { struct sta_priv *pstapriv = &padapter->stapriv; struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); @@ -203,7 +203,7 @@ static void update_BCNTIM(_adapter *padapter) } -void rtw_add_bcn_ie(_adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index, u8 *data, u8 len) +void rtw_add_bcn_ie(struct adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index, u8 *data, u8 len) { PNDIS_802_11_VARIABLE_IEs pIE; u8 bmatch = _FALSE; @@ -273,7 +273,7 @@ void rtw_add_bcn_ie(_adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index, u8 *d pnetwork->IELength = offset + remainder_ielen; } -void rtw_remove_bcn_ie(_adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index) +void rtw_remove_bcn_ie(struct adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index) { u8 *p, *dst_ie, *premainder_ie=NULL, *pbackup_remainder_ie=NULL; uint offset, ielen, ie_offset, remainder_ielen = 0; @@ -351,7 +351,7 @@ u8 chk_sta_is_alive(struct sta_info *psta) return ret; } -void expire_timeout_chk(_adapter *padapter) +void expire_timeout_chk(struct adapter *padapter) { _irqL irqL; _list *phead, *plist; @@ -603,7 +603,7 @@ if (chk_alive_num) { associated_clients_update(padapter, updated); } -void add_RATid(_adapter *padapter, struct sta_info *psta, u8 rssi_level) +void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level) { int i; u8 rf_type; @@ -832,7 +832,7 @@ void add_RATid(_adapter *padapter, struct sta_info *psta, u8 rssi_level) } -void update_bmc_sta(_adapter *padapter) +void update_bmc_sta(struct adapter *padapter) { _irqL irqL; u32 init_rate=0; @@ -943,7 +943,7 @@ void update_bmc_sta(_adapter *padapter) //MAC_ID = 0 for bssid for sta/ap/adhoc //CAM_ID = //0~3 for default key, cmd_id=macid + 3, macid=aid+1; -void update_sta_info_apmode(_adapter *padapter, struct sta_info *psta) +void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta) { _irqL irqL; struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); @@ -1032,7 +1032,7 @@ void update_sta_info_apmode(_adapter *padapter, struct sta_info *psta) } -static void update_hw_ht_param(_adapter *padapter) +static void update_hw_ht_param(struct adapter *padapter) { unsigned char max_AMPDU_len; unsigned char min_MPDU_spacing; @@ -1078,7 +1078,7 @@ static void update_hw_ht_param(_adapter *padapter) } -static void start_bss_network(_adapter *padapter, u8 *pbuf) +static void start_bss_network(struct adapter *padapter, u8 *pbuf) { u8 *p; u8 val8, cur_channel, cur_bwmode, cur_ch_offset; @@ -1186,7 +1186,7 @@ static void start_bss_network(_adapter *padapter, u8 *pbuf) { if(rtw_buddy_adapter_up(padapter)) { - _adapter *pbuddy_adapter = padapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; //turn on all dynamic functions on PRIMARY_ADAPTER, dynamic functions only runs at PRIMARY_ADAPTER Switch_DM_Func(pbuddy_adapter, DYNAMIC_ALL_FUNC_ENABLE, _TRUE); @@ -1250,7 +1250,7 @@ static void start_bss_network(_adapter *padapter, u8 *pbuf) } else if(check_buddy_fwstate(padapter, _FW_LINKED)==_TRUE)//only second adapter can enter AP Mode { - _adapter *pbuddy_adapter = padapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; //To sync cur_channel/cur_bwmode/cur_ch_offset with primary adapter @@ -1374,7 +1374,7 @@ static void start_bss_network(_adapter *padapter, u8 *pbuf) } -int rtw_check_beacon_data(_adapter *padapter, u8 *pbuf, int len) +int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) { int ret=_SUCCESS; u8 *p; @@ -1783,7 +1783,7 @@ int rtw_check_beacon_data(_adapter *padapter, u8 *pbuf, int len) } -void rtw_set_macaddr_acl(_adapter *padapter, int mode) +void rtw_set_macaddr_acl(struct adapter *padapter, int mode) { struct sta_priv *pstapriv = &padapter->stapriv; struct wlan_acl_pool *pacl_list = &pstapriv->acl_list; @@ -1793,7 +1793,7 @@ void rtw_set_macaddr_acl(_adapter *padapter, int mode) pacl_list->mode = mode; } -int rtw_acl_add_sta(_adapter *padapter, u8 *addr) +int rtw_acl_add_sta(struct adapter *padapter, u8 *addr) { _irqL irqL; _list *plist, *phead; @@ -1867,7 +1867,7 @@ int rtw_acl_add_sta(_adapter *padapter, u8 *addr) return ret; } -int rtw_acl_remove_sta(_adapter *padapter, u8 *addr) +int rtw_acl_remove_sta(struct adapter *padapter, u8 *addr) { _irqL irqL; _list *plist, *phead; @@ -1912,13 +1912,13 @@ int rtw_acl_remove_sta(_adapter *padapter, u8 *addr) #ifdef CONFIG_NATIVEAP_MLME -static void update_bcn_fixed_ie(_adapter *padapter) +static void update_bcn_fixed_ie(struct adapter *padapter) { DBG_871X("%s\n", __FUNCTION__); } -static void update_bcn_erpinfo_ie(_adapter *padapter) +static void update_bcn_erpinfo_ie(struct adapter *padapter) { struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); @@ -1953,37 +1953,37 @@ static void update_bcn_erpinfo_ie(_adapter *padapter) } -static void update_bcn_htcap_ie(_adapter *padapter) +static void update_bcn_htcap_ie(struct adapter *padapter) { DBG_871X("%s\n", __FUNCTION__); } -static void update_bcn_htinfo_ie(_adapter *padapter) +static void update_bcn_htinfo_ie(struct adapter *padapter) { DBG_871X("%s\n", __FUNCTION__); } -static void update_bcn_rsn_ie(_adapter *padapter) +static void update_bcn_rsn_ie(struct adapter *padapter) { DBG_871X("%s\n", __FUNCTION__); } -static void update_bcn_wpa_ie(_adapter *padapter) +static void update_bcn_wpa_ie(struct adapter *padapter) { DBG_871X("%s\n", __FUNCTION__); } -static void update_bcn_wmm_ie(_adapter *padapter) +static void update_bcn_wmm_ie(struct adapter *padapter) { DBG_871X("%s\n", __FUNCTION__); } -static void update_bcn_wps_ie(_adapter *padapter) +static void update_bcn_wps_ie(struct adapter *padapter) { u8 *pwps_ie=NULL, *pwps_ie_src, *premainder_ie, *pbackup_remainder_ie=NULL; uint wps_ielen=0, wps_offset, remainder_ielen; @@ -2039,12 +2039,12 @@ static void update_bcn_wps_ie(_adapter *padapter) } -static void update_bcn_p2p_ie(_adapter *padapter) +static void update_bcn_p2p_ie(struct adapter *padapter) { } -static void update_bcn_vendor_spec_ie(_adapter *padapter, u8*oui) +static void update_bcn_vendor_spec_ie(struct adapter *padapter, u8*oui) { DBG_871X("%s\n", __FUNCTION__); @@ -2072,7 +2072,7 @@ static void update_bcn_vendor_spec_ie(_adapter *padapter, u8*oui) } -void update_beacon(_adapter *padapter, u8 ie_id, u8 *oui, u8 tx) +void update_beacon(struct adapter *padapter, u8 ie_id, u8 *oui, u8 tx) { _irqL irqL; struct mlme_priv *pmlmepriv; @@ -2175,7 +2175,7 @@ Set to 2 if only HT STAs are associated in BSS, Set to 3 (HT mixed mode) when one or more non-HT STAs are associated (currently non-GF HT station is considered as non-HT STA also) */ -static int rtw_ht_operation_update(_adapter *padapter) +static int rtw_ht_operation_update(struct adapter *padapter) { u16 cur_op_mode, new_op_mode; int op_mode_changes = 0; @@ -2248,7 +2248,7 @@ static int rtw_ht_operation_update(_adapter *padapter) #endif /* CONFIG_80211N_HT */ -void associated_clients_update(_adapter *padapter, u8 updated) +void associated_clients_update(struct adapter *padapter, u8 updated) { //update associcated stations cap. if(updated == _TRUE) @@ -2280,7 +2280,7 @@ void associated_clients_update(_adapter *padapter, u8 updated) } /* called > TSR LEVEL for USB or SDIO Interface*/ -void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta) +void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) { u8 beacon_updated = _FALSE; struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); @@ -2488,7 +2488,7 @@ void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta) } -u8 bss_cap_update_on_sta_leave(_adapter *padapter, struct sta_info *psta) +u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta) { u8 beacon_updated = _FALSE; struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); @@ -2563,7 +2563,7 @@ u8 bss_cap_update_on_sta_leave(_adapter *padapter, struct sta_info *psta) } -u8 ap_free_sta(_adapter *padapter, struct sta_info *psta, bool active, u16 reason) +u8 ap_free_sta(struct adapter *padapter, struct sta_info *psta, bool active, u16 reason) { _irqL irqL; u8 beacon_updated = _FALSE; @@ -2631,7 +2631,7 @@ u8 ap_free_sta(_adapter *padapter, struct sta_info *psta, bool active, u16 reaso } -int rtw_ap_inform_ch_switch(_adapter *padapter, u8 new_ch, u8 ch_offset) +int rtw_ap_inform_ch_switch(struct adapter *padapter, u8 new_ch, u8 ch_offset) { _irqL irqL; _list *phead, *plist; @@ -2668,7 +2668,7 @@ int rtw_ap_inform_ch_switch(_adapter *padapter, u8 new_ch, u8 ch_offset) return ret; } -int rtw_sta_flush(_adapter *padapter) +int rtw_sta_flush(struct adapter *padapter) { _irqL irqL; _list *phead, *plist; @@ -2725,7 +2725,7 @@ int rtw_sta_flush(_adapter *padapter) } /* called > TSR LEVEL for USB or SDIO Interface*/ -void sta_info_update(_adapter *padapter, struct sta_info *psta) +void sta_info_update(struct adapter *padapter, struct sta_info *psta) { int flags = psta->flags; struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); @@ -2764,7 +2764,7 @@ void sta_info_update(_adapter *padapter, struct sta_info *psta) } /* called >= TSR LEVEL for USB or SDIO Interface*/ -void ap_sta_info_defer_update(_adapter *padapter, struct sta_info *psta) +void ap_sta_info_defer_update(struct adapter *padapter, struct sta_info *psta) { if(psta->state & _FW_LINKED) { @@ -2773,7 +2773,7 @@ void ap_sta_info_defer_update(_adapter *padapter, struct sta_info *psta) } } /* restore hw setting from sw data structures */ -void rtw_ap_restore_network(_adapter *padapter) +void rtw_ap_restore_network(struct adapter *padapter) { struct mlme_priv *mlmepriv = &padapter->mlmepriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; @@ -2840,7 +2840,7 @@ void rtw_ap_restore_network(_adapter *padapter) } -void start_ap_mode(_adapter *padapter) +void start_ap_mode(struct adapter *padapter) { int i; struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); @@ -2896,7 +2896,7 @@ void start_ap_mode(_adapter *padapter) } -void stop_ap_mode(_adapter *padapter) +void stop_ap_mode(struct adapter *padapter) { _irqL irqL; _list *phead, *plist; diff --git a/core/rtw_br_ext.c b/core/rtw_br_ext.c index 44ff827..af3fa8a 100755 --- a/core/rtw_br_ext.c +++ b/core/rtw_br_ext.c @@ -142,7 +142,7 @@ static int skb_pull_and_merge(struct sk_buff *skb, unsigned char *src, int len) return 0; } -static __inline__ unsigned long __nat25_timeout(_adapter *priv) +static __inline__ unsigned long __nat25_timeout(struct adapter *priv) { unsigned long timeout; @@ -152,7 +152,7 @@ static __inline__ unsigned long __nat25_timeout(_adapter *priv) } -static __inline__ int __nat25_has_expired(_adapter *priv, +static __inline__ int __nat25_has_expired(struct adapter *priv, struct nat25_network_db_entry *fdb) { if(time_before_eq(fdb->ageing_timer, __nat25_timeout(priv))) @@ -389,7 +389,7 @@ static __inline__ int __nat25_network_hash(unsigned char *networkAddr) } -static __inline__ void __network_hash_link(_adapter *priv, +static __inline__ void __network_hash_link(struct adapter *priv, struct nat25_network_db_entry *ent, int hash) { // Caller must _enter_critical_bh already! @@ -422,7 +422,7 @@ static __inline__ void __network_hash_unlink(struct nat25_network_db_entry *ent) } -static int __nat25_db_network_lookup_and_replace(_adapter *priv, +static int __nat25_db_network_lookup_and_replace(struct adapter *priv, struct sk_buff *skb, unsigned char *networkAddr) { struct nat25_network_db_entry *db; @@ -499,7 +499,7 @@ static int __nat25_db_network_lookup_and_replace(_adapter *priv, } -static void __nat25_db_network_insert(_adapter *priv, +static void __nat25_db_network_insert(struct adapter *priv, unsigned char *macAddr, unsigned char *networkAddr) { struct nat25_network_db_entry *db; @@ -539,7 +539,7 @@ static void __nat25_db_network_insert(_adapter *priv, } -static void __nat25_db_print(_adapter *priv) +static void __nat25_db_print(struct adapter *priv) { _irqL irqL; _enter_critical_bh(&priv->br_ext_lock, &irqL); @@ -628,7 +628,7 @@ static void __nat25_db_print(_adapter *priv) * NAT2.5 interface */ -void nat25_db_cleanup(_adapter *priv) +void nat25_db_cleanup(struct adapter *priv) { int i; _irqL irqL; @@ -659,7 +659,7 @@ void nat25_db_cleanup(_adapter *priv) } -void nat25_db_expire(_adapter *priv) +void nat25_db_expire(struct adapter *priv) { int i; _irqL irqL; @@ -753,7 +753,7 @@ void nat25_db_expire(_adapter *priv) #ifdef SUPPORT_TX_MCAST2UNI -static int checkIPMcAndReplace(_adapter *priv, struct sk_buff *skb, unsigned int *dst_ip) +static int checkIPMcAndReplace(struct adapter *priv, struct sk_buff *skb, unsigned int *dst_ip) { struct stat_info *pstat; struct list_head *phead, *plist; @@ -780,7 +780,7 @@ static int checkIPMcAndReplace(_adapter *priv, struct sk_buff *skb, unsigned int } #endif -int nat25_db_handle(_adapter *priv, struct sk_buff *skb, int method) +int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method) { unsigned short protocol; unsigned char networkAddr[MAX_NETWORK_ADDR_LEN]; @@ -1484,7 +1484,7 @@ int nat25_db_handle(_adapter *priv, struct sk_buff *skb, int method) } -int nat25_handle_frame(_adapter *priv, struct sk_buff *skb) +int nat25_handle_frame(struct adapter *priv, struct sk_buff *skb) { #ifdef BR_EXT_DEBUG if((!priv->ethBrExtInfo.nat25_disable) && (!(skb->data[0] & 1))) @@ -1567,38 +1567,6 @@ int nat25_handle_frame(_adapter *priv, struct sk_buff *skb) return 0; } -#if 0 -void mac_clone(_adapter *priv, unsigned char *addr) -{ - struct sockaddr sa; - - memcpy(sa.sa_data, addr, ETH_ALEN); - DEBUG_INFO("MAC Clone: Addr=%02x%02x%02x%02x%02x%02x\n", - addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]); - rtl8192cd_set_hwaddr(priv->dev, &sa); -} - - -int mac_clone_handle_frame(_adapter *priv, struct sk_buff *skb) -{ - if(priv->ethBrExtInfo.macclone_enable && !priv->macclone_completed) - { - if(!(skb->data[ETH_ALEN] & 1)) //// check any other particular MAC add - { - if(memcmp(skb->data+ETH_ALEN, GET_MY_HWADDR(priv), ETH_ALEN) && - ((priv->dev->br_port) && - memcmp(skb->data+ETH_ALEN, priv->br_mac, ETH_ALEN))) - { - mac_clone(priv, skb->data+ETH_ALEN); - priv->macclone_completed = 1; - } - } - } - - return 0; -} -#endif // 0 - #define SERVER_PORT 67 #define CLIENT_PORT 68 #define DHCP_MAGIC 0x63825363 @@ -1623,7 +1591,7 @@ struct dhcpMessage { u_int8_t options[308]; /* 312 - cookie */ }; -void dhcp_flag_bcast(_adapter *priv, struct sk_buff *skb) +void dhcp_flag_bcast(struct adapter *priv, struct sk_buff *skb) { if(skb == NULL) return; @@ -1670,7 +1638,7 @@ void dhcp_flag_bcast(_adapter *priv, struct sk_buff *skb) } -void *scdb_findEntry(_adapter *priv, unsigned char *macAddr, +void *scdb_findEntry(struct adapter *priv, unsigned char *macAddr, unsigned char *ipAddr) { unsigned char networkAddr[MAX_NETWORK_ADDR_LEN]; diff --git a/core/rtw_cmd.c b/core/rtw_cmd.c index 7cb3a20..06fe82d 100755 --- a/core/rtw_cmd.c +++ b/core/rtw_cmd.c @@ -349,7 +349,7 @@ int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj) u32 rtw_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj) { int res = _FAIL; - PADAPTER padapter = pcmdpriv->padapter; + struct adapter *padapter = pcmdpriv->padapter; _func_enter_; @@ -428,7 +428,7 @@ _func_exit_; } -void rtw_stop_cmd_thread(_adapter *adapter) +void rtw_stop_cmd_thread(struct adapter *adapter) { if(adapter->cmdThread && adapter->cmdpriv.cmdthd_running == _TRUE && adapter->cmdpriv.stop_req == 0) @@ -444,9 +444,9 @@ thread_return rtw_cmd_thread(thread_context context) u8 ret; struct cmd_obj *pcmd; u8 *pcmdbuf, *prspbuf; - u8 (*cmd_hdl)(_adapter *padapter, u8* pbuf); - void (*pcmd_callback)(_adapter *dev, struct cmd_obj *pcmd); - PADAPTER padapter = (PADAPTER)context; + u8 (*cmd_hdl)(struct adapter *padapter, u8* pbuf); + void (*pcmd_callback)(struct adapter *dev, struct cmd_obj *pcmd); + struct adapter *padapter = (struct adapter *)context; struct cmd_priv *pcmdpriv = &(padapter->cmdpriv); _func_enter_; @@ -677,7 +677,7 @@ _func_exit_; /* u8 rtw_setstandby_cmd(unsigned char *adapter) */ -u8 rtw_setstandby_cmd(_adapter *padapter, uint action) +u8 rtw_setstandby_cmd(struct adapter *padapter, uint action) { struct cmd_obj* ph2c; struct usb_suspend_parm* psetusbsuspend; @@ -718,7 +718,7 @@ rtw_sitesurvey_cmd(~) ### NOTE:#### (!!!!) MUST TAKE CARE THAT BEFORE CALLING THIS FUNC, YOU SHOULD HAVE LOCKED pmlmepriv->lock */ -u8 rtw_sitesurvey_cmd(_adapter *padapter, NDIS_802_11_SSID *ssid, int ssid_num, +u8 rtw_sitesurvey_cmd(struct adapter *padapter, NDIS_802_11_SSID *ssid, int ssid_num, struct rtw_ieee80211_channel *ch, int ch_num) { u8 res = _FAIL; @@ -818,7 +818,7 @@ _func_exit_; return res; } -u8 rtw_setdatarate_cmd(_adapter *padapter, u8 *rateset) +u8 rtw_setdatarate_cmd(struct adapter *padapter, u8 *rateset) { struct cmd_obj* ph2c; struct setdatarate_parm* pbsetdataratepara; @@ -856,7 +856,7 @@ _func_exit_; return res; } -u8 rtw_setbasicrate_cmd(_adapter *padapter, u8 *rateset) +u8 rtw_setbasicrate_cmd(struct adapter *padapter, u8 *rateset) { struct cmd_obj* ph2c; struct setbasicrate_parm* pssetbasicratepara; @@ -898,7 +898,7 @@ unsigned char rtw_setphy_cmd(unsigned char *adapter) 2. for AdHoc/Ap mode or mp mode? */ -u8 rtw_setphy_cmd(_adapter *padapter, u8 modem, u8 ch) +u8 rtw_setphy_cmd(struct adapter *padapter, u8 modem, u8 ch) { struct cmd_obj* ph2c; struct setphy_parm* psetphypara; @@ -935,7 +935,7 @@ _func_exit_; return res; } -u8 rtw_setbbreg_cmd(_adapter*padapter, u8 offset, u8 val) +u8 rtw_setbbreg_cmd(struct adapter*padapter, u8 offset, u8 val) { struct cmd_obj* ph2c; struct writeBB_parm* pwritebbparm; @@ -966,7 +966,7 @@ _func_exit_; return res; } -u8 rtw_getbbreg_cmd(_adapter *padapter, u8 offset, u8 *pval) +u8 rtw_getbbreg_cmd(struct adapter *padapter, u8 offset, u8 *pval) { struct cmd_obj* ph2c; struct readBB_parm* prdbbparm; @@ -1001,7 +1001,7 @@ _func_exit_; return res; } -u8 rtw_setrfreg_cmd(_adapter *padapter, u8 offset, u32 val) +u8 rtw_setrfreg_cmd(struct adapter *padapter, u8 offset, u32 val) { struct cmd_obj* ph2c; struct writeRF_parm* pwriterfparm; @@ -1032,7 +1032,7 @@ _func_exit_; return res; } -u8 rtw_getrfreg_cmd(_adapter *padapter, u8 offset, u8 *pval) +u8 rtw_getrfreg_cmd(struct adapter *padapter, u8 offset, u8 *pval) { struct cmd_obj* ph2c; struct readRF_parm* prdrfparm; @@ -1072,7 +1072,7 @@ _func_exit_; return res; } -void rtw_getbbrfreg_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd) +void rtw_getbbrfreg_cmdrsp_callback(struct adapter* padapter, struct cmd_obj *pcmd) { _func_enter_; @@ -1083,7 +1083,7 @@ void rtw_getbbrfreg_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd) _func_exit_; } -void rtw_readtssi_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd) +void rtw_readtssi_cmdrsp_callback(struct adapter* padapter, struct cmd_obj *pcmd) { _func_enter_; @@ -1093,7 +1093,7 @@ void rtw_readtssi_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd) _func_exit_; } -u8 rtw_createbss_cmd(_adapter *padapter) +u8 rtw_createbss_cmd(struct adapter *padapter) { struct cmd_obj* pcmd; struct cmd_priv *pcmdpriv=&padapter->cmdpriv; @@ -1135,7 +1135,7 @@ _func_exit_; return res; } -u8 rtw_createbss_cmd_ex(_adapter *padapter, unsigned char *pbss, unsigned int sz) +u8 rtw_createbss_cmd_ex(struct adapter *padapter, unsigned char *pbss, unsigned int sz) { struct cmd_obj* pcmd; struct cmd_priv *pcmdpriv=&padapter->cmdpriv; @@ -1165,7 +1165,7 @@ _func_exit_; return res; } -u8 rtw_joinbss_cmd(_adapter *padapter, struct wlan_network* pnetwork) +u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network* pnetwork) { u8 *auth, res = _SUCCESS; uint t_len = 0; @@ -1349,7 +1349,7 @@ _func_exit_; return res; } -u8 rtw_disassoc_cmd(_adapter*padapter, u32 deauth_timeout_ms, bool enqueue) /* for sta_mode */ +u8 rtw_disassoc_cmd(struct adapter*padapter, u32 deauth_timeout_ms, bool enqueue) /* for sta_mode */ { struct cmd_obj *cmdobj = NULL; struct disconnect_parm *param = NULL; @@ -1392,7 +1392,7 @@ _func_exit_; return res; } -u8 rtw_setopmode_cmd(_adapter *padapter, NDIS_802_11_NETWORK_INFRASTRUCTURE networktype, bool enqueue) +u8 rtw_setopmode_cmd(struct adapter *padapter, NDIS_802_11_NETWORK_INFRASTRUCTURE networktype, bool enqueue) { struct cmd_obj* ph2c; struct setopmode_parm* psetop; @@ -1431,7 +1431,7 @@ _func_exit_; return res; } -u8 rtw_setstakey_cmd(_adapter *padapter, u8 *psta, u8 unicast_key, bool enqueue) +u8 rtw_setstakey_cmd(struct adapter *padapter, u8 *psta, u8 unicast_key, bool enqueue) { struct cmd_obj* ph2c; struct set_stakey_parm *psetstakey_para; @@ -1512,7 +1512,7 @@ _func_exit_; return res; } -u8 rtw_clearstakey_cmd(_adapter *padapter, u8 *psta, u8 entry, u8 enqueue) +u8 rtw_clearstakey_cmd(struct adapter *padapter, u8 *psta, u8 entry, u8 enqueue) { struct cmd_obj* ph2c; struct set_stakey_parm *psetstakey_para; @@ -1573,7 +1573,7 @@ _func_exit_; return res; } -u8 rtw_setrttbl_cmd(_adapter *padapter, struct setratable_parm *prate_table) +u8 rtw_setrttbl_cmd(struct adapter *padapter, struct setratable_parm *prate_table) { struct cmd_obj* ph2c; struct setratable_parm * psetrttblparm; @@ -1605,7 +1605,7 @@ _func_exit_; } -u8 rtw_getrttbl_cmd(_adapter *padapter, struct getratable_rsp *pval) +u8 rtw_getrttbl_cmd(struct adapter *padapter, struct getratable_rsp *pval) { struct cmd_obj* ph2c; struct getratable_parm * pgetrttblparm; @@ -1644,7 +1644,7 @@ _func_exit_; } -u8 rtw_setassocsta_cmd(_adapter *padapter, u8 *mac_addr) +u8 rtw_setassocsta_cmd(struct adapter *padapter, u8 *mac_addr) { struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_obj* ph2c; @@ -1690,7 +1690,7 @@ _func_exit_; return res; } -u8 rtw_addbareq_cmd(_adapter*padapter, u8 tid, u8 *addr) +u8 rtw_addbareq_cmd(struct adapter*padapter, u8 tid, u8 *addr) { struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_obj* ph2c; @@ -1730,7 +1730,7 @@ _func_exit_; return res; } //add for CONFIG_IEEE80211W, none 11w can use it -u8 rtw_reset_securitypriv_cmd(_adapter*padapter) +u8 rtw_reset_securitypriv_cmd(struct adapter*padapter) { struct cmd_obj* ph2c; struct drvextra_cmd_parm *pdrvextra_cmd_parm; @@ -1770,7 +1770,7 @@ _func_exit_; } -u8 rtw_free_assoc_resources_cmd(_adapter*padapter) +u8 rtw_free_assoc_resources_cmd(struct adapter*padapter) { struct cmd_obj* ph2c; struct drvextra_cmd_parm *pdrvextra_cmd_parm; @@ -1810,7 +1810,7 @@ _func_exit_; } -u8 rtw_dynamic_chk_wk_cmd(_adapter*padapter) +u8 rtw_dynamic_chk_wk_cmd(struct adapter*padapter) { struct cmd_obj* ph2c; struct drvextra_cmd_parm *pdrvextra_cmd_parm; @@ -1855,7 +1855,7 @@ _func_exit_; } -u8 rtw_set_ch_cmd(_adapter*padapter, u8 ch, u8 bw, u8 ch_offset, u8 enqueue) +u8 rtw_set_ch_cmd(struct adapter*padapter, u8 ch, u8 bw, u8 ch_offset, u8 enqueue) { struct cmd_obj *pcmdobj; struct set_ch_parm *set_ch_parm; @@ -1910,7 +1910,7 @@ _func_exit_; return res; } -u8 rtw_set_chplan_cmd(_adapter*padapter, u8 chplan, u8 enqueue) +u8 rtw_set_chplan_cmd(struct adapter*padapter, u8 chplan, u8 enqueue) { struct cmd_obj* pcmdobj; struct SetChannelPlan_param *setChannelPlan_param; @@ -1969,7 +1969,7 @@ _func_exit_; return res; } -u8 rtw_led_blink_cmd(_adapter*padapter, PLED_871x pLed) +u8 rtw_led_blink_cmd(struct adapter*padapter, PLED_871x pLed) { struct cmd_obj* pcmdobj; struct LedBlink_param *ledBlink_param; @@ -2006,7 +2006,7 @@ _func_exit_; return res; } -u8 rtw_set_csa_cmd(_adapter*padapter, u8 new_ch_no) +u8 rtw_set_csa_cmd(struct adapter*padapter, u8 new_ch_no) { struct cmd_obj* pcmdobj; struct SetChannelSwitch_param*setChannelSwitch_param; @@ -2044,7 +2044,7 @@ _func_exit_; return res; } -u8 rtw_tdls_cmd(_adapter *padapter, u8 *addr, u8 option) +u8 rtw_tdls_cmd(struct adapter *padapter, u8 *addr, u8 option) { struct cmd_obj* pcmdobj; struct TDLSoption_param *TDLSoption; @@ -2090,7 +2090,7 @@ _func_exit_; } #ifdef CONFIG_DETECT_C2H_BY_POLLING -u8 rtw_event_polling_cmd(_adapter*padapter) +u8 rtw_event_polling_cmd(struct adapter*padapter) { struct cmd_obj* ph2c; struct drvextra_cmd_parm *pdrvextra_cmd_parm; @@ -2137,7 +2137,7 @@ exit: } #endif -static void traffic_status_watchdog(_adapter *padapter) +static void traffic_status_watchdog(struct adapter *padapter) { #ifdef CONFIG_LPS u8 bEnterPS; @@ -2276,12 +2276,12 @@ static void traffic_status_watchdog(_adapter *padapter) pmlmepriv->LinkDetectInfo.bHigherBusyTxTraffic = bHigherBusyTxTraffic; } -void dynamic_chk_wk_hdl(_adapter *padapter, u8 *pbuf, int sz); -void dynamic_chk_wk_hdl(_adapter *padapter, u8 *pbuf, int sz) +void dynamic_chk_wk_hdl(struct adapter *padapter, u8 *pbuf, int sz); +void dynamic_chk_wk_hdl(struct adapter *padapter, u8 *pbuf, int sz) { struct mlme_priv *pmlmepriv; - padapter = (_adapter *)pbuf; + padapter = (struct adapter *)pbuf; pmlmepriv = &(padapter->mlmepriv); #ifdef CONFIG_ACTIVE_KEEP_ALIVE_CHECK @@ -2317,8 +2317,8 @@ void dynamic_chk_wk_hdl(_adapter *padapter, u8 *pbuf, int sz) #ifdef CONFIG_LPS -void lps_ctrl_wk_hdl(_adapter *padapter, u8 lps_ctrl_type); -void lps_ctrl_wk_hdl(_adapter *padapter, u8 lps_ctrl_type) +void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type); +void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type) { struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); @@ -2402,7 +2402,7 @@ _func_enter_; _func_exit_; } -u8 rtw_lps_ctrl_wk_cmd(_adapter*padapter, u8 lps_ctrl_type, u8 enqueue) +u8 rtw_lps_ctrl_wk_cmd(struct adapter*padapter, u8 lps_ctrl_type, u8 enqueue) { struct cmd_obj *ph2c; struct drvextra_cmd_parm *pdrvextra_cmd_parm; @@ -2459,12 +2459,12 @@ _func_exit_; #endif #if (RATE_ADAPTIVE_SUPPORT==1) -void rpt_timer_setting_wk_hdl(_adapter *padapter, u16 minRptTime) +void rpt_timer_setting_wk_hdl(struct adapter *padapter, u16 minRptTime) { rtw_hal_set_hwreg(padapter, HW_VAR_RPT_TIMER_SETTING, (u8 *)(&minRptTime)); } -u8 rtw_rpt_timer_cfg_cmd(_adapter*padapter, u16 minRptTime) +u8 rtw_rpt_timer_cfg_cmd(struct adapter*padapter, u16 minRptTime) { struct cmd_obj *ph2c; struct drvextra_cmd_parm *pdrvextra_cmd_parm; @@ -2502,12 +2502,12 @@ _func_exit_; #endif #ifdef CONFIG_ANTENNA_DIVERSITY -void antenna_select_wk_hdl(_adapter *padapter, u8 antenna) +void antenna_select_wk_hdl(struct adapter *padapter, u8 antenna) { rtw_hal_set_hwreg(padapter, HW_VAR_ANTENNA_DIVERSITY_SELECT, (u8 *)(&antenna)); } -u8 rtw_antenna_select_cmd(_adapter*padapter, u8 antenna,u8 enqueue) +u8 rtw_antenna_select_cmd(struct adapter*padapter, u8 antenna,u8 enqueue) { struct cmd_obj *ph2c; struct drvextra_cmd_parm *pdrvextra_cmd_parm; @@ -2553,25 +2553,25 @@ _func_exit_; } #endif -void power_saving_wk_hdl(_adapter *padapter, u8 *pbuf, int sz); -void power_saving_wk_hdl(_adapter *padapter, u8 *pbuf, int sz) +void power_saving_wk_hdl(struct adapter *padapter, u8 *pbuf, int sz); +void power_saving_wk_hdl(struct adapter *padapter, u8 *pbuf, int sz) { rtw_ps_processor(padapter); } //add for CONFIG_IEEE80211W, none 11w can use it -void reset_securitypriv_hdl(_adapter *padapter) +void reset_securitypriv_hdl(struct adapter *padapter) { rtw_reset_securitypriv(padapter); } -void free_assoc_resources_hdl(_adapter *padapter) +void free_assoc_resources_hdl(struct adapter *padapter) { rtw_free_assoc_resources(padapter, 1); } #ifdef CONFIG_P2P -u8 p2p_protocol_wk_cmd(_adapter*padapter, int intCmdType ) +u8 p2p_protocol_wk_cmd(struct adapter*padapter, int intCmdType ) { struct cmd_obj *ph2c; struct drvextra_cmd_parm *pdrvextra_cmd_parm; @@ -2616,7 +2616,7 @@ _func_exit_; } #endif //CONFIG_P2P -u8 rtw_ps_cmd(_adapter*padapter) +u8 rtw_ps_cmd(struct adapter*padapter) { struct cmd_obj *ppscmd; struct drvextra_cmd_parm *pdrvextra_cmd_parm; @@ -2659,7 +2659,7 @@ _func_exit_; #ifdef CONFIG_AP_MODE -static void rtw_chk_hi_queue_hdl(_adapter *padapter) +static void rtw_chk_hi_queue_hdl(struct adapter *padapter) { int cnt=0; struct sta_info *psta_bmc; @@ -2706,7 +2706,7 @@ static void rtw_chk_hi_queue_hdl(_adapter *padapter) } -u8 rtw_chk_hi_queue_cmd(_adapter*padapter) +u8 rtw_chk_hi_queue_cmd(struct adapter*padapter) { struct cmd_obj *ph2c; struct drvextra_cmd_parm *pdrvextra_cmd_parm; @@ -2741,7 +2741,7 @@ exit: } #endif -u8 rtw_c2h_wk_cmd(PADAPTER padapter, u8 *c2h_evt) +u8 rtw_c2h_wk_cmd(struct adapter *padapter, u8 *c2h_evt) { struct cmd_obj *ph2c; struct drvextra_cmd_parm *pdrvextra_cmd_parm; @@ -2774,7 +2774,7 @@ exit: return res; } -s32 c2h_evt_hdl(_adapter *adapter, struct c2h_evt_hdr *c2h_evt, c2h_id_filter filter) +s32 c2h_evt_hdl(struct adapter *adapter, struct c2h_evt_hdr *c2h_evt, c2h_id_filter filter) { s32 ret = _FAIL; u8 buf[16]; @@ -2804,7 +2804,7 @@ exit: static void c2h_wk_callback(_workitem *work) { struct evt_priv *evtpriv = container_of(work, struct evt_priv, c2h_wk); - _adapter *adapter = container_of(evtpriv, _adapter, evtpriv); + struct adapter *adapter = container_of(evtpriv, struct adapter, evtpriv); struct c2h_evt_hdr *c2h_evt; c2h_id_filter ccx_id_filter = rtw_hal_c2h_id_filter_ccx(adapter); @@ -2844,7 +2844,7 @@ static void c2h_wk_callback(_workitem *work) #endif #ifdef CONFIG_DETECT_C2H_BY_POLLING -void event_polling_hdl(_adapter *padapter, u8 *pbuf, int sz) +void event_polling_hdl(struct adapter *padapter, u8 *pbuf, int sz) { c2h_id_filter ccx_id_filter = rtw_hal_c2h_id_filter_ccx(padapter); u8 check_c2hcmd, check_ccx; @@ -2888,7 +2888,7 @@ void event_polling_hdl(_adapter *padapter, u8 *pbuf, int sz) } #endif -u8 rtw_drvextra_cmd_hdl(_adapter *padapter, unsigned char *pbuf) +u8 rtw_drvextra_cmd_hdl(struct adapter *padapter, unsigned char *pbuf) { struct drvextra_cmd_parm *pdrvextra_cmd; @@ -2967,7 +2967,7 @@ u8 rtw_drvextra_cmd_hdl(_adapter *padapter, unsigned char *pbuf) return H2C_SUCCESS; } -void rtw_survey_cmd_callback(_adapter* padapter , struct cmd_obj *pcmd) +void rtw_survey_cmd_callback(struct adapter* padapter , struct cmd_obj *pcmd) { struct mlme_priv *pmlmepriv = &padapter->mlmepriv; @@ -2989,7 +2989,7 @@ _func_enter_; _func_exit_; } -void rtw_disassoc_cmd_callback(_adapter* padapter, struct cmd_obj *pcmd) +void rtw_disassoc_cmd_callback(struct adapter* padapter, struct cmd_obj *pcmd) { _irqL irqL; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; @@ -3020,7 +3020,7 @@ _func_exit_; } -void rtw_joinbss_cmd_callback(_adapter* padapter, struct cmd_obj *pcmd) +void rtw_joinbss_cmd_callback(struct adapter* padapter, struct cmd_obj *pcmd) { struct mlme_priv *pmlmepriv = &padapter->mlmepriv; @@ -3043,7 +3043,7 @@ _func_enter_; _func_exit_; } -void rtw_createbss_cmd_callback(_adapter *padapter, struct cmd_obj *pcmd) +void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd) { _irqL irqL; u8 timer_cancelled; @@ -3170,7 +3170,7 @@ _func_exit_; -void rtw_setstaKey_cmdrsp_callback(_adapter* padapter , struct cmd_obj *pcmd) +void rtw_setstaKey_cmdrsp_callback(struct adapter* padapter , struct cmd_obj *pcmd) { struct sta_priv * pstapriv = &padapter->stapriv; @@ -3194,7 +3194,7 @@ exit: _func_exit_; } -void rtw_setassocsta_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd) +void rtw_setassocsta_cmdrsp_callback(struct adapter* padapter, struct cmd_obj *pcmd) { _irqL irqL; struct sta_priv * pstapriv = &padapter->stapriv; @@ -3227,8 +3227,8 @@ exit: _func_exit_; } -void rtw_getrttbl_cmd_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd); -void rtw_getrttbl_cmd_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd) +void rtw_getrttbl_cmd_cmdrsp_callback(struct adapter* padapter, struct cmd_obj *pcmd); +void rtw_getrttbl_cmd_cmdrsp_callback(struct adapter* padapter, struct cmd_obj *pcmd) { _func_enter_; diff --git a/core/rtw_debug.c b/core/rtw_debug.c index d2fc13c..fc57c0e 100755 --- a/core/rtw_debug.c +++ b/core/rtw_debug.c @@ -102,7 +102,7 @@ int proc_set_write_reg(struct file *file, const char *buffer, unsigned long count, void *data) { struct net_device *dev = (struct net_device *)data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); char tmp[32]; u32 addr, val, len; @@ -151,7 +151,7 @@ int proc_get_read_reg(char *page, char **start, int *eof, void *data) { struct net_device *dev = data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); int len = 0; @@ -217,7 +217,7 @@ int proc_get_fwstate(char *page, char **start, int *eof, void *data) { struct net_device *dev = data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); int len = 0; @@ -233,7 +233,7 @@ int proc_get_sec_info(char *page, char **start, int *eof, void *data) { struct net_device *dev = data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct security_priv *psecuritypriv = &padapter->securitypriv; int len = 0; @@ -251,7 +251,7 @@ int proc_get_mlmext_state(char *page, char **start, int *eof, void *data) { struct net_device *dev = data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); @@ -268,7 +268,7 @@ int proc_get_qos_option(char *page, char **start, int *eof, void *data) { struct net_device *dev = data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); int len = 0; @@ -285,7 +285,7 @@ int proc_get_ht_option(char *page, char **start, int *eof, void *data) { struct net_device *dev = data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); int len = 0; @@ -301,7 +301,7 @@ int proc_get_rf_info(char *page, char **start, int *eof, void *data) { struct net_device *dev = data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; int len = 0; @@ -320,7 +320,7 @@ int proc_get_ap_info(char *page, char **start, { struct sta_info *psta; struct net_device *dev = data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct wlan_network *cur_network = &(pmlmepriv->cur_network); @@ -370,7 +370,7 @@ int proc_get_adapter_state(char *page, char **start, int *eof, void *data) { struct net_device *dev = data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); int len = 0; len += snprintf(page + len, count - len, "bSurpriseRemoved=%d, bDriverStopped=%d\n", @@ -387,7 +387,7 @@ int proc_get_trx_info(char *page, char **start, { int i; struct net_device *dev = data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct recv_priv *precvpriv = &padapter->recvpriv; struct hw_xmit *phwxmit; @@ -420,7 +420,7 @@ int proc_get_mac_reg_dump1(char *page, char **start, int *eof, void *data) { struct net_device *dev = data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); int len = 0; int i,j=1; @@ -443,7 +443,7 @@ int proc_get_mac_reg_dump2(char *page, char **start, int *eof, void *data) { struct net_device *dev = data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); int len = 0; int i,j=1; @@ -466,7 +466,7 @@ int proc_get_mac_reg_dump3(char *page, char **start, int *eof, void *data) { struct net_device *dev = data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); int len = 0; int i,j=1; @@ -489,7 +489,7 @@ int proc_get_bb_reg_dump1(char *page, char **start, int *eof, void *data) { struct net_device *dev = data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); int len = 0; int i,j=1; @@ -509,7 +509,7 @@ int proc_get_bb_reg_dump2(char *page, char **start, int *eof, void *data) { struct net_device *dev = data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); int len = 0; int i,j=1; @@ -529,7 +529,7 @@ int proc_get_bb_reg_dump3(char *page, char **start, int *eof, void *data) { struct net_device *dev = data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); int len = 0; int i,j=1; @@ -549,7 +549,7 @@ int proc_get_rf_reg_dump1(char *page, char **start, int *eof, void *data) { struct net_device *dev = data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); int len = 0; int i,j=1,path; u32 value; @@ -576,7 +576,7 @@ int proc_get_rf_reg_dump2(char *page, char **start, int *eof, void *data) { struct net_device *dev = data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); int len = 0; int i,j=1,path; u32 value; @@ -602,7 +602,7 @@ int proc_get_rf_reg_dump3(char *page, char **start, int *eof, void *data) { struct net_device *dev = data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); int len = 0; int i,j=1,path; u32 value; @@ -629,7 +629,7 @@ int proc_get_rf_reg_dump4(char *page, char **start, int *eof, void *data) { struct net_device *dev = data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); int len = 0; int i,j=1,path; u32 value; @@ -656,7 +656,7 @@ int proc_get_rx_signal(char *page, char **start, int *eof, void *data) { struct net_device *dev = data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); int len = 0; @@ -682,7 +682,7 @@ int proc_set_rx_signal(struct file *file, const char *buffer, unsigned long count, void *data) { struct net_device *dev = (struct net_device *)data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); char tmp[32]; u32 is_signal_dbg, signal_strength; @@ -721,7 +721,7 @@ int proc_get_ht_enable(char *page, char **start, int *eof, void *data) { struct net_device *dev = data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct registry_priv *pregpriv = &padapter->registrypriv; int len = 0; @@ -740,7 +740,7 @@ int proc_set_ht_enable(struct file *file, const char *buffer, unsigned long count, void *data) { struct net_device *dev = (struct net_device *)data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct registry_priv *pregpriv = &padapter->registrypriv; char tmp[32]; u32 mode; @@ -768,7 +768,7 @@ int proc_get_cbw40_enable(char *page, char **start, int *eof, void *data) { struct net_device *dev = data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct registry_priv *pregpriv = &padapter->registrypriv; int len = 0; @@ -787,7 +787,7 @@ int proc_set_cbw40_enable(struct file *file, const char *buffer, unsigned long count, void *data) { struct net_device *dev = (struct net_device *)data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct registry_priv *pregpriv = &padapter->registrypriv; char tmp[32]; u32 mode; @@ -817,7 +817,7 @@ int proc_get_ampdu_enable(char *page, char **start, int *eof, void *data) { struct net_device *dev = data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct registry_priv *pregpriv = &padapter->registrypriv; int len = 0; @@ -836,7 +836,7 @@ int proc_set_ampdu_enable(struct file *file, const char *buffer, unsigned long count, void *data) { struct net_device *dev = (struct net_device *)data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct registry_priv *pregpriv = &padapter->registrypriv; char tmp[32]; u32 mode; @@ -866,7 +866,7 @@ int proc_get_two_path_rssi(char *page, char **start, int *eof, void *data) { struct net_device *dev = data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); int len = 0; @@ -886,7 +886,7 @@ int proc_get_rx_stbc(char *page, char **start, int *eof, void *data) { struct net_device *dev = data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct registry_priv *pregpriv = &padapter->registrypriv; int len = 0; @@ -905,7 +905,7 @@ int proc_set_rx_stbc(struct file *file, const char *buffer, unsigned long count, void *data) { struct net_device *dev = (struct net_device *)data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct registry_priv *pregpriv = &padapter->registrypriv; char tmp[32]; u32 mode; @@ -942,7 +942,7 @@ int proc_set_rssi_disp(struct file *file, const char *buffer, unsigned long count, void *data) { struct net_device *dev = (struct net_device *)data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); char tmp[32]; u32 enable=0; @@ -988,7 +988,7 @@ int proc_get_all_sta_info(char *page, char **start, _irqL irqL; struct sta_info *psta; struct net_device *dev = data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct sta_priv *pstapriv = &padapter->stapriv; int i, j; _list *plist, *phead; @@ -1081,7 +1081,7 @@ int proc_get_best_channel(char *page, char **start, int *eof, void *data) { struct net_device *dev = data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; int len = 0; u32 i, best_channel_24G = 1, best_channel_5G = 36, index_24G = 0, index_5G = 0; @@ -1140,7 +1140,7 @@ int proc_set_best_channel(struct file *file, const char *buffer, unsigned long count, void *data) { struct net_device *dev = (struct net_device *)data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; char tmp[32]; @@ -1171,7 +1171,7 @@ int proc_get_btcoex_dbg(char *page, char **start, int *eof, void *data) { struct net_device *dev = data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct registry_priv *pregpriv = &padapter->registrypriv; int len = 0; @@ -1190,7 +1190,7 @@ int proc_set_btcoex_dbg(struct file *file, const char *buffer, unsigned long count, void *data) { struct net_device *dev = (struct net_device *)data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct registry_priv *pregpriv = &padapter->registrypriv; char tmp[32]; u32 mode; @@ -1219,7 +1219,7 @@ int proc_set_btcoex_dbg(struct file *file, const char *buffer, int proc_get_sreset(char *page, char **start, off_t offset, int count, int *eof, void *data) { struct net_device *dev = data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); int len = 0; @@ -1231,7 +1231,7 @@ int proc_get_sreset(char *page, char **start, off_t offset, int count, int *eof, int proc_set_sreset(struct file *file, const char *buffer, unsigned long count, void *data) { struct net_device *dev = (struct net_device *)data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); char tmp[32]; s32 trigger_point; @@ -1256,7 +1256,7 @@ int proc_set_sreset(struct file *file, const char *buffer, unsigned long count, int proc_get_odm_dbg_comp(char *page, char **start, off_t offset, int count, int *eof, void *data) { struct net_device *dev = data; - _adapter *adapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *adapter = (struct adapter *)rtw_netdev_priv(dev); int len = 0; len += _rtw_odm_dbg_comp_msg(adapter, page, count); @@ -1268,7 +1268,7 @@ int proc_get_odm_dbg_comp(char *page, char **start, off_t offset, int count, int int proc_set_odm_dbg_comp(struct file *file, const char *buffer, unsigned long count, void *data) { struct net_device *dev = (struct net_device *)data; - _adapter *adapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *adapter = (struct adapter *)rtw_netdev_priv(dev); char tmp[32]; u64 dbg_comp; @@ -1292,7 +1292,7 @@ int proc_set_odm_dbg_comp(struct file *file, const char *buffer, unsigned long c int proc_get_odm_dbg_level(char *page, char **start, off_t offset, int count, int *eof, void *data) { struct net_device *dev = data; - _adapter *adapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *adapter = (struct adapter *)rtw_netdev_priv(dev); int len = 0; len += _rtw_odm_dbg_level_msg(adapter, page, count); @@ -1304,7 +1304,7 @@ int proc_get_odm_dbg_level(char *page, char **start, off_t offset, int count, in int proc_set_odm_dbg_level(struct file *file, const char *buffer, unsigned long count, void *data) { struct net_device *dev = (struct net_device *)data; - _adapter *adapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *adapter = (struct adapter *)rtw_netdev_priv(dev); char tmp[32]; u32 dbg_level; @@ -1328,7 +1328,7 @@ int proc_set_odm_dbg_level(struct file *file, const char *buffer, unsigned long int proc_get_odm_adaptivity(char *page, char **start, off_t offset, int count, int *eof, void *data) { struct net_device *dev = data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); int len = 0; len += _rtw_odm_adaptivity_parm_msg(padapter, page, count); @@ -1340,7 +1340,7 @@ int proc_get_odm_adaptivity(char *page, char **start, off_t offset, int count, i int proc_set_odm_adaptivity(struct file *file, const char *buffer, unsigned long count, void *data) { struct net_device *dev = (struct net_device *)data; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); char tmp[32]; u32 TH_L2H_ini; s8 TH_EDCCA_HL_diff; diff --git a/core/rtw_efuse.c b/core/rtw_efuse.c index b8e89d4..c2c48b8 100755 --- a/core/rtw_efuse.c +++ b/core/rtw_efuse.c @@ -52,12 +52,12 @@ u8 fakeBTEfuseModifiedMap[EFUSE_BT_MAX_MAP_LEN]={0}; BOOLEAN Efuse_Read1ByteFromFakeContent( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN u16 Offset, IN OUT u8 *Value ); BOOLEAN Efuse_Read1ByteFromFakeContent( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN u16 Offset, IN OUT u8 *Value ) { @@ -75,12 +75,12 @@ Efuse_Read1ByteFromFakeContent( BOOLEAN Efuse_Write1ByteToFakeContent( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN u16 Offset, IN u8 Value ); BOOLEAN Efuse_Write1ByteToFakeContent( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN u16 Offset, IN u8 Value ) { @@ -117,7 +117,7 @@ Efuse_Write1ByteToFakeContent( *---------------------------------------------------------------------------*/ VOID Efuse_PowerSwitch( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN u8 bWrite, IN u8 PwrState) { @@ -142,7 +142,7 @@ Efuse_PowerSwitch( *---------------------------------------------------------------------------*/ u16 Efuse_GetCurrentSize( - IN PADAPTER pAdapter, + IN struct adapter * pAdapter, IN u8 efuseType, IN BOOLEAN bPseudoTest) { @@ -178,7 +178,7 @@ Efuse_CalculateWordCnts(IN u8 word_en) // VOID ReadEFuseByte( - PADAPTER Adapter, + struct adapter *Adapter, u16 _offset, u8 *pbuf, IN BOOLEAN bPseudoTest) @@ -246,7 +246,7 @@ ReadEFuseByte( VOID efuse_ReadEFuse( - PADAPTER Adapter, + struct adapter *Adapter, u8 efuseType, u16 _offset, u16 _size_byte, @@ -255,7 +255,7 @@ efuse_ReadEFuse( ); VOID efuse_ReadEFuse( - PADAPTER Adapter, + struct adapter *Adapter, u8 efuseType, u16 _offset, u16 _size_byte, @@ -268,7 +268,7 @@ efuse_ReadEFuse( VOID EFUSE_GetEfuseDefinition( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN u8 efuseType, IN u8 type, OUT void *pOut, @@ -296,7 +296,7 @@ EFUSE_GetEfuseDefinition( *---------------------------------------------------------------------------*/ u8 EFUSE_Read1Byte( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u16 Address) { u8 data; @@ -361,12 +361,12 @@ EFUSE_Read1Byte( void EFUSE_Write1Byte( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u16 Address, IN u8 Value); void EFUSE_Write1Byte( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u16 Address, IN u8 Value) { @@ -414,7 +414,7 @@ EFUSE_Write1Byte( /* 11/16/2008 MH Read one byte from real Efuse. */ u8 efuse_OneByteRead( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN u16 addr, IN u8 *data, IN BOOLEAN bPseudoTest) @@ -455,7 +455,7 @@ efuse_OneByteRead( /* 11/16/2008 MH Write one byte to reald Efuse. */ u8 efuse_OneByteWrite( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN u16 addr, IN u8 data, IN BOOLEAN bPseudoTest) @@ -498,7 +498,7 @@ efuse_OneByteWrite( } int -Efuse_PgPacketRead( IN PADAPTER pAdapter, +Efuse_PgPacketRead( IN struct adapter *pAdapter, IN u8 offset, IN u8 *data, IN BOOLEAN bPseudoTest) @@ -511,7 +511,7 @@ Efuse_PgPacketRead( IN PADAPTER pAdapter, } int -Efuse_PgPacketWrite(IN PADAPTER pAdapter, +Efuse_PgPacketWrite(IN struct adapter *pAdapter, IN u8 offset, IN u8 word_en, IN u8 *data, @@ -526,7 +526,7 @@ Efuse_PgPacketWrite(IN PADAPTER pAdapter, int -Efuse_PgPacketWrite_BT(IN PADAPTER pAdapter, +Efuse_PgPacketWrite_BT(IN struct adapter *pAdapter, IN u8 offset, IN u8 word_en, IN u8 *data, @@ -585,7 +585,7 @@ efuse_WordEnableDataRead(IN u8 word_en, u8 -Efuse_WordEnableDataWrite( IN PADAPTER pAdapter, +Efuse_WordEnableDataWrite( IN struct adapter *pAdapter, IN u16 efuse_addr, IN u8 word_en, IN u8 *data, @@ -598,12 +598,12 @@ Efuse_WordEnableDataWrite( IN PADAPTER pAdapter, return ret; } -static u8 efuse_read8(PADAPTER padapter, u16 address, u8 *value) +static u8 efuse_read8(struct adapter *padapter, u16 address, u8 *value) { return efuse_OneByteRead(padapter,address, value, _FALSE); } -static u8 efuse_write8(PADAPTER padapter, u16 address, u8 *value) +static u8 efuse_write8(struct adapter *padapter, u16 address, u8 *value) { return efuse_OneByteWrite(padapter,address, *value, _FALSE); } @@ -611,12 +611,12 @@ static u8 efuse_write8(PADAPTER padapter, u16 address, u8 *value) /* * read/wirte raw efuse data */ -u8 rtw_efuse_access(PADAPTER padapter, u8 bWrite, u16 start_addr, u16 cnts, u8 *data) +u8 rtw_efuse_access(struct adapter *padapter, u8 bWrite, u16 start_addr, u16 cnts, u8 *data) { int i = 0; u16 real_content_len = 0, max_available_size = 0; u8 res = _FAIL ; - u8 (*rw8)(PADAPTER, u16, u8*); + u8 (*rw8)(struct adapter *, u16, u8*); EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_REAL_CONTENT_LEN, (PVOID)&real_content_len, _FALSE); EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (PVOID)&max_available_size, _FALSE); @@ -649,14 +649,14 @@ u8 rtw_efuse_access(PADAPTER padapter, u8 bWrite, u16 start_addr, u16 cnts, u8 * return res; } //------------------------------------------------------------------------------ -u16 efuse_GetMaxSize(PADAPTER padapter) +u16 efuse_GetMaxSize(struct adapter *padapter) { u16 max_size; EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI , TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (PVOID)&max_size, _FALSE); return max_size; } //------------------------------------------------------------------------------ -u8 efuse_GetCurrentSize(PADAPTER padapter, u16 *size) +u8 efuse_GetCurrentSize(struct adapter *padapter, u16 *size) { Efuse_PowerSwitch(padapter, _FALSE, _TRUE); *size = Efuse_GetCurrentSize(padapter, EFUSE_WIFI, _FALSE); @@ -665,7 +665,7 @@ u8 efuse_GetCurrentSize(PADAPTER padapter, u16 *size) return _SUCCESS; } //------------------------------------------------------------------------------ -u8 rtw_efuse_map_read(PADAPTER padapter, u16 addr, u16 cnts, u8 *data) +u8 rtw_efuse_map_read(struct adapter *padapter, u16 addr, u16 cnts, u8 *data) { u16 mapLen=0; @@ -683,7 +683,7 @@ u8 rtw_efuse_map_read(PADAPTER padapter, u16 addr, u16 cnts, u8 *data) return _SUCCESS; } -u8 rtw_BT_efuse_map_read(PADAPTER padapter, u16 addr, u16 cnts, u8 *data) +u8 rtw_BT_efuse_map_read(struct adapter *padapter, u16 addr, u16 cnts, u8 *data) { u16 mapLen=0; @@ -701,7 +701,7 @@ u8 rtw_BT_efuse_map_read(PADAPTER padapter, u16 addr, u16 cnts, u8 *data) return _SUCCESS; } //------------------------------------------------------------------------------ -u8 rtw_efuse_map_write(PADAPTER padapter, u16 addr, u16 cnts, u8 *data) +u8 rtw_efuse_map_write(struct adapter *padapter, u16 addr, u16 cnts, u8 *data) { u8 offset, word_en; u8 *map; @@ -799,7 +799,7 @@ exit: //------------------------------------------------------------------------------ -u8 rtw_BT_efuse_map_write(PADAPTER padapter, u16 addr, u16 cnts, u8 *data) +u8 rtw_BT_efuse_map_write(struct adapter *padapter, u16 addr, u16 cnts, u8 *data) { u8 offset, word_en; u8 *map; @@ -916,13 +916,13 @@ exit: *---------------------------------------------------------------------------*/ VOID Efuse_ReadAllMap( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN u8 efuseType, IN OUT u8 *Efuse, IN BOOLEAN bPseudoTest); VOID Efuse_ReadAllMap( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN u8 efuseType, IN OUT u8 *Efuse, IN BOOLEAN bPseudoTest) @@ -958,7 +958,7 @@ Efuse_ReadAllMap( *---------------------------------------------------------------------------*/ static VOID efuse_ShadowRead1Byte( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN u16 Offset, IN OUT u8 *Value) { @@ -971,7 +971,7 @@ efuse_ShadowRead1Byte( //---------------Read Two Bytes static VOID efuse_ShadowRead2Byte( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN u16 Offset, IN OUT u16 *Value) { @@ -985,7 +985,7 @@ efuse_ShadowRead2Byte( //---------------Read Four Bytes static VOID efuse_ShadowRead4Byte( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN u16 Offset, IN OUT u32 *Value) { @@ -1020,13 +1020,13 @@ efuse_ShadowRead4Byte( #ifdef PLATFORM static VOID efuse_ShadowWrite1Byte( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN u16 Offset, IN u8 Value); #endif //PLATFORM static VOID efuse_ShadowWrite1Byte( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN u16 Offset, IN u8 Value) { @@ -1039,7 +1039,7 @@ efuse_ShadowWrite1Byte( //---------------Write Two Bytes static VOID efuse_ShadowWrite2Byte( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN u16 Offset, IN u16 Value) { @@ -1053,7 +1053,7 @@ efuse_ShadowWrite2Byte( //---------------Write Four Bytes static VOID efuse_ShadowWrite4Byte( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN u16 Offset, IN u32 Value) { @@ -1083,7 +1083,7 @@ efuse_ShadowWrite4Byte( * *---------------------------------------------------------------------------*/ void EFUSE_ShadowMapUpdate( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN u8 efuseType, IN BOOLEAN bPseudoTest) { @@ -1133,7 +1133,7 @@ void EFUSE_ShadowMapUpdate( *---------------------------------------------------------------------------*/ void EFUSE_ShadowRead( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN u8 Type, IN u16 Offset, IN OUT u32 *Value ) @@ -1165,13 +1165,13 @@ EFUSE_ShadowRead( *---------------------------------------------------------------------------*/ VOID EFUSE_ShadowWrite( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN u8 Type, IN u16 Offset, IN OUT u32 Value); VOID EFUSE_ShadowWrite( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN u8 Type, IN u16 Offset, IN OUT u32 Value) @@ -1194,11 +1194,11 @@ EFUSE_ShadowWrite( VOID Efuse_InitSomeVar( - IN PADAPTER pAdapter + IN struct adapter *pAdapter ); VOID Efuse_InitSomeVar( - IN PADAPTER pAdapter + IN struct adapter *pAdapter ) { u8 i; diff --git a/core/rtw_io.c b/core/rtw_io.c index 2a08017..656d5c4 100755 --- a/core/rtw_io.c +++ b/core/rtw_io.c @@ -83,7 +83,7 @@ jackson@realtek.com.tw #endif -u8 _rtw_read8(_adapter *adapter, u32 addr) +u8 _rtw_read8(struct adapter *adapter, u32 addr) { u8 r_val; //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; @@ -98,7 +98,7 @@ u8 _rtw_read8(_adapter *adapter, u32 addr) return r_val; } -u16 _rtw_read16(_adapter *adapter, u32 addr) +u16 _rtw_read16(struct adapter *adapter, u32 addr) { u16 r_val; //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; @@ -113,7 +113,7 @@ u16 _rtw_read16(_adapter *adapter, u32 addr) return rtw_le16_to_cpu(r_val); } -u32 _rtw_read32(_adapter *adapter, u32 addr) +u32 _rtw_read32(struct adapter *adapter, u32 addr) { u32 r_val; //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; @@ -129,7 +129,7 @@ u32 _rtw_read32(_adapter *adapter, u32 addr) } -int _rtw_write8(_adapter *adapter, u32 addr, u8 val) +int _rtw_write8(struct adapter *adapter, u32 addr, u8 val) { //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; struct io_priv *pio_priv = &adapter->iopriv; @@ -144,7 +144,7 @@ int _rtw_write8(_adapter *adapter, u32 addr, u8 val) return RTW_STATUS_CODE(ret); } -int _rtw_write16(_adapter *adapter, u32 addr, u16 val) +int _rtw_write16(struct adapter *adapter, u32 addr, u16 val) { //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; struct io_priv *pio_priv = &adapter->iopriv; @@ -160,7 +160,7 @@ int _rtw_write16(_adapter *adapter, u32 addr, u16 val) return RTW_STATUS_CODE(ret); } -int _rtw_write32(_adapter *adapter, u32 addr, u32 val) +int _rtw_write32(struct adapter *adapter, u32 addr, u32 val) { //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; struct io_priv *pio_priv = &adapter->iopriv; @@ -177,7 +177,7 @@ int _rtw_write32(_adapter *adapter, u32 addr, u32 val) return RTW_STATUS_CODE(ret); } -int _rtw_writeN(_adapter *adapter, u32 addr ,u32 length , u8 *pdata) +int _rtw_writeN(struct adapter *adapter, u32 addr ,u32 length , u8 *pdata) { //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; struct io_priv *pio_priv = &adapter->iopriv; @@ -192,7 +192,7 @@ int _rtw_writeN(_adapter *adapter, u32 addr ,u32 length , u8 *pdata) return RTW_STATUS_CODE(ret); } -int _rtw_write8_async(_adapter *adapter, u32 addr, u8 val) +int _rtw_write8_async(struct adapter *adapter, u32 addr, u8 val) { //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; struct io_priv *pio_priv = &adapter->iopriv; @@ -207,7 +207,7 @@ int _rtw_write8_async(_adapter *adapter, u32 addr, u8 val) return RTW_STATUS_CODE(ret); } -int _rtw_write16_async(_adapter *adapter, u32 addr, u16 val) +int _rtw_write16_async(struct adapter *adapter, u32 addr, u16 val) { //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; struct io_priv *pio_priv = &adapter->iopriv; @@ -222,7 +222,7 @@ int _rtw_write16_async(_adapter *adapter, u32 addr, u16 val) return RTW_STATUS_CODE(ret); } -int _rtw_write32_async(_adapter *adapter, u32 addr, u32 val) +int _rtw_write32_async(struct adapter *adapter, u32 addr, u32 val) { //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; struct io_priv *pio_priv = &adapter->iopriv; @@ -238,7 +238,7 @@ int _rtw_write32_async(_adapter *adapter, u32 addr, u32 val) return RTW_STATUS_CODE(ret); } -void _rtw_read_mem(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem) +void _rtw_read_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem) { void (*_read_mem)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem); //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; @@ -261,7 +261,7 @@ void _rtw_read_mem(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem) } -void _rtw_write_mem(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem) +void _rtw_write_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem) { void (*_write_mem)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem); //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; @@ -278,7 +278,7 @@ void _rtw_write_mem(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem) } -void _rtw_read_port(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem) +void _rtw_read_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem) { u32 (*_read_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem); //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; @@ -301,7 +301,7 @@ void _rtw_read_port(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem) } -void _rtw_read_port_cancel(_adapter *adapter) +void _rtw_read_port_cancel(struct adapter *adapter) { void (*_read_port_cancel)(struct intf_hdl *pintfhdl); struct io_priv *pio_priv = &adapter->iopriv; @@ -314,7 +314,7 @@ void _rtw_read_port_cancel(_adapter *adapter) } -u32 _rtw_write_port(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem) +u32 _rtw_write_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem) { u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem); //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; @@ -333,7 +333,7 @@ u32 _rtw_write_port(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem) return ret; } -u32 _rtw_write_port_and_wait(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem, int timeout_ms) +u32 _rtw_write_port_and_wait(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem, int timeout_ms) { int ret = _SUCCESS; struct xmit_buf *pxmitbuf = (struct xmit_buf *)pmem; @@ -350,7 +350,7 @@ u32 _rtw_write_port_and_wait(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem, int return ret; } -void _rtw_write_port_cancel(_adapter *adapter) +void _rtw_write_port_cancel(struct adapter *adapter) { void (*_write_port_cancel)(struct intf_hdl *pintfhdl); struct io_priv *pio_priv = &adapter->iopriv; @@ -363,7 +363,7 @@ void _rtw_write_port_cancel(_adapter *adapter) } -int rtw_init_io_priv(_adapter *padapter, void (*set_intf_ops)(struct _io_ops *pops)) +int rtw_init_io_priv(struct adapter *padapter, void (*set_intf_ops)(struct _io_ops *pops)) { struct io_priv *piopriv = &padapter->iopriv; struct intf_hdl *pintf = &piopriv->intf; @@ -442,7 +442,7 @@ bool match_write_sniff_ranges(u16 addr, u16 len) return _FALSE; } -u8 dbg_rtw_read8(_adapter *adapter, u32 addr, const char *caller, const int line) +u8 dbg_rtw_read8(struct adapter *adapter, u32 addr, const char *caller, const int line) { u8 val = _rtw_read8(adapter, addr); @@ -452,7 +452,7 @@ u8 dbg_rtw_read8(_adapter *adapter, u32 addr, const char *caller, const int line return val; } -u16 dbg_rtw_read16(_adapter *adapter, u32 addr, const char *caller, const int line) +u16 dbg_rtw_read16(struct adapter *adapter, u32 addr, const char *caller, const int line) { u16 val = _rtw_read16(adapter, addr); @@ -462,7 +462,7 @@ u16 dbg_rtw_read16(_adapter *adapter, u32 addr, const char *caller, const int li return val; } -u32 dbg_rtw_read32(_adapter *adapter, u32 addr, const char *caller, const int line) +u32 dbg_rtw_read32(struct adapter *adapter, u32 addr, const char *caller, const int line) { u32 val = _rtw_read32(adapter, addr); @@ -472,28 +472,28 @@ u32 dbg_rtw_read32(_adapter *adapter, u32 addr, const char *caller, const int li return val; } -int dbg_rtw_write8(_adapter *adapter, u32 addr, u8 val, const char *caller, const int line) +int dbg_rtw_write8(struct adapter *adapter, u32 addr, u8 val, const char *caller, const int line) { if (match_write_sniff_ranges(addr, 1)) DBG_871X("DBG_IO %s:%d rtw_write8(0x%04x, 0x%02x)\n", caller, line, addr, val); return _rtw_write8(adapter, addr, val); } -int dbg_rtw_write16(_adapter *adapter, u32 addr, u16 val, const char *caller, const int line) +int dbg_rtw_write16(struct adapter *adapter, u32 addr, u16 val, const char *caller, const int line) { if (match_write_sniff_ranges(addr, 2)) DBG_871X("DBG_IO %s:%d rtw_write16(0x%04x, 0x%04x)\n", caller, line, addr, val); return _rtw_write16(adapter, addr, val); } -int dbg_rtw_write32(_adapter *adapter, u32 addr, u32 val, const char *caller, const int line) +int dbg_rtw_write32(struct adapter *adapter, u32 addr, u32 val, const char *caller, const int line) { if (match_write_sniff_ranges(addr, 4)) DBG_871X("DBG_IO %s:%d rtw_write32(0x%04x, 0x%08x)\n", caller, line, addr, val); return _rtw_write32(adapter, addr, val); } -int dbg_rtw_writeN(_adapter *adapter, u32 addr ,u32 length , u8 *data, const char *caller, const int line) +int dbg_rtw_writeN(struct adapter *adapter, u32 addr ,u32 length , u8 *data, const char *caller, const int line) { if (match_write_sniff_ranges(addr, length)) DBG_871X("DBG_IO %s:%d rtw_writeN(0x%04x, %u)\n", caller, line, addr, length); diff --git a/core/rtw_ioctl_set.c b/core/rtw_ioctl_set.c index 382161e..cee20f2 100755 --- a/core/rtw_ioctl_set.c +++ b/core/rtw_ioctl_set.c @@ -38,7 +38,7 @@ #include #endif -extern void indicate_wx_scan_complete_event(_adapter *padapter); +extern void indicate_wx_scan_complete_event(struct adapter *padapter); #define IS_MAC_ADDRESS_BROADCAST(addr) \ ( \ @@ -93,8 +93,8 @@ _func_exit_; return ret; } -u8 rtw_do_join(_adapter * padapter); -u8 rtw_do_join(_adapter * padapter) +u8 rtw_do_join(struct adapter * padapter); +u8 rtw_do_join(struct adapter * padapter) { _irqL irqL; _list *plist, *phead; @@ -237,7 +237,7 @@ _func_exit_; return ret; } -u8 rtw_set_802_11_bssid(_adapter* padapter, u8 *bssid) +u8 rtw_set_802_11_bssid(struct adapter* padapter, u8 *bssid) { _irqL irqL; u8 status=_SUCCESS; @@ -321,7 +321,7 @@ _func_exit_; return status; } -u8 rtw_set_802_11_ssid(_adapter* padapter, NDIS_802_11_SSID *ssid) +u8 rtw_set_802_11_ssid(struct adapter* padapter, NDIS_802_11_SSID *ssid) { _irqL irqL; u8 status = _SUCCESS; @@ -445,7 +445,7 @@ _func_exit_; } -u8 rtw_set_802_11_connect(_adapter* padapter, u8 *bssid, NDIS_802_11_SSID *ssid) +u8 rtw_set_802_11_connect(struct adapter* padapter, u8 *bssid, NDIS_802_11_SSID *ssid) { _irqL irqL; u8 status = _SUCCESS; @@ -518,7 +518,7 @@ _func_exit_; return status; } -u8 rtw_set_802_11_infrastructure_mode(_adapter* padapter, +u8 rtw_set_802_11_infrastructure_mode(struct adapter* padapter, NDIS_802_11_NETWORK_INFRASTRUCTURE networktype) { _irqL irqL; @@ -606,7 +606,7 @@ _func_exit_; } -u8 rtw_set_802_11_disassociate(_adapter *padapter) +u8 rtw_set_802_11_disassociate(struct adapter *padapter) { _irqL irqL; struct mlme_priv * pmlmepriv = &padapter->mlmepriv; @@ -633,7 +633,7 @@ _func_exit_; return _TRUE; } -u8 rtw_set_802_11_bssid_list_scan(_adapter* padapter, NDIS_802_11_SSID *pssid, int ssid_max_num) +u8 rtw_set_802_11_bssid_list_scan(struct adapter* padapter, NDIS_802_11_SSID *pssid, int ssid_max_num) { _irqL irqL; struct mlme_priv *pmlmepriv= &padapter->mlmepriv; @@ -685,7 +685,7 @@ _func_exit_; return res; } -u8 rtw_set_802_11_authentication_mode(_adapter* padapter, NDIS_802_11_AUTHENTICATION_MODE authmode) +u8 rtw_set_802_11_authentication_mode(struct adapter* padapter, NDIS_802_11_AUTHENTICATION_MODE authmode) { struct security_priv *psecuritypriv = &padapter->securitypriv; int res; @@ -719,7 +719,7 @@ _func_exit_; return ret; } -u8 rtw_set_802_11_add_wep(_adapter* padapter, NDIS_802_11_WEP *wep){ +u8 rtw_set_802_11_add_wep(struct adapter* padapter, NDIS_802_11_WEP *wep){ u8 bdefaultkey; u8 btransmitkey; @@ -783,7 +783,7 @@ _func_exit_; } -u8 rtw_set_802_11_remove_wep(_adapter* padapter, u32 keyindex){ +u8 rtw_set_802_11_remove_wep(struct adapter* padapter, u32 keyindex){ u8 ret=_SUCCESS; @@ -826,7 +826,7 @@ _func_exit_; } -u8 rtw_set_802_11_add_key(_adapter* padapter, NDIS_802_11_KEY *key){ +u8 rtw_set_802_11_add_key(struct adapter* padapter, NDIS_802_11_KEY *key){ uint encryptionalgo; u8 * pbssid; @@ -1191,7 +1191,7 @@ _func_exit_; return ret; } -u8 rtw_set_802_11_remove_key(_adapter* padapter, NDIS_802_11_REMOVE_KEY *key){ +u8 rtw_set_802_11_remove_key(struct adapter* padapter, NDIS_802_11_REMOVE_KEY *key){ uint encryptionalgo; u8 * pbssid; @@ -1246,11 +1246,11 @@ _func_exit_; /* * rtw_get_cur_max_rate - -* @adapter: pointer to _adapter structure +* @adapter: pointer to struct adapter structure * * Return 0 or 100Kbps */ -u16 rtw_get_cur_max_rate(_adapter *adapter) +u16 rtw_get_cur_max_rate(struct adapter *adapter) { int i = 0; u8 *p; @@ -1318,12 +1318,12 @@ u16 rtw_get_cur_max_rate(_adapter *adapter) /* * rtw_set_scan_mode - -* @adapter: pointer to _adapter structure +* @adapter: pointer to struct adapter structure * @scan_mode: * * Return _SUCCESS or _FAIL */ -int rtw_set_scan_mode(_adapter *adapter, RT_SCAN_TYPE scan_mode) +int rtw_set_scan_mode(struct adapter *adapter, RT_SCAN_TYPE scan_mode) { if(scan_mode != SCAN_ACTIVE && scan_mode != SCAN_PASSIVE) return _FAIL; @@ -1335,12 +1335,12 @@ int rtw_set_scan_mode(_adapter *adapter, RT_SCAN_TYPE scan_mode) /* * rtw_set_channel_plan - -* @adapter: pointer to _adapter structure +* @adapter: pointer to struct adapter structure * @channel_plan: * * Return _SUCCESS or _FAIL */ -int rtw_set_channel_plan(_adapter *adapter, u8 channel_plan) +int rtw_set_channel_plan(struct adapter *adapter, u8 channel_plan) { struct registry_priv *pregistrypriv = &adapter->registrypriv; struct mlme_priv *pmlmepriv = &adapter->mlmepriv; @@ -1351,12 +1351,12 @@ int rtw_set_channel_plan(_adapter *adapter, u8 channel_plan) /* * rtw_set_country - -* @adapter: pointer to _adapter structure +* @adapter: pointer to struct adapter structure * @country_code: string of country code * * Return _SUCCESS or _FAIL */ -int rtw_set_country(_adapter *adapter, const char *country_code) +int rtw_set_country(struct adapter *adapter, const char *country_code) { int channel_plan = RT_CHANNEL_DOMAIN_WORLD_WIDE_5G; diff --git a/core/rtw_iol.c b/core/rtw_iol.c index 0e833be..f130f59 100755 --- a/core/rtw_iol.c +++ b/core/rtw_iol.c @@ -21,7 +21,7 @@ #include #ifdef CONFIG_IOL -struct xmit_frame *rtw_IOL_accquire_xmit_frame(ADAPTER *adapter) +struct xmit_frame *rtw_IOL_accquire_xmit_frame(struct adapter *adapter) { struct xmit_frame *xmit_frame; struct xmit_buf *xmitbuf; @@ -96,7 +96,7 @@ int rtw_IOL_append_cmds(struct xmit_frame *xmit_frame, u8 *IOL_cmds, u32 cmd_len return _SUCCESS; } -bool rtw_IOL_applied(ADAPTER *adapter) +bool rtw_IOL_applied(struct adapter *adapter) { if(1 == adapter->registrypriv.fw_iol) return _TRUE; @@ -109,7 +109,7 @@ bool rtw_IOL_applied(ADAPTER *adapter) return _FALSE; } /* -bool rtw_IOL_applied(ADAPTER *adapter) +bool rtw_IOL_applied(struct adapter *adapter) { if(adapter->registrypriv.fw_iol) return _TRUE; @@ -123,7 +123,7 @@ bool rtw_IOL_applied(ADAPTER *adapter) } */ -int rtw_IOL_exec_cmds_sync(ADAPTER *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt) +int rtw_IOL_exec_cmds_sync(struct adapter *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt) { return rtw_hal_iol_cmd(adapter, xmit_frame, max_wating_ms,bndy_cnt); } @@ -262,7 +262,7 @@ u8 rtw_IOL_cmd_boundary_handle(struct xmit_frame *pxmit_frame) return is_cmd_bndy; } -void rtw_IOL_cmd_buf_dump(ADAPTER *Adapter,int buf_len,u8 *pbuf) +void rtw_IOL_cmd_buf_dump(struct adapter *Adapter,int buf_len,u8 *pbuf) { int i; int j=1; @@ -376,7 +376,7 @@ int rtw_IOL_append_END_cmd(struct xmit_frame *xmit_frame) } -int rtw_IOL_exec_cmd_array_sync(PADAPTER adapter, u8 *IOL_cmds, u32 cmd_num, u32 max_wating_ms) +int rtw_IOL_exec_cmd_array_sync(Pstruct adapter adapter, u8 *IOL_cmds, u32 cmd_num, u32 max_wating_ms) { struct xmit_frame *xmit_frame; @@ -389,7 +389,7 @@ int rtw_IOL_exec_cmd_array_sync(PADAPTER adapter, u8 *IOL_cmds, u32 cmd_num, u32 return rtw_IOL_exec_cmds_sync(adapter, xmit_frame, max_wating_ms,0); } -int rtw_IOL_exec_empty_cmds_sync(ADAPTER *adapter, u32 max_wating_ms) +int rtw_IOL_exec_empty_cmds_sync(struct adapter *adapter, u32 max_wating_ms) { IOL_CMD end_cmd = {0x0, IOL_CMD_END, 0x0, 0x0}; return rtw_IOL_exec_cmd_array_sync(adapter, (u8*)&end_cmd, 1, max_wating_ms); diff --git a/core/rtw_led.c b/core/rtw_led.c index 7710f32..e301831 100755 --- a/core/rtw_led.c +++ b/core/rtw_led.c @@ -28,7 +28,7 @@ void BlinkTimerCallback(void *data) { PLED_871x pLed = (PLED_871x)data; - _adapter *padapter = pLed->padapter; + struct adapter *padapter = pLed->padapter; //DBG_871X("%s\n", __FUNCTION__); @@ -92,7 +92,7 @@ void ResetLedStatus(PLED_871x pLed) { // void InitLed871x( - _adapter *padapter, + struct adapter *padapter, PLED_871x pLed, LED_PIN_871x LedPin ) @@ -134,8 +134,8 @@ DeInitLed871x( // #if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI) -void SwLedOn(_adapter *padapter, PLED_871x pLed); -void SwLedOff(_adapter *padapter, PLED_871x pLed); +void SwLedOn(struct adapter *padapter, PLED_871x pLed); +void SwLedOff(struct adapter *padapter, PLED_871x pLed); #define CONFIG_LED_REMOVE_HAL @@ -144,7 +144,7 @@ SwLedBlink( PLED_871x pLed ) { - _adapter *padapter = pLed->padapter; + struct adapter *padapter = pLed->padapter; struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); u8 bStopBlinking = _FALSE; @@ -262,7 +262,7 @@ SwLedBlink1( PLED_871x pLed ) { - _adapter *padapter = pLed->padapter; + struct adapter *padapter = pLed->padapter; #ifndef CONFIG_LED_REMOVE_HAL HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); #endif @@ -474,7 +474,7 @@ SwLedBlink2( PLED_871x pLed ) { - _adapter *padapter = pLed->padapter; + struct adapter *padapter = pLed->padapter; struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); u8 bStopBlinking = _FALSE; @@ -596,7 +596,7 @@ SwLedBlink3( PLED_871x pLed ) { - _adapter *padapter = pLed->padapter; + struct adapter *padapter = pLed->padapter; struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); u8 bStopBlinking = _FALSE; @@ -767,7 +767,7 @@ SwLedBlink4( PLED_871x pLed ) { - _adapter *padapter = pLed->padapter; + struct adapter *padapter = pLed->padapter; struct led_priv *ledpriv = &(padapter->ledpriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); PLED_871x pLed1 = &(ledpriv->SwLed1); @@ -966,7 +966,7 @@ SwLedBlink5( PLED_871x pLed ) { - _adapter *padapter = pLed->padapter; + struct adapter *padapter = pLed->padapter; struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); u8 bStopBlinking = _FALSE; @@ -1084,7 +1084,7 @@ SwLedBlink6( PLED_871x pLed ) { - _adapter *padapter = pLed->padapter; + struct adapter *padapter = pLed->padapter; struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); u8 bStopBlinking = _FALSE; @@ -1105,7 +1105,7 @@ SwLedBlink6( static void SwLedControlMode0( - _adapter *padapter, + struct adapter *padapter, LED_CTL_MODE LedAction ) { @@ -1220,7 +1220,7 @@ SwLedControlMode0( //ALPHA, added by chiyoko, 20090106 static void SwLedControlMode1( - _adapter *padapter, + struct adapter *padapter, LED_CTL_MODE LedAction ) { @@ -1495,7 +1495,7 @@ SwLedControlMode1( //Arcadyan/Sitecom , added by chiyoko, 20090216 static void SwLedControlMode2( - _adapter *padapter, + struct adapter *padapter, LED_CTL_MODE LedAction ) { @@ -1660,7 +1660,7 @@ SwLedControlMode2( //COREGA, added by chiyoko, 20090316 static void SwLedControlMode3( - _adapter *padapter, + struct adapter *padapter, LED_CTL_MODE LedAction ) { @@ -1839,7 +1839,7 @@ SwLedControlMode2( //Edimax-Belkin, added by chiyoko, 20090413 static void SwLedControlMode4( - _adapter *padapter, + struct adapter *padapter, LED_CTL_MODE LedAction ) { @@ -2171,7 +2171,7 @@ SwLedControlMode4( //Sercomm-Belkin, added by chiyoko, 20090415 static void SwLedControlMode5( - _adapter *padapter, + struct adapter *padapter, LED_CTL_MODE LedAction ) { @@ -2262,7 +2262,7 @@ SwLedControlMode5( //WNC-Corega, added by chiyoko, 20090902 static void SwLedControlMode6( - _adapter *padapter, + struct adapter *padapter, LED_CTL_MODE LedAction ) { @@ -2299,7 +2299,7 @@ SwLedControlMode6( // void BlinkHandler(PLED_871x pLed) { - _adapter *padapter = pLed->padapter; + struct adapter *padapter = pLed->padapter; struct led_priv *ledpriv = &(padapter->ledpriv); //DBG_871X("%s (%s:%d)\n",__FUNCTION__, current->comm, current->pid); @@ -2349,7 +2349,7 @@ void BlinkHandler(PLED_871x pLed) void LedControl871x( - _adapter *padapter, + struct adapter *padapter, LED_CTL_MODE LedAction ) { diff --git a/core/rtw_mlme.c b/core/rtw_mlme.c index 52daa35..51efdbe 100755 --- a/core/rtw_mlme.c +++ b/core/rtw_mlme.c @@ -32,8 +32,8 @@ #include #include -extern void indicate_wx_scan_complete_event(_adapter *padapter); -extern u8 rtw_do_join(_adapter * padapter); +extern void indicate_wx_scan_complete_event(struct adapter *padapter); +extern u8 rtw_do_join(struct adapter * padapter); #ifdef CONFIG_DISABLE_MCS13TO15 extern unsigned char MCS_rate_2R_MCS13TO15_OFF[16]; @@ -43,7 +43,7 @@ extern unsigned char MCS_rate_2R[16]; #endif //CONFIG_DISABLE_MCS13TO15 extern unsigned char MCS_rate_1R[16]; -sint _rtw_init_mlme_priv (_adapter* padapter) +sint _rtw_init_mlme_priv (struct adapter* padapter) { sint i; u8 *pbuf; @@ -382,7 +382,7 @@ _func_exit_; } -void _rtw_free_network_queue(_adapter *padapter, u8 isfreeall) +void _rtw_free_network_queue(struct adapter *padapter, u8 isfreeall) { _irqL irqL; _list *phead, *plist; @@ -418,7 +418,7 @@ _func_exit_; -sint rtw_if_up(_adapter *padapter) { +sint rtw_if_up(struct adapter *padapter) { sint res; _func_enter_; @@ -479,7 +479,7 @@ u8 *rtw_get_beacon_interval_from_ie(u8 *ie) } -int rtw_init_mlme_priv (_adapter *padapter)//(struct mlme_priv *pmlmepriv) +int rtw_init_mlme_priv (struct adapter *padapter)//(struct mlme_priv *pmlmepriv) { int res; _func_enter_; @@ -545,7 +545,7 @@ _func_exit_; } -void rtw_free_network_queue(_adapter* dev, u8 isfreeall) +void rtw_free_network_queue(struct adapter* dev, u8 isfreeall) { _func_enter_; _rtw_free_network_queue(dev, isfreeall); @@ -564,7 +564,7 @@ struct wlan_network *rtw_find_network(_queue *scanned_queue, u8 *addr) return pnetwork; } -int rtw_is_same_ibss(_adapter *adapter, struct wlan_network *pnetwork) +int rtw_is_same_ibss(struct adapter *adapter, struct wlan_network *pnetwork) { int ret=_TRUE; struct security_priv *psecuritypriv = &adapter->securitypriv; @@ -680,7 +680,7 @@ _func_exit_; } void update_network(WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src, - _adapter * padapter, bool update_ie) + struct adapter * padapter, bool update_ie) { u8 ss_ori = dst->PhyInfo.SignalStrength; u8 sq_ori = dst->PhyInfo.SignalQuality; @@ -792,7 +792,7 @@ _func_enter_; _func_exit_; } -static void update_current_network(_adapter *adapter, WLAN_BSSID_EX *pnetwork) +static void update_current_network(struct adapter *adapter, WLAN_BSSID_EX *pnetwork) { struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); @@ -828,7 +828,7 @@ Caller must hold pmlmepriv->lock first. */ -void rtw_update_scanned_network(_adapter *adapter, WLAN_BSSID_EX *target) +void rtw_update_scanned_network(struct adapter *adapter, WLAN_BSSID_EX *target) { _irqL irqL; _list *plist, *phead; @@ -966,11 +966,11 @@ exit: _func_exit_; } -void rtw_add_network(_adapter *adapter, WLAN_BSSID_EX *pnetwork); -void rtw_add_network(_adapter *adapter, WLAN_BSSID_EX *pnetwork) +void rtw_add_network(struct adapter *adapter, WLAN_BSSID_EX *pnetwork); +void rtw_add_network(struct adapter *adapter, WLAN_BSSID_EX *pnetwork) { _irqL irqL; - struct mlme_priv *pmlmepriv = &(((_adapter *)adapter)->mlmepriv); + struct mlme_priv *pmlmepriv = &(((struct adapter *)adapter)->mlmepriv); //_queue *queue = &(pmlmepriv->scanned_queue); _func_enter_; @@ -996,8 +996,8 @@ _func_exit_; // (3) WMM // (4) HT // (5) others -int rtw_is_desired_network(_adapter *adapter, struct wlan_network *pnetwork); -int rtw_is_desired_network(_adapter *adapter, struct wlan_network *pnetwork) +int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *pnetwork); +int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *pnetwork) { struct security_priv *psecuritypriv = &adapter->securitypriv; struct mlme_priv *pmlmepriv = &adapter->mlmepriv; @@ -1058,7 +1058,7 @@ int rtw_is_desired_network(_adapter *adapter, struct wlan_network *pnetwork) } /* TODO: Perry : For Power Management */ -void rtw_atimdone_event_callback(_adapter *adapter , u8 *pbuf) +void rtw_atimdone_event_callback(struct adapter *adapter , u8 *pbuf) { _func_enter_; @@ -1068,7 +1068,7 @@ _func_exit_; } -void rtw_survey_event_callback(_adapter *adapter, u8 *pbuf) +void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf) { _irqL irqL; u32 len; @@ -1134,7 +1134,7 @@ _func_exit_; -void rtw_surveydone_event_callback(_adapter *adapter, u8 *pbuf) +void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf) { _irqL irqL; u8 timer_cancelled = _FALSE; @@ -1310,12 +1310,12 @@ _func_exit_; } -void rtw_dummy_event_callback(_adapter *adapter , u8 *pbuf) +void rtw_dummy_event_callback(struct adapter *adapter , u8 *pbuf) { } -void rtw_fwdbg_event_callback(_adapter *adapter , u8 *pbuf) +void rtw_fwdbg_event_callback(struct adapter *adapter , u8 *pbuf) { } @@ -1354,7 +1354,7 @@ _func_exit_; /* *rtw_free_assoc_resources: the caller has to lock pmlmepriv->lock */ -void rtw_free_assoc_resources(_adapter *adapter, int lock_scanned_queue) +void rtw_free_assoc_resources(struct adapter *adapter, int lock_scanned_queue) { _irqL irqL; struct wlan_network* pwlan = NULL; @@ -1468,7 +1468,7 @@ _func_exit_; /* *rtw_indicate_connect: the caller has to lock pmlmepriv->lock */ -void rtw_indicate_connect(_adapter *padapter) +void rtw_indicate_connect(struct adapter *padapter) { struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv; @@ -1526,7 +1526,7 @@ _func_exit_; /* *rtw_indicate_disconnect: the caller has to lock pmlmepriv->lock */ -void rtw_indicate_disconnect( _adapter *padapter ) +void rtw_indicate_disconnect( struct adapter *padapter ) { struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); @@ -1587,12 +1587,12 @@ _func_enter_; _func_exit_; } -inline void rtw_indicate_scan_done( _adapter *padapter, bool aborted) +inline void rtw_indicate_scan_done( struct adapter *padapter, bool aborted) { rtw_os_indicate_scan_done(padapter, aborted); } -void rtw_scan_abort(_adapter *adapter) +void rtw_scan_abort(struct adapter *adapter) { u32 cnt=0; u32 start; @@ -1624,7 +1624,7 @@ void rtw_scan_abort(_adapter *adapter) pmlmeext->scan_abort = _FALSE; } -static struct sta_info *rtw_joinbss_update_stainfo(_adapter *padapter, struct wlan_network *pnetwork) +static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, struct wlan_network *pnetwork) { int i; struct sta_info *bmc_sta, *psta=NULL; @@ -1734,7 +1734,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(_adapter *padapter, struct wl //pnetwork : returns from rtw_joinbss_event_callback //ptarget_wlan: found from scanned_queue -static void rtw_joinbss_update_network(_adapter *padapter, struct wlan_network *ptarget_wlan, struct wlan_network *pnetwork) +static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_network *ptarget_wlan, struct wlan_network *pnetwork) { struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct wlan_network *cur_network = &(pmlmepriv->cur_network); @@ -1812,7 +1812,7 @@ static void rtw_joinbss_update_network(_adapter *padapter, struct wlan_network * //if join_res > 0, update "cur_network->network" from "pnetwork->network" if (ptarget_wlan !=NULL). // //#define REJOIN -void rtw_joinbss_event_prehandle(_adapter *adapter, u8 *pbuf) +void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf) { _irqL irqL,irqL2; static u8 retry=0; @@ -2004,7 +2004,7 @@ ignore_joinbss_callback: _func_exit_; } -void rtw_joinbss_event_callback(_adapter *adapter, u8 *pbuf) +void rtw_joinbss_event_callback(struct adapter *adapter, u8 *pbuf) { struct wlan_network *pnetwork = (struct wlan_network *)pbuf; @@ -2025,7 +2025,7 @@ _func_enter_; _func_exit_; } -u8 search_max_mac_id(_adapter *padapter) +u8 search_max_mac_id(struct adapter *padapter) { u8 mac_id, aid; #if (RATE_ADAPTIVE_SUPPORT==1) //for 88E RA @@ -2068,7 +2068,7 @@ u8 search_max_mac_id(_adapter *padapter) } //FOR STA, AP ,AD-HOC mode -void rtw_sta_media_status_rpt(_adapter *adapter,struct sta_info *psta, u32 mstatus) +void rtw_sta_media_status_rpt(struct adapter *adapter,struct sta_info *psta, u32 mstatus) { u16 media_status_rpt; @@ -2084,7 +2084,7 @@ void rtw_sta_media_status_rpt(_adapter *adapter,struct sta_info *psta, u32 mstat rtw_hal_set_hwreg(adapter,HW_VAR_H2C_MEDIA_STATUS_RPT,(u8 *)&media_status_rpt); } -void rtw_stassoc_event_callback(_adapter *adapter, u8 *pbuf) +void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf) { _irqL irqL; struct sta_info *psta; @@ -2207,7 +2207,7 @@ _func_exit_; } -void rtw_stadel_event_callback(_adapter *adapter, u8 *pbuf) +void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf) { _irqL irqL,irqL2; int mac_id=-1; @@ -2353,7 +2353,7 @@ _func_exit_; } -void rtw_cpwm_event_callback(PADAPTER padapter, u8 *pbuf) +void rtw_cpwm_event_callback(struct adapter *padapter, u8 *pbuf) { #ifdef CONFIG_LPS_LCLK struct reportpwrstate_parm *preportpwrstate; @@ -2374,9 +2374,9 @@ _func_exit_; /* * _rtw_join_timeout_handler - Timeout/faliure handler for CMD JoinBss -* @adapter: pointer to _adapter structure +* @adapter: pointer to struct adapter structure */ -void _rtw_join_timeout_handler (_adapter *adapter) +void _rtw_join_timeout_handler (struct adapter *adapter) { _irqL irqL; struct mlme_priv *pmlmepriv = &adapter->mlmepriv; @@ -2452,9 +2452,9 @@ _func_exit_; /* * rtw_scan_timeout_handler - Timeout/Faliure handler for CMD SiteSurvey -* @adapter: pointer to _adapter structure +* @adapter: pointer to struct adapter structure */ -void rtw_scan_timeout_handler (_adapter *adapter) +void rtw_scan_timeout_handler (struct adapter *adapter) { _irqL irqL; struct mlme_priv *pmlmepriv = &adapter->mlmepriv; @@ -2471,7 +2471,7 @@ void rtw_scan_timeout_handler (_adapter *adapter) } -static void rtw_auto_scan_handler(_adapter *padapter) +static void rtw_auto_scan_handler(struct adapter *padapter) { struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct pwrctrl_priv *pwrctrlpriv = adapter_to_pwrctl(padapter); @@ -2520,14 +2520,14 @@ static void rtw_auto_scan_handler(_adapter *padapter) } -void rtw_dynamic_check_timer_handlder(_adapter *adapter) +void rtw_dynamic_check_timer_handlder(struct adapter *adapter) { #ifdef CONFIG_AP_MODE struct mlme_priv *pmlmepriv = &adapter->mlmepriv; #endif //CONFIG_AP_MODE struct registry_priv *pregistrypriv = &adapter->registrypriv; #ifdef CONFIG_CONCURRENT_MODE - PADAPTER pbuddy_adapter = adapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = adapter->pbuddy_adapter; #endif if(!adapter) @@ -2600,7 +2600,7 @@ void rtw_dynamic_check_timer_handlder(_adapter *adapter) && (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == _TRUE) ) { // expire NAT2.5 entry - void nat25_db_expire(_adapter *priv); + void nat25_db_expire(struct adapter *priv); nat25_db_expire(adapter); if (adapter->pppoe_connection_in_progress > 0) { @@ -2623,13 +2623,13 @@ void rtw_dynamic_check_timer_handlder(_adapter *adapter) #ifdef CONFIG_SET_SCAN_DENY_TIMER -inline bool rtw_is_scan_deny(_adapter *adapter) +inline bool rtw_is_scan_deny(struct adapter *adapter) { struct mlme_priv *mlmepriv = &adapter->mlmepriv; return (ATOMIC_READ(&mlmepriv->set_scan_deny) != 0) ? _TRUE : _FALSE; } -inline void rtw_clear_scan_deny(_adapter *adapter) +inline void rtw_clear_scan_deny(struct adapter *adapter) { struct mlme_priv *mlmepriv = &adapter->mlmepriv; ATOMIC_SET(&mlmepriv->set_scan_deny, 0); @@ -2637,12 +2637,12 @@ inline void rtw_clear_scan_deny(_adapter *adapter) DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(adapter)); } -void rtw_set_scan_deny_timer_hdl(_adapter *adapter) +void rtw_set_scan_deny_timer_hdl(struct adapter *adapter) { rtw_clear_scan_deny(adapter); } -void rtw_set_scan_deny(_adapter *adapter, u32 ms) +void rtw_set_scan_deny(struct adapter *adapter, u32 ms) { struct mlme_priv *mlmepriv = &adapter->mlmepriv; #ifdef CONFIG_CONCURRENT_MODE @@ -2669,7 +2669,7 @@ void rtw_set_scan_deny(_adapter *adapter, u32 ms) #endif #ifdef CONFIG_DETECT_C2H_BY_POLLING -void rtw_event_polling_timer_hdl(_adapter *adapter) +void rtw_event_polling_timer_hdl(struct adapter *adapter) { rtw_event_polling_cmd(adapter); } @@ -2690,7 +2690,7 @@ static int rtw_check_join_candidate(struct mlme_priv *pmlmepriv , struct wlan_network **candidate, struct wlan_network *competitor) { int updated = _FALSE; - _adapter *adapter = container_of(pmlmepriv, _adapter, mlmepriv); + struct adapter *adapter = container_of(pmlmepriv, struct adapter, mlmepriv); //check bssid, if needed @@ -2762,7 +2762,7 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv ) _irqL irqL; int ret; _list *phead; - _adapter *adapter; + struct adapter *adapter; _queue *queue = &(pmlmepriv->scanned_queue); struct wlan_network *pnetwork = NULL; struct wlan_network *candidate = NULL; @@ -2772,7 +2772,7 @@ _func_enter_; _enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); phead = get_list_head(queue); - adapter = (_adapter *)pmlmepriv->nic_hdl; + adapter = (struct adapter *)pmlmepriv->nic_hdl; pmlmepriv->pscanned = get_next( phead ); @@ -2856,7 +2856,7 @@ _func_exit_; return ret; } -sint rtw_set_auth(_adapter * adapter,struct security_priv *psecuritypriv) +sint rtw_set_auth(struct adapter * adapter,struct security_priv *psecuritypriv) { struct cmd_obj* pcmd; struct setauth_parm *psetauthparm; @@ -2903,7 +2903,7 @@ _func_exit_; } -sint rtw_set_key(_adapter * adapter,struct security_priv *psecuritypriv,sint keyid, u8 set_tx, bool enqueue) +sint rtw_set_key(struct adapter * adapter,struct security_priv *psecuritypriv,sint keyid, u8 set_tx, bool enqueue) { u8 keylen; struct cmd_obj *pcmd; @@ -2998,7 +2998,7 @@ _func_exit_; //adjust IEs for rtw_joinbss_cmd in WMM -int rtw_restruct_wmm_ie(_adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_len, uint initial_out_len) +int rtw_restruct_wmm_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_len, uint initial_out_len) { unsigned int ielength=0; unsigned int i, j; @@ -3052,7 +3052,7 @@ int rtw_restruct_wmm_ie(_adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_len, u // // -static int SecIsInPMKIDList(_adapter *Adapter, u8 *bssid) +static int SecIsInPMKIDList(struct adapter *Adapter, u8 *bssid) { struct security_priv *psecuritypriv=&Adapter->securitypriv; int i=0; @@ -3093,7 +3093,7 @@ static int SecIsInPMKIDList(_adapter *Adapter, u8 *bssid) // 13th element in the array is the IE length // -static int rtw_append_pmkid(_adapter *Adapter,int iEntry, u8 *ie, uint ie_len) +static int rtw_append_pmkid(struct adapter *Adapter,int iEntry, u8 *ie, uint ie_len) { struct security_priv *psecuritypriv=&Adapter->securitypriv; @@ -3112,7 +3112,7 @@ static int rtw_append_pmkid(_adapter *Adapter,int iEntry, u8 *ie, uint ie_len) return (ie_len); } -sint rtw_restruct_sec_ie(_adapter *adapter,u8 *in_ie, u8 *out_ie, uint in_len) +sint rtw_restruct_sec_ie(struct adapter *adapter,u8 *in_ie, u8 *out_ie, uint in_len) { u8 authmode, securitytype, match; u8 sec_ie[255], uncst_oui[4], bkup_ie[255]; @@ -3183,7 +3183,7 @@ _func_exit_; return ielength; } -void rtw_init_registrypriv_dev_network( _adapter* adapter) +void rtw_init_registrypriv_dev_network( struct adapter* adapter) { struct registry_priv* pregistrypriv = &adapter->registrypriv; struct eeprom_priv* peepriv = &adapter->eeprompriv; @@ -3208,7 +3208,7 @@ _func_exit_; } -void rtw_update_registrypriv_dev_network(_adapter* adapter) +void rtw_update_registrypriv_dev_network(struct adapter* adapter) { int sz=0; struct registry_priv* pregistrypriv = &adapter->registrypriv; @@ -3285,7 +3285,7 @@ _func_exit_; } -void rtw_get_encrypt_decrypt_from_registrypriv(_adapter* adapter) +void rtw_get_encrypt_decrypt_from_registrypriv(struct adapter* adapter) { _func_enter_; @@ -3295,7 +3295,7 @@ _func_exit_; } //the fucntion is at passive_level -void rtw_joinbss_reset(_adapter *padapter) +void rtw_joinbss_reset(struct adapter *padapter) { u8 threshold; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; @@ -3343,7 +3343,7 @@ void rtw_joinbss_reset(_adapter *padapter) #ifdef CONFIG_80211N_HT //the fucntion is >= passive_level -unsigned int rtw_restructure_ht_ie(_adapter *padapter, u8 *in_ie, u8 *out_ie, uint in_len, uint *pout_len) +unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ie, uint in_len, uint *pout_len) { u32 ielen, out_len; HT_CAP_AMPDU_FACTOR max_rx_ampdu_factor; @@ -3413,7 +3413,7 @@ unsigned int rtw_restructure_ht_ie(_adapter *padapter, u8 *in_ie, u8 *out_ie, ui } //the fucntion is > passive_level (in critical_section) -void rtw_update_ht_cap(_adapter *padapter, u8 *pie, uint ie_len) +void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len) { u8 *p, max_ampdu_sz; int len; @@ -3599,7 +3599,7 @@ void rtw_update_ht_cap(_adapter *padapter, u8 *pie, uint ie_len) } -void rtw_issue_addbareq_cmd(_adapter *padapter, struct xmit_frame *pxmitframe) +void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitframe) { u8 issued; int priority; @@ -3655,19 +3655,19 @@ void rtw_issue_addbareq_cmd(_adapter *padapter, struct xmit_frame *pxmitframe) #endif #ifdef CONFIG_LAYER2_ROAMING -inline void rtw_set_roaming(_adapter *adapter, u8 to_roaming) +inline void rtw_set_roaming(struct adapter *adapter, u8 to_roaming) { if (to_roaming == 0) adapter->mlmepriv.to_join = _FALSE; adapter->mlmepriv.to_roaming = to_roaming; } -inline u8 rtw_to_roaming(_adapter *adapter) +inline u8 rtw_to_roaming(struct adapter *adapter) { return adapter->mlmepriv.to_roaming; } -void rtw_roaming(_adapter *padapter, struct wlan_network *tgt_network) +void rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_network) { _irqL irqL; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; @@ -3676,7 +3676,7 @@ void rtw_roaming(_adapter *padapter, struct wlan_network *tgt_network) _rtw_roaming(padapter, tgt_network); _exit_critical_bh(&pmlmepriv->lock, &irqL); } -void _rtw_roaming(_adapter *padapter, struct wlan_network *tgt_network) +void _rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_network) { struct mlme_priv *pmlmepriv = &padapter->mlmepriv; int do_join_r; @@ -3721,7 +3721,7 @@ void _rtw_roaming(_adapter *padapter, struct wlan_network *tgt_network) } #endif -sint rtw_linked_check(_adapter *padapter) +sint rtw_linked_check(struct adapter *padapter) { if( (check_fwstate(&padapter->mlmepriv, WIFI_AP_STATE) == _TRUE) || (check_fwstate(&padapter->mlmepriv, WIFI_ADHOC_STATE|WIFI_ADHOC_MASTER_STATE) == _TRUE)) @@ -3738,7 +3738,7 @@ sint rtw_linked_check(_adapter *padapter) } #ifdef CONFIG_CONCURRENT_MODE -sint rtw_buddy_adapter_up(_adapter *padapter) +sint rtw_buddy_adapter_up(struct adapter *padapter) { sint res = _FALSE; @@ -3764,7 +3764,7 @@ sint rtw_buddy_adapter_up(_adapter *padapter) } -sint check_buddy_fwstate(_adapter *padapter, sint state) +sint check_buddy_fwstate(struct adapter *padapter, sint state) { if(padapter == NULL) return _FALSE; @@ -3782,7 +3782,7 @@ sint check_buddy_fwstate(_adapter *padapter, sint state) return _FALSE; } -u8 rtw_get_buddy_bBusyTraffic(_adapter *padapter) +u8 rtw_get_buddy_bBusyTraffic(struct adapter *padapter) { if(padapter == NULL) return _FALSE; diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c index 4e76823..fdd73d2 100755 --- a/core/rtw_mlme_ext.c +++ b/core/rtw_mlme_ext.c @@ -286,7 +286,7 @@ Following are the initialization functions for WiFi MLME *****************************************************************************/ -int init_hw_mlme_ext(_adapter *padapter) +int init_hw_mlme_ext(struct adapter *padapter) { struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; @@ -297,7 +297,7 @@ int init_hw_mlme_ext(_adapter *padapter) return _SUCCESS; } -static void init_mlme_ext_priv_value(_adapter* padapter) +static void init_mlme_ext_priv_value(struct adapter* padapter) { struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); @@ -377,7 +377,7 @@ static int has_channel(RT_CHANNEL_INFO *channel_set, return 0; } -static void init_channel_list(_adapter *padapter, RT_CHANNEL_INFO *channel_set, +static void init_channel_list(struct adapter *padapter, RT_CHANNEL_INFO *channel_set, u8 chanset_size, struct p2p_channels *channel_list) { @@ -433,7 +433,7 @@ static void init_channel_list(_adapter *padapter, RT_CHANNEL_INFO *channel_set, } -static u8 init_channel_set(_adapter* padapter, u8 ChannelPlan, RT_CHANNEL_INFO *channel_set) +static u8 init_channel_set(struct adapter* padapter, u8 ChannelPlan, RT_CHANNEL_INFO *channel_set) { u8 index,chanset_size = 0; u8 b5GBand = _FALSE, b2_4GBand = _FALSE; @@ -534,7 +534,7 @@ static u8 init_channel_set(_adapter* padapter, u8 ChannelPlan, RT_CHANNEL_INFO * return chanset_size; } -int init_mlme_ext_priv(_adapter* padapter) +int init_mlme_ext_priv(struct adapter* padapter) { int res = _SUCCESS; struct registry_priv* pregistrypriv = &padapter->registrypriv; @@ -579,7 +579,7 @@ int init_mlme_ext_priv(_adapter* padapter) void free_mlme_ext_priv (struct mlme_ext_priv *pmlmeext) { - _adapter *padapter = pmlmeext->padapter; + struct adapter *padapter = pmlmeext->padapter; if (!padapter) return; @@ -592,7 +592,7 @@ void free_mlme_ext_priv (struct mlme_ext_priv *pmlmeext) } } -static u8 cmp_pkt_chnl_diff(_adapter *padapter,u8* pframe,uint packet_len) +static u8 cmp_pkt_chnl_diff(struct adapter *padapter,u8* pframe,uint packet_len) { // if the channel is same, return 0. else return channel differential uint len; u8 channel; @@ -616,7 +616,7 @@ static u8 cmp_pkt_chnl_diff(_adapter *padapter,u8* pframe,uint packet_len) } } -static void _mgt_dispatcher(_adapter *padapter, struct mlme_handler *ptable, union recv_frame *precv_frame) +static void _mgt_dispatcher(struct adapter *padapter, struct mlme_handler *ptable, union recv_frame *precv_frame) { u8 bc_addr[ETH_ALEN] = {0xff,0xff,0xff,0xff,0xff,0xff}; u8 *pframe = precv_frame->u.hdr.rx_data; @@ -635,7 +635,7 @@ static void _mgt_dispatcher(_adapter *padapter, struct mlme_handler *ptable, uni } -void mgt_dispatcher(_adapter *padapter, union recv_frame *precv_frame) +void mgt_dispatcher(struct adapter *padapter, union recv_frame *precv_frame) { int index; struct mlme_handler *ptable; @@ -770,7 +770,7 @@ void mgt_dispatcher(_adapter *padapter, union recv_frame *precv_frame) } #ifdef CONFIG_P2P -u32 p2p_listen_state_process(_adapter *padapter, unsigned char *da) +u32 p2p_listen_state_process(struct adapter *padapter, unsigned char *da) { bool response = _TRUE; @@ -822,7 +822,7 @@ Following are the callback functions for each subtype of the management frames *****************************************************************************/ -unsigned int OnProbeReq(_adapter *padapter, union recv_frame *precv_frame) +unsigned int OnProbeReq(struct adapter *padapter, union recv_frame *precv_frame) { unsigned int ielen; unsigned char *p; @@ -971,7 +971,7 @@ _issue_probersp: } -unsigned int OnProbeRsp(_adapter *padapter, union recv_frame *precv_frame) +unsigned int OnProbeRsp(struct adapter *padapter, union recv_frame *precv_frame) { struct sta_info *psta; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; @@ -1066,7 +1066,7 @@ unsigned int OnProbeRsp(_adapter *padapter, union recv_frame *precv_frame) } -unsigned int OnBeacon(_adapter *padapter, union recv_frame *precv_frame) +unsigned int OnBeacon(struct adapter *padapter, union recv_frame *precv_frame) { int cam_idx; struct sta_info *psta; @@ -1223,7 +1223,7 @@ _END_ONBEACON_: } -unsigned int OnAuth(_adapter *padapter, union recv_frame *precv_frame) +unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame) { #ifdef CONFIG_AP_MODE _irqL irqL; @@ -1496,7 +1496,7 @@ auth_fail: } -unsigned int OnAuthClient(_adapter *padapter, union recv_frame *precv_frame) +unsigned int OnAuthClient(struct adapter *padapter, union recv_frame *precv_frame) { unsigned int seq, len, status, algthm, offset; unsigned char *p; @@ -1597,7 +1597,7 @@ authclnt_fail: } -unsigned int OnAssocReq(_adapter *padapter, union recv_frame *precv_frame) +unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) { #ifdef CONFIG_AP_MODE _irqL irqL; @@ -2210,7 +2210,7 @@ OnAssocReqFail: } -unsigned int OnAssocRsp(_adapter *padapter, union recv_frame *precv_frame) +unsigned int OnAssocRsp(struct adapter *padapter, union recv_frame *precv_frame) { uint i; int res; @@ -2325,7 +2325,7 @@ report_assoc_result: return _SUCCESS; } -unsigned int OnDeAuth(_adapter *padapter, union recv_frame *precv_frame) +unsigned int OnDeAuth(struct adapter *padapter, union recv_frame *precv_frame) { unsigned short reason; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; @@ -2422,7 +2422,7 @@ unsigned int OnDeAuth(_adapter *padapter, union recv_frame *precv_frame) } -unsigned int OnDisassoc(_adapter *padapter, union recv_frame *precv_frame) +unsigned int OnDisassoc(struct adapter *padapter, union recv_frame *precv_frame) { unsigned short reason; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; @@ -2496,13 +2496,13 @@ unsigned int OnDisassoc(_adapter *padapter, union recv_frame *precv_frame) } -unsigned int OnAtim(_adapter *padapter, union recv_frame *precv_frame) +unsigned int OnAtim(struct adapter *padapter, union recv_frame *precv_frame) { DBG_871X("%s\n", __FUNCTION__); return _SUCCESS; } -unsigned int on_action_spct_ch_switch(_adapter *padapter, struct sta_info *psta, u8 *ies, uint ies_len) +unsigned int on_action_spct_ch_switch(struct adapter *padapter, struct sta_info *psta, u8 *ies, uint ies_len) { unsigned int ret = _FAIL; struct mlme_ext_priv *mlmeext = &padapter->mlmeextpriv; @@ -2560,7 +2560,7 @@ exit: return ret; } -unsigned int on_action_spct(_adapter *padapter, union recv_frame *precv_frame) +unsigned int on_action_spct(struct adapter *padapter, union recv_frame *precv_frame) { unsigned int ret = _FAIL; struct sta_info *psta = NULL; @@ -2603,17 +2603,17 @@ exit: return ret; } -unsigned int OnAction_qos(_adapter *padapter, union recv_frame *precv_frame) +unsigned int OnAction_qos(struct adapter *padapter, union recv_frame *precv_frame) { return _SUCCESS; } -unsigned int OnAction_dls(_adapter *padapter, union recv_frame *precv_frame) +unsigned int OnAction_dls(struct adapter *padapter, union recv_frame *precv_frame) { return _SUCCESS; } -unsigned int OnAction_back(_adapter *padapter, union recv_frame *precv_frame) +unsigned int OnAction_back(struct adapter *padapter, union recv_frame *precv_frame) { u8 *addr; struct sta_info *psta=NULL; @@ -2781,7 +2781,7 @@ static void get_channel_cnt_24g_5gl_5gh( struct mlme_ext_priv *pmlmeext, u8* p2 } } -void issue_p2p_GO_request(_adapter *padapter, u8* raddr) +void issue_p2p_GO_request(struct adapter *padapter, u8* raddr) { unsigned char category = RTW_WLAN_CATEGORY_PUBLIC; @@ -3059,7 +3059,7 @@ void issue_p2p_GO_request(_adapter *padapter, u8* raddr) #ifdef CONFIG_CONCURRENT_MODE if ( check_buddy_fwstate(padapter, _FW_LINKED ) ) { - _adapter *pbuddy_adapter = padapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; // Operating Class @@ -3226,7 +3226,7 @@ void issue_p2p_GO_request(_adapter *padapter, u8* raddr) } -void issue_p2p_GO_response(_adapter *padapter, u8* raddr, u8* frame_body,uint len, u8 result) +void issue_p2p_GO_response(struct adapter *padapter, u8* raddr, u8* frame_body,uint len, u8 result) { unsigned char category = RTW_WLAN_CATEGORY_PUBLIC; @@ -3557,7 +3557,7 @@ void issue_p2p_GO_response(_adapter *padapter, u8* raddr, u8* frame_body,uint le #ifdef CONFIG_CONCURRENT_MODE if ( check_buddy_fwstate(padapter, _FW_LINKED ) ) { - _adapter *pbuddy_adapter = padapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; // Operating Class @@ -3707,7 +3707,7 @@ void issue_p2p_GO_response(_adapter *padapter, u8* raddr, u8* frame_body,uint le } -void issue_p2p_GO_confirm(_adapter *padapter, u8* raddr, u8 result) +void issue_p2p_GO_confirm(struct adapter *padapter, u8* raddr, u8 result) { unsigned char category = RTW_WLAN_CATEGORY_PUBLIC; @@ -3974,7 +3974,7 @@ void issue_p2p_GO_confirm(_adapter *padapter, u8* raddr, u8 result) } -void issue_p2p_invitation_request(_adapter *padapter, u8* raddr ) +void issue_p2p_invitation_request(struct adapter *padapter, u8* raddr ) { unsigned char category = RTW_WLAN_CATEGORY_PUBLIC; @@ -3990,7 +3990,7 @@ void issue_p2p_invitation_request(_adapter *padapter, u8* raddr ) u32 wfdielen = 0; #endif //CONFIG_WFD #ifdef CONFIG_CONCURRENT_MODE - _adapter *pbuddy_adapter = padapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; struct wifidirect_info *pbuddy_wdinfo = &pbuddy_adapter->wdinfo; struct mlme_priv *pbuddy_mlmepriv = &pbuddy_adapter->mlmepriv; struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; @@ -4168,7 +4168,7 @@ void issue_p2p_invitation_request(_adapter *padapter, u8* raddr ) #ifdef CONFIG_CONCURRENT_MODE if ( check_buddy_fwstate(padapter, _FW_LINKED ) ) { - _adapter *pbuddy_adapter = padapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; // Operating Class @@ -4313,7 +4313,7 @@ void issue_p2p_invitation_request(_adapter *padapter, u8* raddr ) } -void issue_p2p_invitation_response(_adapter *padapter, u8* raddr, u8 dialogToken, u8 status_code) +void issue_p2p_invitation_response(struct adapter *padapter, u8* raddr, u8 dialogToken, u8 status_code) { unsigned char category = RTW_WLAN_CATEGORY_PUBLIC; @@ -4325,7 +4325,7 @@ void issue_p2p_invitation_response(_adapter *padapter, u8* raddr, u8 dialogToken u8 channel_cnt_24g = 0, channel_cnt_5gl = 0, channel_cnt_5gh = 0; u16 len_channellist_attr = 0; #ifdef CONFIG_CONCURRENT_MODE - _adapter *pbuddy_adapter = padapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; struct wifidirect_info *pbuddy_wdinfo = &pbuddy_adapter->wdinfo; struct mlme_priv *pbuddy_mlmepriv = &pbuddy_adapter->mlmepriv; struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; @@ -4514,7 +4514,7 @@ void issue_p2p_invitation_response(_adapter *padapter, u8* raddr, u8 dialogToken #ifdef CONFIG_CONCURRENT_MODE if ( check_buddy_fwstate(padapter, _FW_LINKED ) ) { - _adapter *pbuddy_adapter = padapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; // Operating Class @@ -4592,7 +4592,7 @@ void issue_p2p_invitation_response(_adapter *padapter, u8* raddr, u8 dialogToken } -void issue_p2p_provision_request(_adapter *padapter, u8* pssid, u8 ussidlen, u8* pdev_raddr ) +void issue_p2p_provision_request(struct adapter *padapter, u8* pssid, u8 ussidlen, u8* pdev_raddr ) { unsigned char category = RTW_WLAN_CATEGORY_PUBLIC; u8 action = P2P_PUB_ACTION_ACTION; @@ -4727,7 +4727,7 @@ u8 is_matched_in_profilelist( u8* peermacaddr, struct profile_info* profileinfo return (match_result ); } -void issue_probersp_p2p(_adapter *padapter, unsigned char *da) +void issue_probersp_p2p(struct adapter *padapter, unsigned char *da) { struct xmit_frame *pmgntframe; struct pkt_attrib *pattrib; @@ -5073,7 +5073,7 @@ void issue_probersp_p2p(_adapter *padapter, unsigned char *da) } -int _issue_probereq_p2p(_adapter *padapter, u8 *da, int wait_ack) +int _issue_probereq_p2p(struct adapter *padapter, u8 *da, int wait_ack) { int ret = _FAIL; struct xmit_frame *pmgntframe; @@ -5427,12 +5427,12 @@ exit: return ret; } -inline void issue_probereq_p2p(_adapter *adapter, u8 *da) +inline void issue_probereq_p2p(struct adapter *adapter, u8 *da) { _issue_probereq_p2p(adapter, da, _FALSE); } -int issue_probereq_p2p_ex(_adapter *adapter, u8 *da, int try_cnt, int wait_ms) +int issue_probereq_p2p_ex(struct adapter *adapter, u8 *da, int try_cnt, int wait_ms) { int ret; int i = 0; @@ -5477,7 +5477,7 @@ exit: s32 rtw_action_public_decache(union recv_frame *recv_frame, s32 token) { - _adapter *adapter = recv_frame->u.hdr.adapter; + struct adapter *adapter = recv_frame->u.hdr.adapter; struct mlme_ext_priv *mlmeext = &(adapter->mlmeextpriv); u8 *frame = recv_frame->u.hdr.rx_data; u16 seq_ctrl = ( (recv_frame->u.hdr.attrib.seq_num&0xffff) << 4) | @@ -5511,7 +5511,7 @@ s32 rtw_action_public_decache(union recv_frame *recv_frame, s32 token) unsigned int on_action_public_p2p(union recv_frame *precv_frame) { - _adapter *padapter = precv_frame->u.hdr.adapter; + struct adapter *padapter = precv_frame->u.hdr.adapter; u8 *pframe = precv_frame->u.hdr.rx_data; uint len = precv_frame->u.hdr.len; u8 *frame_body; @@ -5983,7 +5983,7 @@ unsigned int on_action_public_default(union recv_frame *precv_frame, u8 action) uint frame_len = precv_frame->u.hdr.len; u8 *frame_body = pframe + sizeof(struct rtw_ieee80211_hdr_3addr); u8 token; - _adapter *adapter = precv_frame->u.hdr.adapter; + struct adapter *adapter = precv_frame->u.hdr.adapter; int cnt = 0; char msg[64]; @@ -6003,7 +6003,7 @@ exit: return ret; } -unsigned int on_action_public(_adapter *padapter, union recv_frame *precv_frame) +unsigned int on_action_public(struct adapter *padapter, union recv_frame *precv_frame) { unsigned int ret = _FAIL; u8 *pframe = precv_frame->u.hdr.rx_data; @@ -6033,13 +6033,13 @@ exit: return ret; } -unsigned int OnAction_ht(_adapter *padapter, union recv_frame *precv_frame) +unsigned int OnAction_ht(struct adapter *padapter, union recv_frame *precv_frame) { return _SUCCESS; } #ifdef CONFIG_IEEE80211W -unsigned int OnAction_sa_query(_adapter *padapter, union recv_frame *precv_frame) +unsigned int OnAction_sa_query(struct adapter *padapter, union recv_frame *precv_frame) { u8 *pframe = precv_frame->u.hdr.rx_data; struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib; @@ -6077,12 +6077,12 @@ unsigned int OnAction_sa_query(_adapter *padapter, union recv_frame *precv_frame } #endif //CONFIG_IEEE80211W -unsigned int OnAction_wmm(_adapter *padapter, union recv_frame *precv_frame) +unsigned int OnAction_wmm(struct adapter *padapter, union recv_frame *precv_frame) { return _SUCCESS; } -unsigned int OnAction_p2p(_adapter *padapter, union recv_frame *precv_frame) +unsigned int OnAction_p2p(struct adapter *padapter, union recv_frame *precv_frame) { #ifdef CONFIG_P2P u8 *frame_body; @@ -6151,7 +6151,7 @@ unsigned int OnAction_p2p(_adapter *padapter, union recv_frame *precv_frame) } -unsigned int OnAction(_adapter *padapter, union recv_frame *precv_frame) +unsigned int OnAction(struct adapter *padapter, union recv_frame *precv_frame) { int i; unsigned char category; @@ -6176,7 +6176,7 @@ unsigned int OnAction(_adapter *padapter, union recv_frame *precv_frame) } -unsigned int DoReserved(_adapter *padapter, union recv_frame *precv_frame) +unsigned int DoReserved(struct adapter *padapter, union recv_frame *precv_frame) { //DBG_871X("rcvd mgt frame(%x, %x)\n", (GetFrameSubType(pframe) >> 4), *(unsigned int *)GetAddr1Ptr(pframe)); @@ -6232,7 +6232,7 @@ Following are some TX fuctions for WiFi MLME *****************************************************************************/ -void update_mgnt_tx_rate(_adapter *padapter, u8 rate) +void update_mgnt_tx_rate(struct adapter *padapter, u8 rate) { struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); @@ -6240,7 +6240,7 @@ void update_mgnt_tx_rate(_adapter *padapter, u8 rate) DBG_871X("%s(): rate = %x\n",__FUNCTION__, rate); } -void update_mgntframe_attrib(_adapter *padapter, struct pkt_attrib *pattrib) +void update_mgntframe_attrib(struct adapter *padapter, struct pkt_attrib *pattrib) { struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); @@ -6274,7 +6274,7 @@ void update_mgntframe_attrib(_adapter *padapter, struct pkt_attrib *pattrib) } -void dump_mgntframe(_adapter *padapter, struct xmit_frame *pmgntframe) +void dump_mgntframe(struct adapter *padapter, struct xmit_frame *pmgntframe) { if(padapter->bSurpriseRemoved == _TRUE || padapter->bDriverStopped == _TRUE) @@ -6287,7 +6287,7 @@ void dump_mgntframe(_adapter *padapter, struct xmit_frame *pmgntframe) rtw_hal_mgnt_xmit(padapter, pmgntframe); } -s32 dump_mgntframe_and_wait(_adapter *padapter, struct xmit_frame *pmgntframe, int timeout_ms) +s32 dump_mgntframe_and_wait(struct adapter *padapter, struct xmit_frame *pmgntframe, int timeout_ms) { s32 ret = _FAIL; _irqL irqL; @@ -6318,7 +6318,7 @@ s32 dump_mgntframe_and_wait(_adapter *padapter, struct xmit_frame *pmgntframe, i return ret; } -s32 dump_mgntframe_and_wait_ack(_adapter *padapter, struct xmit_frame *pmgntframe) +s32 dump_mgntframe_and_wait_ack(struct adapter *padapter, struct xmit_frame *pmgntframe) { #ifdef CONFIG_XMIT_ACK s32 ret = _FAIL; @@ -6394,7 +6394,7 @@ int update_hidden_ssid(u8 *ies, u32 ies_len, u8 hidden_ssid_mode) return len_diff; } -void issue_beacon(_adapter *padapter, int timeout_ms) +void issue_beacon(struct adapter *padapter, int timeout_ms) { struct xmit_frame *pmgntframe; struct pkt_attrib *pattrib; @@ -6709,7 +6709,7 @@ _issue_bcn: } -void issue_probersp(_adapter *padapter, unsigned char *da, u8 is_valid_p2p_probereq) +void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p_probereq) { struct xmit_frame *pmgntframe; struct pkt_attrib *pattrib; @@ -6965,7 +6965,7 @@ void issue_probersp(_adapter *padapter, unsigned char *da, u8 is_valid_p2p_probe } -int _issue_probereq(_adapter *padapter, NDIS_802_11_SSID *pssid, u8 *da, int wait_ack) +int _issue_probereq(struct adapter *padapter, NDIS_802_11_SSID *pssid, u8 *da, int wait_ack) { int ret = _FAIL; struct xmit_frame *pmgntframe; @@ -7078,12 +7078,12 @@ exit: return ret; } -inline void issue_probereq(_adapter *padapter, NDIS_802_11_SSID *pssid, u8 *da) +inline void issue_probereq(struct adapter *padapter, NDIS_802_11_SSID *pssid, u8 *da) { _issue_probereq(padapter, pssid, da, _FALSE); } -int issue_probereq_ex(_adapter *padapter, NDIS_802_11_SSID *pssid, u8 *da, +int issue_probereq_ex(struct adapter *padapter, NDIS_802_11_SSID *pssid, u8 *da, int try_cnt, int wait_ms) { int ret; @@ -7126,7 +7126,7 @@ exit: } // if psta == NULL, indiate we are station(client) now... -void issue_auth(_adapter *padapter, struct sta_info *psta, unsigned short status) +void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned short status) { struct xmit_frame *pmgntframe; struct pkt_attrib *pattrib; @@ -7271,7 +7271,7 @@ void issue_auth(_adapter *padapter, struct sta_info *psta, unsigned short status } -void issue_asocrsp(_adapter *padapter, unsigned short status, struct sta_info *pstat, int pkt_type) +void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_info *pstat, int pkt_type) { #ifdef CONFIG_AP_MODE struct xmit_frame *pmgntframe; @@ -7454,7 +7454,7 @@ void issue_asocrsp(_adapter *padapter, unsigned short status, struct sta_info *p #endif } -void issue_assocreq(_adapter *padapter) +void issue_assocreq(struct adapter *padapter) { int ret = _FAIL; struct xmit_frame *pmgntframe; @@ -7938,7 +7938,7 @@ exit: } //when wait_ack is ture, this function shoule be called at process context -static int _issue_nulldata(_adapter *padapter, unsigned char *da, unsigned int power_mode, int wait_ack) +static int _issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned int power_mode, int wait_ack) { int ret = _FAIL; struct xmit_frame *pmgntframe; @@ -8021,7 +8021,7 @@ exit: //when wait_ms >0 , this function shoule be called at process context //da == NULL for station mode -int issue_nulldata(_adapter *padapter, unsigned char *da, unsigned int power_mode, int try_cnt, int wait_ms) +int issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned int power_mode, int try_cnt, int wait_ms) { int ret; int i = 0; @@ -8069,7 +8069,7 @@ exit: } //when wait_ack is ture, this function shoule be called at process context -static int _issue_qos_nulldata(_adapter *padapter, unsigned char *da, u16 tid, int wait_ack) +static int _issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 tid, int wait_ack) { int ret = _FAIL; struct xmit_frame *pmgntframe; @@ -8155,7 +8155,7 @@ exit: //when wait_ms >0 , this function shoule be called at process context //da == NULL for station mode -int issue_qos_nulldata(_adapter *padapter, unsigned char *da, u16 tid, int try_cnt, int wait_ms) +int issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 tid, int try_cnt, int wait_ms) { int ret; int i = 0; @@ -8202,7 +8202,7 @@ exit: return ret; } -static int _issue_deauth(_adapter *padapter, unsigned char *da, unsigned short reason, u8 wait_ack) +static int _issue_deauth(struct adapter *padapter, unsigned char *da, unsigned short reason, u8 wait_ack) { struct xmit_frame *pmgntframe; struct pkt_attrib *pattrib; @@ -8276,13 +8276,13 @@ exit: return ret; } -int issue_deauth(_adapter *padapter, unsigned char *da, unsigned short reason) +int issue_deauth(struct adapter *padapter, unsigned char *da, unsigned short reason) { DBG_871X("%s to "MAC_FMT"\n", __func__, MAC_ARG(da)); return _issue_deauth(padapter, da, reason, _FALSE); } -int issue_deauth_ex(_adapter *padapter, u8 *da, unsigned short reason, int try_cnt, +int issue_deauth_ex(struct adapter *padapter, u8 *da, unsigned short reason, int try_cnt, int wait_ms) { int ret; @@ -8324,7 +8324,7 @@ exit: return ret; } -void issue_action_spct_ch_switch(_adapter *padapter, u8 *ra, u8 new_ch, u8 ch_offset) +void issue_action_spct_ch_switch(struct adapter *padapter, u8 *ra, u8 new_ch, u8 ch_offset) { _irqL irqL; _list *plist, *phead; @@ -8389,7 +8389,7 @@ void issue_action_spct_ch_switch(_adapter *padapter, u8 *ra, u8 new_ch, u8 ch_of } #ifdef CONFIG_IEEE80211W -void issue_action_SA_Query(_adapter *padapter, unsigned char *raddr, unsigned char action, unsigned short tid) +void issue_action_SA_Query(struct adapter *padapter, unsigned char *raddr, unsigned char action, unsigned short tid) { u8 category = RTW_WLAN_CATEGORY_SA_QUERY; u16 reason_code; @@ -8466,7 +8466,7 @@ void issue_action_SA_Query(_adapter *padapter, unsigned char *raddr, unsigned ch } #endif //CONFIG_IEEE80211W -void issue_action_BA(_adapter *padapter, unsigned char *raddr, unsigned char action, unsigned short status) +void issue_action_BA(struct adapter *padapter, unsigned char *raddr, unsigned char action, unsigned short status) { u8 category = RTW_WLAN_CATEGORY_BACK; u16 start_seq; @@ -8638,7 +8638,7 @@ void issue_action_BA(_adapter *padapter, unsigned char *raddr, unsigned char act #endif //CONFIG_80211N_HT } -static void issue_action_BSSCoexistPacket(_adapter *padapter) +static void issue_action_BSSCoexistPacket(struct adapter *padapter) { _irqL irqL; _list *plist, *phead; @@ -8796,7 +8796,7 @@ static void issue_action_BSSCoexistPacket(_adapter *padapter) #endif //CONFIG_80211N_HT } -unsigned int send_delba(_adapter *padapter, u8 initiator, u8 *addr) +unsigned int send_delba(struct adapter *padapter, u8 initiator, u8 *addr) { struct sta_priv *pstapriv = &padapter->stapriv; struct sta_info *psta = NULL; @@ -8854,7 +8854,7 @@ unsigned int send_delba(_adapter *padapter, u8 initiator, u8 *addr) } -unsigned int send_beacon(_adapter *padapter) +unsigned int send_beacon(struct adapter *padapter) { u8 bxmitok = _FALSE; int issue=0; @@ -8862,7 +8862,7 @@ unsigned int send_beacon(_adapter *padapter) //#ifdef CONFIG_CONCURRENT_MODE //struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); //struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); - //_adapter *pbuddy_adapter = padapter->pbuddy_adapter; + //struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; //struct mlme_priv *pbuddy_mlmepriv = &(pbuddy_adapter->mlmepriv); //#endif @@ -8925,7 +8925,7 @@ Following are some utitity fuctions for WiFi MLME *****************************************************************************/ BOOLEAN IsLegal5GChannel( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN u8 channel) { @@ -8940,7 +8940,7 @@ BOOLEAN IsLegal5GChannel( return _FALSE; } -void site_survey(_adapter *padapter) +void site_survey(struct adapter *padapter) { unsigned char survey_channel = 0, val8; RT_SCAN_TYPE ScanType = SCAN_PASSIVE; @@ -8957,7 +8957,7 @@ void site_survey(_adapter *padapter) #endif //CONFIG_STA_MODE_SCAN_UNDER_AP_MODE struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); - PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; #endif //CONFIG_CONCURRENT_MODE @@ -9346,7 +9346,7 @@ void site_survey(_adapter *padapter) } //collect bss info from Beacon and Probe request/response frames. -u8 collect_bss_info(_adapter *padapter, union recv_frame *precv_frame, WLAN_BSSID_EX *bssid) +u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, WLAN_BSSID_EX *bssid) { int i; u32 len; @@ -9592,7 +9592,7 @@ u8 collect_bss_info(_adapter *padapter, union recv_frame *precv_frame, WLAN_BSSI return _SUCCESS; } -void start_create_ibss(_adapter* padapter) +void start_create_ibss(struct adapter* padapter) { unsigned short caps; u8 val8; @@ -9655,7 +9655,7 @@ void start_create_ibss(_adapter* padapter) } -void start_clnt_join(_adapter* padapter) +void start_clnt_join(struct adapter* padapter) { unsigned short caps; u8 val8; @@ -9780,7 +9780,7 @@ void start_clnt_join(_adapter* padapter) } -void start_clnt_auth(_adapter* padapter) +void start_clnt_auth(struct adapter* padapter) { struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); @@ -9805,7 +9805,7 @@ void start_clnt_auth(_adapter* padapter) } -void start_clnt_assoc(_adapter* padapter) +void start_clnt_assoc(struct adapter* padapter) { struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); @@ -9820,7 +9820,7 @@ void start_clnt_assoc(_adapter* padapter) set_link_timer(pmlmeext, REASSOC_TO); } -unsigned int receive_disconnect(_adapter *padapter, unsigned char *MacAddr, unsigned short reason) +unsigned int receive_disconnect(struct adapter *padapter, unsigned char *MacAddr, unsigned short reason) { struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); @@ -9850,7 +9850,7 @@ unsigned int receive_disconnect(_adapter *padapter, unsigned char *MacAddr, unsi } #ifdef CONFIG_80211D -static void process_80211d(PADAPTER padapter, WLAN_BSSID_EX *bssid) +static void process_80211d(struct adapter *padapter, WLAN_BSSID_EX *bssid) { struct registry_priv *pregistrypriv; struct mlme_ext_priv *pmlmeext; @@ -10122,7 +10122,7 @@ Following are the functions to report events *****************************************************************************/ -void report_survey_event(_adapter *padapter, union recv_frame *precv_frame) +void report_survey_event(struct adapter *padapter, union recv_frame *precv_frame) { struct cmd_obj *pcmd_obj; u8 *pevtcmd; @@ -10188,7 +10188,7 @@ void report_survey_event(_adapter *padapter, union recv_frame *precv_frame) } -void report_surveydone_event(_adapter *padapter) +void report_surveydone_event(struct adapter *padapter) { struct cmd_obj *pcmd_obj; u8 *pevtcmd; @@ -10235,7 +10235,7 @@ void report_surveydone_event(_adapter *padapter) } -void report_join_res(_adapter *padapter, int res) +void report_join_res(struct adapter *padapter, int res) { struct cmd_obj *pcmd_obj; u8 *pevtcmd; @@ -10288,7 +10288,7 @@ void report_join_res(_adapter *padapter, int res) } -void report_del_sta_event(_adapter *padapter, unsigned char* MacAddr, unsigned short reason) +void report_del_sta_event(struct adapter *padapter, unsigned char* MacAddr, unsigned short reason) { struct cmd_obj *pcmd_obj; u8 *pevtcmd; @@ -10346,7 +10346,7 @@ void report_del_sta_event(_adapter *padapter, unsigned char* MacAddr, unsigned s return; } -void report_add_sta_event(_adapter *padapter, unsigned char* MacAddr, int cam_idx) +void report_add_sta_event(struct adapter *padapter, unsigned char* MacAddr, int cam_idx) { struct cmd_obj *pcmd_obj; u8 *pevtcmd; @@ -10401,7 +10401,7 @@ Following are the event callback functions *****************************************************************************/ //for sta/adhoc mode -void update_sta_info(_adapter *padapter, struct sta_info *psta) +void update_sta_info(struct adapter *padapter, struct sta_info *psta) { struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; @@ -10454,7 +10454,7 @@ void update_sta_info(_adapter *padapter, struct sta_info *psta) } -void mlmeext_joinbss_event_callback(_adapter *padapter, int join_res) +void mlmeext_joinbss_event_callback(struct adapter *padapter, int join_res) { struct sta_info *psta, *psta_bmc; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; @@ -10567,7 +10567,7 @@ exit_mlmeext_joinbss_event_callback: } -void mlmeext_sta_add_event_callback(_adapter *padapter, struct sta_info *psta) +void mlmeext_sta_add_event_callback(struct adapter *padapter, struct sta_info *psta) { struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); @@ -10617,7 +10617,7 @@ void mlmeext_sta_add_event_callback(_adapter *padapter, struct sta_info *psta) } -void mlmeext_sta_del_event_callback(_adapter *padapter) +void mlmeext_sta_del_event_callback(struct adapter *padapter) { struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); @@ -10670,8 +10670,8 @@ void mlmeext_sta_del_event_callback(_adapter *padapter) Following are the functions for the timer handlers *****************************************************************************/ -void _linked_rx_signal_strehgth_display(_adapter *padapter); -void _linked_rx_signal_strehgth_display(_adapter *padapter) +void _linked_rx_signal_strehgth_display(struct adapter *padapter); +void _linked_rx_signal_strehgth_display(struct adapter *padapter) { struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); @@ -10718,7 +10718,7 @@ void _linked_rx_signal_strehgth_display(_adapter *padapter) } -u8 chk_ap_is_alive(_adapter *padapter, struct sta_info *psta) +u8 chk_ap_is_alive(struct adapter *padapter, struct sta_info *psta) { u8 ret = _FALSE; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; @@ -10762,7 +10762,7 @@ u8 chk_ap_is_alive(_adapter *padapter, struct sta_info *psta) return ret; } -void linked_status_chk(_adapter *padapter) +void linked_status_chk(struct adapter *padapter) { u32 i; struct sta_info *psta; @@ -10925,7 +10925,7 @@ void linked_status_chk(_adapter *padapter) } -void survey_timer_hdl(_adapter *padapter) +void survey_timer_hdl(struct adapter *padapter) { struct cmd_obj *ph2c; struct sitesurvey_parm *psurveyPara; @@ -10990,7 +10990,7 @@ exit_survey_timer_hdl: return; } -void link_timer_hdl(_adapter *padapter) +void link_timer_hdl(struct adapter *padapter) { //static unsigned int rx_pkt = 0; //static u64 tx_cnt = 0; @@ -11128,7 +11128,7 @@ void addba_timer_hdl(struct sta_info *psta) } #ifdef CONFIG_IEEE80211W -void sa_query_timer_hdl(_adapter *padapter) +void sa_query_timer_hdl(struct adapter *padapter) { struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_priv * pmlmepriv = &padapter->mlmepriv; @@ -11148,12 +11148,12 @@ void sa_query_timer_hdl(_adapter *padapter) } #endif //CONFIG_IEEE80211W -u8 NULL_hdl(_adapter *padapter, u8 *pbuf) +u8 NULL_hdl(struct adapter *padapter, u8 *pbuf) { return H2C_SUCCESS; } -u8 setopmode_hdl(_adapter *padapter, u8 *pbuf) +u8 setopmode_hdl(struct adapter *padapter, u8 *pbuf) { u8 type; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; @@ -11190,7 +11190,7 @@ u8 setopmode_hdl(_adapter *padapter, u8 *pbuf) } -u8 createbss_hdl(_adapter *padapter, u8 *pbuf) +u8 createbss_hdl(struct adapter *padapter, u8 *pbuf) { struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); @@ -11256,7 +11256,7 @@ u8 createbss_hdl(_adapter *padapter, u8 *pbuf) } -u8 join_cmd_hdl(_adapter *padapter, u8 *pbuf) +u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf) { u8 join_type; PNDIS_802_11_VARIABLE_IEs pIE; @@ -11456,7 +11456,7 @@ u8 join_cmd_hdl(_adapter *padapter, u8 *pbuf) } -u8 disconnect_hdl(_adapter *padapter, unsigned char *pbuf) +u8 disconnect_hdl(struct adapter *padapter, unsigned char *pbuf) { struct disconnect_parm *param = (struct disconnect_parm *)pbuf; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; @@ -11519,7 +11519,7 @@ u8 disconnect_hdl(_adapter *padapter, unsigned char *pbuf) return H2C_SUCCESS; } -int rtw_scan_ch_decision(_adapter *padapter, struct rtw_ieee80211_channel *out, +int rtw_scan_ch_decision(struct adapter *padapter, struct rtw_ieee80211_channel *out, u32 out_num, struct rtw_ieee80211_channel *in, u32 in_num) { int i, j; @@ -11583,7 +11583,7 @@ int rtw_scan_ch_decision(_adapter *padapter, struct rtw_ieee80211_channel *out, return j; } -u8 sitesurvey_cmd_hdl(_adapter *padapter, u8 *pbuf) +u8 sitesurvey_cmd_hdl(struct adapter *padapter, u8 *pbuf) { struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct sitesurvey_parm *pparm = (struct sitesurvey_parm *)pbuf; @@ -11718,7 +11718,7 @@ u8 sitesurvey_cmd_hdl(_adapter *padapter, u8 *pbuf) } -u8 setauth_hdl(_adapter *padapter, unsigned char *pbuf) +u8 setauth_hdl(struct adapter *padapter, unsigned char *pbuf) { struct setauth_parm *pparm = (struct setauth_parm *)pbuf; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; @@ -11732,7 +11732,7 @@ u8 setauth_hdl(_adapter *padapter, unsigned char *pbuf) return H2C_SUCCESS; } -u8 setkey_hdl(_adapter *padapter, u8 *pbuf) +u8 setkey_hdl(struct adapter *padapter, u8 *pbuf) { unsigned short ctrl; struct setkey_parm *pparm = (struct setkey_parm *)pbuf; @@ -11757,7 +11757,7 @@ u8 setkey_hdl(_adapter *padapter, u8 *pbuf) return H2C_SUCCESS; } -u8 set_stakey_hdl(_adapter *padapter, u8 *pbuf) +u8 set_stakey_hdl(struct adapter *padapter, u8 *pbuf) { u16 ctrl=0; u8 cam_id;//cam_entry @@ -11891,7 +11891,7 @@ u8 set_stakey_hdl(_adapter *padapter, u8 *pbuf) return H2C_SUCCESS; } -u8 add_ba_hdl(_adapter *padapter, unsigned char *pbuf) +u8 add_ba_hdl(struct adapter *padapter, unsigned char *pbuf) { struct addBaReq_parm *pparm = (struct addBaReq_parm *)pbuf; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; @@ -11931,7 +11931,7 @@ u8 add_ba_hdl(_adapter *padapter, unsigned char *pbuf) return H2C_SUCCESS; } -u8 set_tx_beacon_cmd(_adapter* padapter) +u8 set_tx_beacon_cmd(struct adapter* padapter) { struct cmd_obj *ph2c; struct Tx_Beacon_param *ptxBeacon_parm; @@ -11978,12 +11978,12 @@ _func_exit_; } -u8 mlme_evt_hdl(_adapter *padapter, unsigned char *pbuf) +u8 mlme_evt_hdl(struct adapter *padapter, unsigned char *pbuf) { u8 evt_code, evt_seq; u16 evt_sz; uint *peventbuf; - void (*event_callback)(_adapter *dev, u8 *pbuf); + void (*event_callback)(struct adapter *dev, u8 *pbuf); struct evt_priv *pevt_priv = &(padapter->evtpriv); peventbuf = (uint*)pbuf; @@ -12042,7 +12042,7 @@ _abort_event_: } -u8 h2c_msg_hdl(_adapter *padapter, unsigned char *pbuf) +u8 h2c_msg_hdl(struct adapter *padapter, unsigned char *pbuf) { if(!pbuf) return H2C_PARAMETERS_ERROR; @@ -12050,7 +12050,7 @@ u8 h2c_msg_hdl(_adapter *padapter, unsigned char *pbuf) return H2C_SUCCESS; } -u8 tx_beacon_hdl(_adapter *padapter, unsigned char *pbuf) +u8 tx_beacon_hdl(struct adapter *padapter, unsigned char *pbuf) { if(send_beacon(padapter)==_FAIL) { @@ -12134,9 +12134,9 @@ u8 tx_beacon_hdl(_adapter *padapter, unsigned char *pbuf) } #ifdef CONFIG_DUALMAC_CONCURRENT -void dc_SelectChannel(_adapter *padapter, unsigned char channel) +void dc_SelectChannel(struct adapter *padapter, unsigned char channel) { - PADAPTER ptarget_adapter; + struct adapter *ptarget_adapter; if( (padapter->pbuddy_adapter != NULL) && (padapter->DualMacConcurrent == _TRUE) && @@ -12157,9 +12157,9 @@ void dc_SelectChannel(_adapter *padapter, unsigned char channel) _exit_critical_mutex(&(adapter_to_dvobj(ptarget_adapter)->setch_mutex), NULL); } -void dc_SetBWMode(_adapter *padapter, unsigned short bwmode, unsigned char channel_offset) +void dc_SetBWMode(struct adapter *padapter, unsigned short bwmode, unsigned char channel_offset) { - PADAPTER ptarget_adapter; + struct adapter *ptarget_adapter; if( (padapter->pbuddy_adapter != NULL) && (padapter->DualMacConcurrent == _TRUE) && @@ -12180,7 +12180,7 @@ void dc_SetBWMode(_adapter *padapter, unsigned short bwmode, unsigned char chann _exit_critical_mutex(&(adapter_to_dvobj(ptarget_adapter)->setbw_mutex), NULL); } -static void dc_change_band(_adapter *padapter, WLAN_BSSID_EX *pnetwork) +static void dc_change_band(struct adapter *padapter, WLAN_BSSID_EX *pnetwork) { u8 network_type,rate_len, total_rate_len,remainder_rate_len; struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); @@ -12232,10 +12232,10 @@ static void dc_change_band(_adapter *padapter, WLAN_BSSID_EX *pnetwork) } } -void dc_set_channel_bwmode_disconnect(_adapter *padapter) +void dc_set_channel_bwmode_disconnect(struct adapter *padapter) { struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; - PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; struct mlme_priv *pbuddy_mlmepriv = NULL; if(pbuddy_adapter != NULL && @@ -12261,12 +12261,12 @@ void dc_set_channel_bwmode_disconnect(_adapter *padapter) } } -u8 dc_handle_join_request(_adapter *padapter, u8 *ch, u8 *bw, u8 *offset) +u8 dc_handle_join_request(struct adapter *padapter, u8 *ch, u8 *bw, u8 *offset) { struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); WLAN_BSSID_EX *pnetwork = (WLAN_BSSID_EX*)(&(pmlmeinfo->network)); - PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; struct mlme_ext_priv *pbuddy_mlmeext = NULL; struct mlme_priv *pbuddy_mlmepriv = NULL; u8 ret = _SUCCESS; @@ -12329,11 +12329,11 @@ exit: return ret; } -void dc_handle_join_done(_adapter *padapter, u8 join_res) +void dc_handle_join_done(struct adapter *padapter, u8 join_res) { struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); - PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; struct mlme_priv *pbuddy_mlmepriv = NULL; struct mlme_ext_priv *pbuddy_mlmeext = NULL; struct mlme_ext_info *pbuddy_mlmeinfo = NULL; @@ -12473,7 +12473,7 @@ void dc_handle_join_done(_adapter *padapter, u8 join_res) sint dc_check_fwstate(_adapter *padapter, sint fw_state) { - PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; struct mlme_priv *pbuddy_mlmepriv = NULL; if(padapter->pbuddy_adapter != NULL && @@ -12488,11 +12488,11 @@ sint dc_check_fwstate(_adapter *padapter, sint fw_state) return _FALSE; } -u8 dc_handle_site_survey(_adapter *padapter) +u8 dc_handle_site_survey(struct adapter *padapter) { struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); - PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; // only mac0 can do scan request, help issue nulldata(1) for mac1 if(pbuddy_adapter != NULL && @@ -12511,7 +12511,7 @@ u8 dc_handle_site_survey(_adapter *padapter) return _FALSE; } -void dc_report_survey_event(_adapter *padapter, union recv_frame *precv_frame) +void dc_report_survey_event(struct adapter *padapter, union recv_frame *precv_frame) { if(padapter->pbuddy_adapter != NULL && padapter->DualMacConcurrent == _TRUE) @@ -12520,11 +12520,11 @@ void dc_report_survey_event(_adapter *padapter, union recv_frame *precv_frame) } } -void dc_set_channel_bwmode_survey_done(_adapter *padapter) +void dc_set_channel_bwmode_survey_done(struct adapter *padapter) { struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; - PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; struct mlme_priv *pbuddy_mlmepriv = NULL; struct mlme_ext_priv *pbuddy_mlmeext = NULL; struct mlme_ext_info *pbuddy_mlmeinfo = NULL; @@ -12587,7 +12587,7 @@ void dc_set_channel_bwmode_survey_done(_adapter *padapter) } } -void dc_set_ap_channel_bandwidth(_adapter *padapter, u8 channel, u8 channel_offset, u8 bwmode) +void dc_set_ap_channel_bandwidth(struct adapter *padapter, u8 channel, u8 channel_offset, u8 bwmode) { u8 *p; u8 val8, cur_channel, cur_bwmode, cur_ch_offset, change_band; @@ -12598,7 +12598,7 @@ void dc_set_ap_channel_bandwidth(_adapter *padapter, u8 channel, u8 channel_offs struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct HT_info_element *pht_info=NULL; - _adapter *pbuddy_adapter = padapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; struct mlme_priv *pbuddy_mlmepriv = NULL; struct mlme_ext_priv *pbuddy_mlmeext = NULL; @@ -12721,7 +12721,7 @@ void dc_set_ap_channel_bandwidth(_adapter *padapter, u8 channel, u8 channel_offs void dc_resume_xmit(_adapter *padapter) { - PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; if(pbuddy_adapter != NULL && padapter->DualMacConcurrent == _TRUE) @@ -12731,9 +12731,9 @@ void dc_resume_xmit(_adapter *padapter) } } -u8 dc_check_xmit(_adapter *padapter) +u8 dc_check_xmit(struct adapter *padapter) { - PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; struct mlme_priv *pbuddy_mlmepriv = NULL; if(pbuddy_adapter != NULL && @@ -12752,9 +12752,9 @@ u8 dc_check_xmit(_adapter *padapter) #endif #ifdef CONFIG_CONCURRENT_MODE -sint check_buddy_mlmeinfo_state(_adapter *padapter, u32 state) +sint check_buddy_mlmeinfo_state(struct adapter *padapter, u32 state) { - PADAPTER pbuddy_adapter; + struct adapter *pbuddy_adapter; struct mlme_ext_priv *pbuddy_mlmeext; struct mlme_ext_info *pbuddy_mlmeinfo; @@ -12777,11 +12777,11 @@ sint check_buddy_mlmeinfo_state(_adapter *padapter, u32 state) } -void concurrent_chk_joinbss_done(_adapter *padapter, int join_res) +void concurrent_chk_joinbss_done(struct adapter *padapter, int join_res) { struct mlme_ext_priv *pmlmeext; struct mlme_ext_info *pmlmeinfo; - PADAPTER pbuddy_adapter; + struct adapter *pbuddy_adapter; struct mlme_priv *pbuddy_mlmepriv; struct mlme_ext_priv *pbuddy_mlmeext; struct mlme_ext_info *pbuddy_mlmeinfo; @@ -12987,7 +12987,7 @@ void concurrent_chk_joinbss_done(_adapter *padapter, int join_res) } #endif //CONFIG_CONCURRENT_MODE -int rtw_chk_start_clnt_join(_adapter *padapter, u8 *ch, u8 *bw, u8 *offset) +int rtw_chk_start_clnt_join(struct adapter *padapter, u8 *ch, u8 *bw, u8 *offset) { struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; unsigned char cur_ch = pmlmeext->cur_channel; @@ -12997,7 +12997,7 @@ int rtw_chk_start_clnt_join(_adapter *padapter, u8 *ch, u8 *bw, u8 *offset) bool connect_allow = _TRUE; #ifdef CONFIG_CONCURRENT_MODE - PADAPTER pbuddy_adapter; + struct adapter *pbuddy_adapter; struct mlme_ext_priv *pbuddy_mlmeext; struct mlme_ext_info *pbuddy_pmlmeinfo; struct mlme_priv *pbuddy_mlmepriv; @@ -13114,10 +13114,10 @@ exit: } /* Find union about ch, bw, ch_offset of all linked interfaces */ -int rtw_get_ch_setting_union(_adapter *adapter, u8 *ch, u8 *bw, u8 *offset) +int rtw_get_ch_setting_union(struct adapter *adapter, u8 *ch, u8 *bw, u8 *offset) { struct dvobj_priv *dvobj = adapter_to_dvobj(adapter); - _adapter *iface; + struct adapter *iface; struct mlme_ext_priv *mlmeext; int i; u8 ch_ret = 0; @@ -13169,7 +13169,7 @@ int rtw_get_ch_setting_union(_adapter *adapter, u8 *ch, u8 *bw, u8 *offset) return num; } -u8 set_ch_hdl(_adapter *padapter, u8 *pbuf) +u8 set_ch_hdl(struct adapter *padapter, u8 *pbuf) { struct set_ch_parm *set_ch_parm; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; @@ -13193,7 +13193,7 @@ u8 set_ch_hdl(_adapter *padapter, u8 *pbuf) return H2C_SUCCESS; } -u8 set_chplan_hdl(_adapter *padapter, unsigned char *pbuf) +u8 set_chplan_hdl(struct adapter *padapter, unsigned char *pbuf) { struct SetChannelPlan_param *setChannelPlan_param; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; @@ -13210,7 +13210,7 @@ u8 set_chplan_hdl(_adapter *padapter, unsigned char *pbuf) return H2C_SUCCESS; } -u8 led_blink_hdl(_adapter *padapter, unsigned char *pbuf) +u8 led_blink_hdl(struct adapter *padapter, unsigned char *pbuf) { struct LedBlink_param *ledBlink_param; @@ -13226,7 +13226,7 @@ u8 led_blink_hdl(_adapter *padapter, unsigned char *pbuf) return H2C_SUCCESS; } -u8 set_csa_hdl(_adapter *padapter, unsigned char *pbuf) +u8 set_csa_hdl(struct adapter *padapter, unsigned char *pbuf) { #ifdef CONFIG_DFS struct SetChannelSwitch_param *setChannelSwitch_param; @@ -13278,7 +13278,7 @@ u8 set_csa_hdl(_adapter *padapter, unsigned char *pbuf) // TDLS_CKALV_PH1 : check alive timer phase1 // TDLS_CKALV_PH2 : check alive timer phase2 // TDLS_FREE_STA : free tdls sta -u8 tdls_hdl(_adapter *padapter, unsigned char *pbuf) +u8 tdls_hdl(struct adapter *padapter, unsigned char *pbuf) { #ifdef CONFIG_TDLS _irqL irqL; diff --git a/core/rtw_odm.c b/core/rtw_odm.c index 1c92150..fae9127 100755 --- a/core/rtw_odm.c +++ b/core/rtw_odm.c @@ -101,7 +101,7 @@ const char *odm_dbg_level_str[] = { #define RTW_ODM_DBG_LEVEL_NUM 6 -int _rtw_odm_dbg_comp_msg(_adapter *adapter, char *buf, int len) +int _rtw_odm_dbg_comp_msg(struct adapter *adapter, char *buf, int len) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(adapter); DM_ODM_T *odm = &pHalData->odmpriv; @@ -120,7 +120,7 @@ int _rtw_odm_dbg_comp_msg(_adapter *adapter, char *buf, int len) return cnt; } -void rtw_odm_dbg_comp_msg(_adapter *adapter) +void rtw_odm_dbg_comp_msg(struct adapter *adapter) { char buf[768] = {0}; @@ -128,12 +128,12 @@ void rtw_odm_dbg_comp_msg(_adapter *adapter) DBG_871X_LEVEL(_drv_always_, "\n%s", buf); } -inline void rtw_odm_dbg_comp_set(_adapter *adapter, u64 comps) +inline void rtw_odm_dbg_comp_set(struct adapter *adapter, u64 comps) { rtw_hal_set_def_var(adapter, HW_DEF_ODM_DBG_FLAG, &comps); } -int _rtw_odm_dbg_level_msg(_adapter *adapter, char *buf, int len) +int _rtw_odm_dbg_level_msg(struct adapter *adapter, char *buf, int len) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(adapter); DM_ODM_T *odm = &pHalData->odmpriv; @@ -151,7 +151,7 @@ int _rtw_odm_dbg_level_msg(_adapter *adapter, char *buf, int len) return cnt; } -void rtw_odm_dbg_level_msg(_adapter *adapter) +void rtw_odm_dbg_level_msg(struct adapter *adapter) { char buf[100] = {0}; @@ -159,12 +159,12 @@ void rtw_odm_dbg_level_msg(_adapter *adapter) DBG_871X_LEVEL(_drv_always_, "\n%s", buf); } -inline void rtw_odm_dbg_level_set(_adapter *adapter, u32 level) +inline void rtw_odm_dbg_level_set(struct adapter *adapter, u32 level) { rtw_hal_set_def_var(adapter, HW_DEF_ODM_DBG_LEVEL, &level); } -int _rtw_odm_adaptivity_parm_msg(_adapter *adapter, char *buf, int len) +int _rtw_odm_adaptivity_parm_msg(struct adapter *adapter, char *buf, int len) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(adapter); DM_ODM_T *odm = &pHalData->odmpriv; @@ -182,7 +182,7 @@ int _rtw_odm_adaptivity_parm_msg(_adapter *adapter, char *buf, int len) ); } -void rtw_odm_adaptivity_parm_msg(_adapter *adapter) +void rtw_odm_adaptivity_parm_msg(struct adapter *adapter) { char buf[256] = {0}; @@ -190,7 +190,7 @@ void rtw_odm_adaptivity_parm_msg(_adapter *adapter) DBG_871X_LEVEL(_drv_always_, "\n%s", buf); } -void rtw_odm_adaptivity_parm_set(_adapter *adapter, s8 TH_L2H_ini, s8 TH_EDCCA_HL_diff, +void rtw_odm_adaptivity_parm_set(struct adapter *adapter, s8 TH_L2H_ini, s8 TH_EDCCA_HL_diff, s8 IGI_Base, bool ForceEDCCA, u8 AdapEn_RSSI, u8 IGI_LowerBound) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(adapter); diff --git a/core/rtw_p2p.c b/core/rtw_p2p.c index b9b205a..4d4f032 100755 --- a/core/rtw_p2p.c +++ b/core/rtw_p2p.c @@ -40,7 +40,7 @@ int rtw_p2p_is_channel_list_ok( u8 desired_ch, u8* ch_list, u8 ch_cnt ) return( found ); } -int is_any_client_associated(_adapter *padapter) +int is_any_client_associated(struct adapter *padapter) { return padapter->stapriv.asoc_list_cnt ? _TRUE : _FALSE; } @@ -53,7 +53,7 @@ static u32 go_add_group_info_attr(struct wifidirect_info *pwdinfo, u8 *pbuf) u16 attr_len = 0; u8 tmplen, *pdata_attr, *pstart, *pcur; struct sta_info *psta = NULL; - _adapter *padapter = pwdinfo->padapter; + struct adapter *padapter = pwdinfo->padapter; struct sta_priv *pstapriv = &padapter->stapriv; DBG_871X("%s\n", __FUNCTION__); @@ -153,7 +153,7 @@ static void issue_group_disc_req(struct wifidirect_info *pwdinfo, u8 *da) unsigned char *pframe; struct rtw_ieee80211_hdr *pwlanhdr; unsigned short *fctrl; - _adapter *padapter = pwdinfo->padapter; + struct adapter *padapter = pwdinfo->padapter; struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); unsigned char category = RTW_WLAN_CATEGORY_P2P;//P2P action frame @@ -212,7 +212,7 @@ static void issue_p2p_devdisc_resp(struct wifidirect_info *pwdinfo, u8 *da, u8 s unsigned char *pframe; struct rtw_ieee80211_hdr *pwlanhdr; unsigned short *fctrl; - _adapter *padapter = pwdinfo->padapter; + struct adapter *padapter = pwdinfo->padapter; struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); unsigned char category = RTW_WLAN_CATEGORY_PUBLIC; @@ -281,7 +281,7 @@ static void issue_p2p_devdisc_resp(struct wifidirect_info *pwdinfo, u8 *da, u8 s static void issue_p2p_provision_resp(struct wifidirect_info *pwdinfo, u8* raddr, u8* frame_body, u16 config_method) { - _adapter *padapter = pwdinfo->padapter; + struct adapter *padapter = pwdinfo->padapter; unsigned char category = RTW_WLAN_CATEGORY_PUBLIC; u8 action = P2P_PUB_ACTION_ACTION; u8 dialogToken = frame_body[7]; // The Dialog Token of provisioning discovery request frame. @@ -396,7 +396,7 @@ static void issue_p2p_presence_resp(struct wifidirect_info *pwdinfo, u8 *da, u8 unsigned char *pframe; struct rtw_ieee80211_hdr *pwlanhdr; unsigned short *fctrl; - _adapter *padapter = pwdinfo->padapter; + struct adapter *padapter = pwdinfo->padapter; struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); unsigned char category = RTW_WLAN_CATEGORY_P2P;//P2P action frame @@ -535,7 +535,7 @@ u32 build_beacon_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) { u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 }; u32 len=0, wfdielen = 0; - _adapter *padapter = pwdinfo->padapter; + struct adapter *padapter = pwdinfo->padapter; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info; @@ -652,7 +652,7 @@ u32 build_probe_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) { u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 }; u32 len=0, wfdielen = 0; - _adapter *padapter = pwdinfo->padapter; + struct adapter *padapter = pwdinfo->padapter; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info; @@ -765,7 +765,7 @@ u32 build_probe_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf, u8 tunnel { u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 }; u32 len=0, wfdielen = 0; - _adapter *padapter = pwdinfo->padapter; + struct adapter *padapter = pwdinfo->padapter; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info; @@ -960,7 +960,7 @@ u32 build_assoc_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) { u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 }; u32 len=0, wfdielen = 0; - _adapter *padapter = NULL; + struct adapter *padapter = NULL; struct mlme_priv *pmlmepriv = NULL; struct wifi_display_info *pwfd_info = NULL; @@ -1067,7 +1067,7 @@ u32 build_assoc_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) { u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 }; u32 len=0, wfdielen = 0; - _adapter *padapter = pwdinfo->padapter; + struct adapter *padapter = pwdinfo->padapter; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info; @@ -1165,7 +1165,7 @@ u32 build_nego_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) { u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 }; u32 len=0, wfdielen = 0; - _adapter *padapter = pwdinfo->padapter; + struct adapter *padapter = pwdinfo->padapter; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info; @@ -1263,7 +1263,7 @@ u32 build_nego_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) { u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 }; u32 len=0, wfdielen = 0; - _adapter *padapter = pwdinfo->padapter; + struct adapter *padapter = pwdinfo->padapter; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info; @@ -1362,7 +1362,7 @@ u32 build_nego_confirm_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) { u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 }; u32 len=0, wfdielen = 0; - _adapter *padapter = pwdinfo->padapter; + struct adapter *padapter = pwdinfo->padapter; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info; @@ -1461,7 +1461,7 @@ u32 build_invitation_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) { u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 }; u32 len=0, wfdielen = 0; - _adapter *padapter = pwdinfo->padapter; + struct adapter *padapter = pwdinfo->padapter; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info; @@ -1574,7 +1574,7 @@ u32 build_invitation_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) { u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 }; u32 len=0, wfdielen = 0; - _adapter *padapter = pwdinfo->padapter; + struct adapter *padapter = pwdinfo->padapter; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info; @@ -1687,7 +1687,7 @@ u32 build_provdisc_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) { u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 }; u32 len=0, wfdielen = 0; - _adapter *padapter = pwdinfo->padapter; + struct adapter *padapter = pwdinfo->padapter; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info; @@ -1786,7 +1786,7 @@ u32 build_provdisc_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) { u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 }; u32 len=0, wfdielen = 0; - _adapter *padapter = pwdinfo->padapter; + struct adapter *padapter = pwdinfo->padapter; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info; @@ -2503,7 +2503,7 @@ u32 process_p2p_devdisc_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint le u8 *frame_body; u8 status, dialogToken; struct sta_info *psta = NULL; - _adapter *padapter = pwdinfo->padapter; + struct adapter *padapter = pwdinfo->padapter; struct sta_priv *pstapriv = &padapter->stapriv; u8 *p2p_ie; u32 p2p_ielen = 0; @@ -2707,7 +2707,7 @@ u8 rtw_p2p_ch_inclusion(struct mlme_ext_priv *pmlmeext, u8 *peer_ch_list, u8 pee u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe, uint len ) { - _adapter *padapter = pwdinfo->padapter; + struct adapter *padapter = pwdinfo->padapter; u8 result = P2P_STATUS_SUCCESS; u32 p2p_ielen = 0, wps_ielen = 0; u8 * ies; @@ -2724,7 +2724,7 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe #endif // CONFIG_TDLS #endif // CONFIG_WFD #ifdef CONFIG_CONCURRENT_MODE - _adapter *pbuddy_adapter = pwdinfo->padapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = pwdinfo->padapter->pbuddy_adapter; struct wifidirect_info *pbuddy_wdinfo = &pbuddy_adapter->wdinfo; struct mlme_priv *pbuddy_mlmepriv = &pbuddy_adapter->mlmepriv; struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; @@ -2943,7 +2943,7 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pframe, uint len ) { - _adapter *padapter = pwdinfo->padapter; + struct adapter *padapter = pwdinfo->padapter; u8 result = P2P_STATUS_SUCCESS; u32 p2p_ielen, wps_ielen; u8 * ies; @@ -3317,7 +3317,7 @@ u8 process_p2p_presence_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint le return _TRUE; } -void find_phase_handler( _adapter* padapter ) +void find_phase_handler( struct adapter* padapter ) { struct wifidirect_info *pwdinfo = &padapter->wdinfo; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; @@ -3341,9 +3341,9 @@ _func_enter_; _func_exit_; } -void p2p_concurrent_handler( _adapter* padapter ); +void p2p_concurrent_handler( struct adapter* padapter ); -void restore_p2p_state_handler( _adapter* padapter ) +void restore_p2p_state_handler( struct adapter* padapter ) { struct wifidirect_info *pwdinfo = &padapter->wdinfo; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; @@ -3358,7 +3358,7 @@ _func_enter_; #ifdef CONFIG_CONCURRENT_MODE if ( check_buddy_fwstate(padapter, _FW_LINKED ) ) { - _adapter *pbuddy_adapter = padapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; struct mlme_priv *pbuddy_mlmepriv = &pbuddy_adapter->mlmepriv; struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; @@ -3386,7 +3386,7 @@ _func_enter_; _func_exit_; } -void pre_tx_invitereq_handler( _adapter* padapter ) +void pre_tx_invitereq_handler( struct adapter* padapter ) { struct wifidirect_info *pwdinfo = &padapter->wdinfo; u8 val8 = 1; @@ -3400,7 +3400,7 @@ _func_enter_; _func_exit_; } -void pre_tx_provdisc_handler( _adapter* padapter ) +void pre_tx_provdisc_handler( struct adapter* padapter ) { struct wifidirect_info *pwdinfo = &padapter->wdinfo; u8 val8 = 1; @@ -3414,7 +3414,7 @@ _func_enter_; _func_exit_; } -void pre_tx_negoreq_handler( _adapter* padapter ) +void pre_tx_negoreq_handler( struct adapter* padapter ) { struct wifidirect_info *pwdinfo = &padapter->wdinfo; u8 val8 = 1; @@ -3429,10 +3429,10 @@ _func_exit_; } #ifdef CONFIG_CONCURRENT_MODE -void p2p_concurrent_handler( _adapter* padapter ) +void p2p_concurrent_handler( struct adapter* padapter ) { struct wifidirect_info *pwdinfo = &padapter->wdinfo; - //_adapter *pbuddy_adapter = padapter->pbuddy_adapter; + //struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; //struct wifidirect_info *pbuddy_wdinfo = &pbuddy_adapter->wdinfo; //struct mlme_priv *pbuddy_mlmepriv = &pbuddy_adapter->mlmepriv; //struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; @@ -3441,7 +3441,7 @@ _func_enter_; if ( check_buddy_fwstate(padapter, _FW_LINKED ) ) { - PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; pwdinfo->operating_channel = pbuddy_mlmeext->cur_channel; @@ -3549,7 +3549,7 @@ _func_exit_; #endif #ifdef CONFIG_IOCTL_CFG80211 -static void ro_ch_handler(_adapter *padapter) +static void ro_ch_handler(struct adapter *padapter) { struct cfg80211_wifidirect_info *pcfg80211_wdinfo = &padapter->cfg80211_wdinfo; struct wifidirect_info *pwdinfo = &padapter->wdinfo; @@ -3600,7 +3600,7 @@ _func_exit_; static void ro_ch_timer_process (void *FunctionContext) { - _adapter *adapter = (_adapter *)FunctionContext; + struct adapter *adapter = (struct adapter *)FunctionContext; struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(adapter->rtw_wdev); //printk("%s \n", __FUNCTION__); @@ -3612,11 +3612,11 @@ static void ro_ch_timer_process (void *FunctionContext) p2p_protocol_wk_cmd( adapter, P2P_RO_CH_WK); } -static void rtw_change_p2pie_op_ch(_adapter *padapter, const u8 *frame_body, u32 len, u8 ch) +static void rtw_change_p2pie_op_ch(struct adapter *padapter, const u8 *frame_body, u32 len, u8 ch) { u8 *ies, *p2p_ie; u32 ies_len, p2p_ielen; - PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; ies = (u8*)(frame_body + _PUBLIC_ACTION_IE_OFFSET_); @@ -3641,11 +3641,11 @@ static void rtw_change_p2pie_op_ch(_adapter *padapter, const u8 *frame_body, u32 } } -static void rtw_change_p2pie_ch_list(_adapter *padapter, const u8 *frame_body, u32 len, u8 ch) +static void rtw_change_p2pie_ch_list(struct adapter *padapter, const u8 *frame_body, u32 len, u8 ch) { u8 *ies, *p2p_ie; u32 ies_len, p2p_ielen; - PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; ies = (u8*)(frame_body + _PUBLIC_ACTION_IE_OFFSET_); @@ -3681,13 +3681,13 @@ static void rtw_change_p2pie_ch_list(_adapter *padapter, const u8 *frame_body, u } } -static bool rtw_chk_p2pie_ch_list_with_buddy(_adapter *padapter, const u8 *frame_body, u32 len) +static bool rtw_chk_p2pie_ch_list_with_buddy(struct adapter *padapter, const u8 *frame_body, u32 len) { bool fit = _FALSE; #ifdef CONFIG_CONCURRENT_MODE u8 *ies, *p2p_ie; u32 ies_len, p2p_ielen; - PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; u8 buddy_ch = pbuddy_mlmeext->cur_channel; @@ -3731,13 +3731,13 @@ static bool rtw_chk_p2pie_ch_list_with_buddy(_adapter *padapter, const u8 *frame return fit; } -static bool rtw_chk_p2pie_op_ch_with_buddy(_adapter *padapter, const u8 *frame_body, u32 len) +static bool rtw_chk_p2pie_op_ch_with_buddy(struct adapter *padapter, const u8 *frame_body, u32 len) { bool fit = _FALSE; #ifdef CONFIG_CONCURRENT_MODE u8 *ies, *p2p_ie; u32 ies_len, p2p_ielen; - PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; u8 buddy_ch = pbuddy_mlmeext->cur_channel; @@ -3773,7 +3773,7 @@ static void rtw_cfg80211_adjust_p2pie_channel(_adapter *padapter, const u8 *fram #ifdef CONFIG_CONCURRENT_MODE u8 *ies, *p2p_ie; u32 ies_len, p2p_ielen; - PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; ies = (u8*)(frame_body + _PUBLIC_ACTION_IE_OFFSET_); @@ -3824,7 +3824,7 @@ static void rtw_cfg80211_adjust_p2pie_channel(_adapter *padapter, const u8 *fram } #ifdef CONFIG_WFD -void rtw_append_wfd_ie(_adapter *padapter, u8 *buf, u32* len) +void rtw_append_wfd_ie(struct adapter *padapter, u8 *buf, u32* len) { unsigned char *frame_body; u8 category, action, OUI_Subtype, dialogToken=0; @@ -4003,7 +4003,7 @@ bool rtw_p2p_nego_intent_compare(u8 req, u8 resp) return _FALSE; } -int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx) +int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx) { int is_p2p_frame = (-1); unsigned char *frame_body; @@ -4373,7 +4373,7 @@ int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx) return is_p2p_frame; } -void rtw_init_cfg80211_wifidirect_info( _adapter* padapter) +void rtw_init_cfg80211_wifidirect_info( struct adapter* padapter) { struct cfg80211_wifidirect_info *pcfg80211_wdinfo = &padapter->cfg80211_wdinfo; @@ -4383,7 +4383,7 @@ void rtw_init_cfg80211_wifidirect_info( _adapter* padapter) } #endif //CONFIG_IOCTL_CFG80211 -void p2p_protocol_wk_hdl(_adapter *padapter, int intCmdType) +void p2p_protocol_wk_hdl(struct adapter *padapter, int intCmdType) { struct wifidirect_info *pwdinfo= &(padapter->wdinfo); @@ -4472,7 +4472,7 @@ _func_exit_; } #ifdef CONFIG_P2P_PS -void process_p2p_ps_ie(PADAPTER padapter, u8 *IEs, u32 IELength) +void process_p2p_ps_ie(struct adapter *padapter, u8 *IEs, u32 IELength) { u8 * ies; u32 ies_len; @@ -4583,7 +4583,7 @@ _func_enter_; _func_exit_; } -void p2p_ps_wk_hdl(_adapter *padapter, u8 p2p_ps_state) +void p2p_ps_wk_hdl(struct adapter *padapter, u8 p2p_ps_state) { struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); struct wifidirect_info *pwdinfo= &(padapter->wdinfo); @@ -4643,7 +4643,7 @@ _func_enter_; _func_exit_; } -u8 p2p_ps_wk_cmd(_adapter*padapter, u8 p2p_ps_state, u8 enqueue) +u8 p2p_ps_wk_cmd(struct adapter*padapter, u8 p2p_ps_state, u8 enqueue) { struct cmd_obj *ph2c; struct drvextra_cmd_parm *pdrvextra_cmd_parm; @@ -4701,7 +4701,7 @@ _func_exit_; static void reset_ch_sitesurvey_timer_process (void *FunctionContext) { - _adapter *adapter = (_adapter *)FunctionContext; + struct adapter *adapter = (struct adapter *)FunctionContext; struct wifidirect_info *pwdinfo = &adapter->wdinfo; if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) @@ -4720,7 +4720,7 @@ static void reset_ch_sitesurvey_timer_process (void *FunctionContext) static void reset_ch_sitesurvey_timer_process2 (void *FunctionContext) { - _adapter *adapter = (_adapter *)FunctionContext; + struct adapter *adapter = (struct adapter *)FunctionContext; struct wifidirect_info *pwdinfo = &adapter->wdinfo; if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) @@ -4739,7 +4739,7 @@ static void reset_ch_sitesurvey_timer_process2 (void *FunctionContext) static void restore_p2p_state_timer_process (void *FunctionContext) { - _adapter *adapter = (_adapter *)FunctionContext; + struct adapter *adapter = (struct adapter *)FunctionContext; struct wifidirect_info *pwdinfo = &adapter->wdinfo; if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) @@ -4750,7 +4750,7 @@ static void restore_p2p_state_timer_process (void *FunctionContext) static void pre_tx_scan_timer_process (void *FunctionContext) { - _adapter *adapter = (_adapter *) FunctionContext; + struct adapter *adapter = (struct adapter *) FunctionContext; struct wifidirect_info *pwdinfo = &adapter->wdinfo; _irqL irqL; struct mlme_priv *pmlmepriv = &adapter->mlmepriv; @@ -4795,7 +4795,7 @@ static void pre_tx_scan_timer_process (void *FunctionContext) static void find_phase_timer_process (void *FunctionContext) { - _adapter *adapter = (_adapter *)FunctionContext; + struct adapter *adapter = (struct adapter *)FunctionContext; struct wifidirect_info *pwdinfo = &adapter->wdinfo; if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) @@ -4809,7 +4809,7 @@ static void find_phase_timer_process (void *FunctionContext) #ifdef CONFIG_CONCURRENT_MODE void ap_p2p_switch_timer_process (void *FunctionContext) { - _adapter *adapter = (_adapter *)FunctionContext; + struct adapter *adapter = (struct adapter *)FunctionContext; struct wifidirect_info *pwdinfo = &adapter->wdinfo; #ifdef CONFIG_IOCTL_CFG80211 struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(adapter->rtw_wdev); @@ -4826,7 +4826,7 @@ void ap_p2p_switch_timer_process (void *FunctionContext) } #endif -void reset_global_wifidirect_info( _adapter* padapter ) +void reset_global_wifidirect_info( struct adapter* padapter ) { struct wifidirect_info *pwdinfo; @@ -4838,7 +4838,7 @@ void reset_global_wifidirect_info( _adapter* padapter ) } #ifdef CONFIG_WFD -int rtw_init_wifi_display_info(_adapter* padapter) +int rtw_init_wifi_display_info(struct adapter* padapter) { int res = _SUCCESS; struct wifi_display_info *pwfd_info = &padapter->wfd_info; @@ -4862,7 +4862,7 @@ int rtw_init_wifi_display_info(_adapter* padapter) } #endif //CONFIG_WFD -void rtw_init_wifidirect_timers(_adapter* padapter) +void rtw_init_wifidirect_timers(struct adapter* padapter) { struct wifidirect_info *pwdinfo = &padapter->wdinfo; @@ -4876,7 +4876,7 @@ void rtw_init_wifidirect_timers(_adapter* padapter) #endif } -void rtw_init_wifidirect_addrs(_adapter* padapter, u8 *dev_addr, u8 *iface_addr) +void rtw_init_wifidirect_addrs(struct adapter* padapter, u8 *dev_addr, u8 *iface_addr) { #ifdef CONFIG_P2P struct wifidirect_info *pwdinfo = &padapter->wdinfo; @@ -4891,14 +4891,14 @@ void rtw_init_wifidirect_addrs(_adapter* padapter, u8 *dev_addr, u8 *iface_addr) #endif } -void init_wifidirect_info( _adapter* padapter, enum P2P_ROLE role) +void init_wifidirect_info( struct adapter* padapter, enum P2P_ROLE role) { struct wifidirect_info *pwdinfo; #ifdef CONFIG_WFD struct wifi_display_info *pwfd_info = &padapter->wfd_info; #endif #ifdef CONFIG_CONCURRENT_MODE - _adapter *pbuddy_adapter = padapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; struct wifidirect_info *pbuddy_wdinfo; struct mlme_priv *pbuddy_mlmepriv; struct mlme_ext_priv *pbuddy_mlmeext; @@ -5204,7 +5204,7 @@ void dbg_rtw_p2p_set_role(struct wifidirect_info *wdinfo, enum P2P_ROLE role, co #endif //CONFIG_DBG_P2P -int rtw_p2p_enable(_adapter *padapter, enum P2P_ROLE role) +int rtw_p2p_enable(struct adapter *padapter, enum P2P_ROLE role) { int ret = _SUCCESS; struct wifidirect_info *pwdinfo= &(padapter->wdinfo); @@ -5215,7 +5215,7 @@ int rtw_p2p_enable(_adapter *padapter, enum P2P_ROLE role) u16 bwmode; #ifdef CONFIG_CONCURRENT_MODE - _adapter *pbuddy_adapter = padapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; struct wifidirect_info *pbuddy_wdinfo = &pbuddy_adapter->wdinfo; // Commented by Albert 2011/12/30 // The driver just supports 1 P2P group operation. diff --git a/core/rtw_pwrctrl.c b/core/rtw_pwrctrl.c index 04625b0..f1eceb1 100755 --- a/core/rtw_pwrctrl.c +++ b/core/rtw_pwrctrl.c @@ -29,7 +29,7 @@ #endif #ifdef CONFIG_IPS -void _ips_enter(_adapter * padapter) +void _ips_enter(struct adapter * padapter) { struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); @@ -64,7 +64,7 @@ void _ips_enter(_adapter * padapter) } -void ips_enter(_adapter * padapter) +void ips_enter(struct adapter * padapter) { struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); @@ -73,7 +73,7 @@ void ips_enter(_adapter * padapter) _exit_pwrlock(&pwrpriv->lock); } -int _ips_leave(_adapter * padapter) +int _ips_leave(struct adapter * padapter) { struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); int result = _SUCCESS; @@ -100,7 +100,7 @@ int _ips_leave(_adapter * padapter) return result; } -int ips_leave(_adapter * padapter) +int ips_leave(struct adapter * padapter) { struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); int ret; @@ -114,18 +114,18 @@ int ips_leave(_adapter * padapter) #endif /* CONFIG_IPS */ #ifdef CONFIG_AUTOSUSPEND -extern void autosuspend_enter(_adapter* padapter); -extern int autoresume_enter(_adapter* padapter); +extern void autosuspend_enter(struct adapter* padapter); +extern int autoresume_enter(struct adapter* padapter); #endif #ifdef SUPPORT_HW_RFOFF_DETECTED -int rtw_hw_suspend(_adapter *padapter ); -int rtw_hw_resume(_adapter *padapter); +int rtw_hw_suspend(struct adapter *padapter ); +int rtw_hw_resume(struct adapter *padapter); #endif -bool rtw_pwr_unassociated_idle(_adapter *adapter) +bool rtw_pwr_unassociated_idle(struct adapter *adapter) { - _adapter *buddy = adapter->pbuddy_adapter; + struct adapter *buddy = adapter->pbuddy_adapter; struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); struct xmit_priv *pxmit_priv = &adapter->xmitpriv; #ifdef CONFIG_P2P @@ -204,7 +204,7 @@ exit: return ret; } -void rtw_ps_processor(_adapter*padapter) +void rtw_ps_processor(struct adapter*padapter) { #ifdef CONFIG_P2P struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); @@ -334,7 +334,7 @@ exit: void pwr_state_check_handler(void *FunctionContext) { - _adapter *padapter = (_adapter *)FunctionContext; + struct adapter *padapter = (struct adapter *)FunctionContext; rtw_ps_cmd(padapter); } @@ -346,7 +346,7 @@ void pwr_state_check_handler(void *FunctionContext) * pslv power state level, only could be PS_STATE_S0 ~ PS_STATE_S4 * */ -void rtw_set_rpwm(PADAPTER padapter, u8 pslv) +void rtw_set_rpwm(struct adapter *padapter, u8 pslv) { u8 rpwm; struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); @@ -477,8 +477,8 @@ _func_enter_; _func_exit_; } -u8 PS_RDY_CHECK(_adapter * padapter); -u8 PS_RDY_CHECK(_adapter * padapter) +u8 PS_RDY_CHECK(struct adapter * padapter); +u8 PS_RDY_CHECK(struct adapter * padapter) { u32 curr_time, delta_time; struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); @@ -524,7 +524,7 @@ u8 PS_RDY_CHECK(_adapter * padapter) return _TRUE; } -void rtw_set_ps_mode(PADAPTER padapter, u8 ps_mode, u8 smart_ps, u8 bcn_ant_mode) +void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode, u8 smart_ps, u8 bcn_ant_mode) { struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); #ifdef CONFIG_P2P @@ -688,7 +688,7 @@ _func_exit_; * -1: Timeout * -2: Other error */ -s32 LPS_RF_ON_check(PADAPTER padapter, u32 delay_ms) +s32 LPS_RF_ON_check(struct adapter *padapter, u32 delay_ms) { u32 start_time; u8 bAwake = _FALSE; @@ -725,11 +725,11 @@ s32 LPS_RF_ON_check(PADAPTER padapter, u32 delay_ms) // Description: // Enter the leisure power save mode. // -void LPS_Enter(PADAPTER padapter) +void LPS_Enter(struct adapter *padapter) { struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); - _adapter *buddy = padapter->pbuddy_adapter; + struct adapter *buddy = padapter->pbuddy_adapter; _func_enter_; @@ -794,7 +794,7 @@ _func_exit_; // Description: // Leave the leisure power save mode. // -void LPS_Leave(PADAPTER padapter) +void LPS_Leave(struct adapter *padapter) { #define LPS_LEAVE_TIMEOUT_MS 100 @@ -834,7 +834,7 @@ _func_exit_; // Description: Leave all power save mode: LPS, FwLPS, IPS if needed. // Move code to function by tynli. 2010.03.26. // -void LeaveAllPowerSaveMode(IN PADAPTER Adapter) +void LeaveAllPowerSaveMode(IN struct adapter *Adapter) { struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv); u8 enqueue = 0; @@ -893,7 +893,7 @@ _func_exit_; #ifdef CONFIG_LPS_LCLK void LPS_Leave_check( - PADAPTER padapter) + struct adapter *padapter) { struct pwrctrl_priv *pwrpriv; u32 start_time; @@ -947,7 +947,7 @@ _func_exit_; * using to update cpwn of drv; and drv willl make a decision to up or down pwr level */ void cpwm_int_hdl( - PADAPTER padapter, + struct adapter *padapter, struct reportpwrstate_parm *preportpwrstate) { struct pwrctrl_priv *pwrpriv; @@ -1000,7 +1000,7 @@ static void cpwm_event_callback(struct work_struct *work) { struct pwrctrl_priv *pwrpriv = container_of(work, struct pwrctrl_priv, cpwm_event); struct dvobj_priv *dvobj = pwrctl_to_dvobj(pwrpriv); - _adapter *adapter = dvobj->if1; + struct adapter *adapter = dvobj->if1; struct reportpwrstate_parm report; //DBG_871X("%s\n",__FUNCTION__); @@ -1012,7 +1012,7 @@ static void cpwm_event_callback(struct work_struct *work) #ifdef CONFIG_LPS_RPWM_TIMER static void rpwmtimeout_workitem_callback(struct work_struct *work) { - PADAPTER padapter; + struct adapter *padapter; struct dvobj_priv *dvobj; struct pwrctrl_priv *pwrpriv; @@ -1065,7 +1065,7 @@ exit: */ static void pwr_rpwm_timeout_handler(void *FunctionContext) { - PADAPTER padapter; + struct adapter *padapter; struct pwrctrl_priv *pwrpriv; @@ -1106,7 +1106,7 @@ __inline static void unregister_task_alive(struct pwrctrl_priv *pwrctrl, u32 tag * _SUCCESS rtw_xmit_thread can write fifo/txcmd afterwards. * _FAIL rtw_xmit_thread can not do anything. */ -s32 rtw_register_tx_alive(PADAPTER padapter) +s32 rtw_register_tx_alive(struct adapter *padapter) { s32 res; struct pwrctrl_priv *pwrctrl; @@ -1172,7 +1172,7 @@ _func_exit_; * _SUCCESS rtw_cmd_thread can issue cmds to firmware afterwards. * _FAIL rtw_cmd_thread can not do anything. */ -s32 rtw_register_cmd_alive(PADAPTER padapter) +s32 rtw_register_cmd_alive(struct adapter *padapter) { s32 res; struct pwrctrl_priv *pwrctrl; @@ -1234,7 +1234,7 @@ _func_exit_; * _SUCCESS * _FAIL */ -s32 rtw_register_rx_alive(PADAPTER padapter) +s32 rtw_register_rx_alive(struct adapter *padapter) { struct pwrctrl_priv *pwrctrl; @@ -1265,7 +1265,7 @@ _func_exit_; * _SUCCESS * _FAIL */ -s32 rtw_register_evt_alive(PADAPTER padapter) +s32 rtw_register_evt_alive(struct adapter *padapter) { struct pwrctrl_priv *pwrctrl; @@ -1294,7 +1294,7 @@ _func_exit_; * No more pkts for TX, * Then driver shall call this fun. to power down firmware again. */ -void rtw_unregister_tx_alive(PADAPTER padapter) +void rtw_unregister_tx_alive(struct adapter *padapter) { struct pwrctrl_priv *pwrctrl; @@ -1332,7 +1332,7 @@ _func_exit_; * and no more command to do, * then driver shall call this fun. to power down firmware again. */ -void rtw_unregister_cmd_alive(PADAPTER padapter) +void rtw_unregister_cmd_alive(struct adapter *padapter) { struct pwrctrl_priv *pwrctrl; @@ -1366,7 +1366,7 @@ _func_exit_; /* * Caller: ISR */ -void rtw_unregister_rx_alive(PADAPTER padapter) +void rtw_unregister_rx_alive(struct adapter *padapter) { struct pwrctrl_priv *pwrctrl; @@ -1387,7 +1387,7 @@ _func_enter_; _func_exit_; } -void rtw_unregister_evt_alive(PADAPTER padapter) +void rtw_unregister_evt_alive(struct adapter *padapter) { struct pwrctrl_priv *pwrctrl; @@ -1411,7 +1411,7 @@ _func_exit_; static void resume_workitem_callback(struct work_struct *work); #endif //CONFIG_RESUME_IN_WORKQUEUE -void rtw_init_pwrctrl_priv(PADAPTER padapter) +void rtw_init_pwrctrl_priv(struct adapter *padapter) { struct pwrctrl_priv *pwrctrlpriv = adapter_to_pwrctl(padapter); @@ -1494,7 +1494,7 @@ _func_exit_; } -void rtw_free_pwrctrl_priv(PADAPTER adapter) +void rtw_free_pwrctrl_priv(struct adapter *adapter) { struct pwrctrl_priv *pwrctrlpriv = adapter_to_pwrctl(adapter); @@ -1527,13 +1527,13 @@ _func_exit_; #ifdef CONFIG_RESUME_IN_WORKQUEUE #if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI) -extern int rtw_resume_process(_adapter *padapter); +extern int rtw_resume_process(struct adapter *padapter); #endif static void resume_workitem_callback(struct work_struct *work) { struct pwrctrl_priv *pwrpriv = container_of(work, struct pwrctrl_priv, resume_work); struct dvobj_priv *dvobj = pwrctl_to_dvobj(pwrpriv); - _adapter *adapter = dvobj->if1; + struct adapter *adapter = dvobj->if1; DBG_871X("%s\n",__FUNCTION__); @@ -1575,7 +1575,7 @@ inline void rtw_set_do_late_resume(struct pwrctrl_priv *pwrpriv, bool enable) #ifdef CONFIG_HAS_EARLYSUSPEND #if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI) -extern int rtw_resume_process(_adapter *padapter); +extern int rtw_resume_process(struct adapter *padapter); #endif static void rtw_early_suspend(struct early_suspend *h) { @@ -1589,7 +1589,7 @@ static void rtw_late_resume(struct early_suspend *h) { struct pwrctrl_priv *pwrpriv = container_of(h, struct pwrctrl_priv, early_suspend); struct dvobj_priv *dvobj = pwrctl_to_dvobj(pwrpriv); - _adapter *adapter = dvobj->if1; + struct adapter *adapter = dvobj->if1; DBG_871X("%s\n",__FUNCTION__); if(pwrpriv->do_late_resume) { @@ -1627,7 +1627,7 @@ void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv) #ifdef CONFIG_ANDROID_POWER #if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI) -extern int rtw_resume_process(PADAPTER padapter); +extern int rtw_resume_process(struct adapter *padapter); #endif static void rtw_early_suspend(android_early_suspend_t *h) { @@ -1641,7 +1641,7 @@ static void rtw_late_resume(android_early_suspend_t *h) { struct pwrctrl_priv *pwrpriv = container_of(h, struct pwrctrl_priv, early_suspend); struct dvobj_priv *dvobj = pwrctl_to_dvobj(pwrpriv); - _adapter *adapter = dvobj->if1; + struct adapter *adapter = dvobj->if1; DBG_871X("%s\n",__FUNCTION__); if(pwrpriv->do_late_resume) { @@ -1677,7 +1677,7 @@ void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv) } #endif //CONFIG_ANDROID_POWER -u8 rtw_interface_ps_func(_adapter *padapter,HAL_INTF_PS_FUNC efunc_id,u8* val) +u8 rtw_interface_ps_func(struct adapter *padapter,HAL_INTF_PS_FUNC efunc_id,u8* val) { u8 bResult = _TRUE; rtw_hal_intf_ps_func(padapter,efunc_id,val); @@ -1686,7 +1686,7 @@ u8 rtw_interface_ps_func(_adapter *padapter,HAL_INTF_PS_FUNC efunc_id,u8* val) } -inline void rtw_set_ips_deny(_adapter *padapter, u32 ms) +inline void rtw_set_ips_deny(struct adapter *padapter, u32 ms) { struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); pwrpriv->ips_deny_time = rtw_get_current_time() + rtw_ms_to_systime(ms); @@ -1694,12 +1694,12 @@ inline void rtw_set_ips_deny(_adapter *padapter, u32 ms) /* * rtw_pwr_wakeup - Wake the NIC up from: 1)IPS. 2)USB autosuspend -* @adapter: pointer to _adapter structure +* @adapter: pointer to struct adapter structure * @ips_deffer_ms: the ms wiil prevent from falling into IPS after wakeup * Return _SUCCESS or _FAIL */ -int _rtw_pwr_wakeup(_adapter *padapter, u32 ips_deffer_ms, const char *caller) +int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *caller) { struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); struct mlme_priv *pmlmepriv = &padapter->mlmepriv; @@ -1851,7 +1851,7 @@ exit: } -int rtw_pm_set_lps(_adapter *padapter, u8 mode) +int rtw_pm_set_lps(struct adapter *padapter, u8 mode) { int ret = 0; struct pwrctrl_priv *pwrctrlpriv = adapter_to_pwrctl(padapter); @@ -1880,7 +1880,7 @@ int rtw_pm_set_lps(_adapter *padapter, u8 mode) return ret; } -int rtw_pm_set_ips(_adapter *padapter, u8 mode) +int rtw_pm_set_ips(struct adapter *padapter, u8 mode) { struct pwrctrl_priv *pwrctrlpriv = adapter_to_pwrctl(padapter); diff --git a/core/rtw_recv.c b/core/rtw_recv.c index a4f8d69..6ab794b 100755 --- a/core/rtw_recv.c +++ b/core/rtw_recv.c @@ -62,7 +62,7 @@ _func_exit_; } -sint _rtw_init_recv_priv(struct recv_priv *precvpriv, _adapter *padapter) +sint _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter) { sint i; @@ -165,7 +165,7 @@ void rtw_mfree_recv_priv_lock(struct recv_priv *precvpriv) void _rtw_free_recv_priv (struct recv_priv *precvpriv) { - _adapter *padapter = precvpriv->adapter; + struct adapter *padapter = precvpriv->adapter; _func_enter_; @@ -190,7 +190,7 @@ union recv_frame *_rtw_alloc_recvframe (_queue *pfree_recv_queue) union recv_frame *precvframe; _list *plist, *phead; - _adapter *padapter; + struct adapter *padapter; struct recv_priv *precvpriv; _func_enter_; @@ -246,7 +246,7 @@ void rtw_init_recvframe(union recv_frame *precvframe, struct recv_priv *precvpri int rtw_free_recvframe(union recv_frame *precvframe, _queue *pfree_recv_queue) { _irqL irqL; - _adapter *padapter=precvframe->u.hdr.adapter; + struct adapter *padapter=precvframe->u.hdr.adapter; struct recv_priv *precvpriv = &padapter->recvpriv; _func_enter_; @@ -299,7 +299,7 @@ _func_exit_; sint _rtw_enqueue_recvframe(union recv_frame *precvframe, _queue *queue) { - _adapter *padapter=precvframe->u.hdr.adapter; + struct adapter *padapter=precvframe->u.hdr.adapter; struct recv_priv *precvpriv = &padapter->recvpriv; _func_enter_; @@ -380,7 +380,7 @@ _func_exit_; } -u32 rtw_free_uc_swdec_pending_queue(_adapter *adapter) +u32 rtw_free_uc_swdec_pending_queue(struct adapter *adapter) { u32 cnt = 0; union recv_frame *pending_frame; @@ -469,8 +469,8 @@ struct recv_buf *rtw_dequeue_recvbuf (_queue *queue) } -sint recvframe_chkmic(_adapter *adapter, union recv_frame *precvframe); -sint recvframe_chkmic(_adapter *adapter, union recv_frame *precvframe){ +sint recvframe_chkmic(struct adapter *adapter, union recv_frame *precvframe); +sint recvframe_chkmic(struct adapter *adapter, union recv_frame *precvframe){ sint i,res=_SUCCESS; u32 datalen; @@ -616,8 +616,8 @@ _func_exit_; } //decrypt and set the ivlen,icvlen of the recv_frame -union recv_frame * decryptor(_adapter *padapter,union recv_frame *precv_frame); -union recv_frame * decryptor(_adapter *padapter,union recv_frame *precv_frame) +union recv_frame * decryptor(struct adapter *padapter,union recv_frame *precv_frame); +union recv_frame * decryptor(struct adapter *padapter,union recv_frame *precv_frame) { struct rx_pkt_attrib *prxattrib = &precv_frame->u.hdr.attrib; @@ -736,8 +736,8 @@ _func_exit_; } //###set the security information in the recv_frame -union recv_frame * portctrl(_adapter *adapter,union recv_frame * precv_frame); -union recv_frame * portctrl(_adapter *adapter,union recv_frame * precv_frame) +union recv_frame * portctrl(struct adapter *adapter,union recv_frame * precv_frame); +union recv_frame * portctrl(struct adapter *adapter,union recv_frame * precv_frame) { u8 *psta_addr, *ptr; uint auth_alg; @@ -862,8 +862,8 @@ _func_exit_; } -void process_pwrbit_data(_adapter *padapter, union recv_frame *precv_frame); -void process_pwrbit_data(_adapter *padapter, union recv_frame *precv_frame) +void process_pwrbit_data(struct adapter *padapter, union recv_frame *precv_frame); +void process_pwrbit_data(struct adapter *padapter, union recv_frame *precv_frame) { #ifdef CONFIG_AP_MODE unsigned char pwrbit; @@ -908,8 +908,8 @@ void process_pwrbit_data(_adapter *padapter, union recv_frame *precv_frame) #endif } -void process_wmmps_data(_adapter *padapter, union recv_frame *precv_frame); -void process_wmmps_data(_adapter *padapter, union recv_frame *precv_frame) +void process_wmmps_data(struct adapter *padapter, union recv_frame *precv_frame); +void process_wmmps_data(struct adapter *padapter, union recv_frame *precv_frame) { #ifdef CONFIG_AP_MODE struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib; @@ -982,7 +982,7 @@ void process_wmmps_data(_adapter *padapter, union recv_frame *precv_frame) } #ifdef CONFIG_TDLS -sint OnTDLS(_adapter *adapter, union recv_frame *precv_frame) +sint OnTDLS(struct adapter *adapter, union recv_frame *precv_frame) { struct rx_pkt_attrib *pattrib = & precv_frame->u.hdr.attrib; sint ret = _SUCCESS; @@ -1074,8 +1074,8 @@ exit: } #endif -void count_rx_stats(_adapter *padapter, union recv_frame *prframe, struct sta_info*sta); -void count_rx_stats(_adapter *padapter, union recv_frame *prframe, struct sta_info*sta) +void count_rx_stats(struct adapter *padapter, union recv_frame *prframe, struct sta_info*sta); +void count_rx_stats(struct adapter *padapter, union recv_frame *prframe, struct sta_info*sta) { int sz; struct sta_info *psta = NULL; @@ -1108,12 +1108,12 @@ void count_rx_stats(_adapter *padapter, union recv_frame *prframe, struct sta_in } sint sta2sta_data_frame( - _adapter *adapter, + struct adapter *adapter, union recv_frame *precv_frame, struct sta_info**psta ); sint sta2sta_data_frame( - _adapter *adapter, + struct adapter *adapter, union recv_frame *precv_frame, struct sta_info**psta ) @@ -1324,11 +1324,11 @@ _func_exit_; } sint ap2sta_data_frame( - _adapter *adapter, + struct adapter *adapter, union recv_frame *precv_frame, struct sta_info**psta ); sint ap2sta_data_frame( - _adapter *adapter, + struct adapter *adapter, union recv_frame *precv_frame, struct sta_info**psta ) { @@ -1481,11 +1481,11 @@ _func_exit_; } sint sta2ap_data_frame( - _adapter *adapter, + struct adapter *adapter, union recv_frame *precv_frame, struct sta_info**psta ); sint sta2ap_data_frame( - _adapter *adapter, + struct adapter *adapter, union recv_frame *precv_frame, struct sta_info**psta ) { @@ -1552,8 +1552,8 @@ _func_exit_; } -sint validate_recv_ctrl_frame(_adapter *padapter, union recv_frame *precv_frame); -sint validate_recv_ctrl_frame(_adapter *padapter, union recv_frame *precv_frame) +sint validate_recv_ctrl_frame(struct adapter *padapter, union recv_frame *precv_frame); +sint validate_recv_ctrl_frame(struct adapter *padapter, union recv_frame *precv_frame) { #ifdef CONFIG_AP_MODE struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib; @@ -1720,9 +1720,9 @@ sint validate_recv_ctrl_frame(_adapter *padapter, union recv_frame *precv_frame) } -union recv_frame* recvframe_chk_defrag(PADAPTER padapter, union recv_frame *precv_frame); -sint validate_recv_mgnt_frame(PADAPTER padapter, union recv_frame *precv_frame); -sint validate_recv_mgnt_frame(PADAPTER padapter, union recv_frame *precv_frame) +union recv_frame* recvframe_chk_defrag(struct adapter *padapter, union recv_frame *precv_frame); +sint validate_recv_mgnt_frame(struct adapter *padapter, union recv_frame *precv_frame); +sint validate_recv_mgnt_frame(struct adapter *padapter, union recv_frame *precv_frame) { //struct mlme_priv *pmlmepriv = &padapter->mlmepriv; @@ -1826,8 +1826,8 @@ sint validate_recv_mgnt_frame(PADAPTER padapter, union recv_frame *precv_frame) } -sint validate_recv_data_frame(_adapter *adapter, union recv_frame *precv_frame); -sint validate_recv_data_frame(_adapter *adapter, union recv_frame *precv_frame) +sint validate_recv_data_frame(struct adapter *adapter, union recv_frame *precv_frame); +sint validate_recv_data_frame(struct adapter *adapter, union recv_frame *precv_frame) { u8 bretry; u8 *psa, *pda, *pbssid; @@ -1998,7 +1998,7 @@ _func_exit_; } #ifdef CONFIG_IEEE80211W -static sint validate_80211w_mgmt(_adapter *adapter, union recv_frame *precv_frame) +static sint validate_80211w_mgmt(struct adapter *adapter, union recv_frame *precv_frame) { struct mlme_priv *pmlmepriv = &adapter->mlmepriv; struct rx_pkt_attrib *pattrib = & precv_frame->u.hdr.attrib; @@ -2118,8 +2118,8 @@ validate_80211w_fail: } #endif //CONFIG_IEEE80211W -sint validate_recv_frame(_adapter *adapter, union recv_frame *precv_frame); -sint validate_recv_frame(_adapter *adapter, union recv_frame *precv_frame) +sint validate_recv_frame(struct adapter *adapter, union recv_frame *precv_frame); +sint validate_recv_frame(struct adapter *adapter, union recv_frame *precv_frame) { //shall check frame subtype, to / from ds, da, bssid @@ -2339,7 +2339,7 @@ sint wlanhdr_to_ethhdr ( union recv_frame *precvframe) struct ieee80211_snap_hdr *psnap; sint ret=_SUCCESS; - _adapter *adapter =precvframe->u.hdr.adapter; + struct adapter *adapter =precvframe->u.hdr.adapter; struct mlme_priv *pmlmepriv = &adapter->mlmepriv; u8 *ptr = get_recvframe_data(precvframe) ; // point to frame_ctrl field @@ -2417,7 +2417,7 @@ sint wlanhdr_to_ethhdr ( union recv_frame *precvframe) struct ieee80211_snap_hdr *psnap; sint ret=_SUCCESS; - _adapter *adapter =precvframe->u.hdr.adapter; + struct adapter *adapter =precvframe->u.hdr.adapter; struct mlme_priv *pmlmepriv = &adapter->mlmepriv; u8* ptr = get_recvframe_data(precvframe) ; // point to frame_ctrl field @@ -2541,7 +2541,7 @@ _func_exit_; #if defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI) static void recvframe_expand_pkt( - PADAPTER padapter, + struct adapter *padapter, union recv_frame *prframe) { struct recv_frame_hdr *pfhdr; @@ -2591,8 +2591,8 @@ static void recvframe_expand_pkt( #endif //perform defrag -union recv_frame * recvframe_defrag(_adapter *adapter,_queue *defrag_q); -union recv_frame * recvframe_defrag(_adapter *adapter,_queue *defrag_q) +union recv_frame * recvframe_defrag(struct adapter *adapter,_queue *defrag_q); +union recv_frame * recvframe_defrag(struct adapter *adapter,_queue *defrag_q) { _list *plist, *phead; u8 *data,wlanhdr_offset; @@ -2686,7 +2686,7 @@ _func_exit_; } //check if need to defrag, if needed queue the frame to defrag_q -union recv_frame* recvframe_chk_defrag(PADAPTER padapter, union recv_frame *precv_frame) +union recv_frame* recvframe_chk_defrag(struct adapter *padapter, union recv_frame *precv_frame) { u8 ismfrag; u8 fragnum; @@ -2815,8 +2815,8 @@ _func_exit_; #define ENDIAN_FREE 1 -int amsdu_to_msdu(_adapter *padapter, union recv_frame *prframe); -int amsdu_to_msdu(_adapter *padapter, union recv_frame *prframe) +int amsdu_to_msdu(struct adapter *padapter, union recv_frame *prframe); +int amsdu_to_msdu(struct adapter *padapter, union recv_frame *prframe) { int a_len, padding_len; u16 eth_type, nSubframe_Length; @@ -2961,7 +2961,7 @@ int amsdu_to_msdu(_adapter *padapter, union recv_frame *prframe) if( br_port && (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == _TRUE) ) { - int nat25_handle_frame(_adapter *priv, struct sk_buff *skb); + int nat25_handle_frame(struct adapter *priv, struct sk_buff *skb); if (nat25_handle_frame(padapter, sub_skb) == -1) { //priv->ext_stats.rx_data_drops++; //DEBUG_ERR("RX DROP: nat25_handle_frame fail!\n"); @@ -3133,8 +3133,8 @@ int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, union rec } -int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ctrl *preorder_ctrl, int bforced); -int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ctrl *preorder_ctrl, int bforced) +int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reorder_ctrl *preorder_ctrl, int bforced); +int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reorder_ctrl *preorder_ctrl, int bforced) { //_irqL irql; //u8 bcancelled; @@ -3302,8 +3302,8 @@ int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ctrl *pre } -int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe); -int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe) +int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *prframe); +int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *prframe) { _irqL irql; int retval = _SUCCESS; @@ -3479,7 +3479,7 @@ void rtw_reordering_ctrl_timeout_handler(void *pcontext) { _irqL irql; struct recv_reorder_ctrl *preorder_ctrl = (struct recv_reorder_ctrl *)pcontext; - _adapter *padapter = preorder_ctrl->padapter; + struct adapter *padapter = preorder_ctrl->padapter; _queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue; @@ -3501,8 +3501,8 @@ void rtw_reordering_ctrl_timeout_handler(void *pcontext) } -int process_recv_indicatepkts(_adapter *padapter, union recv_frame *prframe); -int process_recv_indicatepkts(_adapter *padapter, union recv_frame *prframe) +int process_recv_indicatepkts(struct adapter *padapter, union recv_frame *prframe); +int process_recv_indicatepkts(struct adapter *padapter, union recv_frame *prframe) { int retval = _SUCCESS; //struct recv_priv *precvpriv = &padapter->recvpriv; @@ -3577,7 +3577,7 @@ int process_recv_indicatepkts(_adapter *padapter, union recv_frame *prframe) } -int recv_func_prehandle(_adapter *padapter, union recv_frame *rframe) +int recv_func_prehandle(struct adapter *padapter, union recv_frame *rframe) { int ret = _SUCCESS; struct rx_pkt_attrib *pattrib = &rframe->u.hdr.attrib; @@ -3598,7 +3598,7 @@ exit: return ret; } -int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe) +int recv_func_posthandle(struct adapter *padapter, union recv_frame *prframe) { int ret = _SUCCESS; union recv_frame *orig_prframe = prframe; @@ -3768,8 +3768,8 @@ _recv_data_drop: } -int recv_func(_adapter *padapter, union recv_frame *rframe); -int recv_func(_adapter *padapter, union recv_frame *rframe) +int recv_func(struct adapter *padapter, union recv_frame *rframe); +int recv_func(struct adapter *padapter, union recv_frame *rframe) { int ret; struct rx_pkt_attrib *prxattrib = &rframe->u.hdr.attrib; @@ -3827,7 +3827,7 @@ exit: s32 rtw_recv_entry(union recv_frame *precvframe) { - _adapter *padapter; + struct adapter *padapter; struct recv_priv *precvpriv; s32 ret=_SUCCESS; @@ -3862,7 +3862,7 @@ _func_exit_; #ifdef CONFIG_NEW_SIGNAL_STAT_PROCESS void rtw_signal_stat_timer_hdl(RTW_TIMER_HDL_ARGS){ - _adapter *adapter = (_adapter *)FunctionContext; + struct adapter *adapter = (struct adapter *)FunctionContext; struct recv_priv *recvpriv = &adapter->recvpriv; u32 tmp_s, tmp_q; diff --git a/core/rtw_security.c b/core/rtw_security.c index f587e5b..10e12b1 100755 --- a/core/rtw_security.c +++ b/core/rtw_security.c @@ -160,7 +160,7 @@ _func_exit_; /* Need to consider the fragment situation */ -void rtw_wep_encrypt(_adapter *padapter, u8 *pxmitframe) +void rtw_wep_encrypt(struct adapter *padapter, u8 *pxmitframe) { // exclude ICV unsigned char crc[4]; @@ -240,7 +240,7 @@ _func_exit_; } -void rtw_wep_decrypt(_adapter *padapter, u8 *precvframe) +void rtw_wep_decrypt(struct adapter *padapter, u8 *precvframe) { // exclude ICV u8 crc[4]; @@ -648,7 +648,7 @@ _func_exit_; //The hlen isn't include the IV -u32 rtw_tkip_encrypt(_adapter *padapter, u8 *pxmitframe) +u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe) { // exclude ICV u16 pnl; u32 pnh; @@ -770,7 +770,7 @@ _func_exit_; //The hlen isn't include the IV -u32 rtw_tkip_decrypt(_adapter *padapter, u8 *precvframe) +u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe) { // exclude ICV u16 pnl; u32 pnh; @@ -1579,7 +1579,7 @@ _func_exit_; -u32 rtw_aes_encrypt(_adapter *padapter, u8 *pxmitframe) +u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe) { // exclude ICV @@ -1969,7 +1969,7 @@ _func_exit_; return res; } -u32 rtw_aes_decrypt(_adapter *padapter, u8 *precvframe) +u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe) { // exclude ICV @@ -2092,7 +2092,7 @@ exit: } #ifdef CONFIG_IEEE80211W -u32 rtw_BIP_verify(_adapter *padapter, u8 *precvframe) +u32 rtw_BIP_verify(struct adapter *padapter, u8 *precvframe) { struct rx_pkt_attrib *pattrib = &((union recv_frame *)precvframe)->u.hdr.attrib; u8 *pframe; @@ -2902,7 +2902,7 @@ int omac1_aes_128(u8 *key, u8 *data, size_t data_len, u8 *mac) } #ifdef CONFIG_TDLS -void wpa_tdls_generate_tpk(_adapter *padapter, struct sta_info *psta) +void wpa_tdls_generate_tpk(struct adapter *padapter, struct sta_info *psta) { struct mlme_priv *pmlmepriv = &padapter->mlmepriv; u8 *SNonce = psta->SNonce; @@ -3073,7 +3073,7 @@ int tdls_verify_mic(u8 *kck, u8 trans_seq, void rtw_use_tkipkey_handler(void *FunctionContext) { - _adapter *padapter = (_adapter *)FunctionContext; + struct adapter *padapter = (struct adapter *)FunctionContext; _func_enter_; @@ -3089,7 +3089,7 @@ _func_exit_; } /* Restore HW wep key setting according to key_mask */ -void rtw_sec_restore_wep_key(_adapter *adapter) +void rtw_sec_restore_wep_key(struct adapter *adapter) { struct security_priv* securitypriv=&(adapter->securitypriv); sint keyid; @@ -3106,7 +3106,7 @@ void rtw_sec_restore_wep_key(_adapter *adapter) } } -u8 rtw_handle_tkip_countermeasure(_adapter* adapter, const char *caller) +u8 rtw_handle_tkip_countermeasure(struct adapter* adapter, const char *caller) { struct security_priv* securitypriv=&(adapter->securitypriv); u8 status = _SUCCESS; diff --git a/core/rtw_sreset.c b/core/rtw_sreset.c index 2756b4a..2c0492b 100755 --- a/core/rtw_sreset.c +++ b/core/rtw_sreset.c @@ -20,7 +20,7 @@ #include -void sreset_init_value(_adapter *padapter) +void sreset_init_value(struct adapter *padapter) { #if defined(DBG_CONFIG_ERROR_DETECT) HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); @@ -33,7 +33,7 @@ void sreset_init_value(_adapter *padapter) psrtpriv->last_tx_complete_time =0; #endif } -void sreset_reset_value(_adapter *padapter) +void sreset_reset_value(struct adapter *padapter) { #if defined(DBG_CONFIG_ERROR_DETECT) HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); @@ -46,7 +46,7 @@ void sreset_reset_value(_adapter *padapter) #endif } -u8 sreset_get_wifi_status(_adapter *padapter) +u8 sreset_get_wifi_status(struct adapter *padapter) { #if defined(DBG_CONFIG_ERROR_DETECT) HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); @@ -84,7 +84,7 @@ u8 sreset_get_wifi_status(_adapter *padapter) #endif } -void sreset_set_wifi_error_status(_adapter *padapter, u32 status) +void sreset_set_wifi_error_status(struct adapter *padapter, u32 status) { #if defined(DBG_CONFIG_ERROR_DETECT) HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); @@ -92,7 +92,7 @@ void sreset_set_wifi_error_status(_adapter *padapter, u32 status) #endif } -void sreset_set_trigger_point(_adapter *padapter, s32 tgp) +void sreset_set_trigger_point(struct adapter *padapter, s32 tgp) { #if defined(DBG_CONFIG_ERROR_DETECT) HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); @@ -100,7 +100,7 @@ void sreset_set_trigger_point(_adapter *padapter, s32 tgp) #endif } -bool sreset_inprogress(_adapter *padapter) +bool sreset_inprogress(struct adapter *padapter) { #if defined(DBG_CONFIG_ERROR_RESET) HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); @@ -110,7 +110,7 @@ bool sreset_inprogress(_adapter *padapter) #endif } -void sreset_restore_security_station(_adapter *padapter) +void sreset_restore_security_station(struct adapter *padapter) { u8 EntryId = 0; struct mlme_priv *mlmepriv = &padapter->mlmepriv; @@ -168,7 +168,7 @@ void sreset_restore_security_station(_adapter *padapter) } } -void sreset_restore_network_station(_adapter *padapter) +void sreset_restore_network_station(struct adapter *padapter) { struct mlme_priv *mlmepriv = &padapter->mlmepriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; @@ -235,7 +235,7 @@ void sreset_restore_network_station(_adapter *padapter) } -void sreset_restore_network_status(_adapter *padapter) +void sreset_restore_network_status(struct adapter *padapter) { struct mlme_priv *mlmepriv = &padapter->mlmepriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; @@ -254,7 +254,7 @@ void sreset_restore_network_status(_adapter *padapter) } } -void sreset_stop_adapter(_adapter *padapter) +void sreset_stop_adapter(struct adapter *padapter) { struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct xmit_priv *pxmitpriv = &padapter->xmitpriv; @@ -285,7 +285,7 @@ void sreset_stop_adapter(_adapter *padapter) } -void sreset_start_adapter(_adapter *padapter) +void sreset_start_adapter(struct adapter *padapter) { struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct xmit_priv *pxmitpriv = &padapter->xmitpriv; @@ -311,7 +311,7 @@ void sreset_start_adapter(_adapter *padapter) } -void sreset_reset(_adapter *padapter) +void sreset_reset(struct adapter *padapter) { #ifdef DBG_CONFIG_ERROR_RESET HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); diff --git a/core/rtw_sta_mgt.c b/core/rtw_sta_mgt.c index c26a712..b5f060d 100755 --- a/core/rtw_sta_mgt.c +++ b/core/rtw_sta_mgt.c @@ -461,7 +461,7 @@ _func_exit_; // using pstapriv->sta_hash_lock to protect -u32 rtw_free_stainfo(_adapter *padapter , struct sta_info *psta) +u32 rtw_free_stainfo(struct adapter *padapter , struct sta_info *psta) { int i; _irqL irqL0; @@ -659,7 +659,7 @@ _func_exit_; } // free all stainfo which in sta_hash[all] -void rtw_free_all_stainfo(_adapter *padapter) +void rtw_free_all_stainfo(struct adapter *padapter) { _irqL irqL; _list *plist, *phead; @@ -757,7 +757,7 @@ _func_exit_; } -u32 rtw_init_bcmc_stainfo(_adapter* padapter) +u32 rtw_init_bcmc_stainfo(struct adapter* padapter) { struct sta_info *psta; @@ -799,7 +799,7 @@ _func_exit_; } -struct sta_info* rtw_get_bcmc_stainfo(_adapter* padapter) +struct sta_info* rtw_get_bcmc_stainfo(struct adapter* padapter) { struct sta_info *psta; struct sta_priv *pstapriv = &padapter->stapriv; @@ -811,7 +811,7 @@ _func_exit_; } -u8 rtw_access_ctrl(_adapter *padapter, u8 *mac_addr) +u8 rtw_access_ctrl(struct adapter *padapter, u8 *mac_addr) { u8 res = _TRUE; #ifdef CONFIG_AP_MODE diff --git a/core/rtw_wlan_util.c b/core/rtw_wlan_util.c index ca5649f..0146fe0 100755 --- a/core/rtw_wlan_util.c +++ b/core/rtw_wlan_util.c @@ -144,7 +144,7 @@ unsigned char networktype_to_raid(unsigned char network_type) } -u8 judge_network_type(_adapter *padapter, unsigned char *rate, int ratelen) +u8 judge_network_type(struct adapter *padapter, unsigned char *rate, int ratelen) { u8 network_type = 0; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; @@ -245,8 +245,8 @@ unsigned char ratetbl_val_2wifirate(unsigned char rate) } -int is_basicrate(_adapter *padapter, unsigned char rate); -int is_basicrate(_adapter *padapter, unsigned char rate) +int is_basicrate(struct adapter *padapter, unsigned char rate); +int is_basicrate(struct adapter *padapter, unsigned char rate) { int i; unsigned char val; @@ -268,8 +268,8 @@ int is_basicrate(_adapter *padapter, unsigned char rate) return _FALSE; } -unsigned int ratetbl2rateset(_adapter *padapter, unsigned char *rateset); -unsigned int ratetbl2rateset(_adapter *padapter, unsigned char *rateset) +unsigned int ratetbl2rateset(struct adapter *padapter, unsigned char *rateset); +unsigned int ratetbl2rateset(struct adapter *padapter, unsigned char *rateset) { int i; unsigned char rate; @@ -304,7 +304,7 @@ unsigned int ratetbl2rateset(_adapter *padapter, unsigned char *rateset) return len; } -void get_rate_set(_adapter *padapter, unsigned char *pbssrate, int *bssrate_len) +void get_rate_set(struct adapter *padapter, unsigned char *pbssrate, int *bssrate_len) { unsigned char supportedrates[NumRates]; @@ -314,7 +314,7 @@ void get_rate_set(_adapter *padapter, unsigned char *pbssrate, int *bssrate_len) } void UpdateBrateTbl( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN u8 *mBratesOS ) { @@ -362,19 +362,19 @@ void UpdateBrateTblForSoftAP(u8 *bssrateset, u32 bssratelen) } -void Save_DM_Func_Flag(_adapter *padapter) +void Save_DM_Func_Flag(struct adapter *padapter) { u8 bSaveFlag = _TRUE; rtw_hal_set_hwreg(padapter, HW_VAR_DM_FUNC_OP, (u8 *)(&bSaveFlag)); } -void Restore_DM_Func_Flag(_adapter *padapter) +void Restore_DM_Func_Flag(struct adapter *padapter) { u8 bSaveFlag = _FALSE; rtw_hal_set_hwreg(padapter, HW_VAR_DM_FUNC_OP, (u8 *)(&bSaveFlag)); } -void Switch_DM_Func(_adapter *padapter, u32 mode, u8 enable) +void Switch_DM_Func(struct adapter *padapter, u32 mode, u8 enable) { if(enable == _TRUE) rtw_hal_set_hwreg(padapter, HW_VAR_DM_FUNC_SET, (u8 *)(&mode)); @@ -382,17 +382,17 @@ void Switch_DM_Func(_adapter *padapter, u32 mode, u8 enable) rtw_hal_set_hwreg(padapter, HW_VAR_DM_FUNC_CLR, (u8 *)(&mode)); } -static void Set_NETYPE1_MSR(_adapter *padapter, u8 type) +static void Set_NETYPE1_MSR(struct adapter *padapter, u8 type) { rtw_hal_set_hwreg(padapter, HW_VAR_MEDIA_STATUS1, (u8 *)(&type)); } -static void Set_NETYPE0_MSR(_adapter *padapter, u8 type) +static void Set_NETYPE0_MSR(struct adapter *padapter, u8 type) { rtw_hal_set_hwreg(padapter, HW_VAR_MEDIA_STATUS, (u8 *)(&type)); } -void Set_MSR(_adapter *padapter, u8 type) +void Set_MSR(struct adapter *padapter, u8 type) { #ifdef CONFIG_CONCURRENT_MODE if(padapter->iface_type == IFACE_PORT1) @@ -406,12 +406,12 @@ void Set_MSR(_adapter *padapter, u8 type) } } -inline u8 rtw_get_oper_ch(_adapter *adapter) +inline u8 rtw_get_oper_ch(struct adapter *adapter) { return adapter_to_dvobj(adapter)->oper_channel; } -inline void rtw_set_oper_ch(_adapter *adapter, u8 ch) +inline void rtw_set_oper_ch(struct adapter *adapter, u8 ch) { if (adapter_to_dvobj(adapter)->oper_channel != ch) adapter_to_dvobj(adapter)->on_oper_ch_time = rtw_get_current_time(); @@ -419,32 +419,32 @@ inline void rtw_set_oper_ch(_adapter *adapter, u8 ch) adapter_to_dvobj(adapter)->oper_channel = ch; } -inline u8 rtw_get_oper_bw(_adapter *adapter) +inline u8 rtw_get_oper_bw(struct adapter *adapter) { return adapter_to_dvobj(adapter)->oper_bwmode; } -inline void rtw_set_oper_bw(_adapter *adapter, u8 bw) +inline void rtw_set_oper_bw(struct adapter *adapter, u8 bw) { adapter_to_dvobj(adapter)->oper_bwmode = bw; } -inline u8 rtw_get_oper_choffset(_adapter *adapter) +inline u8 rtw_get_oper_choffset(struct adapter *adapter) { return adapter_to_dvobj(adapter)->oper_ch_offset; } -inline void rtw_set_oper_choffset(_adapter *adapter, u8 offset) +inline void rtw_set_oper_choffset(struct adapter *adapter, u8 offset) { adapter_to_dvobj(adapter)->oper_ch_offset = offset; } -inline u32 rtw_get_on_oper_ch_time(_adapter *adapter) +inline u32 rtw_get_on_oper_ch_time(struct adapter *adapter) { return adapter_to_dvobj(adapter)->on_oper_ch_time; } -inline u32 rtw_get_on_cur_ch_time(_adapter *adapter) +inline u32 rtw_get_on_cur_ch_time(struct adapter *adapter) { if (adapter->mlmeextpriv.cur_channel == adapter_to_dvobj(adapter)->oper_channel) return adapter_to_dvobj(adapter)->on_oper_ch_time; @@ -452,7 +452,7 @@ inline u32 rtw_get_on_cur_ch_time(_adapter *adapter) return 0; } -void SelectChannel(_adapter *padapter, unsigned char channel) +void SelectChannel(struct adapter *padapter, unsigned char channel) { struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; @@ -474,7 +474,7 @@ void SelectChannel(_adapter *padapter, unsigned char channel) #endif // CONFIG_DUALMAC_CONCURRENT } -void SetBWMode(_adapter *padapter, unsigned short bwmode, unsigned char channel_offset) +void SetBWMode(struct adapter *padapter, unsigned short bwmode, unsigned char channel_offset) { struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; @@ -498,7 +498,7 @@ void SetBWMode(_adapter *padapter, unsigned short bwmode, unsigned char channel_ #endif // CONFIG_DUALMAC_CONCURRENT } -void set_channel_bwmode(_adapter *padapter, unsigned char channel, unsigned char channel_offset, unsigned short bwmode) +void set_channel_bwmode(struct adapter *padapter, unsigned char channel, unsigned char channel_offset, unsigned short bwmode) { u8 center_ch; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; @@ -584,7 +584,7 @@ u16 get_beacon_interval(WLAN_BSSID_EX *bss) return le16_to_cpu(le_val); } -int is_client_associated_to_ap(_adapter *padapter) +int is_client_associated_to_ap(struct adapter *padapter) { struct mlme_ext_priv *pmlmeext; struct mlme_ext_info *pmlmeinfo; @@ -605,7 +605,7 @@ int is_client_associated_to_ap(_adapter *padapter) } } -int is_client_associated_to_ibss(_adapter *padapter) +int is_client_associated_to_ibss(struct adapter *padapter) { struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); @@ -620,7 +620,7 @@ int is_client_associated_to_ibss(_adapter *padapter) } } -int is_IBSS_empty(_adapter *padapter) +int is_IBSS_empty(struct adapter *padapter) { unsigned int i; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; @@ -655,19 +655,19 @@ unsigned int decide_wait_for_beacon_timeout(unsigned int bcn_interval) } void CAM_empty_entry( - PADAPTER Adapter, + struct adapter * Adapter, u8 ucIndex ) { rtw_hal_set_hwreg(Adapter, HW_VAR_CAM_EMPTY_ENTRY, (u8 *)(&ucIndex)); } -void invalidate_cam_all(_adapter *padapter) +void invalidate_cam_all(struct adapter *padapter) { rtw_hal_set_hwreg(padapter, HW_VAR_CAM_INVALID_ALL, NULL); } #if 0 -static u32 _ReadCAM(_adapter *padapter ,u32 addr) +static u32 _ReadCAM(struct adapter *padapter ,u32 addr) { u32 count = 0, cmd; cmd = CAM_POLLINIG |addr ; @@ -682,7 +682,7 @@ static u32 _ReadCAM(_adapter *padapter ,u32 addr) return rtw_read32(padapter,REG_CAMREAD); } #endif -void read_cam(_adapter *padapter ,u8 entry) +void read_cam(struct adapter *padapter ,u8 entry) { u32 j,count = 0, addr; u32 cam_val[2]; //cam_val[0] is read_val, cam_val[1] is the address @@ -701,7 +701,7 @@ void read_cam(_adapter *padapter ,u8 entry) } -void write_cam(_adapter *padapter, u8 entry, u16 ctrl, u8 *mac, u8 *key) +void write_cam(struct adapter *padapter, u8 entry, u16 ctrl, u8 *mac, u8 *key) { unsigned int i, val, addr; //unsigned int cmd; @@ -745,7 +745,7 @@ void write_cam(_adapter *padapter, u8 entry, u16 ctrl, u8 *mac, u8 *key) } -void clear_cam_entry(_adapter *padapter, u8 entry) +void clear_cam_entry(struct adapter *padapter, u8 entry) { #if 0 u32 addr, val=0; @@ -776,7 +776,7 @@ void clear_cam_entry(_adapter *padapter, u8 entry) #endif } -int allocate_fw_sta_entry(_adapter *padapter) +int allocate_fw_sta_entry(struct adapter *padapter) { unsigned int mac_id; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; @@ -795,7 +795,7 @@ int allocate_fw_sta_entry(_adapter *padapter) return mac_id; } -void flush_all_cam_entry(_adapter *padapter) +void flush_all_cam_entry(struct adapter *padapter) { struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); @@ -847,7 +847,7 @@ void flush_all_cam_entry(_adapter *padapter) } #if defined(CONFIG_P2P) && defined(CONFIG_WFD) -int WFD_info_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) +int WFD_info_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) { struct registry_priv *pregpriv = &padapter->registrypriv; struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); @@ -882,7 +882,7 @@ int WFD_info_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) } #endif -int WMM_param_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) +int WMM_param_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) { //struct registry_priv *pregpriv = &padapter->registrypriv; struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); @@ -921,7 +921,7 @@ int WMM_param_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) } -void WMMOnAssocRsp(_adapter *padapter) +void WMMOnAssocRsp(struct adapter *padapter) { u8 ACI, ACM, AIFS, ECWMin, ECWMax, aSifsTime; u8 acm_mask; @@ -1042,7 +1042,7 @@ void WMMOnAssocRsp(_adapter *padapter) return; } -static void bwmode_update_check(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) +static void bwmode_update_check(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) { #ifdef CONFIG_80211N_HT unsigned char new_bwmode; @@ -1142,7 +1142,7 @@ static void bwmode_update_check(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pI #endif //CONFIG_80211N_HT } -void HT_caps_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) +void HT_caps_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) { #ifdef CONFIG_80211N_HT unsigned int i; @@ -1229,7 +1229,7 @@ void HT_caps_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) return; } -void HT_info_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) +void HT_info_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) { #ifdef CONFIG_80211N_HT struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; @@ -1251,7 +1251,7 @@ void HT_info_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) return; } -void HTOnAssocRsp(_adapter *padapter) +void HTOnAssocRsp(struct adapter *padapter) { unsigned char max_AMPDU_len; unsigned char min_MPDU_spacing; @@ -1337,7 +1337,7 @@ void HTOnAssocRsp(_adapter *padapter) } -void ERP_IE_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) +void ERP_IE_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) { struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); @@ -1349,7 +1349,7 @@ void ERP_IE_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) _rtw_memcpy(&(pmlmeinfo->ERP_IE), pIE->data, pIE->Length); } -void VCS_update(_adapter *padapter, struct sta_info *psta) +void VCS_update(struct adapter *padapter, struct sta_info *psta) { struct registry_priv *pregpriv = &padapter->registrypriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; @@ -1417,7 +1417,7 @@ int check_ap_tdls_prohibited(u8 *pframe, u8 pkt_len) } #endif //CONFIG_TDLS -int rtw_check_bcn_info(ADAPTER *Adapter, u8 *pframe, u32 packet_len) +int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len) { unsigned int len; unsigned char *p; @@ -1626,7 +1626,7 @@ _mismatch: _func_exit_; } -void update_beacon_info(_adapter *padapter, u8 *pframe, uint pkt_len, struct sta_info *psta) +void update_beacon_info(struct adapter *padapter, u8 *pframe, uint pkt_len, struct sta_info *psta) { unsigned int i; unsigned int len; @@ -1680,7 +1680,7 @@ void update_beacon_info(_adapter *padapter, u8 *pframe, uint pkt_len, struct sta } #ifdef CONFIG_DFS -void process_csa_ie(_adapter *padapter, u8 *pframe, uint pkt_len) +void process_csa_ie(struct adapter *padapter, u8 *pframe, uint pkt_len) { unsigned int i; unsigned int len; @@ -1709,7 +1709,7 @@ void process_csa_ie(_adapter *padapter, u8 *pframe, uint pkt_len) } #endif //CONFIG_DFS -unsigned int is_ap_in_tkip(_adapter *padapter) +unsigned int is_ap_in_tkip(struct adapter *padapter) { u32 i; PNDIS_802_11_VARIABLE_IEs pIE; @@ -1754,7 +1754,7 @@ unsigned int is_ap_in_tkip(_adapter *padapter) } -unsigned int should_forbid_n_rate(_adapter * padapter) +unsigned int should_forbid_n_rate(struct adapter * padapter) { u32 i; PNDIS_802_11_VARIABLE_IEs pIE; @@ -1798,7 +1798,7 @@ unsigned int should_forbid_n_rate(_adapter * padapter) } -unsigned int is_ap_in_wep(_adapter *padapter) +unsigned int is_ap_in_wep(struct adapter *padapter) { u32 i; PNDIS_802_11_VARIABLE_IEs pIE; @@ -1938,7 +1938,7 @@ unsigned int update_MSC_rate(struct HT_caps_element *pHT_caps) return mask; } -int support_short_GI(_adapter *padapter, struct HT_caps_element *pHT_caps) +int support_short_GI(struct adapter *padapter, struct HT_caps_element *pHT_caps) { unsigned char bit_offset; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; @@ -1997,25 +1997,25 @@ unsigned char get_highest_mcs_rate(struct HT_caps_element *pHT_caps) return i; } -void Update_RA_Entry(_adapter *padapter, struct sta_info *psta) +void Update_RA_Entry(struct adapter *padapter, struct sta_info *psta) { rtw_hal_update_ra_mask(psta, 0); } -void enable_rate_adaptive(_adapter *padapter, struct sta_info *psta); -void enable_rate_adaptive(_adapter *padapter, struct sta_info *psta) +void enable_rate_adaptive(struct adapter *padapter, struct sta_info *psta); +void enable_rate_adaptive(struct adapter *padapter, struct sta_info *psta) { Update_RA_Entry(padapter, psta); } -void set_sta_rate(_adapter *padapter, struct sta_info *psta) +void set_sta_rate(struct adapter *padapter, struct sta_info *psta) { //rate adaptive enable_rate_adaptive(padapter, psta); } // Update RRSR and Rate for USERATE -void update_tx_basic_rate(_adapter *padapter, u8 wirelessmode) +void update_tx_basic_rate(struct adapter *padapter, u8 wirelessmode) { NDIS_802_11_RATES_EX supported_rates; #ifdef CONFIG_P2P @@ -2141,7 +2141,7 @@ unsigned char check_assoc_AP(u8 *pframe, uint len) } } -void update_IOT_info(_adapter *padapter) +void update_IOT_info(struct adapter *padapter) { struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); @@ -2173,7 +2173,7 @@ void update_IOT_info(_adapter *padapter) } -void update_capinfo(PADAPTER Adapter, u16 updateCap) +void update_capinfo(struct adapter *Adapter, u16 updateCap) { struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); @@ -2243,7 +2243,7 @@ void update_capinfo(PADAPTER Adapter, u16 updateCap) } -void update_wireless_mode(_adapter *padapter) +void update_wireless_mode(struct adapter *padapter) { int ratelen, network_type = 0; u32 SIFS_Timer; @@ -2309,8 +2309,8 @@ void update_wireless_mode(_adapter *padapter) update_mgnt_tx_rate(padapter, IEEE80211_OFDM_RATE_6MB); } -void fire_write_MAC_cmd(_adapter *padapter, unsigned int addr, unsigned int value); -void fire_write_MAC_cmd(_adapter *padapter, unsigned int addr, unsigned int value) +void fire_write_MAC_cmd(struct adapter *padapter, unsigned int addr, unsigned int value); +void fire_write_MAC_cmd(struct adapter *padapter, unsigned int addr, unsigned int value) { #if 0 struct cmd_obj *ph2c; @@ -2337,7 +2337,7 @@ void fire_write_MAC_cmd(_adapter *padapter, unsigned int addr, unsigned int valu #endif } -void update_bmc_sta_support_rate(_adapter *padapter, u32 mac_id) +void update_bmc_sta_support_rate(struct adapter *padapter, u32 mac_id) { struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); @@ -2353,7 +2353,7 @@ void update_bmc_sta_support_rate(_adapter *padapter, u32 mac_id) } } -int update_sta_support_rate(_adapter *padapter, u8* pvar_ie, uint var_ie_len, int cam_idx) +int update_sta_support_rate(struct adapter *padapter, u8* pvar_ie, uint var_ie_len, int cam_idx) { unsigned int ie_len; PNDIS_802_11_VARIABLE_IEs pIE; @@ -2380,7 +2380,7 @@ int update_sta_support_rate(_adapter *padapter, u8* pvar_ie, uint var_ie_len, in } -void process_addba_req(_adapter *padapter, u8 *paddba_req, u8 *addr) +void process_addba_req(struct adapter *padapter, u8 *paddba_req, u8 *addr) { struct sta_info *psta; u16 tid, start_seq, param; @@ -2431,18 +2431,18 @@ void update_TSF(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint len) pmlmeext->TSFValue |= le32_to_cpu(*pbuf); } -void correct_TSF(_adapter *padapter, struct mlme_ext_priv *pmlmeext) +void correct_TSF(struct adapter *padapter, struct mlme_ext_priv *pmlmeext) { rtw_hal_set_hwreg(padapter, HW_VAR_CORRECT_TSF, 0); } -void beacon_timing_control(_adapter *padapter) +void beacon_timing_control(struct adapter *padapter) { rtw_hal_bcn_related_reg_setting(padapter); } #if 0 -unsigned int setup_beacon_frame(_adapter *padapter, unsigned char *beacon_frame) +unsigned int setup_beacon_frame(struct adapter *padapter, unsigned char *beacon_frame) { unsigned short ATIMWindow; unsigned char *pframe; @@ -2543,9 +2543,9 @@ unsigned int setup_beacon_frame(_adapter *padapter, unsigned char *beacon_frame) } #endif -static _adapter *pbuddy_padapter = NULL; +static struct adapter *pbuddy_padapter = NULL; -int rtw_handle_dualmac(_adapter *adapter, bool init) +int rtw_handle_dualmac(struct adapter *adapter, bool init) { int status = _SUCCESS; struct dvobj_priv *dvobj = adapter_to_dvobj(adapter); @@ -2575,15 +2575,15 @@ int rtw_handle_dualmac(_adapter *adapter, bool init) if (dvobj->InterfaceNumber == 0) { //set adapter_type/iface type adapter->isprimary = _TRUE; - adapter->adapter_type = PRIMARY_ADAPTER; + adapter->adapter_type = PRIMARY_struct adapter; adapter->iface_type = IFACE_PORT0; - DBG_871X("%s(): PRIMARY_ADAPTER\n",__FUNCTION__); + DBG_871X("%s(): PRIMARY_struct adapter\n",__FUNCTION__); } else { //set adapter_type/iface type adapter->isprimary = _FALSE; - adapter->adapter_type = SECONDARY_ADAPTER; + adapter->adapter_type = SECONDARY_struct adapter; adapter->iface_type = IFACE_PORT1; - DBG_871X("%s(): SECONDARY_ADAPTER\n",__FUNCTION__); + DBG_871X("%s(): SECONDARY_struct adapter\n",__FUNCTION__); } #endif }else { @@ -2593,7 +2593,7 @@ exit: return status; } #ifdef CONFIG_WOWLAN -void rtw_get_current_ip_address(PADAPTER padapter, u8 *pcurrentip) +void rtw_get_current_ip_address(struct adapter *padapter, u8 *pcurrentip) { struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); @@ -2615,7 +2615,7 @@ void rtw_get_current_ip_address(PADAPTER padapter, u8 *pcurrentip) } } } -void rtw_get_sec_iv(PADAPTER padapter, u8*pcur_dot11txpn, u8 *StaAddr) +void rtw_get_sec_iv(struct adapter *padapter, u8*pcur_dot11txpn, u8 *StaAddr) { struct sta_info *psta; struct security_priv *psecpriv = &padapter->securitypriv; @@ -2637,7 +2637,7 @@ void rtw_get_sec_iv(PADAPTER padapter, u8*pcur_dot11txpn, u8 *StaAddr) DBG_871X("%s(): CurrentIV: 0x%016llx\n", __func__, psta->dot11txpn.val); } } -void rtw_set_sec_iv(PADAPTER padapter) +void rtw_set_sec_iv(struct adapter *padapter) { struct sta_info *psta; struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); diff --git a/core/rtw_xmit.c b/core/rtw_xmit.c index 679530d..4bd7b36 100755 --- a/core/rtw_xmit.c +++ b/core/rtw_xmit.c @@ -69,7 +69,7 @@ _func_exit_; } -s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, _adapter *padapter) +s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) { int i; struct xmit_buf *pxmitbuf; @@ -366,7 +366,7 @@ void rtw_mfree_xmit_priv_lock (struct xmit_priv *pxmitpriv) void _rtw_free_xmit_priv (struct xmit_priv *pxmitpriv) { int i; - _adapter *padapter = pxmitpriv->adapter; + struct adapter *padapter = pxmitpriv->adapter; struct xmit_frame *pxmitframe = (struct xmit_frame*) pxmitpriv->pxmit_frame_buf; struct xmit_buf *pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmitbuf; u32 max_xmit_extbuf_size = MAX_XMIT_EXTBUF_SZ; @@ -448,7 +448,7 @@ _func_exit_; } -static void update_attrib_vcs_info(_adapter *padapter, struct xmit_frame *pxmitframe) +static void update_attrib_vcs_info(struct adapter *padapter, struct xmit_frame *pxmitframe) { u32 sz; struct pkt_attrib *pattrib = &pxmitframe->attrib; @@ -674,7 +674,7 @@ static void set_qos(struct pkt_file *ppktfile, struct pkt_attrib *pattrib) pattrib->subtype = WIFI_QOS_DATA_TYPE; } -static s32 update_attrib(_adapter *padapter, _pkt *pkt, struct pkt_attrib *pattrib) +static s32 update_attrib(struct adapter *padapter, _pkt *pkt, struct pkt_attrib *pattrib) { uint i; struct pkt_file pktfile; @@ -959,7 +959,7 @@ _func_exit_; return res; } -static s32 xmitframe_addmic(_adapter *padapter, struct xmit_frame *pxmitframe){ +static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitframe){ sint curfragnum,length; u8 *pframe, *payload,mic[8]; struct mic_data micdata; @@ -1107,7 +1107,7 @@ _func_exit_; return _SUCCESS; } -static s32 xmitframe_swencrypt(_adapter *padapter, struct xmit_frame *pxmitframe){ +static s32 xmitframe_swencrypt(struct adapter *padapter, struct xmit_frame *pxmitframe){ struct pkt_attrib *pattrib = &pxmitframe->attrib; //struct security_priv *psecuritypriv=&padapter->securitypriv; @@ -1147,7 +1147,7 @@ _func_exit_; return _SUCCESS; } -s32 rtw_make_wlanhdr (_adapter *padapter , u8 *hdr, struct pkt_attrib *pattrib) +s32 rtw_make_wlanhdr (struct adapter *padapter , u8 *hdr, struct pkt_attrib *pattrib) { u16 *qc; @@ -1373,7 +1373,7 @@ _func_exit_; return res; } -s32 rtw_txframes_pending(_adapter *padapter) +s32 rtw_txframes_pending(struct adapter *padapter) { struct xmit_priv *pxmitpriv = &padapter->xmitpriv; @@ -1383,7 +1383,7 @@ s32 rtw_txframes_pending(_adapter *padapter) (_rtw_queue_empty(&pxmitpriv->vo_pending) == _FALSE)); } -s32 rtw_txframes_sta_ac_pending(_adapter *padapter, struct pkt_attrib *pattrib) +s32 rtw_txframes_sta_ac_pending(struct adapter *padapter, struct pkt_attrib *pattrib) { struct sta_info *psta; struct tx_servq *ptxservq; @@ -1438,7 +1438,7 @@ s32 rtw_txframes_sta_ac_pending(_adapter *padapter, struct pkt_attrib *pattrib) #ifdef CONFIG_TDLS -int rtw_build_tdls_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe, u8 action) +int rtw_build_tdls_ies(struct adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe, u8 action) { int res=_SUCCESS; @@ -1483,7 +1483,7 @@ int rtw_build_tdls_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 * return res; } -s32 rtw_make_tdls_wlanhdr (_adapter *padapter , u8 *hdr, struct pkt_attrib *pattrib, u8 action) +s32 rtw_make_tdls_wlanhdr (struct adapter *padapter , u8 *hdr, struct pkt_attrib *pattrib, u8 action) { u16 *qc; struct rtw_ieee80211_hdr *pwlanhdr = (struct rtw_ieee80211_hdr *)hdr; @@ -1590,7 +1590,7 @@ _func_exit_; return res; } -s32 rtw_xmit_tdls_coalesce(_adapter * padapter, struct xmit_frame * pxmitframe, u8 action) +s32 rtw_xmit_tdls_coalesce(struct adapter * padapter, struct xmit_frame * pxmitframe, u8 action) { s32 llc_sz; @@ -1728,7 +1728,7 @@ This sub-routine will perform all the following: 6. apply sw-encrypt, if necessary. */ -s32 rtw_xmitframe_coalesce(_adapter *padapter, _pkt *pkt, struct xmit_frame *pxmitframe) +s32 rtw_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit_frame *pxmitframe) { struct pkt_file pktfile; @@ -1940,7 +1940,7 @@ _func_exit_; #ifdef CONFIG_IEEE80211W //broadcast or multicast management pkt use BIP, unicast management pkt use CCMP encryption -s32 rtw_mgmt_xmitframe_coalesce(_adapter *padapter, _pkt *pkt, struct xmit_frame *pxmitframe) +s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit_frame *pxmitframe) { struct pkt_file pktfile; s32 frg_inx, frg_len, mpdu_len, llc_sz, mem_sz; @@ -2211,7 +2211,7 @@ _func_exit_; return SNAP_SIZE + sizeof(u16); } -void rtw_update_protection(_adapter *padapter, u8 *ie, uint ie_len) +void rtw_update_protection(struct adapter *padapter, u8 *ie, uint ie_len) { uint protection; @@ -2260,7 +2260,7 @@ _func_exit_; } -void rtw_count_tx_stats(PADAPTER padapter, struct xmit_frame *pxmitframe, int sz) +void rtw_count_tx_stats(struct adapter *padapter, struct xmit_frame *pxmitframe, int sz) { struct sta_info *psta = NULL; struct stainfo_stats *pstats = NULL; @@ -2542,7 +2542,7 @@ struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv)//(_queue *pf struct xmit_frame *pxframe = NULL; _list *plist, *phead; _queue *pfree_xmit_queue = &pxmitpriv->free_xmit_queue; - _adapter *padapter = pxmitpriv->adapter; + struct adapter *padapter = pxmitpriv->adapter; _func_enter_; @@ -2638,7 +2638,7 @@ s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitfram { _irqL irqL; _queue *queue; - _adapter *padapter = pxmitpriv->adapter; + struct adapter *padapter = pxmitpriv->adapter; _pkt *pndis_pkt = NULL; _func_enter_; @@ -2721,7 +2721,7 @@ _func_enter_; _func_exit_; } -s32 rtw_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe) +s32 rtw_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitframe) { if (rtw_xmit_classifier(padapter, pxmitframe) == _FAIL) { @@ -2785,7 +2785,7 @@ struct xmit_frame* rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmi struct tx_servq *ptxservq = NULL; _queue *pframe_queue = NULL; struct xmit_frame *pxmitframe = NULL; - _adapter *padapter = pxmitpriv->adapter; + struct adapter *padapter = pxmitpriv->adapter; struct registry_priv *pregpriv = &padapter->registrypriv; int i, inx[4]; #ifdef CONFIG_USB_HCI @@ -2864,7 +2864,7 @@ _func_exit_; return pxmitframe; } -struct tx_servq *rtw_get_sta_pending(_adapter *padapter, struct sta_info *psta, sint up, u8 *ac) +struct tx_servq *rtw_get_sta_pending(struct adapter *padapter, struct sta_info *psta, sint up, u8 *ac) { struct tx_servq *ptxservq=NULL; @@ -2912,7 +2912,7 @@ _func_exit_; * Will enqueue pxmitframe to the proper queue, * and indicate it to xx_pending list..... */ -s32 rtw_xmit_classifier(_adapter *padapter, struct xmit_frame *pxmitframe) +s32 rtw_xmit_classifier(struct adapter *padapter, struct xmit_frame *pxmitframe) { //_irqL irqL0; u8 ac_index; @@ -2970,7 +2970,7 @@ _func_exit_; return res; } -void rtw_alloc_hwxmits(_adapter *padapter) +void rtw_alloc_hwxmits(struct adapter *padapter) { struct hw_xmit *hwxmits; struct xmit_priv *pxmitpriv = &padapter->xmitpriv; @@ -3032,7 +3032,7 @@ void rtw_alloc_hwxmits(_adapter *padapter) } -void rtw_free_hwxmits(_adapter *padapter) +void rtw_free_hwxmits(struct adapter *padapter) { struct hw_xmit *hwxmits; struct xmit_priv *pxmitpriv = &padapter->xmitpriv; @@ -3057,14 +3057,14 @@ _func_exit_; } #ifdef CONFIG_BR_EXT -int rtw_br_client_tx(_adapter *padapter, struct sk_buff **pskb) +int rtw_br_client_tx(struct adapter *padapter, struct sk_buff **pskb) { struct sk_buff *skb = *pskb; struct xmit_priv *pxmitpriv = &padapter->xmitpriv; _irqL irqL; //if(check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == _TRUE) { - void dhcp_flag_bcast(_adapter *priv, struct sk_buff *skb); + void dhcp_flag_bcast(struct adapter *priv, struct sk_buff *skb); int res, is_vlan_tag=0, i, do_nat25=1; unsigned short vlan_hdr=0; void *br_port = NULL; @@ -3109,7 +3109,7 @@ int rtw_br_client_tx(_adapter *padapter, struct sk_buff **pskb) if (*((unsigned short *)(skb->data+MACADDRLEN*2)) == __constant_htons(ETH_P_IP)) { if (memcmp(padapter->scdb_mac, skb->data+MACADDRLEN, MACADDRLEN)) { - void *scdb_findEntry(_adapter *priv, unsigned char *macAddr, unsigned char *ipAddr); + void *scdb_findEntry(struct adapter *priv, unsigned char *macAddr, unsigned char *ipAddr); if ((padapter->scdb_entry = (struct nat25_network_db_entry *)scdb_findEntry(padapter, skb->data+MACADDRLEN, skb->data+WLAN_ETHHDR_LEN+12)) != NULL) { @@ -3134,7 +3134,7 @@ int rtw_br_client_tx(_adapter *padapter, struct sk_buff **pskb) #endif // 1 if (do_nat25) { - int nat25_db_handle(_adapter *priv, struct sk_buff *skb, int method); + int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method); if (nat25_db_handle(padapter, skb, NAT25_CHECK) == 0) { struct sk_buff *newskb; @@ -3279,7 +3279,7 @@ u32 rtw_get_ff_hwaddr(struct xmit_frame *pxmitframe) } -static void do_queue_select(_adapter *padapter, struct pkt_attrib *pattrib) +static void do_queue_select(struct adapter *padapter, struct pkt_attrib *pattrib) { u8 qsel; @@ -3302,7 +3302,7 @@ static void do_queue_select(_adapter *padapter, struct pkt_attrib *pattrib) * 0 success, hardware will handle this xmit frame(packet) * <0 fail */ -s32 rtw_xmit(_adapter *padapter, _pkt **ppkt) +s32 rtw_xmit(struct adapter *padapter, _pkt **ppkt) { static u32 start = 0; static u32 drop_cnt = 0; @@ -3401,7 +3401,7 @@ s32 rtw_xmit(_adapter *padapter, _pkt **ppkt) } #ifdef CONFIG_TDLS -sint xmitframe_enqueue_for_tdls_sleeping_sta(_adapter *padapter, struct xmit_frame *pxmitframe) +sint xmitframe_enqueue_for_tdls_sleeping_sta(struct adapter *padapter, struct xmit_frame *pxmitframe) { sint ret=_FALSE; @@ -3477,7 +3477,7 @@ sint xmitframe_enqueue_for_tdls_sleeping_sta(_adapter *padapter, struct xmit_fra #if defined(CONFIG_AP_MODE) || defined(CONFIG_TDLS) -sint xmitframe_enqueue_for_sleeping_sta(_adapter *padapter, struct xmit_frame *pxmitframe) +sint xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_frame *pxmitframe) { _irqL irqL; sint ret=_FALSE; @@ -3644,7 +3644,7 @@ sint xmitframe_enqueue_for_sleeping_sta(_adapter *padapter, struct xmit_frame *p } -static void dequeue_xmitframes_to_sleeping_queue(_adapter *padapter, struct sta_info *psta, _queue *pframequeue) +static void dequeue_xmitframes_to_sleeping_queue(struct adapter *padapter, struct sta_info *psta, _queue *pframequeue) { sint ret; _list *plist, *phead; @@ -3683,7 +3683,7 @@ static void dequeue_xmitframes_to_sleeping_queue(_adapter *padapter, struct sta_ } -void stop_sta_xmit(_adapter *padapter, struct sta_info *psta) +void stop_sta_xmit(struct adapter *padapter, struct sta_info *psta) { _irqL irqL0; struct sta_info *psta_bmc; @@ -3746,7 +3746,7 @@ void stop_sta_xmit(_adapter *padapter, struct sta_info *psta) } -void wakeup_sta_to_xmit(_adapter *padapter, struct sta_info *psta) +void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta) { _irqL irqL; u8 update_mask=0, wmmps_ac=0; @@ -3925,7 +3925,7 @@ _exit: } -void xmit_delivery_enabled_frames(_adapter *padapter, struct sta_info *psta) +void xmit_delivery_enabled_frames(struct adapter *padapter, struct sta_info *psta) { _irqL irqL; u8 wmmps_ac=0; @@ -4032,7 +4032,7 @@ void enqueue_pending_xmitbuf( { _irqL irql; _queue *pqueue; - _adapter *pri_adapter = pxmitpriv->adapter; + struct adapter *pri_adapter = pxmitpriv->adapter; pqueue = &pxmitpriv->pending_xmitbuf_queue; @@ -4154,7 +4154,7 @@ sint check_pending_xmitbuf( thread_return rtw_xmit_thread(thread_context context) { s32 err; - PADAPTER padapter; + struct adapter *padapter; err = _SUCCESS; @@ -4237,7 +4237,7 @@ void rtw_sctx_done(struct submit_ctx **sctx) #ifdef CONFIG_XMIT_ACK #ifdef CONFIG_XMIT_ACK_POLLING -s32 c2h_evt_hdl(_adapter *adapter, struct c2h_evt_hdr *c2h_evt, c2h_id_filter filter); +s32 c2h_evt_hdl(struct adapter *adapter, struct c2h_evt_hdr *c2h_evt, c2h_id_filter filter); /** * rtw_ack_tx_polling - @@ -4252,7 +4252,7 @@ int rtw_ack_tx_polling(struct xmit_priv *pxmitpriv, u32 timeout_ms) { int ret = _FAIL; struct submit_ctx *pack_tx_ops = &pxmitpriv->ack_tx_ops; - _adapter *adapter = container_of(pxmitpriv, _adapter, xmitpriv); + struct adapter *adapter = container_of(pxmitpriv, struct adapter, xmitpriv); pack_tx_ops->submit_time = rtw_get_current_time(); pack_tx_ops->timeout_ms = timeout_ms; @@ -4288,13 +4288,13 @@ int rtw_ack_tx_polling(struct xmit_priv *pxmitpriv, u32 timeout_ms) #endif #ifdef CONFIG_DETECT_C2H_BY_POLLING -s32 c2h_evt_hdl(_adapter *adapter, struct c2h_evt_hdr *c2h_evt, c2h_id_filter filter); +s32 c2h_evt_hdl(struct adapter *adapter, struct c2h_evt_hdr *c2h_evt, c2h_id_filter filter); #endif int rtw_ack_tx_wait(struct xmit_priv *pxmitpriv, u32 timeout_ms) { #ifdef CONFIG_DETECT_C2H_BY_POLLING - _adapter *adapter = container_of(pxmitpriv, _adapter, xmitpriv); + struct adapter *adapter = container_of(pxmitpriv, struct adapter, xmitpriv); c2h_id_filter ccx_id_filter = rtw_hal_c2h_id_filter_ccx(adapter); struct submit_ctx *pack_tx_ops = &pxmitpriv->ack_tx_ops; u8 check_c2hcmd; diff --git a/hal/HalPhyRf.c b/hal/HalPhyRf.c index ceed28c..b23f1ec 100755 --- a/hal/HalPhyRf.c +++ b/hal/HalPhyRf.c @@ -25,7 +25,7 @@ VOID phy_PathAStandBy( - IN PADAPTER pAdapter + IN struct adapter *pAdapter ) { RTPRINT(FINIT, INIT_IQK, ("Path-A standby mode!\n")); @@ -41,7 +41,7 @@ phy_PathAStandBy( u1Byte //bit0 = 1 => Tx OK, bit1 = 1 => Rx OK phy_PathA_IQK_8192C( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN BOOLEAN configPathB ) { @@ -129,7 +129,7 @@ phy_PathA_IQK_8192C( u1Byte //bit0 = 1 => Tx OK, bit1 = 1 => Rx OK phy_PathB_IQK_8192C( - IN PADAPTER pAdapter + IN struct adapter *pAdapter ) { u4Byte regEAC, regEB4, regEBC, regEC4, regECC; @@ -178,7 +178,7 @@ phy_PathB_IQK_8192C( VOID phy_PathAFillIQKMatrix( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN BOOLEAN bIQKOK, IN s4Byte result[][8], IN u1Byte final_candidate, @@ -245,7 +245,7 @@ phy_PathAFillIQKMatrix( VOID phy_PathBFillIQKMatrix( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN BOOLEAN bIQKOK, IN s4Byte result[][8], IN u1Byte final_candidate, @@ -307,7 +307,7 @@ phy_PathBFillIQKMatrix( BOOLEAN phy_SimularityCompare_92C( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN s4Byte result[][8], IN u1Byte c1, IN u1Byte c2 @@ -379,7 +379,7 @@ return FALSE => do IQK again */ BOOLEAN phy_SimularityCompare( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN s4Byte result[][8], IN u1Byte c1, IN u1Byte c2 @@ -394,7 +394,7 @@ phy_SimularityCompare( VOID phy_IQCalibrate_8192C( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN s4Byte result[][8], IN u1Byte t, IN BOOLEAN is2T @@ -650,7 +650,7 @@ phy_IQCalibrate_8192C( VOID phy_LCCalibrate92C( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN BOOLEAN is2T ) { @@ -714,7 +714,7 @@ phy_LCCalibrate92C( VOID phy_LCCalibrate( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN BOOLEAN is2T ) { @@ -741,7 +741,7 @@ phy_LCCalibrate( VOID phy_APCalibrate_8192C( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN s1Byte delta, IN BOOLEAN is2T ) @@ -1186,7 +1186,7 @@ if (pAdapter->registrypriv.mp_mode == 1) VOID PHY_IQCalibrate_8192C( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN BOOLEAN bReCovery ) { @@ -1396,7 +1396,7 @@ if (pAdapter->registrypriv.mp_mode == 1) VOID PHY_LCCalibrate_8192C( - IN PADAPTER pAdapter + IN struct adapter *pAdapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); @@ -1404,7 +1404,7 @@ PHY_LCCalibrate_8192C( PMGNT_INFO pMgntInfo=&pAdapter->MgntInfo; PMGNT_INFO pMgntInfoBuddyAdapter; u4Byte timeout = 2000, timecount = 0; - PADAPTER BuddyAdapter = pAdapter->BuddyAdapter; + struct adapter *BuddyAdapter = pAdapter->BuddyAdapter; #if MP_DRIVER == 1 if (pAdapter->registrypriv.mp_mode == 1) @@ -1464,7 +1464,7 @@ if (pAdapter->registrypriv.mp_mode == 1) VOID PHY_APCalibrate_8192C( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN s1Byte delta ) { @@ -1509,7 +1509,7 @@ ODM_ResetIQKResult( { u1Byte i; #if (DM_ODM_SUPPORT_TYPE == ODM_MP || DM_ODM_SUPPORT_TYPE == ODM_CE) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter *Adapter = pDM_Odm->Adapter; if (!IS_HARDWARE_TYPE_8192D(Adapter)) return; diff --git a/hal/HalPhyRf_8188e.c b/hal/HalPhyRf_8188e.c index 77c9012..10b270d 100755 --- a/hal/HalPhyRf_8188e.c +++ b/hal/HalPhyRf_8188e.c @@ -139,7 +139,7 @@ void doIQK( ) { #if !(DM_ODM_SUPPORT_TYPE & ODM_AP) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter * Adapter = pDM_Odm->Adapter; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); #endif @@ -290,7 +290,7 @@ odm_TxPwrTrackSetPwr88E( u1Byte BW20PowerLevel[MAX_TX_COUNT], BW40PowerLevel[MAX_TX_COUNT]; u1Byte rf = 0; u4Byte pwr = 0, TxAGC = 0; - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter *Adapter = pDM_Odm->Adapter; //printk("odm_TxPwrTrackSetPwr88E CH=%d, modify TXAGC \n", *(pDM_Odm->pChannel)); ODM_RT_TRACE(pDM_Odm, ODM_COMP_TX_PWR_TRACK, ODM_DBG_LOUD, ("odm_TxPwrTrackSetPwr88E CH=%d\n", *(pDM_Odm->pChannel))); #if (DM_ODM_SUPPORT_TYPE & (ODM_MP|ODM_CE )) @@ -384,7 +384,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm #else - IN PADAPTER Adapter + IN struct adapter *Adapter #endif ) { @@ -643,7 +643,7 @@ phy_PathA_IQK_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, #endif IN BOOLEAN configPathB ) @@ -719,7 +719,7 @@ phy_PathA_RxIQK( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, #endif IN BOOLEAN configPathB ) @@ -880,7 +880,7 @@ phy_PathB_IQK_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm #else - IN PADAPTER pAdapter + IN struct adapter *pAdapter #endif ) { @@ -943,7 +943,7 @@ _PHY_PathAFillIQKMatrix( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, #endif IN BOOLEAN bIQKOK, IN s4Byte result[][8], @@ -1018,7 +1018,7 @@ _PHY_PathBFillIQKMatrix( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, #endif IN BOOLEAN bIQKOK, IN s4Byte result[][8], @@ -1087,7 +1087,7 @@ _PHY_PathBFillIQKMatrix( #if !(DM_ODM_SUPPORT_TYPE & ODM_MP) BOOLEAN ODM_CheckPowerStatus( - IN PADAPTER Adapter) + IN struct adapter * Adapter) { /* HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -1122,7 +1122,7 @@ _PHY_SaveADDARegisters( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, #endif IN pu4Byte ADDAReg, IN pu4Byte ADDABackup, @@ -1155,7 +1155,7 @@ _PHY_SaveMACRegisters( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, #endif IN pu4Byte MACReg, IN pu4Byte MACBackup @@ -1185,7 +1185,7 @@ _PHY_ReloadADDARegisters( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, #endif IN pu4Byte ADDAReg, IN pu4Byte ADDABackup, @@ -1215,7 +1215,7 @@ _PHY_ReloadMACRegisters( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, #endif IN pu4Byte MACReg, IN pu4Byte MACBackup @@ -1244,7 +1244,7 @@ _PHY_PathADDAOn( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, #endif IN pu4Byte ADDAReg, IN BOOLEAN isPathAOn, @@ -1284,7 +1284,7 @@ _PHY_MACSettingCalibration( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, #endif IN pu4Byte MACReg, IN pu4Byte MACBackup @@ -1316,7 +1316,7 @@ _PHY_PathAStandBy( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm #else - IN PADAPTER pAdapter + IN struct adapter *pAdapter #endif ) { @@ -1341,7 +1341,7 @@ _PHY_PIModeSwitch( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, #endif IN BOOLEAN PIMode ) @@ -1368,7 +1368,7 @@ phy_SimularityCompare_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, #endif IN s4Byte result[][8], IN u1Byte c1, @@ -1503,7 +1503,7 @@ phy_IQCalibrate_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, #endif IN s4Byte result[][8], IN u1Byte t, @@ -1796,7 +1796,7 @@ phy_LCCalibrate_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, #endif IN BOOLEAN is2T ) @@ -1887,7 +1887,7 @@ phy_APCalibrate_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, #endif IN s1Byte delta, IN BOOLEAN is2T @@ -2380,7 +2380,7 @@ PHY_IQCalibrate_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, #endif IN BOOLEAN bReCovery ) @@ -2675,7 +2675,7 @@ PHY_LCCalibrate_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm #else - IN PADAPTER pAdapter + IN struct adapter *pAdapter #endif ) { @@ -2764,7 +2764,7 @@ PHY_APCalibrate_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, #endif IN s1Byte delta ) @@ -2814,7 +2814,7 @@ VOID phy_SetRFPathSwitch_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, #endif IN BOOLEAN bMain, IN BOOLEAN is2T @@ -2863,7 +2863,7 @@ VOID PHY_SetRFPathSwitch_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, #endif IN BOOLEAN bMain ) @@ -2905,7 +2905,7 @@ VOID PHY_SetRFPathSwitch_8188E( VOID phy_DigitalPredistortion( #if !(DM_ODM_SUPPORT_TYPE & ODM_AP) - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, #else IN PDM_ODM_T pDM_Odm, #endif @@ -2917,7 +2917,7 @@ phy_DigitalPredistortion( VOID PHY_DigitalPredistortion_8188E( #if !(DM_ODM_SUPPORT_TYPE & ODM_AP) - IN PADAPTER pAdapter + IN struct adapter *pAdapter #else IN PDM_ODM_T pDM_Odm #endif @@ -2961,7 +2961,7 @@ BOOLEAN phy_QueryRFPathSwitch_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, #endif IN BOOLEAN is2T ) @@ -3007,7 +3007,7 @@ BOOLEAN PHY_QueryRFPathSwitch_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm #else - IN PADAPTER pAdapter + IN struct adapter *pAdapter #endif ) { diff --git a/hal/HalPhyRf_8188e.h b/hal/HalPhyRf_8188e.h index a8f4620..8e2cea7 100755 --- a/hal/HalPhyRf_8188e.h +++ b/hal/HalPhyRf_8188e.h @@ -47,7 +47,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm #else - IN PADAPTER Adapter + IN struct adapter * Adapter #endif ); @@ -59,7 +59,7 @@ PHY_IQCalibrate_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER Adapter, + IN struct adapter * Adapter, #endif IN BOOLEAN bReCovery); @@ -72,7 +72,7 @@ PHY_LCCalibrate_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm #else - IN PADAPTER pAdapter + IN struct adapter * pAdapter #endif ); @@ -84,11 +84,11 @@ PHY_APCalibrate_8188E( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + IN struct adapter * pAdapter, #endif IN s1Byte delta); void -PHY_DigitalPredistortion_8188E( IN PADAPTER pAdapter); +PHY_DigitalPredistortion_8188E( IN struct adapter * pAdapter); VOID @@ -96,7 +96,7 @@ _PHY_SaveADDARegisters( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + IN struct adapter * pAdapter, #endif IN pu4Byte ADDAReg, IN pu4Byte ADDABackup, @@ -108,7 +108,7 @@ _PHY_PathADDAOn( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + IN struct adapter * pAdapter, #endif IN pu4Byte ADDAReg, IN BOOLEAN isPathAOn, @@ -120,7 +120,7 @@ _PHY_MACSettingCalibration( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm, #else - IN PADAPTER pAdapter, + IN struct adapter * pAdapter, #endif IN pu4Byte MACReg, IN pu4Byte MACBackup @@ -132,7 +132,7 @@ _PHY_PathAStandBy( #if (DM_ODM_SUPPORT_TYPE & ODM_AP) IN PDM_ODM_T pDM_Odm #else - IN PADAPTER pAdapter + IN struct adapter * pAdapter #endif ); diff --git a/hal/HalPwrSeqCmd.c b/hal/HalPwrSeqCmd.c index 2948242..6a27c7f 100755 --- a/hal/HalPwrSeqCmd.c +++ b/hal/HalPwrSeqCmd.c @@ -50,7 +50,7 @@ Major Change History: // 2011.07.07, added by Roger. // u8 HalPwrSeqCmdParsing( - PADAPTER padapter, + struct adapter * padapter, u8 CutVersion, u8 FabVersion, u8 InterfaceType, diff --git a/hal/hal_com.c b/hal/hal_com.c index 519727a..00839ec 100755 --- a/hal/hal_com.c +++ b/hal/hal_com.c @@ -74,7 +74,7 @@ void dump_chip_info(HAL_VERSION ChipVersion) u8 //return the final channel plan decision hal_com_get_channel_plan( - IN PADAPTER padapter, + IN struct adapter *padapter, IN u8 hw_channel_plan, //channel plan from HW (efuse/eeprom) IN u8 sw_channel_plan, //channel plan from SW (registry/module param) IN u8 def_channel_plan, //channel plan used when the former two is invalid @@ -141,7 +141,7 @@ u8 MRateToHwRate(u8 rate) } void HalSetBrateCfg( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN u8 *mBratesOS, OUT u16 *pBrateCfg) { @@ -175,7 +175,7 @@ void HalSetBrateCfg( static VOID _OneOutPipeMapping( - IN PADAPTER pAdapter + IN struct adapter *pAdapter ) { struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(pAdapter); @@ -193,7 +193,7 @@ _OneOutPipeMapping( static VOID _TwoOutPipeMapping( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN BOOLEAN bWIFICfg ) { @@ -238,7 +238,7 @@ _TwoOutPipeMapping( } static VOID _ThreeOutPipeMapping( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN BOOLEAN bWIFICfg ) { @@ -283,7 +283,7 @@ static VOID _ThreeOutPipeMapping( BOOLEAN Hal_MappingOutPipe( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN u8 NumOutPipe ) { @@ -313,7 +313,7 @@ Hal_MappingOutPipe( } -void hal_init_macaddr(_adapter *adapter) +void hal_init_macaddr(struct adapter *adapter) { rtw_hal_set_hwreg(adapter, HW_VAR_MAC_ADDR, adapter->eeprompriv.mac_addr); #ifdef CONFIG_CONCURRENT_MODE @@ -328,12 +328,12 @@ void hal_init_macaddr(_adapter *adapter) * BITS [127:120] [119:16] [15:8] [7:4] [3:0] */ -void c2h_evt_clear(_adapter *adapter) +void c2h_evt_clear(struct adapter *adapter) { rtw_write8(adapter, REG_C2HEVT_CLEAR, C2H_EVT_HOST_CLOSE); } -s32 c2h_evt_read(_adapter *adapter, u8 *buf) +s32 c2h_evt_read(struct adapter *adapter, u8 *buf) { s32 ret = _FAIL; struct c2h_evt_hdr *c2h_evt; @@ -386,7 +386,7 @@ exit: } u8 -SetHalDefVar(_adapter *adapter, HAL_DEF_VARIABLE variable, void *value) +SetHalDefVar(struct adapter *adapter, HAL_DEF_VARIABLE variable, void *value) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(adapter); PDM_ODM_T pDM_Odm = &(pHalData->odmpriv); @@ -415,7 +415,7 @@ SetHalDefVar(_adapter *adapter, HAL_DEF_VARIABLE variable, void *value) } u8 -GetHalDefVar(_adapter *adapter, HAL_DEF_VARIABLE variable, void *value) +GetHalDefVar(struct adapter *adapter, HAL_DEF_VARIABLE variable, void *value) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(adapter); PDM_ODM_T pDM_Odm = &(pHalData->odmpriv); diff --git a/hal/hal_intf.c b/hal/hal_intf.c index 8b78553..d24ceca 100755 --- a/hal/hal_intf.c +++ b/hal/hal_intf.c @@ -34,75 +34,75 @@ #include #endif -void rtw_hal_chip_configure(_adapter *padapter) +void rtw_hal_chip_configure(struct adapter *padapter) { if(padapter->HalFunc.intf_chip_configure) padapter->HalFunc.intf_chip_configure(padapter); } -void rtw_hal_read_chip_info(_adapter *padapter) +void rtw_hal_read_chip_info(struct adapter *padapter) { if(padapter->HalFunc.read_adapter_info) padapter->HalFunc.read_adapter_info(padapter); } -void rtw_hal_read_chip_version(_adapter *padapter) +void rtw_hal_read_chip_version(struct adapter *padapter) { if(padapter->HalFunc.read_chip_version) padapter->HalFunc.read_chip_version(padapter); } -void rtw_hal_def_value_init(_adapter *padapter) +void rtw_hal_def_value_init(struct adapter *padapter) { if (is_primary_adapter(padapter)) if(padapter->HalFunc.init_default_value) padapter->HalFunc.init_default_value(padapter); } -void rtw_hal_free_data(_adapter *padapter) +void rtw_hal_free_data(struct adapter *padapter) { if (is_primary_adapter(padapter)) if(padapter->HalFunc.free_hal_data) padapter->HalFunc.free_hal_data(padapter); } -void rtw_hal_dm_init(_adapter *padapter) +void rtw_hal_dm_init(struct adapter *padapter) { if (is_primary_adapter(padapter)) if(padapter->HalFunc.dm_init) padapter->HalFunc.dm_init(padapter); } -void rtw_hal_dm_deinit(_adapter *padapter) +void rtw_hal_dm_deinit(struct adapter *padapter) { // cancel dm timer if (is_primary_adapter(padapter)) if(padapter->HalFunc.dm_deinit) padapter->HalFunc.dm_deinit(padapter); } -void rtw_hal_sw_led_init(_adapter *padapter) +void rtw_hal_sw_led_init(struct adapter *padapter) { if(padapter->HalFunc.InitSwLeds) padapter->HalFunc.InitSwLeds(padapter); } -void rtw_hal_sw_led_deinit(_adapter *padapter) +void rtw_hal_sw_led_deinit(struct adapter *padapter) { if(padapter->HalFunc.DeInitSwLeds) padapter->HalFunc.DeInitSwLeds(padapter); } -u32 rtw_hal_power_on(_adapter *padapter) +u32 rtw_hal_power_on(struct adapter *padapter) { if(padapter->HalFunc.hal_power_on) return padapter->HalFunc.hal_power_on(padapter); return _FAIL; } -void rtw_hal_power_off(_adapter *padapter) +void rtw_hal_power_off(struct adapter *padapter) { if(padapter->HalFunc.hal_power_off) padapter->HalFunc.hal_power_off(padapter); } -uint rtw_hal_init(_adapter *padapter) +uint rtw_hal_init(struct adapter *padapter) { uint status = _SUCCESS; struct dvobj_priv *dvobj = adapter_to_dvobj(padapter); @@ -169,7 +169,7 @@ uint rtw_hal_init(_adapter *padapter) } -uint rtw_hal_deinit(_adapter *padapter) +uint rtw_hal_deinit(struct adapter *padapter) { uint status = _SUCCESS; struct dvobj_priv *dvobj = adapter_to_dvobj(padapter); @@ -199,43 +199,43 @@ _func_exit_; return status; } -void rtw_hal_set_hwreg(_adapter *padapter, u8 variable, u8 *val) +void rtw_hal_set_hwreg(struct adapter *padapter, u8 variable, u8 *val) { if (padapter->HalFunc.SetHwRegHandler) padapter->HalFunc.SetHwRegHandler(padapter, variable, val); } -void rtw_hal_get_hwreg(_adapter *padapter, u8 variable, u8 *val) +void rtw_hal_get_hwreg(struct adapter *padapter, u8 variable, u8 *val) { if (padapter->HalFunc.GetHwRegHandler) padapter->HalFunc.GetHwRegHandler(padapter, variable, val); } -u8 rtw_hal_set_def_var(_adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue) +u8 rtw_hal_set_def_var(struct adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue) { if(padapter->HalFunc.SetHalDefVarHandler) return padapter->HalFunc.SetHalDefVarHandler(padapter,eVariable,pValue); return _FAIL; } -u8 rtw_hal_get_def_var(_adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue) +u8 rtw_hal_get_def_var(struct adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue) { if(padapter->HalFunc.GetHalDefVarHandler) return padapter->HalFunc.GetHalDefVarHandler(padapter,eVariable,pValue); return _FAIL; } -void rtw_hal_set_odm_var(_adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1,BOOLEAN bSet) +void rtw_hal_set_odm_var(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1,BOOLEAN bSet) { if(padapter->HalFunc.SetHalODMVarHandler) padapter->HalFunc.SetHalODMVarHandler(padapter,eVariable,pValue1,bSet); } -void rtw_hal_get_odm_var(_adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1,BOOLEAN bSet) +void rtw_hal_get_odm_var(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1,BOOLEAN bSet) { if(padapter->HalFunc.GetHalODMVarHandler) padapter->HalFunc.GetHalODMVarHandler(padapter,eVariable,pValue1,bSet); } -void rtw_hal_enable_interrupt(_adapter *padapter) +void rtw_hal_enable_interrupt(struct adapter *padapter) { if (!is_primary_adapter(padapter)){ DBG_871X(" rtw_hal_enable_interrupt: Secondary adapter return l\n"); @@ -248,7 +248,7 @@ void rtw_hal_enable_interrupt(_adapter *padapter) DBG_871X("%s: HalFunc.enable_interrupt is NULL!\n", __FUNCTION__); } -void rtw_hal_disable_interrupt(_adapter *padapter) +void rtw_hal_disable_interrupt(struct adapter *padapter) { if (!is_primary_adapter(padapter)){ DBG_871X(" rtw_hal_disable_interrupt: Secondary adapter return l\n"); @@ -263,7 +263,7 @@ void rtw_hal_disable_interrupt(_adapter *padapter) } -u32 rtw_hal_inirp_init(_adapter *padapter) +u32 rtw_hal_inirp_init(struct adapter *padapter) { u32 rst = _FAIL; if(padapter->HalFunc.inirp_init) @@ -273,7 +273,7 @@ u32 rtw_hal_inirp_init(_adapter *padapter) return rst; } -u32 rtw_hal_inirp_deinit(_adapter *padapter) +u32 rtw_hal_inirp_deinit(struct adapter *padapter) { if(padapter->HalFunc.inirp_deinit) @@ -283,14 +283,14 @@ u32 rtw_hal_inirp_deinit(_adapter *padapter) } -u8 rtw_hal_intf_ps_func(_adapter *padapter,HAL_INTF_PS_FUNC efunc_id, u8* val) +u8 rtw_hal_intf_ps_func(struct adapter *padapter,HAL_INTF_PS_FUNC efunc_id, u8* val) { if(padapter->HalFunc.interface_ps_func) return padapter->HalFunc.interface_ps_func(padapter,efunc_id,val); return _FAIL; } -s32 rtw_hal_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe) +s32 rtw_hal_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitframe) { if(padapter->HalFunc.hal_xmitframe_enqueue) return padapter->HalFunc.hal_xmitframe_enqueue(padapter, pxmitframe); @@ -298,7 +298,7 @@ s32 rtw_hal_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe) return _FALSE; } -s32 rtw_hal_xmit(_adapter *padapter, struct xmit_frame *pxmitframe) +s32 rtw_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe) { if(padapter->HalFunc.hal_xmit) return padapter->HalFunc.hal_xmit(padapter, pxmitframe); @@ -306,7 +306,7 @@ s32 rtw_hal_xmit(_adapter *padapter, struct xmit_frame *pxmitframe) return _FALSE; } -s32 rtw_hal_mgnt_xmit(_adapter *padapter, struct xmit_frame *pmgntframe) +s32 rtw_hal_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe) { s32 ret = _FAIL; unsigned char *pframe; @@ -338,26 +338,26 @@ s32 rtw_hal_mgnt_xmit(_adapter *padapter, struct xmit_frame *pmgntframe) return ret; } -s32 rtw_hal_init_xmit_priv(_adapter *padapter) +s32 rtw_hal_init_xmit_priv(struct adapter *padapter) { if(padapter->HalFunc.init_xmit_priv != NULL) return padapter->HalFunc.init_xmit_priv(padapter); return _FAIL; } -void rtw_hal_free_xmit_priv(_adapter *padapter) +void rtw_hal_free_xmit_priv(struct adapter *padapter) { if(padapter->HalFunc.free_xmit_priv != NULL) padapter->HalFunc.free_xmit_priv(padapter); } -s32 rtw_hal_init_recv_priv(_adapter *padapter) +s32 rtw_hal_init_recv_priv(struct adapter *padapter) { if(padapter->HalFunc.init_recv_priv) return padapter->HalFunc.init_recv_priv(padapter); return _FAIL; } -void rtw_hal_free_recv_priv(_adapter *padapter) +void rtw_hal_free_recv_priv(struct adapter *padapter) { if(padapter->HalFunc.free_recv_priv) padapter->HalFunc.free_recv_priv(padapter); @@ -365,7 +365,7 @@ void rtw_hal_free_recv_priv(_adapter *padapter) void rtw_hal_update_ra_mask(struct sta_info *psta, u8 rssi_level) { - _adapter *padapter; + struct adapter *padapter; struct mlme_priv *pmlmepriv; if(!psta) @@ -386,71 +386,71 @@ void rtw_hal_update_ra_mask(struct sta_info *psta, u8 rssi_level) } } -void rtw_hal_add_ra_tid(_adapter *padapter, u32 bitmap, u8 arg, u8 rssi_level) +void rtw_hal_add_ra_tid(struct adapter *padapter, u32 bitmap, u8 arg, u8 rssi_level) { if(padapter->HalFunc.Add_RateATid) padapter->HalFunc.Add_RateATid(padapter, bitmap, arg, rssi_level); } /* Start specifical interface thread */ -void rtw_hal_start_thread(_adapter *padapter) +void rtw_hal_start_thread(struct adapter *padapter) { if(padapter->HalFunc.run_thread) padapter->HalFunc.run_thread(padapter); } /* Start specifical interface thread */ -void rtw_hal_stop_thread(_adapter *padapter) +void rtw_hal_stop_thread(struct adapter *padapter) { if(padapter->HalFunc.cancel_thread) padapter->HalFunc.cancel_thread(padapter); } -u32 rtw_hal_read_bbreg(_adapter *padapter, u32 RegAddr, u32 BitMask) +u32 rtw_hal_read_bbreg(struct adapter *padapter, u32 RegAddr, u32 BitMask) { u32 data = 0; if(padapter->HalFunc.read_bbreg) data = padapter->HalFunc.read_bbreg(padapter, RegAddr, BitMask); return data; } -void rtw_hal_write_bbreg(_adapter *padapter, u32 RegAddr, u32 BitMask, u32 Data) +void rtw_hal_write_bbreg(struct adapter *padapter, u32 RegAddr, u32 BitMask, u32 Data) { if(padapter->HalFunc.write_bbreg) padapter->HalFunc.write_bbreg(padapter, RegAddr, BitMask, Data); } -u32 rtw_hal_read_rfreg(_adapter *padapter, u32 eRFPath, u32 RegAddr, u32 BitMask) +u32 rtw_hal_read_rfreg(struct adapter *padapter, u32 eRFPath, u32 RegAddr, u32 BitMask) { u32 data = 0; if( padapter->HalFunc.read_rfreg) data = padapter->HalFunc.read_rfreg(padapter, eRFPath, RegAddr, BitMask); return data; } -void rtw_hal_write_rfreg(_adapter *padapter, u32 eRFPath, u32 RegAddr, u32 BitMask, u32 Data) +void rtw_hal_write_rfreg(struct adapter *padapter, u32 eRFPath, u32 RegAddr, u32 BitMask, u32 Data) { if(padapter->HalFunc.write_rfreg) padapter->HalFunc.write_rfreg(padapter, eRFPath, RegAddr, BitMask, Data); } -s32 rtw_hal_interrupt_handler(_adapter *padapter) +s32 rtw_hal_interrupt_handler(struct adapter *padapter) { if(padapter->HalFunc.interrupt_handler) return padapter->HalFunc.interrupt_handler(padapter); return _FAIL; } -void rtw_hal_set_bwmode(_adapter *padapter, HT_CHANNEL_WIDTH Bandwidth, u8 Offset) +void rtw_hal_set_bwmode(struct adapter *padapter, HT_CHANNEL_WIDTH Bandwidth, u8 Offset) { if(padapter->HalFunc.set_bwmode_handler) padapter->HalFunc.set_bwmode_handler(padapter, Bandwidth, Offset); } -void rtw_hal_set_chan(_adapter *padapter, u8 channel) +void rtw_hal_set_chan(struct adapter *padapter, u8 channel) { if(padapter->HalFunc.set_channel_handler) padapter->HalFunc.set_channel_handler(padapter, channel); } -void rtw_hal_dm_watchdog(_adapter *padapter) +void rtw_hal_dm_watchdog(struct adapter *padapter) { #if defined(CONFIG_CONCURRENT_MODE) if (padapter->adapter_type != PRIMARY_ADAPTER) @@ -460,7 +460,7 @@ void rtw_hal_dm_watchdog(_adapter *padapter) padapter->HalFunc.hal_dm_watchdog(padapter); } -void rtw_hal_bcn_related_reg_setting(_adapter *padapter) +void rtw_hal_bcn_related_reg_setting(struct adapter *padapter) { if(padapter->HalFunc.SetBeaconRelatedRegistersHandler) padapter->HalFunc.SetBeaconRelatedRegistersHandler(padapter); @@ -468,13 +468,13 @@ void rtw_hal_bcn_related_reg_setting(_adapter *padapter) #ifdef CONFIG_ANTENNA_DIVERSITY -u8 rtw_hal_antdiv_before_linked(_adapter *padapter) +u8 rtw_hal_antdiv_before_linked(struct adapter *padapter) { if(padapter->HalFunc.AntDivBeforeLinkHandler) return padapter->HalFunc.AntDivBeforeLinkHandler(padapter); return _FALSE; } -void rtw_hal_antdiv_rssi_compared(_adapter *padapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src) +void rtw_hal_antdiv_rssi_compared(struct adapter *padapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src) { if(padapter->HalFunc.AntDivCompareHandler) padapter->HalFunc.AntDivCompareHandler(padapter, dst, src); @@ -482,7 +482,7 @@ void rtw_hal_antdiv_rssi_compared(_adapter *padapter, WLAN_BSSID_EX *dst, WLAN_B #endif #ifdef CONFIG_HOSTAPD_MLME -s32 rtw_hal_hostap_mgnt_xmit_entry(_adapter *padapter, _pkt *pkt) +s32 rtw_hal_hostap_mgnt_xmit_entry(struct adapter *padapter, _pkt *pkt) { if(padapter->HalFunc.hostap_mgnt_xmit_entry) return padapter->HalFunc.hostap_mgnt_xmit_entry(padapter, pkt); @@ -491,12 +491,12 @@ s32 rtw_hal_hostap_mgnt_xmit_entry(_adapter *padapter, _pkt *pkt) #endif //CONFIG_HOSTAPD_MLME #ifdef DBG_CONFIG_ERROR_DETECT -void rtw_hal_sreset_init(_adapter *padapter) +void rtw_hal_sreset_init(struct adapter *padapter) { if(padapter->HalFunc.sreset_init_value) padapter->HalFunc.sreset_init_value(padapter); } -void rtw_hal_sreset_reset(_adapter *padapter) +void rtw_hal_sreset_reset(struct adapter *padapter) { padapter = GET_PRIMARY_ADAPTER(padapter); @@ -504,13 +504,13 @@ void rtw_hal_sreset_reset(_adapter *padapter) padapter->HalFunc.silentreset(padapter); } -void rtw_hal_sreset_reset_value(_adapter *padapter) +void rtw_hal_sreset_reset_value(struct adapter *padapter) { if(padapter->HalFunc.sreset_reset_value) padapter->HalFunc.sreset_reset_value(padapter); } -void rtw_hal_sreset_xmit_status_check(_adapter *padapter) +void rtw_hal_sreset_xmit_status_check(struct adapter *padapter) { if (!is_primary_adapter(padapter)) return; @@ -518,7 +518,7 @@ void rtw_hal_sreset_xmit_status_check(_adapter *padapter) if(padapter->HalFunc.sreset_xmit_status_check) padapter->HalFunc.sreset_xmit_status_check(padapter); } -void rtw_hal_sreset_linked_status_check(_adapter *padapter) +void rtw_hal_sreset_linked_status_check(struct adapter *padapter) { if (!is_primary_adapter(padapter)) return; @@ -526,7 +526,7 @@ void rtw_hal_sreset_linked_status_check(_adapter *padapter) if(padapter->HalFunc.sreset_linked_status_check) padapter->HalFunc.sreset_linked_status_check(padapter); } -u8 rtw_hal_sreset_get_wifi_status(_adapter *padapter) +u8 rtw_hal_sreset_get_wifi_status(struct adapter *padapter) { u8 status = 0; if(padapter->HalFunc.sreset_get_wifi_status) @@ -534,7 +534,7 @@ u8 rtw_hal_sreset_get_wifi_status(_adapter *padapter) return status; } -bool rtw_hal_sreset_inprogress(_adapter *padapter) +bool rtw_hal_sreset_inprogress(struct adapter *padapter) { bool inprogress = _FALSE; @@ -547,7 +547,7 @@ bool rtw_hal_sreset_inprogress(_adapter *padapter) #endif //DBG_CONFIG_ERROR_DETECT #ifdef CONFIG_IOL -int rtw_hal_iol_cmd(ADAPTER *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt) +int rtw_hal_iol_cmd(struct adapter *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt) { if(adapter->HalFunc.IOL_exec_cmds_sync) return adapter->HalFunc.IOL_exec_cmds_sync(adapter, xmit_frame, max_wating_ms,bndy_cnt); @@ -556,7 +556,7 @@ int rtw_hal_iol_cmd(ADAPTER *adapter, struct xmit_frame *xmit_frame, u32 max_wat #endif #ifdef CONFIG_XMIT_THREAD_MODE -s32 rtw_hal_xmit_thread_handler(_adapter *padapter) +s32 rtw_hal_xmit_thread_handler(struct adapter *padapter) { if(padapter->HalFunc.xmit_thread_handler) return padapter->HalFunc.xmit_thread_handler(padapter); @@ -564,19 +564,19 @@ s32 rtw_hal_xmit_thread_handler(_adapter *padapter) } #endif -void rtw_hal_notch_filter(_adapter *adapter, bool enable) +void rtw_hal_notch_filter(struct adapter *adapter, bool enable) { if(adapter->HalFunc.hal_notch_filter) adapter->HalFunc.hal_notch_filter(adapter,enable); } -void rtw_hal_reset_security_engine(_adapter * adapter) +void rtw_hal_reset_security_engine(struct adapter * adapter) { if(adapter->HalFunc.hal_reset_security_engine) adapter->HalFunc.hal_reset_security_engine(adapter); } -s32 rtw_hal_c2h_handler(_adapter *adapter, struct c2h_evt_hdr *c2h_evt) +s32 rtw_hal_c2h_handler(struct adapter *adapter, struct c2h_evt_hdr *c2h_evt) { s32 ret = _FAIL; if (adapter->HalFunc.c2h_handler) @@ -584,7 +584,7 @@ s32 rtw_hal_c2h_handler(_adapter *adapter, struct c2h_evt_hdr *c2h_evt) return ret; } -c2h_id_filter rtw_hal_c2h_id_filter_ccx(_adapter *adapter) +c2h_id_filter rtw_hal_c2h_id_filter_ccx(struct adapter *adapter) { return adapter->HalFunc.c2h_id_filter_ccx; } diff --git a/hal/odm.c b/hal/odm.c index 57bea4d..b63ec05 100755 --- a/hal/odm.c +++ b/hal/odm.c @@ -369,11 +369,11 @@ odm_Adaptivity( //============================================================ // Function predefine. //============================================================ -VOID odm_PathDiversityInit_92C( IN PADAPTER Adapter); -VOID odm_2TPathDiversityInit_92C( IN PADAPTER Adapter); -VOID odm_1TPathDiversityInit_92C( IN PADAPTER Adapter); -BOOLEAN odm_IsConnected_92C(IN PADAPTER Adapter); -VOID odm_PathDiversityAfterLink_92C( IN PADAPTER Adapter); +VOID odm_PathDiversityInit_92C( IN struct adapter *Adapter); +VOID odm_2TPathDiversityInit_92C( IN struct adapter *Adapter); +VOID odm_1TPathDiversityInit_92C( IN struct adapter *Adapter); +BOOLEAN odm_IsConnected_92C(IN struct adapter *Adapter); +VOID odm_PathDiversityAfterLink_92C( IN struct adapter *Adapter); VOID odm_CCKTXPathDiversityCallback( @@ -395,10 +395,10 @@ odm_PathDivChkAntSwitchWorkitemCallback( IN PVOID pContext ); -VOID odm_SetRespPath_92C( IN PADAPTER Adapter, IN u1Byte DefaultRespPath); -VOID odm_OFDMTXPathDiversity_92C( IN PADAPTER Adapter); -VOID odm_CCKTXPathDiversity_92C( IN PADAPTER Adapter); -VOID odm_ResetPathDiversity_92C( IN PADAPTER Adapter); +VOID odm_SetRespPath_92C( IN struct adapter *Adapter, IN u1Byte DefaultRespPath); +VOID odm_OFDMTXPathDiversity_92C( IN struct adapter *Adapter); +VOID odm_CCKTXPathDiversity_92C( IN struct adapter *Adapter); +VOID odm_ResetPathDiversity_92C( IN struct adapter *Adapter); //Start-------------------- RX High Power------------------------// VOID odm_RXHPInit( IN PDM_ODM_T pDM_Odm); @@ -415,7 +415,7 @@ odm_PathDivInit( IN PDM_ODM_T pDM_Odm); VOID odm_SetRespPath_92C( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u1Byte DefaultRespPath ); @@ -608,33 +608,33 @@ odm_TXPowerTrackingCheckCE( VOID ODM_RateAdaptiveStateApInit( - IN PADAPTER Adapter , + IN struct adapter *Adapter , IN PRT_WLAN_STA pEntry ); VOID odm_TXPowerTrackingCallbackThermalMeter92C( - IN PADAPTER Adapter + IN struct adapter *Adapter ); VOID odm_TXPowerTrackingCallbackRXGainThermalMeter92D( - IN PADAPTER Adapter + IN struct adapter * Adapter ); VOID odm_TXPowerTrackingCallbackThermalMeter92D( - IN PADAPTER Adapter + IN struct adapter *Adapter ); VOID odm_TXPowerTrackingDirectCall92C( - IN PADAPTER Adapter + IN struct adapter * Adapter ); VOID odm_TXPowerTrackingThermalMeterCheck( - IN PADAPTER Adapter + IN struct adapter * Adapter ); #endif @@ -1065,7 +1065,7 @@ ODM_CmnInfoHook( break; case ODM_CMNINFO_BUDDY_ADAPTOR: - pDM_Odm->pBuddyAdapter = (PADAPTER *)pValue; + pDM_Odm->pBuddyAdapter = (struct adapter **)pValue; break; case ODM_CMNINFO_DMSP_IS_MASTER: @@ -1277,7 +1277,7 @@ odm_CommonInfoSelfUpdate( #if (DM_ODM_SUPPORT_TYPE == ODM_MP) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter *Adapter = pDM_Odm->Adapter; PMGNT_INFO pMgntInfo = &Adapter->MgntInfo; pEntry = pDM_Odm->pODM_StaInfo[0]; @@ -1392,7 +1392,7 @@ VOID ODM_InitAllWorkItems(IN PDM_ODM_T pDM_Odm ) { #if USE_WORKITEM - PADAPTER pAdapter = pDM_Odm->Adapter; + struct adapter * pAdapter = pDM_Odm->Adapter; ODM_InitializeWorkItem( pDM_Odm, &pDM_Odm->DM_SWAT_Table.SwAntennaSwitchWorkitem, @@ -1588,7 +1588,7 @@ odm_EnableEDCCA( { // This should be moved out of OUTSRC - PADAPTER pAdapter = pDM_Odm->Adapter; + struct adapter * pAdapter = pDM_Odm->Adapter; // Enable EDCCA. The value is suggested by SD3 Wilson. // @@ -1631,7 +1631,7 @@ odm_DynamicEDCCA( IN PDM_ODM_T pDM_Odm ) { - PADAPTER pAdapter = pDM_Odm->Adapter; + struct adapter * pAdapter = pDM_Odm->Adapter; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); u1Byte RegC50, RegC58; BOOLEAN bEDCCAenable = FALSE; @@ -1730,7 +1730,7 @@ odm_DIGbyRSSI_LPS( IN PDM_ODM_T pDM_Odm ) { - PADAPTER pAdapter =pDM_Odm->Adapter; + struct adapter * pAdapter =pDM_Odm->Adapter; pDIG_T pDM_DigTable = &pDM_Odm->DM_DigTable; PFALSE_ALARM_STATISTICS pFalseAlmCnt = &pDM_Odm->FalseAlmCnt; @@ -1835,7 +1835,7 @@ odm_Adaptivity( BOOLEAN EDCCA_State = 0; #if (DM_ODM_SUPPORT_TYPE == ODM_MP) - PADAPTER pAdapter = pDM_Odm->Adapter; + struct adapter * pAdapter = pDM_Odm->Adapter; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); BOOLEAN bFwCurrentInPSMode=FALSE; PMGNT_INFO pMgntInfo = &(pAdapter->MgntInfo); @@ -2043,7 +2043,7 @@ odm_DIG( #if (DM_ODM_SUPPORT_TYPE == ODM_MP) // This should be moved out of OUTSRC - PADAPTER pAdapter = pDM_Odm->Adapter; + struct adapter * pAdapter = pDM_Odm->Adapter; #if OS_WIN_FROM_WIN7(OS_VERSION) if(IsAPModeExist( pAdapter) && pAdapter->bInHctTest) { @@ -2673,7 +2673,7 @@ odm_DigAbort( { #if (DM_ODM_SUPPORT_TYPE == ODM_MP) // This should be moved out of OUTSRC - PADAPTER pAdapter = pDM_Odm->Adapter; + struct adapter * pAdapter = pDM_Odm->Adapter; pRXHP_T pRX_HP_Table = &pDM_Odm->DM_RXHP_Table; #if OS_WIN_FROM_WIN7(OS_VERSION) @@ -2763,7 +2763,7 @@ odm_DIG( #if (DM_ODM_SUPPORT_TYPE == ODM_MP) // This should be moved out of OUTSRC - PADAPTER pAdapter = pDM_Odm->Adapter; + struct adapter * pAdapter = pDM_Odm->Adapter; #if OS_WIN_FROM_WIN7(OS_VERSION) if(IsAPModeExist( pAdapter) && pAdapter->bInHctTest) { @@ -3713,7 +3713,7 @@ odm_RateAdaptiveMaskInit( #if (DM_ODM_SUPPORT_TYPE & ODM_MP) VOID ODM_RateAdaptiveStateApInit( - IN PADAPTER Adapter , + IN struct adapter *Adapter , IN PRT_WLAN_STA pEntry ) { @@ -3878,8 +3878,8 @@ odm_RefreshRateAdaptiveMaskMP( ) { #if (DM_ODM_SUPPORT_TYPE == ODM_MP) - PADAPTER pAdapter = pDM_Odm->Adapter; - PADAPTER pTargetAdapter = NULL; + struct adapter *pAdapter = pDM_Odm->Adapter; + struct adapter * pTargetAdapter = NULL; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); PMGNT_INFO pMgntInfo = GetDefaultMgntInfo(pAdapter); //PRATE_ADAPTIVE pRA = (PRATE_ADAPTIVE)&pMgntInfo->RateAdaptive; @@ -3996,7 +3996,7 @@ odm_RefreshRateAdaptiveMaskCE( { #if (DM_ODM_SUPPORT_TYPE == ODM_CE) u1Byte i; - PADAPTER pAdapter = pDM_Odm->Adapter; + struct adapter *pAdapter = pDM_Odm->Adapter; if(pAdapter->bDriverStopped) { @@ -4131,7 +4131,7 @@ odm_DynamicTxPowerInit( ) { #if (DM_ODM_SUPPORT_TYPE == ODM_MP) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter *Adapter = pDM_Odm->Adapter; PMGNT_INFO pMgntInfo = &Adapter->MgntInfo; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -4154,7 +4154,7 @@ odm_DynamicTxPowerInit( pHalData->LastDTPLvl = TxHighPwrLevel_Normal; pHalData->DynamicTxHighPowerLvl = TxHighPwrLevel_Normal; #elif (DM_ODM_SUPPORT_TYPE == ODM_CE) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter *Adapter = pDM_Odm->Adapter; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); struct dm_priv *pdmpriv = &pHalData->dmpriv; pdmpriv->bDynamicTxPowerEnable = _FALSE; @@ -4195,12 +4195,12 @@ odm_DynamicTxPowerSavePowerIndex( u4Byte Power_Index_REG[6] = {0xc90, 0xc91, 0xc92, 0xc98, 0xc99, 0xc9a}; #if (DM_ODM_SUPPORT_TYPE == ODM_MP) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter *Adapter = pDM_Odm->Adapter; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); for(index = 0; index< 6; index++) pHalData->PowerIndex_backup[index] = PlatformEFIORead1Byte(Adapter, Power_Index_REG[index]); #elif (DM_ODM_SUPPORT_TYPE == ODM_CE) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter *Adapter = pDM_Odm->Adapter; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); struct dm_priv *pdmpriv = &pHalData->dmpriv; for(index = 0; index< 6; index++) @@ -4214,7 +4214,7 @@ odm_DynamicTxPowerRestorePowerIndex( ) { u1Byte index; - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter * Adapter = pDM_Odm->Adapter; #if (DM_ODM_SUPPORT_TYPE & (ODM_CE|ODM_MP)) HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -4255,7 +4255,7 @@ odm_DynamicTxPower( // For AP/ADSL use prtl8192cd_priv // For CE/NIC use PADAPTER // - //PADAPTER pAdapter = pDM_Odm->Adapter; + //struct adapter * pAdapter = pDM_Odm->Adapter; // prtl8192cd_priv priv = pDM_Odm->priv; if (!(pDM_Odm->SupportAbility & ODM_BB_DYNAMIC_TXPWR)) @@ -4364,7 +4364,7 @@ odm_DynamicTxPower_92C( ) { #if (DM_ODM_SUPPORT_TYPE == ODM_MP) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter *Adapter = pDM_Odm->Adapter; PMGNT_INFO pMgntInfo = &Adapter->MgntInfo; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); s4Byte UndecoratedSmoothedPWDB; @@ -4481,7 +4481,7 @@ odm_DynamicTxPower_92C( #elif (DM_ODM_SUPPORT_TYPE == ODM_CE) #if (RTL8192C_SUPPORT==1) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter *Adapter = pDM_Odm->Adapter; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); struct dm_priv *pdmpriv = &pHalData->dmpriv; struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv); @@ -4611,12 +4611,12 @@ odm_DynamicTxPower_92D( ) { #if (DM_ODM_SUPPORT_TYPE == ODM_MP) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter *Adapter = pDM_Odm->Adapter; PMGNT_INFO pMgntInfo = &Adapter->MgntInfo; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); s4Byte UndecoratedSmoothedPWDB; - PADAPTER BuddyAdapter = Adapter->BuddyAdapter; + struct adapter *BuddyAdapter = Adapter->BuddyAdapter; BOOLEAN bGetValueFromBuddyAdapter = dm_DualMacGetParameterFromBuddyAdapter(Adapter); u1Byte HighPowerLvlBackForMac0 = TxHighPwrLevel_Level1; @@ -4769,7 +4769,7 @@ odm_DynamicTxPower_92D( pHalData->LastDTPLvl = pHalData->DynamicTxHighPowerLvl; #elif (DM_ODM_SUPPORT_TYPE == ODM_CE) #if (RTL8192D_SUPPORT==1) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter *Adapter = pDM_Odm->Adapter; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv); @@ -4777,7 +4777,7 @@ odm_DynamicTxPower_92D( DM_ODM_T *podmpriv = &pHalData->odmpriv; int UndecoratedSmoothedPWDB; #if (RTL8192D_EASY_SMART_CONCURRENT == 1) - PADAPTER BuddyAdapter = Adapter->BuddyAdapter; + struct adapter *BuddyAdapter = Adapter->BuddyAdapter; BOOLEAN bGetValueFromBuddyAdapter = DualMacGetParameterFromBuddyAdapter(Adapter); u8 HighPowerLvlBackForMac0 = TxHighPwrLevel_Level1; #endif @@ -4952,7 +4952,7 @@ odm_RSSIMonitorCheck( // For AP/ADSL use prtl8192cd_priv // For CE/NIC use PADAPTER // - PADAPTER pAdapter = pDM_Odm->Adapter; + struct adapter * pAdapter = pDM_Odm->Adapter; prtl8192cd_priv priv = pDM_Odm->priv; if (!(pDM_Odm->SupportAbility & ODM_BB_RSSI_MONITOR)) @@ -4991,7 +4991,7 @@ odm_RSSIMonitorCheckMP( ) { #if (DM_ODM_SUPPORT_TYPE == ODM_MP) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter *Adapter = pDM_Odm->Adapter; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); PRT_WLAN_STA pEntry; u1Byte i; @@ -5077,7 +5077,7 @@ odm_RSSIMonitorCheckMP( // static VOID FindMinimumRSSI_Dmsp( - IN PADAPTER pAdapter + IN struct adapter *pAdapter ) { #if 0 @@ -5086,7 +5086,7 @@ FindMinimumRSSI_Dmsp( s32 Rssi_val_min_back_for_mac0; BOOLEAN bGetValueFromBuddyAdapter = dm_DualMacGetParameterFromBuddyAdapter(pAdapter); BOOLEAN bRestoreRssi = _FALSE; - PADAPTER BuddyAdapter = pAdapter->BuddyAdapter; + struct adapter *BuddyAdapter = pAdapter->BuddyAdapter; if(pHalData->MacPhyMode92D == DUALMAC_SINGLEPHY) { @@ -5121,7 +5121,7 @@ FindMinimumRSSI_Dmsp( static void FindMinimumRSSI( -IN PADAPTER pAdapter +IN struct adapter *pAdapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); @@ -5152,7 +5152,7 @@ odm_RSSIMonitorCheckCE( ) { #if (DM_ODM_SUPPORT_TYPE == ODM_CE) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter *Adapter = pDM_Odm->Adapter; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); struct dm_priv *pdmpriv = &pHalData->dmpriv; int i; @@ -5421,7 +5421,7 @@ odm_TXPowerTrackingThermalMeterInit( ) { #if (DM_ODM_SUPPORT_TYPE == ODM_MP) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter * Adapter = pDM_Odm->Adapter; PMGNT_INFO pMgntInfo = &Adapter->MgntInfo; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -5482,7 +5482,7 @@ ODM_TXPowerTrackingCheck( // For AP/ADSL use prtl8192cd_priv // For CE/NIC use PADAPTER // - PADAPTER pAdapter = pDM_Odm->Adapter; + struct adapter * pAdapter = pDM_Odm->Adapter; prtl8192cd_priv priv = pDM_Odm->priv; //if (!(pDM_Odm->SupportAbility & ODM_RF_TX_PWR_TRACK)) @@ -5520,7 +5520,7 @@ odm_TXPowerTrackingCheckCE( ) { #if (DM_ODM_SUPPORT_TYPE == ODM_CE) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter *Adapter = pDM_Odm->Adapter; #if( (RTL8192C_SUPPORT==1) || (RTL8723A_SUPPORT==1) ) rtl8192c_odm_CheckTXPowerTracking(Adapter); #endif @@ -5567,7 +5567,7 @@ odm_TXPowerTrackingCheckMP( ) { #if (DM_ODM_SUPPORT_TYPE == ODM_MP) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter *Adapter = pDM_Odm->Adapter; if (ODM_CheckPowerStatus(Adapter) == FALSE) return; @@ -5609,7 +5609,7 @@ odm_TXPowerTrackingCheckAP( VOID odm_TXPowerTrackingThermalMeterCheck( - IN PADAPTER Adapter + IN struct adapter * Adapter ) { #ifndef AP_BUILD_WORKAROUND @@ -5673,7 +5673,7 @@ odm_SwAntDivInit_NIC_8723A( IN PDM_ODM_T pDM_Odm) { pSWAT_T pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table; - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter * Adapter = pDM_Odm->Adapter; u1Byte btAntNum=BT_GetPGAntNum(Adapter); @@ -5805,7 +5805,7 @@ odm_SwAntDivChkAntSwitch( // For AP/ADSL use prtl8192cd_priv // For CE/NIC use PADAPTER // - PADAPTER pAdapter = pDM_Odm->Adapter; + struct adapter * pAdapter = pDM_Odm->Adapter; prtl8192cd_priv priv = pDM_Odm->priv; // @@ -5946,7 +5946,7 @@ odm_SwAntDivChkAntSwitchNIC( } #elif (DM_ODM_SUPPORT_TYPE & ODM_MP) { - PADAPTER pAdapter = pDM_Odm->Adapter; + struct adapter *pAdapter = pDM_Odm->Adapter; PMGNT_INFO pMgntInfo=&pAdapter->MgntInfo; // Select RSSI checking target @@ -5960,7 +5960,7 @@ odm_SwAntDivChkAntSwitchNIC( { u1Byte index = 0; PSTA_INFO_T pEntry = NULL; - PADAPTER pTargetAdapter = NULL; + struct adapter * pTargetAdapter = NULL; if(pMgntInfo->mIbss ) { @@ -6014,7 +6014,7 @@ odm_SwAntDivChkAntSwitchNIC( else { #if (DM_ODM_SUPPORT_TYPE &( ODM_MP)) - //PADAPTER Adapter = pDM_Odm->Adapter; + //struct adapter *Adapter = pDM_Odm->Adapter; curTxOkCnt = pAdapter->TxStats.NumTxBytesUnicast - pDM_SWAT_Table->lastTxOkCnt; curRxOkCnt =pAdapter->RxStats.NumRxBytesUnicast - pDM_SWAT_Table->lastRxOkCnt; pDM_SWAT_Table->lastTxOkCnt = pAdapter->TxStats.NumTxBytesUnicast; @@ -6252,7 +6252,7 @@ odm_SwAntDivChkAntSwitchNIC( //1 6.Set next timer { - PADAPTER pAdapter = pDM_Odm->Adapter; + struct adapter * pAdapter = pDM_Odm->Adapter; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); @@ -6309,7 +6309,7 @@ odm_SwAntDivChkAntSwitchNIC( u1Byte odm_SwAntDivSelectChkChnl( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { #if (RT_MEM_SIZE_LEVEL != RT_MEM_SIZE_MINIMUM) @@ -6355,7 +6355,7 @@ odm_SwAntDivSelectChkChnl( VOID odm_SwAntDivConsructChkScanChnl( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u1Byte ChkChnl ) { @@ -6401,7 +6401,7 @@ odm_SwAntDivChkAntSwitchCallback( PRT_TIMER pTimer ) { - PADAPTER Adapter = (PADAPTER)pTimer->Adapter; + struct adapter * Adapter = (PADAPTER)pTimer->Adapter; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); pSWAT_T pDM_SWAT_Table = &pHalData->DM_OutSrc.DM_SWAT_Table; @@ -6422,7 +6422,7 @@ odm_SwAntDivChkAntSwitchWorkitemCallback( ) { - PADAPTER pAdapter = (PADAPTER)pContext; + struct adapter * pAdapter = (PADAPTER)pContext; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); odm_SwAntDivChkAntSwitch(&pHalData->DM_OutSrc, SWAW_STEP_DETERMINE); @@ -6432,7 +6432,7 @@ odm_SwAntDivChkAntSwitchWorkitemCallback( VOID odm_SwAntDivChkAntSwitchCallback(void *FunctionContext) { PDM_ODM_T pDM_Odm= (PDM_ODM_T)FunctionContext; - PADAPTER padapter = pDM_Odm->Adapter; + struct adapter *padapter = pDM_Odm->Adapter; if(padapter->net_closed == _TRUE) return; odm_SwAntDivChkAntSwitch(pDM_Odm, SWAW_STEP_DETERMINE); @@ -6460,10 +6460,10 @@ VOID odm_SwAntDivChkAntSwitch( VOID ODM_SwAntDivResetBeforeLink( IN PDM_ODM_T pDM_Odm ){} VOID ODM_SwAntDivRestAfterLink( IN PDM_ODM_T pDM_Odm ){} #if (DM_ODM_SUPPORT_TYPE == ODM_MP) -u1Byte odm_SwAntDivSelectChkChnl( IN PADAPTER Adapter ){ return 0;} +u1Byte odm_SwAntDivSelectChkChnl( IN struct adapter *Adapter ){ return 0;} VOID odm_SwAntDivConsructChkScanChnl( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u1Byte ChkChnl ){} #endif @@ -6487,7 +6487,7 @@ ODM_SwAntDivCheckBeforeLink8192C( { #if (RT_MEM_SIZE_LEVEL != RT_MEM_SIZE_MINIMUM) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter *Adapter = pDM_Odm->Adapter; HAL_DATA_TYPE *pHalData=NULL; PMGNT_INFO pMgntInfo = NULL; //pSWAT_T pDM_SWAT_Table = &Adapter->DM_SWAT_Table; @@ -7358,7 +7358,7 @@ ODM_EdcaTurboInit( #if ((DM_ODM_SUPPORT_TYPE == ODM_AP)||(DM_ODM_SUPPORT_TYPE==ODM_ADSL)) odm_EdcaParaInit(pDM_Odm); #elif (DM_ODM_SUPPORT_TYPE==ODM_MP) - PADAPTER Adapter = NULL; + struct adapter *Adapter = NULL; HAL_DATA_TYPE *pHalData = NULL; if(pDM_Odm->Adapter==NULL) { @@ -7374,7 +7374,7 @@ ODM_EdcaTurboInit( pHalData->bIsAnyNonBEPkts = FALSE; #elif(DM_ODM_SUPPORT_TYPE==ODM_CE) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter *Adapter = pDM_Odm->Adapter; pDM_Odm->DM_EDCA_Table.bCurrentTurboEDCA = FALSE; pDM_Odm->DM_EDCA_Table.bIsCurRDLState = FALSE; Adapter->recvpriv.bIsAnyNonBEPkts =FALSE; @@ -7397,7 +7397,7 @@ odm_EdcaTurboCheck( // For AP/ADSL use prtl8192cd_priv // For CE/NIC use PADAPTER // - PADAPTER pAdapter = pDM_Odm->Adapter; + struct adapter * pAdapter = pDM_Odm->Adapter; prtl8192cd_priv priv = pDM_Odm->priv; // @@ -7448,7 +7448,7 @@ odm_EdcaTurboCheckCE( #if(DM_ODM_SUPPORT_TYPE==ODM_CE) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter * Adapter = pDM_Odm->Adapter; u32 trafficIndex; u32 edca_param; @@ -7575,12 +7575,12 @@ odm_EdcaTurboCheckMP( { - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter * Adapter = pDM_Odm->Adapter; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); #if(DM_ODM_SUPPORT_TYPE==ODM_MP) - PADAPTER pDefaultAdapter = GetDefaultAdapter(Adapter); - PADAPTER pExtAdapter = GetFirstExtAdapter(Adapter);//NULL; + struct adapter * pDefaultAdapter = GetDefaultAdapter(Adapter); + struct adapter * pExtAdapter = GetFirstExtAdapter(Adapter);//NULL; PMGNT_INFO pMgntInfo = &Adapter->MgntInfo; PSTA_QOS pStaQos = Adapter->MgntInfo.pStaQos; //[Win7 Count Tx/Rx statistic for Extension Port] odm_CheckEdcaTurbo's Adapter is always Default. 2009.08.20, by Bohn @@ -7750,7 +7750,7 @@ odm_IsEdcaTurboDisable( IN PDM_ODM_T pDM_Odm ) { - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter * Adapter = pDM_Odm->Adapter; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); #if(DM_ODM_SUPPORT_TYPE==ODM_MP) @@ -7834,7 +7834,7 @@ ODM_EdcaParaSelByIot( ) { - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter * Adapter = pDM_Odm->Adapter; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); u4Byte IOTPeer=0; u4Byte ICType=pDM_Odm->SupportICType; @@ -7842,8 +7842,8 @@ ODM_EdcaParaSelByIot( u4Byte RFType=pDM_Odm->RFType; #if(DM_ODM_SUPPORT_TYPE==ODM_MP) - PADAPTER pDefaultAdapter = GetDefaultAdapter(Adapter); - PADAPTER pExtAdapter = GetFirstExtAdapter(Adapter);//NULL; + struct adapter * pDefaultAdapter = GetDefaultAdapter(Adapter); + struct adapter * pExtAdapter = GetFirstExtAdapter(Adapter);//NULL; PMGNT_INFO pMgntInfo = &Adapter->MgntInfo; u1Byte TwoPortStatus = (u1Byte)TWO_PORT_STATUS__WITHOUT_ANY_ASSOCIATE; @@ -8807,7 +8807,7 @@ odm_IotEngine( // BOOLEAN ODM_CheckPowerStatus( - IN PADAPTER Adapter) + IN struct adapter * Adapter) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -8994,7 +8994,7 @@ PatchDCTone( ) { //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); - //PADAPTER pAdapter; + //struct adapter *pAdapter; u4Byte psd_report; @@ -9293,7 +9293,7 @@ odm_PSD_Monitor( u4Byte ReScan, Interval, Is40MHz; u8Byte curTxOkCnt, curRxOkCnt; int cur_byte_idx, cur_bit_idx; - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter * Adapter = pDM_Odm->Adapter; PMGNT_INFO pMgntInfo = &Adapter->MgntInfo; //--------------2G band synthesizer for 92D switch RF channel using----------------- u1Byte group_idx=0; @@ -9839,7 +9839,7 @@ odm_PSDMonitorCallback( PRT_TIMER pTimer ) { - PADAPTER Adapter = (PADAPTER)pTimer->Adapter; + struct adapter * Adapter = (PADAPTER)pTimer->Adapter; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); PDM_ODM_T pDM_Odm = &pHalData->DM_OutSrc; @@ -9856,7 +9856,7 @@ odm_PSDMonitorWorkItemCallback( IN PVOID pContext ) { - PADAPTER Adapter = (PADAPTER)pContext; + struct adapter *Adapter = (PADAPTER)pContext; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); PDM_ODM_T pDM_Odm = &pHalData->DM_OutSrc; @@ -9870,7 +9870,7 @@ odm_PSDMonitorWorkItemCallback( VOID ODM_PSDDbgControl( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u4Byte mode, IN u4Byte btRssi ) @@ -9924,7 +9924,7 @@ void odm_RXHP( { #if( DM_ODM_SUPPORT_TYPE & (ODM_MP)) #if (DEV_BUS_TYPE == RT_PCI_INTERFACE) | (DEV_BUS_TYPE == RT_USB_INTERFACE) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter *Adapter = pDM_Odm->Adapter; PMGNT_INFO pMgntInfo = &(Adapter->MgntInfo); pDIG_T pDM_DigTable = &pDM_Odm->DM_DigTable; pRXHP_T pRX_HP_Table = &pDM_Odm->DM_RXHP_Table; @@ -10308,7 +10308,7 @@ odm_PSD_RXHP( ) { pRXHP_T pRX_HP_Table = &pDM_Odm->DM_RXHP_Table; - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter * Adapter = pDM_Odm->Adapter; PMGNT_INFO pMgntInfo = &(Adapter->MgntInfo); unsigned int pts, start_point, stop_point, initial_gain ; static u1Byte PSD_bitmap_memory[80], init_memory = 0; @@ -10604,7 +10604,7 @@ odm_PSD_RXHPCallback( PRT_TIMER pTimer ) { - PADAPTER Adapter = (PADAPTER)pTimer->Adapter; + struct adapter * Adapter = (PADAPTER)pTimer->Adapter; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); PDM_ODM_T pDM_Odm = &pHalData->DM_OutSrc; pRXHP_T pRX_HP_Table = &pDM_Odm->DM_RXHP_Table; @@ -10626,7 +10626,7 @@ odm_PSD_RXHPWorkitemCallback( IN PVOID pContext ) { - PADAPTER pAdapter = (PADAPTER)pContext; + struct adapter *pAdapter = (PADAPTER)pContext; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); PDM_ODM_T pDM_Odm = &pHalData->DM_OutSrc; @@ -10671,7 +10671,7 @@ odm_GlobalAdapterCheck( #if (DM_ODM_SUPPORT_TYPE == ODM_MP) VOID odm_OFDMTXPathDiversity_92C( - IN PADAPTER Adapter) + IN struct adapter *Adapter) { // HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); PMGNT_INFO pMgntInfo = &(Adapter->MgntInfo); @@ -10753,7 +10753,7 @@ odm_OFDMTXPathDiversity_92C( BOOLEAN odm_IsConnected_92C( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { PRT_WLAN_STA pEntry; @@ -10794,7 +10794,7 @@ odm_IsConnected_92C( VOID odm_ResetPathDiversity_92C( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -10841,7 +10841,7 @@ odm_ResetPathDiversity_92C( VOID odm_CCKTXPathDiversity_92C( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -10990,7 +10990,7 @@ odm_CCKTXPathDiversity_92C( VOID odm_PathDiversityAfterLink_92C( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -11086,11 +11086,11 @@ odm_CCKTXPathDiversityCallback( ) { #if USE_WORKITEM - PADAPTER Adapter = (PADAPTER)pTimer->Adapter; + struct adapter *Adapter = (PADAPTER)pTimer->Adapter; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); PDM_ODM_T pDM_Odm = &pHalData->DM_OutSrc; #else - PADAPTER Adapter = (PADAPTER)pTimer->Adapter; + struct adapter *Adapter = (PADAPTER)pTimer->Adapter; #endif #if DEV_BUS_TYPE==RT_PCI_INTERFACE @@ -11111,7 +11111,7 @@ odm_CCKTXPathDiversityWorkItemCallback( IN PVOID pContext ) { - PADAPTER Adapter = (PADAPTER)pContext; + struct adapter *Adapter = (PADAPTER)pContext; odm_CCKTXPathDiversity_92C(Adapter); } @@ -11119,7 +11119,7 @@ odm_CCKTXPathDiversityWorkItemCallback( VOID ODM_CCKPathDiversityChkPerPktRssi( - PADAPTER Adapter, + struct adapter * Adapter, BOOLEAN bIsDefPort, BOOLEAN bMatchBSSID, PRT_WLAN_STA pEntry, @@ -11183,12 +11183,12 @@ ODM_CCKPathDiversityChkPerPktRssi( BOOLEAN ODM_PathDiversityBeforeLink92C( - //IN PADAPTER Adapter + //IN struct adapter *Adapter IN PDM_ODM_T pDM_Odm ) { #if (RT_MEM_SIZE_LEVEL != RT_MEM_SIZE_MINIMUM) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter * Adapter = pDM_Odm->Adapter; HAL_DATA_TYPE* pHalData = NULL; PMGNT_INFO pMgntInfo = NULL; //pSWAT_T pDM_SWAT_Table = &Adapter->DM_SWAT_Table; @@ -11407,7 +11407,7 @@ ODM_PathDiversityBeforeLink92C( // VOID ODM_PathDivChkPerPktRssi( - PADAPTER Adapter, + struct adapter * Adapter, BOOLEAN bIsDefPort, BOOLEAN bMatchBSSID, PRT_WLAN_STA pEntry, @@ -11452,7 +11452,7 @@ ODM_PathDivRestAfterLink( IN PDM_ODM_T pDM_Odm ) { - PADAPTER Adapter=pDM_Odm->Adapter; + struct adapter * Adapter=pDM_Odm->Adapter; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); pSWAT_T pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table; @@ -11475,7 +11475,7 @@ odm_PathDivChkAntSwitchCallback( PRT_TIMER pTimer ) { - PADAPTER Adapter = (PADAPTER)pTimer->Adapter; + struct adapter * Adapter = (PADAPTER)pTimer->Adapter; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); PDM_ODM_T pDM_Odm = &pHalData->DM_OutSrc; @@ -11500,7 +11500,7 @@ odm_PathDivChkAntSwitchWorkitemCallback( IN PVOID pContext ) { - PADAPTER pAdapter = (PADAPTER)pContext; + struct adapter *pAdapter = (PADAPTER)pContext; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); PDM_ODM_T pDM_Odm = &pHalData->DM_OutSrc; @@ -11518,11 +11518,11 @@ odm_PathDivChkAntSwitchWorkitemCallback( VOID odm_PathDivChkAntSwitch( PDM_ODM_T pDM_Odm - //PADAPTER Adapter, + //struct adapter * Adapter, //u1Byte Step ) { - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter * Adapter = pDM_Odm->Adapter; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); PMGNT_INFO pMgntInfo = &Adapter->MgntInfo; @@ -11549,7 +11549,7 @@ odm_PathDivChkAntSwitch( u1Byte n=0; static u8Byte lastTxOkCnt_tmp=0, lastRxOkCnt_tmp=0; //u8Byte curTxOkCnt_tmp, curRxOkCnt_tmp; - PADAPTER BuddyAdapter = Adapter->BuddyAdapter; // another adapter MAC + struct adapter * BuddyAdapter = Adapter->BuddyAdapter; // another adapter MAC // Path Diversity //Neil Chen--2011--06--22 //u1Byte PathDiv_Trigger = (u1Byte) PHY_QueryBBReg(Adapter, 0xBA0,BIT31); @@ -11608,7 +11608,7 @@ odm_PathDivChkAntSwitch( { u1Byte index = 0; PRT_WLAN_STA pEntry = NULL; - PADAPTER pTargetAdapter = NULL; + struct adapter * pTargetAdapter = NULL; if( pMgntInfo->mIbss || ACTING_AS_AP(Adapter) ) { @@ -11986,7 +11986,7 @@ odm_PathDivChkAntSwitch( VOID odm_SetRespPath_92C( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u1Byte DefaultRespPath ) { @@ -12010,7 +12010,7 @@ odm_SetRespPath_92C( VOID ODM_FillTXPathInTXDESC( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN PRT_TCB pTcb, IN pu1Byte pDesc ) diff --git a/hal/odm.h b/hal/odm.h index ec25a43..a09ddd7 100755 --- a/hal/odm.h +++ b/hal/odm.h @@ -140,7 +140,7 @@ typedef struct _ADAPTER{ HAL_DATA_TYPE* temp2; prtl8192cd_priv priv; #endif -}ADAPTER, *PADAPTER; +}ADAPTER, *struct adapter *; #endif #if (DM_ODM_SUPPORT_TYPE == ODM_AP) @@ -1118,7 +1118,7 @@ typedef struct DM_Out_Source_Dynamic_Mechanism_Structure // // Add for different team use temporarily // - PADAPTER Adapter; // For CE/NIC team + struct adapter * Adapter; // For CE/NIC team prtl8192cd_priv priv; // For AP/ADSL team // WHen you use Adapter or priv pointer, you must make sure the pointer is ready. BOOLEAN odm_ready; @@ -1196,7 +1196,7 @@ typedef struct DM_Out_Source_Dynamic_Mechanism_Structure u1Byte u1Byte_temp; BOOLEAN BOOLEAN_temp; - PADAPTER PADAPTER_temp; + struct adapter *_temp; // MAC PHY Mode SMSP/DMSP/DMDP = 0/1/2 u1Byte *pMacPhyMode; @@ -1219,7 +1219,7 @@ typedef struct DM_Out_Source_Dynamic_Mechanism_Structure // Common info for 92D DMSP BOOLEAN *pbGetValueFromOtherMac; - PADAPTER *pBuddyAdapter; + struct adapter * *pBuddyAdapter; BOOLEAN *pbMasterOfDMSP; //MAC0: master, MAC1: slave // Common info for Status BOOLEAN *pbScanInProcess; @@ -1709,7 +1709,7 @@ ODM_RAStateCheck( // function prototype //============================================================ //#define DM_ChangeDynamicInitGainThresh ODM_ChangeDynamicInitGainThresh -//void ODM_ChangeDynamicInitGainThresh(IN PADAPTER pAdapter, +//void ODM_ChangeDynamicInitGainThresh(IN struct adapter * pAdapter, // IN INT32 DM_Type, // IN INT32 DM_Value); VOID @@ -1721,14 +1721,14 @@ ODM_ChangeDynamicInitGainThresh( BOOLEAN ODM_CheckPowerStatus( - IN PADAPTER Adapter + IN struct adapter * Adapter ); #if (DM_ODM_SUPPORT_TYPE != ODM_ADSL) VOID ODM_RateAdaptiveStateApInit( - IN PADAPTER Adapter , + IN struct adapter * Adapter , IN PRT_WLAN_STA pEntry ); #endif @@ -1833,7 +1833,7 @@ VOID odm_PSDMonitorInit(PDM_ODM_T pDM_Odm); VOID ODM_PSDDbgControl( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN u4Byte mode, IN u4Byte btRssi ); @@ -1922,13 +1922,13 @@ VOID ODM_PathDivRestAfterLink( //#define PATHDIV_ENABLE 1 -//VOID odm_PathDivChkAntSwitch(PADAPTER Adapter,u1Byte Step); +//VOID odm_PathDivChkAntSwitch(struct adapter * Adapter,u1Byte Step); VOID ODM_PathDivRestAfterLink( IN PDM_ODM_T pDM_Odm ); #define dm_PathDiv_RSSI_Check ODM_PathDivChkPerPktRssi -VOID ODM_PathDivChkPerPktRssi(PADAPTER Adapter, +VOID ODM_PathDivChkPerPktRssi(struct adapter * Adapter, BOOLEAN bIsDefPort, BOOLEAN bMatchBSSID, PRT_WLAN_STA pEntry, @@ -1956,12 +1956,12 @@ PlatformDivision64( #define PathDivCheckBeforeLink8192C ODM_PathDiversityBeforeLink92C BOOLEAN ODM_PathDiversityBeforeLink92C( - //IN PADAPTER Adapter + //IN struct adapter * Adapter IN PDM_ODM_T pDM_Odm ); #define DM_ChangeDynamicInitGainThresh ODM_ChangeDynamicInitGainThresh -//void ODM_ChangeDynamicInitGainThresh(IN PADAPTER pAdapter, +//void ODM_ChangeDynamicInitGainThresh(IN struct adapter * pAdapter, // IN INT32 DM_Type, // IN INT32 DM_Value); // @@ -1969,7 +1969,7 @@ ODM_PathDiversityBeforeLink92C( VOID ODM_CCKPathDiversityChkPerPktRssi( - PADAPTER Adapter, + struct adapter * Adapter, BOOLEAN bIsDefPort, BOOLEAN bMatchBSSID, PRT_WLAN_STA pEntry, @@ -1991,7 +1991,7 @@ typedef enum tag_DIG_Connect_Definition VOID ODM_FillTXPathInTXDESC( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN PRT_TCB pTcb, IN pu1Byte pDesc ); diff --git a/hal/odm_RTL8188E.c b/hal/odm_RTL8188E.c index f379c13..65041c4 100755 --- a/hal/odm_RTL8188E.c +++ b/hal/odm_RTL8188E.c @@ -51,7 +51,7 @@ odm_RX_HWAntDivInit( ) { u4Byte value32; - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter * Adapter = pDM_Odm->Adapter; #if (MP_DRIVER == 1) if (*(pDM_Odm->mp_mode) == 1) { @@ -89,7 +89,7 @@ odm_TRX_HWAntDivInit( ) { u4Byte value32; - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter * Adapter = pDM_Odm->Adapter; #if (MP_DRIVER == 1) if (*(pDM_Odm->mp_mode) == 1) @@ -142,7 +142,7 @@ odm_FastAntTrainingInit( u4Byte value32, i; pFAT_T pDM_FatTable = &pDM_Odm->DM_FatTable; u4Byte AntCombination = 2; - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter * Adapter = pDM_Odm->Adapter; ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("odm_FastAntTrainingInit() \n")); #if (MP_DRIVER == 1) @@ -254,7 +254,7 @@ ODM_AntennaDiversityInit_88E( //2012.03.27 LukeLee: For temp use, should be removed later //pDM_Odm->AntDivType = CG_TRX_HW_ANTDIV; //{ - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter * Adapter = pDM_Odm->Adapter; HAL_DATA_TYPE* pHalData = GET_HAL_DATA(Adapter); //pHalData->AntDivCfg = 1; //} @@ -537,7 +537,7 @@ odm_SetNextMACAddrTarget( // #if( DM_ODM_SUPPORT_TYPE & ODM_MP) { - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter *Adapter = pDM_Odm->Adapter; PMGNT_INFO pMgntInfo = &Adapter->MgntInfo; for (i=0; i<6; i++) @@ -696,7 +696,7 @@ odm_FastAntTrainingCallback( { #if (DM_ODM_SUPPORT_TYPE == ODM_CE) - PADAPTER padapter = pDM_Odm->Adapter; + struct adapter *padapter = pDM_Odm->Adapter; if(padapter->net_closed == _TRUE) return; //if(*pDM_Odm->pbNet_closed == TRUE) @@ -815,7 +815,7 @@ odm_FastAntTrainingCallback( PRT_TIMER pTimer ) { - PADAPTER Adapter = (PADAPTER)pTimer->Adapter; + struct adapter * Adapter = (PADAPTER)pTimer->Adapter; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); //#if DEV_BUS_TYPE==RT_PCI_INTERFACE @@ -833,7 +833,7 @@ odm_FastAntTrainingCallback( VOID odm_FastAntTrainingCallback(void *FunctionContext) { PDM_ODM_T pDM_Odm= (PDM_ODM_T)FunctionContext; - PADAPTER padapter = pDM_Odm->Adapter; + struct adapter *padapter = pDM_Odm->Adapter; if(padapter->net_closed == _TRUE) return; odm_FastAntTraining(pDM_Odm); @@ -898,7 +898,7 @@ odm_DynamicPrimaryCCA( IN PDM_ODM_T pDM_Odm ) { - PADAPTER Adapter = pDM_Odm->Adapter; // for NIC + struct adapter *Adapter = pDM_Odm->Adapter; // for NIC prtl8192cd_priv priv = pDM_Odm->priv; // for AP HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); diff --git a/hal/odm_interface.c b/hal/odm_interface.c index 7f6dd58..ad4a62e 100755 --- a/hal/odm_interface.c +++ b/hal/odm_interface.c @@ -37,10 +37,10 @@ ODM_Read1Byte( prtl8192cd_priv priv = pDM_Odm->priv; return RTL_R8(RegAddr); #elif(DM_ODM_SUPPORT_TYPE & ODM_CE) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter * Adapter = pDM_Odm->Adapter; return rtw_read8(Adapter,RegAddr); #elif(DM_ODM_SUPPORT_TYPE & ODM_MP) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter * Adapter = pDM_Odm->Adapter; return PlatformEFIORead1Byte(Adapter, RegAddr); #endif @@ -57,10 +57,10 @@ ODM_Read2Byte( prtl8192cd_priv priv = pDM_Odm->priv; return RTL_R16(RegAddr); #elif(DM_ODM_SUPPORT_TYPE & ODM_CE) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter * Adapter = pDM_Odm->Adapter; return rtw_read16(Adapter,RegAddr); #elif(DM_ODM_SUPPORT_TYPE & ODM_MP) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter * Adapter = pDM_Odm->Adapter; return PlatformEFIORead2Byte(Adapter, RegAddr); #endif @@ -77,10 +77,10 @@ ODM_Read4Byte( prtl8192cd_priv priv = pDM_Odm->priv; return RTL_R32(RegAddr); #elif(DM_ODM_SUPPORT_TYPE & ODM_CE) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter * Adapter = pDM_Odm->Adapter; return rtw_read32(Adapter,RegAddr); #elif(DM_ODM_SUPPORT_TYPE & ODM_MP) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter * Adapter = pDM_Odm->Adapter; return PlatformEFIORead4Byte(Adapter, RegAddr); #endif @@ -98,10 +98,10 @@ ODM_Write1Byte( prtl8192cd_priv priv = pDM_Odm->priv; RTL_W8(RegAddr, Data); #elif(DM_ODM_SUPPORT_TYPE & ODM_CE) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter * Adapter = pDM_Odm->Adapter; rtw_write8(Adapter,RegAddr, Data); #elif(DM_ODM_SUPPORT_TYPE & ODM_MP) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter * Adapter = pDM_Odm->Adapter; PlatformEFIOWrite1Byte(Adapter, RegAddr, Data); #endif @@ -119,10 +119,10 @@ ODM_Write2Byte( prtl8192cd_priv priv = pDM_Odm->priv; RTL_W16(RegAddr, Data); #elif(DM_ODM_SUPPORT_TYPE & ODM_CE) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter * Adapter = pDM_Odm->Adapter; rtw_write16(Adapter,RegAddr, Data); #elif(DM_ODM_SUPPORT_TYPE & ODM_MP) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter * Adapter = pDM_Odm->Adapter; PlatformEFIOWrite2Byte(Adapter, RegAddr, Data); #endif @@ -140,10 +140,10 @@ ODM_Write4Byte( prtl8192cd_priv priv = pDM_Odm->priv; RTL_W32(RegAddr, Data); #elif(DM_ODM_SUPPORT_TYPE & ODM_CE) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter * Adapter = pDM_Odm->Adapter; rtw_write32(Adapter,RegAddr, Data); #elif(DM_ODM_SUPPORT_TYPE & ODM_MP) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter * Adapter = pDM_Odm->Adapter; PlatformEFIOWrite4Byte(Adapter, RegAddr, Data); #endif @@ -161,7 +161,7 @@ ODM_SetMACReg( #if(DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) PHY_SetBBReg(pDM_Odm->priv, RegAddr, BitMask, Data); #elif(DM_ODM_SUPPORT_TYPE & (ODM_CE|ODM_MP)) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter * Adapter = pDM_Odm->Adapter; PHY_SetBBReg(Adapter, RegAddr, BitMask, Data); #endif } @@ -177,7 +177,7 @@ ODM_GetMACReg( #if(DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) return PHY_QueryBBReg(pDM_Odm->priv, RegAddr, BitMask); #elif(DM_ODM_SUPPORT_TYPE & (ODM_CE|ODM_MP)) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter * Adapter = pDM_Odm->Adapter; return PHY_QueryBBReg(Adapter, RegAddr, BitMask); #endif } @@ -194,7 +194,7 @@ ODM_SetBBReg( #if(DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) PHY_SetBBReg(pDM_Odm->priv, RegAddr, BitMask, Data); #elif(DM_ODM_SUPPORT_TYPE & (ODM_CE|ODM_MP)) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter * Adapter = pDM_Odm->Adapter; PHY_SetBBReg(Adapter, RegAddr, BitMask, Data); #endif } @@ -210,7 +210,7 @@ ODM_GetBBReg( #if(DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) return PHY_QueryBBReg(pDM_Odm->priv, RegAddr, BitMask); #elif(DM_ODM_SUPPORT_TYPE & (ODM_CE|ODM_MP)) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter * Adapter = pDM_Odm->Adapter; return PHY_QueryBBReg(Adapter, RegAddr, BitMask); #endif } @@ -228,7 +228,7 @@ ODM_SetRFReg( #if(DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) PHY_SetRFReg(pDM_Odm->priv, eRFPath, RegAddr, BitMask, Data); #elif(DM_ODM_SUPPORT_TYPE & (ODM_CE|ODM_MP)) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter * Adapter = pDM_Odm->Adapter; PHY_SetRFReg(Adapter, eRFPath, RegAddr, BitMask, Data); #endif } @@ -245,7 +245,7 @@ ODM_GetRFReg( #if(DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) return PHY_QueryRFReg(pDM_Odm->priv, eRFPath, RegAddr, BitMask, 1); #elif(DM_ODM_SUPPORT_TYPE & (ODM_CE|ODM_MP)) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter * Adapter = pDM_Odm->Adapter; return PHY_QueryRFReg(Adapter, eRFPath, RegAddr, BitMask); #endif } @@ -268,7 +268,7 @@ ODM_AllocateMemory( #elif (DM_ODM_SUPPORT_TYPE & ODM_CE ) *pPtr = rtw_zvmalloc(length); #elif(DM_ODM_SUPPORT_TYPE & ODM_MP) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter * Adapter = pDM_Odm->Adapter; PlatformAllocateMemory(Adapter, pPtr, length); #endif } @@ -286,7 +286,7 @@ ODM_FreeMemory( #elif (DM_ODM_SUPPORT_TYPE & ODM_CE ) rtw_vmfree(pPtr, length); #elif(DM_ODM_SUPPORT_TYPE & ODM_MP) - //PADAPTER Adapter = pDM_Odm->Adapter; + //struct adapter * Adapter = pDM_Odm->Adapter; PlatformFreeMemory(pPtr, length); #endif } @@ -322,7 +322,7 @@ ODM_AcquireSpinLock( #elif (DM_ODM_SUPPORT_TYPE & ODM_CE ) #elif(DM_ODM_SUPPORT_TYPE & ODM_MP) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter * Adapter = pDM_Odm->Adapter; PlatformAcquireSpinLock(Adapter, type); #endif } @@ -337,7 +337,7 @@ ODM_ReleaseSpinLock( #elif (DM_ODM_SUPPORT_TYPE & ODM_CE ) #elif(DM_ODM_SUPPORT_TYPE & ODM_MP) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter * Adapter = pDM_Odm->Adapter; PlatformReleaseSpinLock(Adapter, type); #endif } @@ -359,7 +359,7 @@ ODM_InitializeWorkItem( #elif(DM_ODM_SUPPORT_TYPE & ODM_CE) #elif(DM_ODM_SUPPORT_TYPE & ODM_MP) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter * Adapter = pDM_Odm->Adapter; PlatformInitializeWorkItem(Adapter, pRtWorkItem, RtWorkItemCallback, pContext, szID); #endif } @@ -516,7 +516,7 @@ ODM_SetTimer( #elif(DM_ODM_SUPPORT_TYPE & ODM_CE) _set_timer(pTimer,msDelay ); //ms #elif(DM_ODM_SUPPORT_TYPE & ODM_MP) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter * Adapter = pDM_Odm->Adapter; PlatformSetTimer(Adapter, pTimer, msDelay); #endif @@ -536,10 +536,10 @@ ODM_InitializeTimer( pTimer->data = (unsigned long)pDM_Odm; init_timer(pTimer); #elif(DM_ODM_SUPPORT_TYPE & ODM_CE) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter *Adapter = pDM_Odm->Adapter; _init_timer(pTimer,Adapter->pnetdev,CallBackFunc,pDM_Odm); #elif(DM_ODM_SUPPORT_TYPE & ODM_MP) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter *Adapter = pDM_Odm->Adapter; PlatformInitializeTimer(Adapter, pTimer, CallBackFunc,pContext,szID); #endif } @@ -556,7 +556,7 @@ ODM_CancelTimer( #elif(DM_ODM_SUPPORT_TYPE & ODM_CE) _cancel_timer_ex(pTimer); #elif(DM_ODM_SUPPORT_TYPE & ODM_MP) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter *Adapter = pDM_Odm->Adapter; PlatformCancelTimer(Adapter, pTimer); #endif } @@ -574,7 +574,7 @@ ODM_ReleaseTimer( #elif(DM_ODM_SUPPORT_TYPE & ODM_MP) - PADAPTER Adapter = pDM_Odm->Adapter; + struct adapter *Adapter = pDM_Odm->Adapter; // <20120301, Kordan> If the initilization fails, InitializeAdapterXxx will return regardless of InitHalDm. // Hence, uninitialized timers cause BSOD when the driver releases resources since the init fail. @@ -595,7 +595,7 @@ ODM_ReleaseTimer( #if (DM_ODM_SUPPORT_TYPE & ODM_MP) VOID ODM_FillH2CCmd( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN u1Byte ElementID, IN u4Byte CmdLen, IN pu1Byte pCmdBuffer diff --git a/hal/rtl8188e_cmd.c b/hal/rtl8188e_cmd.c index 4decacc..e484fad 100755 --- a/hal/rtl8188e_cmd.c +++ b/hal/rtl8188e_cmd.c @@ -39,7 +39,7 @@ #define RTL88E_EX_MESSAGE_BOX_SIZE 4 #define RTL88E_RSVDPAGE_SIZE 1024 -static u8 _is_fw_read_cmd_down(_adapter* padapter, u8 msgbox_num) +static u8 _is_fw_read_cmd_down(struct adapter* padapter, u8 msgbox_num) { u8 read_down = _FALSE; int retry_cnts = 100; @@ -73,7 +73,7 @@ static u8 _is_fw_read_cmd_down(_adapter* padapter, u8 msgbox_num) *|31 - 0 | *|ext_msg| ******************************************/ -static s32 FillH2CCmd_88E(PADAPTER padapter, u8 ElementID, u32 CmdLen, u8 *pCmdBuffer) +static s32 FillH2CCmd_88E(struct adapter *padapter, u8 ElementID, u32 CmdLen, u8 *pCmdBuffer) { u8 bcmd_down = _FALSE; s32 retry_cnts = 100; @@ -170,7 +170,7 @@ _func_exit_; return ret; } -u8 rtl8192c_h2c_msg_hdl(_adapter *padapter, unsigned char *pbuf) +u8 rtl8192c_h2c_msg_hdl(struct adapter *padapter, unsigned char *pbuf) { u8 ElementID, CmdLen; u8 *pCmdBuffer; @@ -190,7 +190,7 @@ u8 rtl8192c_h2c_msg_hdl(_adapter *padapter, unsigned char *pbuf) } /* #if defined(CONFIG_AUTOSUSPEND) && defined(SUPPORT_HW_RFOFF_DETECTED) -u8 rtl8192c_set_FwSelectSuspend_cmd(_adapter *padapter ,u8 bfwpoll, u16 period) +u8 rtl8192c_set_FwSelectSuspend_cmd(struct adapter *padapter ,u8 bfwpoll, u16 period) { u8 res=_SUCCESS; struct H2C_SS_RFOFF_PARAM param; @@ -202,7 +202,7 @@ u8 rtl8192c_set_FwSelectSuspend_cmd(_adapter *padapter ,u8 bfwpoll, u16 period) } #endif //CONFIG_AUTOSUSPEND && SUPPORT_HW_RFOFF_DETECTED */ -u8 rtl8188e_set_rssi_cmd(_adapter*padapter, u8 *param) +u8 rtl8188e_set_rssi_cmd(struct adapter*padapter, u8 *param) { u8 res=_SUCCESS; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); @@ -224,7 +224,7 @@ _func_exit_; return res; } -u8 rtl8188e_set_raid_cmd(_adapter*padapter, u32 mask) +u8 rtl8188e_set_raid_cmd(struct adapter*padapter, u32 mask) { u8 buf[3]; u8 res=_SUCCESS; @@ -251,7 +251,7 @@ _func_exit_; //bitmap[28:31]= Rate Adaptive id //arg[0:4] = macid //arg[5] = Short GI -void rtl8188e_Add_RateATid(PADAPTER pAdapter, u32 bitmap, u8 arg, u8 rssi_level) +void rtl8188e_Add_RateATid(struct adapter *pAdapter, u32 bitmap, u8 arg, u8 rssi_level) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); //struct dm_priv *pdmpriv = &pHalData->dmpriv; @@ -301,7 +301,7 @@ void rtl8188e_Add_RateATid(PADAPTER pAdapter, u32 bitmap, u8 arg, u8 rssi_level) } -void rtl8188e_set_FwPwrMode_cmd(PADAPTER padapter, u8 Mode) +void rtl8188e_set_FwPwrMode_cmd(struct adapter *padapter, u8 Mode) { SETPWRMODE_PARM H2CSetPwrMode; struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); @@ -359,7 +359,7 @@ _func_enter_; _func_exit_; } -void rtl8188e_set_FwMediaStatus_cmd(PADAPTER padapter, u16 mstatus_rpt ) +void rtl8188e_set_FwMediaStatus_cmd(struct adapter *padapter, u16 mstatus_rpt ) { u8 opmode,macid; u16 mst_rpt = cpu_to_le16 (mstatus_rpt); @@ -388,7 +388,7 @@ void rtl8188e_set_FwMediaStatus_cmd(PADAPTER padapter, u16 mstatus_rpt ) } -void ConstructBeacon(_adapter *padapter, u8 *pframe, u32 *pLength) +void ConstructBeacon(struct adapter *padapter, u8 *pframe, u32 *pLength) { struct rtw_ieee80211_hdr *pwlanhdr; u16 *fctrl; @@ -490,7 +490,7 @@ _ConstructBeacon: } -void ConstructPSPoll(_adapter *padapter, u8 *pframe, u32 *pLength) +void ConstructPSPoll(struct adapter *padapter, u8 *pframe, u32 *pLength) { struct rtw_ieee80211_hdr *pwlanhdr; u16 *fctrl; @@ -521,7 +521,7 @@ void ConstructPSPoll(_adapter *padapter, u8 *pframe, u32 *pLength) } void ConstructNullFunctionData( - PADAPTER padapter, + struct adapter *padapter, u8 *pframe, u32 *pLength, u8 *StaAddr, @@ -593,7 +593,7 @@ void ConstructNullFunctionData( *pLength = pktlen; } -void ConstructProbeRsp(_adapter *padapter, u8 *pframe, u32 *pLength, u8 *StaAddr, BOOLEAN bHideSSID) +void ConstructProbeRsp(struct adapter *padapter, u8 *pframe, u32 *pLength, u8 *StaAddr, BOOLEAN bHideSSID) { struct rtw_ieee80211_hdr *pwlanhdr; u16 *fctrl; @@ -639,7 +639,7 @@ void ConstructProbeRsp(_adapter *padapter, u8 *pframe, u32 *pLength, u8 *StaAddr // Construct the ARP response packet to support ARP offload. // static void ConstructARPResponse( - PADAPTER padapter, + struct adapter *padapter, u8 *pframe, u32 *pLength, u8 *pIPAddress @@ -802,7 +802,7 @@ static void ConstructARPResponse( } #endif -void rtl8188e_set_FwRsvdPage_cmd(PADAPTER padapter, PRSVDPAGE_LOC rsvdpageloc) +void rtl8188e_set_FwRsvdPage_cmd(struct adapter *padapter, PRSVDPAGE_LOC rsvdpageloc) { u8 u1H2CRsvdPageParm[H2C_8188E_RSVDPAGE_LOC_LEN]={0}; u8 u1H2CAoacRsvdPageParm[H2C_8188E_AOAC_RSVDPAGE_LOC_LEN]={0}; @@ -829,7 +829,7 @@ void rtl8188e_set_FwRsvdPage_cmd(PADAPTER padapter, PRSVDPAGE_LOC rsvdpageloc) // 2010.06.23. Added by tynli. VOID CheckFwRsvdPageContent( - IN PADAPTER Adapter + IN struct adapter * Adapter ) { HAL_DATA_TYPE* pHalData = GET_HAL_DATA(Adapter); @@ -855,7 +855,7 @@ CheckFwRsvdPageContent( // TRUE: At the second time, we should send the first packet (default:beacon) // to Hw again and set the lengh in descriptor to the real beacon lengh. // 2009.10.15 by tynli. -static void SetFwRsvdPagePkt(PADAPTER padapter, BOOLEAN bDLFinished) +static void SetFwRsvdPagePkt(struct adapter *padapter, BOOLEAN bDLFinished) { PHAL_DATA_TYPE pHalData; struct xmit_frame *pmgntframe; @@ -1019,7 +1019,7 @@ exit: rtw_mfree(ReservedPagePacket, RTL88E_RSVDPAGE_SIZE); } -void rtl8188e_set_FwJoinBssReport_cmd(PADAPTER padapter, u8 mstatus) +void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *padapter, u8 mstatus) { JOINBSSRPT_PARM JoinBssRptParm; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); @@ -1193,7 +1193,7 @@ _func_exit_; } #ifdef CONFIG_P2P_PS -void rtl8188e_set_p2p_ps_offload_cmd(_adapter* padapter, u8 p2p_ps_state) +void rtl8188e_set_p2p_ps_offload_cmd(struct adapter* padapter, u8 p2p_ps_state) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); @@ -1288,7 +1288,7 @@ _func_exit_; /* ask FW to Reset sync register at Beacon early interrupt */ -u8 rtl8188e_reset_tsf(_adapter *padapter, u8 reset_port ) +u8 rtl8188e_reset_tsf(struct adapter *padapter, u8 reset_port ) { u8 buf[2]; u8 res=_SUCCESS; @@ -1308,7 +1308,7 @@ _func_exit_; return res; } -int reset_tsf(PADAPTER Adapter, u8 reset_port ) +int reset_tsf(struct adapter *Adapter, u8 reset_port ) { u8 reset_cnt_before = 0, reset_cnt_after = 0, loop_cnt = 0; u32 reg_reset_tsf_cnt = (IFACE_PORT0==reset_port) ? @@ -1334,7 +1334,7 @@ int reset_tsf(PADAPTER Adapter, u8 reset_port ) #ifdef CONFIG_WOWLAN #ifdef CONFIG_GPIO_WAKEUP -void rtl8188es_set_output_gpio(_adapter* padapter, u8 index, u8 outputval) +void rtl8188es_set_output_gpio(struct adapter* padapter, u8 index, u8 outputval) { if ( index <= 7 ) { /* config GPIO mode */ @@ -1376,7 +1376,7 @@ void rtl8188es_set_output_gpio(_adapter* padapter, u8 index, u8 outputval) } #endif //CONFIG_GPIO_WAKEUP -void rtl8188es_set_wowlan_cmd(_adapter* padapter, u8 enable) +void rtl8188es_set_wowlan_cmd(struct adapter* padapter, u8 enable) { u8 res=_SUCCESS; u32 test=0; diff --git a/hal/rtl8188e_dm.c b/hal/rtl8188e_dm.c index dcff835..c850f38 100755 --- a/hal/rtl8188e_dm.c +++ b/hal/rtl8188e_dm.c @@ -43,7 +43,7 @@ static VOID dm_CheckProtection( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { #if 0 @@ -70,7 +70,7 @@ dm_CheckProtection( static VOID dm_CheckStatistics( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { #if 0 @@ -89,7 +89,7 @@ dm_CheckStatistics( #endif } -static void dm_CheckPbcGPIO(_adapter *padapter) +static void dm_CheckPbcGPIO(struct adapter *padapter) { u8 tmp1byte; u8 bPbcPressed = _FALSE; @@ -166,7 +166,7 @@ static void dm_CheckPbcGPIO(_adapter *padapter) // VOID dm_InterruptMigration( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -244,7 +244,7 @@ dm_InterruptMigration( // static void dm_InitGPIOSetting( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); @@ -269,7 +269,7 @@ dm_InitGPIOSetting( //============================================================ // functions //============================================================ -static void Init_ODM_ComInfo_88E(PADAPTER Adapter) +static void Init_ODM_ComInfo_88E(struct adapter *Adapter) { PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); @@ -340,7 +340,7 @@ static void Init_ODM_ComInfo_88E(PADAPTER Adapter) ODM_CmnInfoUpdate(pDM_Odm,ODM_CMNINFO_ABILITY,pdmpriv->InitODMFlag); } -static void Update_ODM_ComInfo_88E(PADAPTER Adapter) +static void Update_ODM_ComInfo_88E(struct adapter *Adapter) { struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv; struct mlme_priv *pmlmepriv = &Adapter->mlmepriv; @@ -426,7 +426,7 @@ static void Update_ODM_ComInfo_88E(PADAPTER Adapter) void rtl8188e_InitHalDm( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); @@ -451,7 +451,7 @@ rtl8188e_InitHalDm( VOID rtl8188e_HalDmWatchDog( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { BOOLEAN bFwCurrentInPSMode = _FALSE; @@ -461,7 +461,7 @@ rtl8188e_HalDmWatchDog( struct dm_priv *pdmpriv = &pHalData->dmpriv; PDM_ODM_T pDM_Odm = &(pHalData->odmpriv); #ifdef CONFIG_CONCURRENT_MODE - PADAPTER pbuddy_adapter = Adapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = Adapter->pbuddy_adapter; #endif //CONFIG_CONCURRENT_MODE _func_enter_; @@ -554,7 +554,7 @@ skip_dm: return; } -void rtl8188e_init_dm_priv(IN PADAPTER Adapter) +void rtl8188e_init_dm_priv(IN struct adapter *Adapter) { PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); struct dm_priv *pdmpriv = &pHalData->dmpriv; @@ -569,7 +569,7 @@ void rtl8188e_init_dm_priv(IN PADAPTER Adapter) ODM_InitDebugSetting(podmpriv); } -void rtl8188e_deinit_dm_priv(IN PADAPTER Adapter) +void rtl8188e_deinit_dm_priv(IN struct adapter *Adapter) { PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); struct dm_priv *pdmpriv = &pHalData->dmpriv; @@ -586,9 +586,9 @@ void rtl8188e_deinit_dm_priv(IN PADAPTER Adapter) // Add new function to reset the state of antenna diversity before link. // // Compare RSSI for deciding antenna -void AntDivCompare8188E(PADAPTER Adapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src) +void AntDivCompare8188E(struct adapter *Adapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src) { - //PADAPTER Adapter = pDM_Odm->Adapter ; + //struct adapter *Adapter = pDM_Odm->Adapter ; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); if(0 != pHalData->AntDivCfg ) @@ -605,7 +605,7 @@ void AntDivCompare8188E(PADAPTER Adapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src } // Add new function to reset the state of antenna diversity before link. -u8 AntDivBeforeLink8188E(PADAPTER Adapter ) +u8 AntDivBeforeLink8188E(struct adapter *Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); diff --git a/hal/rtl8188e_hal_init.c b/hal/rtl8188e_hal_init.c index 1e38e22..a64ad24 100755 --- a/hal/rtl8188e_hal_init.c +++ b/hal/rtl8188e_hal_init.c @@ -31,7 +31,7 @@ #ifdef CONFIG_USB_HCI #include #endif -static void iol_mode_enable(PADAPTER padapter, u8 enable) +static void iol_mode_enable(struct adapter *padapter, u8 enable) { u8 reg_0xf0 = 0; @@ -58,7 +58,7 @@ static void iol_mode_enable(PADAPTER padapter, u8 enable) } } -static s32 iol_execute(PADAPTER padapter, u8 control) +static s32 iol_execute(struct adapter *padapter, u8 control) { s32 status = _FAIL; u8 reg_0x88 = 0,reg_1c7=0; @@ -92,7 +92,7 @@ static s32 iol_execute(PADAPTER padapter, u8 control) } static s32 iol_InitLLTTable( - PADAPTER padapter, + struct adapter *padapter, u8 txpktbuf_bndy ) { @@ -284,7 +284,7 @@ exit: } void efuse_read_phymap_from_txpktbuf( - ADAPTER *adapter, + struct adapter *adapter, int bcnhead, //beacon head, where FW store len(2-byte) and efuse physical map. u8 *content, //buffer to store efuse physical map u16 *size //for efuse content: the max byte to read. will update to byte read @@ -402,7 +402,7 @@ void efuse_read_phymap_from_txpktbuf( static s32 iol_read_efuse( - PADAPTER padapter, + struct adapter *padapter, u8 txpktbuf_bndy, u16 offset, u16 size_byte, @@ -445,7 +445,7 @@ static s32 iol_read_efuse( return status; } -s32 rtl8188e_iol_efuse_patch(PADAPTER padapter) +s32 rtl8188e_iol_efuse_patch(struct adapter *padapter) { s32 result = _SUCCESS; printk("==> %s \n",__FUNCTION__); @@ -462,7 +462,7 @@ s32 rtl8188e_iol_efuse_patch(PADAPTER padapter) } static s32 iol_ioconfig( - PADAPTER padapter, + struct adapter *padapter, u8 iocfg_bndy ) { @@ -475,7 +475,7 @@ static s32 iol_ioconfig( return rst; } -int rtl8188e_IOL_exec_cmds_sync(ADAPTER *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms,u32 bndy_cnt) +int rtl8188e_IOL_exec_cmds_sync(struct adapter *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms,u32 bndy_cnt) { u32 start_time = rtw_get_current_time(); @@ -524,7 +524,7 @@ exit: return ret; } -void rtw_IOL_cmd_tx_pkt_buf_dump(ADAPTER *Adapter,int data_len) +void rtw_IOL_cmd_tx_pkt_buf_dump(struct adapter *Adapter,int data_len) { u32 fifo_data,reg_140; u32 addr,rstatus,loop=0; @@ -568,7 +568,7 @@ void rtw_IOL_cmd_tx_pkt_buf_dump(ADAPTER *Adapter,int data_len) static VOID _FWDownloadEnable( - IN PADAPTER padapter, + IN struct adapter * padapter, IN BOOLEAN enable ) { @@ -598,7 +598,7 @@ _FWDownloadEnable( #define MAX_REG_BOLCK_SIZE 196 static int _BlockWrite( - IN PADAPTER padapter, + IN struct adapter * padapter, IN PVOID buffer, IN u32 buffSize ) @@ -711,7 +711,7 @@ exit: static int _PageWrite( - IN PADAPTER padapter, + IN struct adapter *padapter, IN u32 page, IN PVOID buffer, IN u32 size @@ -748,7 +748,7 @@ _FillDummy( static int _WriteFW( - IN PADAPTER padapter, + IN struct adapter * padapter, IN PVOID buffer, IN u32 size ) @@ -792,7 +792,7 @@ exit: return ret; } -void _MCUIO_Reset88E(PADAPTER padapter,u8 bReset) +void _MCUIO_Reset88E(struct adapter *padapter,u8 bReset) { u8 u1bTmp; @@ -807,7 +807,7 @@ void _MCUIO_Reset88E(PADAPTER padapter,u8 bReset) } } -void _8051Reset88E(PADAPTER padapter) +void _8051Reset88E(struct adapter *padapter) { u8 u1bTmp; @@ -820,7 +820,7 @@ void _8051Reset88E(PADAPTER padapter) DBG_871X("=====> _8051Reset88E(): 8051 reset success .\n"); } -static s32 _FWFreeToGo(PADAPTER padapter) +static s32 _FWFreeToGo(struct adapter *padapter) { u32 counter = 0; u32 value32; @@ -874,9 +874,9 @@ u8 FwBuffer8188E[FW_8188E_SIZE]; // Download 8192C firmware code. // // -s32 rtl8188e_FirmwareDownload(PADAPTER padapter, BOOLEAN bUsedWoWLANFw) +s32 rtl8188e_FirmwareDownload(struct adapter *padapter, BOOLEAN bUsedWoWLANFw) #else -s32 rtl8188e_FirmwareDownload(PADAPTER padapter) +s32 rtl8188e_FirmwareDownload(struct adapter *padapter) #endif { s32 rtStatus = _SUCCESS; @@ -1044,7 +1044,7 @@ Exit: } #ifdef CONFIG_WOWLAN -void rtl8188e_InitializeFirmwareVars(PADAPTER padapter) +void rtl8188e_InitializeFirmwareVars(struct adapter *padapter) { PHAL_DATA_TYPE pHalData = GET_HAL_DATA(padapter); struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); @@ -1067,7 +1067,7 @@ void rtl8188e_InitializeFirmwareVars(PADAPTER padapter) // VOID SetFwRelatedForWoWLAN8188ES( - IN PADAPTER padapter, + IN struct adapter * padapter, IN u8 bHostIsGoingtoSleep ) { @@ -1090,7 +1090,7 @@ SetFwRelatedForWoWLAN8188ES( rtl8188e_InitializeFirmwareVars(padapter); } #else -void rtl8188e_InitializeFirmwareVars(PADAPTER padapter) +void rtl8188e_InitializeFirmwareVars(struct adapter *padapter) { PHAL_DATA_TYPE pHalData = GET_HAL_DATA(padapter); @@ -1105,7 +1105,7 @@ void rtl8188e_InitializeFirmwareVars(PADAPTER padapter) } #endif //CONFIG_WOWLAN -static void rtl8188e_free_hal_data(PADAPTER padapter) +static void rtl8188e_free_hal_data(struct adapter *padapter) { _func_enter_; @@ -1128,21 +1128,21 @@ enum{ static BOOLEAN hal_EfusePgPacketWrite2ByteHeader( - IN PADAPTER pAdapter, + IN struct adapter * pAdapter, IN u8 efuseType, IN u16 *pAddr, IN PPGPKT_STRUCT pTargetPkt, IN BOOLEAN bPseudoTest); static BOOLEAN hal_EfusePgPacketWrite1ByteHeader( - IN PADAPTER pAdapter, + IN struct adapter * pAdapter, IN u8 efuseType, IN u16 *pAddr, IN PPGPKT_STRUCT pTargetPkt, IN BOOLEAN bPseudoTest); static BOOLEAN hal_EfusePgPacketWriteData( - IN PADAPTER pAdapter, + IN struct adapter * pAdapter, IN u8 efuseType, IN u16 *pAddr, IN PPGPKT_STRUCT pTargetPkt, @@ -1150,7 +1150,7 @@ hal_EfusePgPacketWriteData( static VOID hal_EfusePowerSwitch_RTL8188E( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN u8 bWrite, IN u8 PwrState) { @@ -1204,7 +1204,7 @@ hal_EfusePowerSwitch_RTL8188E( static VOID rtl8188e_EfusePowerSwitch( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN u8 bWrite, IN u8 PwrState) { @@ -1214,7 +1214,7 @@ rtl8188e_EfusePowerSwitch( static bool efuse_read_phymap( - PADAPTER Adapter, + struct adapter *Adapter, u8 *pbuf, //buffer to store efuse physical map u16 *size //the max byte to read. will update to byte read ) @@ -1256,7 +1256,7 @@ static bool efuse_read_phymap( static VOID Hal_EfuseReadEFuse88E( - PADAPTER Adapter, + struct adapter * Adapter, u16 _offset, u16 _size_byte, u8 *pbuf, @@ -1451,7 +1451,7 @@ exit: static BOOLEAN Hal_EfuseSwitchToBank( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN u8 bank, IN BOOLEAN bPseudoTest ) @@ -1503,7 +1503,7 @@ Hal_EfuseSwitchToBank( static VOID ReadEFuseByIC( - PADAPTER Adapter, + struct adapter *Adapter, u8 efuseType, u16 _offset, u16 _size_byte, @@ -1562,7 +1562,7 @@ exit: static VOID ReadEFuse_Pseudo( - PADAPTER Adapter, + struct adapter *Adapter, u8 efuseType, u16 _offset, u16 _size_byte, @@ -1575,7 +1575,7 @@ ReadEFuse_Pseudo( static VOID rtl8188e_ReadEFuse( - PADAPTER Adapter, + struct adapter *Adapter, u8 efuseType, u16 _offset, u16 _size_byte, @@ -1596,7 +1596,7 @@ rtl8188e_ReadEFuse( //Do not support BT VOID Hal_EFUSEGetEfuseDefinition88E( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN u1Byte efuseType, IN u1Byte type, OUT PVOID pOut @@ -1664,7 +1664,7 @@ Hal_EFUSEGetEfuseDefinition88E( } VOID Hal_EFUSEGetEfuseDefinition_Pseudo88E( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN u8 efuseType, IN u8 type, OUT PVOID pOut @@ -1734,7 +1734,7 @@ Hal_EFUSEGetEfuseDefinition_Pseudo88E( static VOID rtl8188e_EFUSE_GetEfuseDefinition( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN u8 efuseType, IN u8 type, OUT void *pOut, @@ -1752,7 +1752,7 @@ rtl8188e_EFUSE_GetEfuseDefinition( } static u8 -Hal_EfuseWordEnableDataWrite( IN PADAPTER pAdapter, +Hal_EfuseWordEnableDataWrite( IN struct adapter *pAdapter, IN u16 efuse_addr, IN u8 word_en, IN u8 *data, @@ -1818,7 +1818,7 @@ Hal_EfuseWordEnableDataWrite( IN PADAPTER pAdapter, } static u8 -Hal_EfuseWordEnableDataWrite_Pseudo( IN PADAPTER pAdapter, +Hal_EfuseWordEnableDataWrite_Pseudo( IN struct adapter *pAdapter, IN u16 efuse_addr, IN u8 word_en, IN u8 *data, @@ -1832,7 +1832,7 @@ Hal_EfuseWordEnableDataWrite_Pseudo( IN PADAPTER pAdapter, } static u8 -rtl8188e_Efuse_WordEnableDataWrite( IN PADAPTER pAdapter, +rtl8188e_Efuse_WordEnableDataWrite( IN struct adapter *pAdapter, IN u16 efuse_addr, IN u8 word_en, IN u8 *data, @@ -1854,7 +1854,7 @@ rtl8188e_Efuse_WordEnableDataWrite( IN PADAPTER pAdapter, static u16 -hal_EfuseGetCurrentSize_8188e(IN PADAPTER pAdapter, +hal_EfuseGetCurrentSize_8188e(IN struct adapter *pAdapter, IN BOOLEAN bPseudoTest) { int bContinual = _TRUE; @@ -1925,7 +1925,7 @@ hal_EfuseGetCurrentSize_8188e(IN PADAPTER pAdapter, } static u16 -Hal_EfuseGetCurrentSize_Pseudo(IN PADAPTER pAdapter, +Hal_EfuseGetCurrentSize_Pseudo(IN struct adapter *pAdapter, IN BOOLEAN bPseudoTest) { u16 ret=0; @@ -1938,7 +1938,7 @@ Hal_EfuseGetCurrentSize_Pseudo(IN PADAPTER pAdapter, static u16 rtl8188e_EfuseGetCurrentSize( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN u8 efuseType, IN BOOLEAN bPseudoTest) { @@ -1960,7 +1960,7 @@ rtl8188e_EfuseGetCurrentSize( static int hal_EfusePgPacketRead_8188e( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN u8 offset, IN u8 *data, IN BOOLEAN bPseudoTest) @@ -2075,7 +2075,7 @@ hal_EfusePgPacketRead_8188e( } static int -Hal_EfusePgPacketRead( IN PADAPTER pAdapter, +Hal_EfusePgPacketRead( IN struct adapter *pAdapter, IN u8 offset, IN u8 *data, IN BOOLEAN bPseudoTest) @@ -2089,7 +2089,7 @@ Hal_EfusePgPacketRead( IN PADAPTER pAdapter, } static int -Hal_EfusePgPacketRead_Pseudo( IN PADAPTER pAdapter, +Hal_EfusePgPacketRead_Pseudo( IN struct adapter *pAdapter, IN u8 offset, IN u8 *data, IN BOOLEAN bPseudoTest) @@ -2102,7 +2102,7 @@ Hal_EfusePgPacketRead_Pseudo( IN PADAPTER pAdapter, } static int -rtl8188e_Efuse_PgPacketRead( IN PADAPTER pAdapter, +rtl8188e_Efuse_PgPacketRead( IN struct adapter *pAdapter, IN u8 offset, IN u8 *data, IN BOOLEAN bPseudoTest) @@ -2123,7 +2123,7 @@ rtl8188e_Efuse_PgPacketRead( IN PADAPTER pAdapter, static BOOLEAN hal_EfuseFixHeaderProcess( - IN PADAPTER pAdapter, + IN struct adapter * pAdapter, IN u8 efuseType, IN PPGPKT_STRUCT pFixPkt, IN u16 *pAddr, @@ -2164,7 +2164,7 @@ hal_EfuseFixHeaderProcess( static BOOLEAN hal_EfusePgPacketWrite2ByteHeader( - IN PADAPTER pAdapter, + IN struct adapter * pAdapter, IN u8 efuseType, IN u16 *pAddr, IN PPGPKT_STRUCT pTargetPkt, @@ -2261,7 +2261,7 @@ hal_EfusePgPacketWrite2ByteHeader( static BOOLEAN hal_EfusePgPacketWrite1ByteHeader( - IN PADAPTER pAdapter, + IN struct adapter * pAdapter, IN u8 efuseType, IN u16 *pAddr, IN PPGPKT_STRUCT pTargetPkt, @@ -2309,7 +2309,7 @@ hal_EfusePgPacketWrite1ByteHeader( static BOOLEAN hal_EfusePgPacketWriteData( - IN PADAPTER pAdapter, + IN struct adapter * pAdapter, IN u8 efuseType, IN u16 *pAddr, IN PPGPKT_STRUCT pTargetPkt, @@ -2346,7 +2346,7 @@ hal_EfusePgPacketWriteData( static BOOLEAN hal_EfusePgPacketWriteHeader( - IN PADAPTER pAdapter, + IN struct adapter * pAdapter, IN u8 efuseType, IN u16 *pAddr, IN PPGPKT_STRUCT pTargetPkt, @@ -2408,7 +2408,7 @@ wordEnMatched( static BOOLEAN hal_EfuseCheckIfDatafollowed( - IN PADAPTER pAdapter, + IN struct adapter * pAdapter, IN u8 word_cnts, IN u16 startAddr, IN BOOLEAN bPseudoTest @@ -2428,7 +2428,7 @@ hal_EfuseCheckIfDatafollowed( static BOOLEAN hal_EfusePartialWriteCheck( - IN PADAPTER pAdapter, + IN struct adapter * pAdapter, IN u8 efuseType, IN u16 *pAddr, IN PPGPKT_STRUCT pTargetPkt, @@ -2553,7 +2553,7 @@ hal_EfusePartialWriteCheck( static BOOLEAN hal_EfusePgCheckAvailableAddr( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN u8 efuseType, IN BOOLEAN bPseudoTest ) @@ -2594,7 +2594,7 @@ hal_EfuseConstructPGPkt( static BOOLEAN hal_EfusePgPacketWrite_BT( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN u8 offset, IN u8 word_en, IN u8 *pData, @@ -2624,7 +2624,7 @@ hal_EfusePgPacketWrite_BT( static BOOLEAN hal_EfusePgPacketWrite_8188e( - IN PADAPTER pAdapter, + IN struct adapter * pAdapter, IN u8 offset, IN u8 word_en, IN u8 *pData, @@ -2654,7 +2654,7 @@ hal_EfusePgPacketWrite_8188e( static int -Hal_EfusePgPacketWrite_Pseudo(IN PADAPTER pAdapter, +Hal_EfusePgPacketWrite_Pseudo(IN struct adapter *pAdapter, IN u8 offset, IN u8 word_en, IN u8 *data, @@ -2668,7 +2668,7 @@ Hal_EfusePgPacketWrite_Pseudo(IN PADAPTER pAdapter, } static int -Hal_EfusePgPacketWrite(IN PADAPTER pAdapter, +Hal_EfusePgPacketWrite(IN struct adapter *pAdapter, IN u8 offset, IN u8 word_en, IN u8 *data, @@ -2682,7 +2682,7 @@ Hal_EfusePgPacketWrite(IN PADAPTER pAdapter, } static int -rtl8188e_Efuse_PgPacketWrite(IN PADAPTER pAdapter, +rtl8188e_Efuse_PgPacketWrite(IN struct adapter *pAdapter, IN u8 offset, IN u8 word_en, IN u8 *data, @@ -2703,7 +2703,7 @@ rtl8188e_Efuse_PgPacketWrite(IN PADAPTER pAdapter, static HAL_VERSION ReadChipVersion8188E( - IN PADAPTER padapter + IN struct adapter *padapter ) { u32 value32; @@ -2753,12 +2753,12 @@ ReadChipVersion8188E( return ChipVersion; } -static void rtl8188e_read_chip_version(PADAPTER padapter) +static void rtl8188e_read_chip_version(struct adapter *padapter) { ReadChipVersion8188E(padapter); } void rtl8188e_GetHalODMVar( - PADAPTER Adapter, + struct adapter * Adapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1, BOOLEAN bSet) @@ -2773,7 +2773,7 @@ void rtl8188e_GetHalODMVar( } } void rtl8188e_SetHalODMVar( - PADAPTER Adapter, + struct adapter * Adapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1, BOOLEAN bSet) @@ -2812,7 +2812,7 @@ void rtl8188e_SetHalODMVar( } } -void rtl8188e_start_thread(_adapter *padapter) +void rtl8188e_start_thread(struct adapter *padapter) { #ifdef CONFIG_SDIO_HCI #ifndef CONFIG_SDIO_TX_TASKLET @@ -2827,7 +2827,7 @@ void rtl8188e_start_thread(_adapter *padapter) #endif } -void rtl8188e_stop_thread(_adapter *padapter) +void rtl8188e_stop_thread(struct adapter *padapter) { #ifdef CONFIG_SDIO_HCI #ifndef CONFIG_SDIO_TX_TASKLET @@ -2842,7 +2842,7 @@ void rtl8188e_stop_thread(_adapter *padapter) #endif #endif } -void hal_notch_filter_8188e(_adapter *adapter, bool enable) +void hal_notch_filter_8188e(struct adapter *adapter, bool enable) { if (enable) { DBG_871X("Enable notch filter\n"); @@ -2916,7 +2916,7 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc) } -u8 GetEEPROMSize8188E(PADAPTER padapter) +u8 GetEEPROMSize8188E(struct adapter *padapter) { u8 size = 0; u32 cr; @@ -2936,7 +2936,7 @@ u8 GetEEPROMSize8188E(PADAPTER padapter) // LLT R/W/Init function // //------------------------------------------------------------------------- -s32 _LLTWrite(PADAPTER padapter, u32 address, u32 data) +s32 _LLTWrite(struct adapter *padapter, u32 address, u32 data) { s32 status = _SUCCESS; s32 count = 0; @@ -2963,7 +2963,7 @@ s32 _LLTWrite(PADAPTER padapter, u32 address, u32 data) return status; } -u8 _LLTRead(PADAPTER padapter, u32 address) +u8 _LLTRead(struct adapter *padapter, u32 address) { s32 count = 0; u32 value = _LLT_INIT_ADDR(address) | _LLT_OP(_LLT_READ_ACCESS); @@ -2987,7 +2987,7 @@ u8 _LLTRead(PADAPTER padapter, u32 address) return 0xFF; } -void Read_LLT_Tab(PADAPTER padapter) +void Read_LLT_Tab(struct adapter *padapter) { u32 addr,next_addr; printk("############### %s ###################\n",__FUNCTION__); @@ -3002,7 +3002,7 @@ void Read_LLT_Tab(PADAPTER padapter) } -s32 InitLLTTable(PADAPTER padapter, u8 txpktbuf_bndy) +s32 InitLLTTable(struct adapter *padapter, u8 txpktbuf_bndy) { s32 status = _FAIL; u32 i; @@ -3053,7 +3053,7 @@ s32 InitLLTTable(PADAPTER padapter, u8 txpktbuf_bndy) void -Hal_InitPGData88E(PADAPTER padapter) +Hal_InitPGData88E(struct adapter *padapter) { EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter); // HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); @@ -3089,7 +3089,7 @@ Hal_InitPGData88E(PADAPTER padapter) void Hal_EfuseParseIDCode88E( - IN PADAPTER padapter, + IN struct adapter *padapter, IN u8 *hwinfo ) { @@ -3146,7 +3146,7 @@ Hal_EEValueCheck( static void Hal_ReadPowerValueFromPROM_8188E( - IN PADAPTER padapter, + IN struct adapter * padapter, IN PTxPowerInfo24G pwrInfo24G, IN u8* PROMContent, IN BOOLEAN AutoLoadFail @@ -3370,7 +3370,7 @@ Hal_GetChnlGroup88E( } void Hal_ReadPowerSavingMode88E( - PADAPTER padapter, + struct adapter * padapter, IN u8* hwinfo, IN BOOLEAN AutoLoadFail ) @@ -3414,7 +3414,7 @@ void Hal_ReadPowerSavingMode88E( void Hal_ReadTxPowerInfo88E( - IN PADAPTER padapter, + IN struct adapter * padapter, IN u8* PROMContent, IN BOOLEAN AutoLoadFail ) @@ -3495,7 +3495,7 @@ Hal_ReadTxPowerInfo88E( VOID Hal_EfuseParseXtal_8188E( - IN PADAPTER pAdapter, + IN struct adapter * pAdapter, IN u8* hwinfo, IN BOOLEAN AutoLoadFail ) @@ -3517,7 +3517,7 @@ Hal_EfuseParseXtal_8188E( void Hal_EfuseParseBoardType88E( - IN PADAPTER pAdapter, + IN struct adapter * pAdapter, IN u8* hwinfo, IN BOOLEAN AutoLoadFail ) @@ -3533,7 +3533,7 @@ Hal_EfuseParseBoardType88E( void Hal_EfuseParseEEPROMVer88E( - IN PADAPTER padapter, + IN struct adapter * padapter, IN u8* hwinfo, IN BOOLEAN AutoLoadFail ) @@ -3554,7 +3554,7 @@ Hal_EfuseParseEEPROMVer88E( void rtl8188e_EfuseParseChnlPlan( - IN PADAPTER padapter, + IN struct adapter * padapter, IN u8* hwinfo, IN BOOLEAN AutoLoadFail ) @@ -3572,7 +3572,7 @@ rtl8188e_EfuseParseChnlPlan( void Hal_EfuseParseCustomerID88E( - IN PADAPTER padapter, + IN struct adapter * padapter, IN u8* hwinfo, IN BOOLEAN AutoLoadFail ) @@ -3596,7 +3596,7 @@ Hal_EfuseParseCustomerID88E( void Hal_ReadAntennaDiversity88E( - IN PADAPTER pAdapter, + IN struct adapter * pAdapter, IN u8* PROMContent, IN BOOLEAN AutoLoadFail ) @@ -3644,7 +3644,7 @@ Hal_ReadAntennaDiversity88E( void Hal_ReadThermalMeter_88E( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u8* PROMContent, IN BOOLEAN AutoloadFail ) @@ -3675,7 +3675,7 @@ Hal_ReadThermalMeter_88E( void Hal_InitChannelPlan( - IN PADAPTER padapter + IN struct adapter *padapter ) { #if 0 @@ -3712,7 +3712,7 @@ Hal_InitChannelPlan( #endif } -BOOLEAN HalDetectPwrDownMode88E(PADAPTER Adapter) +BOOLEAN HalDetectPwrDownMode88E(struct adapter *Adapter) { u8 tmpvalue = 0; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -3736,7 +3736,7 @@ BOOLEAN HalDetectPwrDownMode88E(PADAPTER Adapter) } // HalDetectPwrDownMode #ifdef CONFIG_WOWLAN -void Hal_DetectWoWMode(PADAPTER pAdapter) +void Hal_DetectWoWMode(struct adapter *pAdapter) { adapter_to_pwrctl(pAdapter)->bSupportRemoteWakeup = _TRUE; DBG_871X("%s\n", __func__); @@ -3745,7 +3745,7 @@ void Hal_DetectWoWMode(PADAPTER pAdapter) #ifdef CONFIG_RF_GAIN_OFFSET void Hal_ReadRFGainOffset( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN u8* PROMContent, IN BOOLEAN AutoloadFail) { @@ -3777,7 +3777,7 @@ void Hal_ReadRFGainOffset( // The value of pHalData->RegBcnCtrlVal is initialized in HwConfigureRTL8192CE() function. // void SetBcnCtrlReg( - PADAPTER padapter, + struct adapter *padapter, u8 SetBits, u8 ClearBits) { diff --git a/hal/rtl8188e_phycfg.c b/hal/rtl8188e_phycfg.c index 99bc334..83b85d5 100755 --- a/hal/rtl8188e_phycfg.c +++ b/hal/rtl8188e_phycfg.c @@ -86,7 +86,7 @@ phy_CalculateBitShift( #if(SIC_ENABLE == 1) static BOOLEAN sic_IsSICReady( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { BOOLEAN bRet=_FALSE; @@ -241,7 +241,7 @@ sic_Write4Byte( //============================================================ static VOID SIC_SetBBReg( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u32 RegAddr, IN u32 BitMask, IN u32 Data @@ -286,7 +286,7 @@ SIC_SetBBReg( static u32 SIC_QueryBBReg( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u32 RegAddr, IN u32 BitMask ) @@ -324,7 +324,7 @@ SIC_QueryBBReg( VOID SIC_Init( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { // Here we need to write 0x1b8~0x1bf = 0 after fw is downloaded @@ -350,7 +350,7 @@ SIC_Init( static BOOLEAN SIC_LedOff( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { // When SIC is enabled, led pin will be used as debug pin, @@ -365,7 +365,7 @@ SIC_LedOff( * OverView: Read "sepcific bits" from BB register * * Input: -* PADAPTER Adapter, +* struct adapter * Adapter, * u4Byte RegAddr, //The target address to be readback * u4Byte BitMask //The target bit position in the target address * //to be readback @@ -375,7 +375,7 @@ SIC_LedOff( */ u32 rtl8188e_PHY_QueryBBReg( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u32 RegAddr, IN u32 BitMask ) @@ -411,7 +411,7 @@ rtl8188e_PHY_QueryBBReg( * OverView: Write "Specific bits" to BB register (page 8~) * * Input: -* PADAPTER Adapter, +* struct adapter * Adapter, * u4Byte RegAddr, //The target address to be modified * u4Byte BitMask //The target bit position in the target address * //to be modified @@ -425,7 +425,7 @@ rtl8188e_PHY_QueryBBReg( VOID rtl8188e_PHY_SetBBReg( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u32 RegAddr, IN u32 BitMask, IN u32 Data @@ -469,7 +469,7 @@ rtl8188e_PHY_SetBBReg( * OverView: Read regster from RF chips * * Input: -* PADAPTER Adapter, +* struct adapter * Adapter, * RF_RADIO_PATH_E eRFPath, //Radio path of A/B/C/D * u4Byte Offset, //The target address to be read * @@ -484,7 +484,7 @@ rtl8188e_PHY_SetBBReg( */ static u32 phy_RFSerialRead( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN RF_RADIO_PATH_E eRFPath, IN u32 Offset ) @@ -567,7 +567,7 @@ phy_RFSerialRead( * OverView: Write data to RF register (page 8~) * * Input: -* PADAPTER Adapter, +* struct adapter * Adapter, * RF_RADIO_PATH_E eRFPath, //Radio path of A/B/C/D * u4Byte Offset, //The target address to be read * u4Byte Data //The new register Data in the target bit position @@ -606,7 +606,7 @@ phy_RFSerialRead( */ static VOID phy_RFSerialWrite( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN RF_RADIO_PATH_E eRFPath, IN u32 Offset, IN u32 Data @@ -665,7 +665,7 @@ phy_RFSerialWrite( * OverView: Query "Specific bits" to RF register (page 8~) * * Input: -* PADAPTER Adapter, +* struct adapter * Adapter, * RF_RADIO_PATH_E eRFPath, //Radio path of A/B/C/D * u4Byte RegAddr, //The target address to be read * u4Byte BitMask //The target bit position in the target address @@ -677,7 +677,7 @@ phy_RFSerialWrite( */ u32 rtl8188e_PHY_QueryRFReg( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN RF_RADIO_PATH_E eRFPath, IN u32 RegAddr, IN u32 BitMask @@ -726,7 +726,7 @@ rtl8188e_PHY_QueryRFReg( * OverView: Write "Specific bits" to RF register (page 8~) * * Input: -* PADAPTER Adapter, +* struct adapter * Adapter, * RF_RADIO_PATH_E eRFPath, //Radio path of A/B/C/D * u4Byte RegAddr, //The target address to be modified * u4Byte BitMask //The target bit position in the target address @@ -740,7 +740,7 @@ rtl8188e_PHY_QueryRFReg( */ VOID rtl8188e_PHY_SetRFReg( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN RF_RADIO_PATH_E eRFPath, IN u32 RegAddr, IN u32 BitMask, @@ -804,7 +804,7 @@ rtl8188e_PHY_SetRFReg( * Overview: This function read BB parameters from general file format, and do register * Read/Write * - * Input: PADAPTER Adapter + * Input: struct adapter * Adapter * ps1Byte pFileName * * Output: NONE @@ -816,7 +816,7 @@ rtl8188e_PHY_SetRFReg( *---------------------------------------------------------------------------*/ static int phy_ConfigMACWithParaFile( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN u8* pFileName ) { @@ -833,7 +833,7 @@ phy_ConfigMACWithParaFile( * Overview: This function read BB parameters from Header file we gen, and do register * Read/Write * - * Input: PADAPTER Adapter + * Input: struct adapter * Adapter * ps1Byte pFileName * * Output: NONE @@ -846,7 +846,7 @@ phy_ConfigMACWithParaFile( #ifndef CONFIG_PHY_SETTING_WITH_ODM static int phy_ConfigMACWithHeaderFile( - IN PADAPTER Adapter + IN struct adapter * Adapter ) { u32 i = 0; @@ -898,7 +898,7 @@ phy_ConfigMACWithHeaderFile( * 08/12/2008 MHC Create Version 0. * *---------------------------------------------------------------------------*/ -s32 PHY_MACConfig8188E(PADAPTER Adapter) +s32 PHY_MACConfig8188E(struct adapter *Adapter) { int rtStatus = _SUCCESS; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -940,7 +940,7 @@ s32 PHY_MACConfig8188E(PADAPTER Adapter) * OverView: Initialize Register definition offset for Radio Path A/B/C/D * * Input: -* PADAPTER Adapter, +* struct adapter * Adapter, * * Output: None * Return: None @@ -948,7 +948,7 @@ s32 PHY_MACConfig8188E(PADAPTER Adapter) */ static VOID phy_InitBBRFRegisterDefinition( - IN PADAPTER Adapter + IN struct adapter * Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -1060,7 +1060,7 @@ phy_InitBBRFRegisterDefinition( * Overview: This function read BB parameters from general file format, and do register * Read/Write * - * Input: PADAPTER Adapter + * Input: struct adapter * Adapter * ps1Byte pFileName * * Output: NONE @@ -1072,7 +1072,7 @@ phy_InitBBRFRegisterDefinition( *---------------------------------------------------------------------------*/ static int phy_ConfigBBWithParaFile( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN u8* pFileName ) { @@ -1090,7 +1090,7 @@ phy_ConfigBBWithParaFile( //**************************************** VOID phy_ConfigBBExternalPA( - IN PADAPTER Adapter + IN struct adapter * Adapter ) { #ifdef CONFIG_USB_HCI @@ -1124,7 +1124,7 @@ phy_ConfigBBExternalPA( * Overview: This function read BB parameters from general file format, and do register * Read/Write * - * Input: PADAPTER Adapter + * Input: struct adapter * Adapter * u1Byte ConfigType 0 => PHY_CONFIG * 1 =>AGC_TAB * @@ -1136,7 +1136,7 @@ phy_ConfigBBExternalPA( #ifndef CONFIG_PHY_SETTING_WITH_ODM static int phy_ConfigBBWithHeaderFile( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN u8 ConfigType ) { @@ -1266,7 +1266,7 @@ exit: VOID storePwrIndexDiffRateOffset( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u32 RegAddr, IN u32 BitMask, IN u32 Data @@ -1399,7 +1399,7 @@ storePwrIndexDiffRateOffset( *---------------------------------------------------------------------------*/ static int phy_ConfigBBWithPgParaFile( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN u8* pFileName) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -1430,7 +1430,7 @@ phy_ConfigBBWithPgParaFile( *---------------------------------------------------------------------------*/ static int phy_ConfigBBWithPgHeaderFile( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN u8 ConfigType) { int i; @@ -1489,7 +1489,7 @@ phy_ConfigBBWithPgHeaderFile( static VOID phy_BB8192C_Config_1T( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { #if 0 @@ -1525,7 +1525,7 @@ phy_BB8192C_Config_1T( // Now it is just for 8256. static int phy_BB8190_Config_HardCode( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { //RT_ASSERT(FALSE, ("This function is not implement yet!! \n")); @@ -1534,7 +1534,7 @@ phy_BB8190_Config_HardCode( static int phy_BB8188E_Config_ParaFile( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(Adapter); @@ -1640,7 +1640,7 @@ phy_BB8190_Config_ParaFile_Fail: int PHY_BBConfig8188E( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { int rtStatus = _SUCCESS; @@ -1709,7 +1709,7 @@ PHY_BBConfig8188E( int PHY_RFConfig8188E( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -1749,7 +1749,7 @@ PHY_RFConfig8188E( * * Overview: This function read RF parameters from general file format, and do RF 3-wire * - * Input: PADAPTER Adapter + * Input: struct adapter * Adapter * ps1Byte pFileName * RF_RADIO_PATH_E eRFPath * @@ -1761,7 +1761,7 @@ PHY_RFConfig8188E( *---------------------------------------------------------------------------*/ int rtl8188e_PHY_ConfigRFWithParaFile( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN u8* pFileName, RF_RADIO_PATH_E eRFPath ) @@ -1796,7 +1796,7 @@ u32 Rtl8192S_HighPower_RadioA_Array[HighPowerRadioAArrayLen] = { int PHY_ConfigRFExternalPA( - IN PADAPTER Adapter, + IN struct adapter * Adapter, RF_RADIO_PATH_E eRFPath ) { @@ -1830,7 +1830,7 @@ PHY_ConfigRFExternalPA( * * Overview: This function read RF parameters from general file format, and do RF 3-wire * - * Input: PADAPTER Adapter + * Input: struct adapter * Adapter * ps1Byte pFileName * RF_RADIO_PATH_E eRFPath * @@ -1843,7 +1843,7 @@ PHY_ConfigRFExternalPA( #ifndef CONFIG_PHY_SETTING_WITH_ODM int rtl8188e_PHY_ConfigRFWithHeaderFile( - IN PADAPTER Adapter, + IN struct adapter * Adapter, RF_RADIO_PATH_E eRFPath ) { @@ -2024,7 +2024,7 @@ exit: * Overview: This function is write register and then readback to make sure whether * BB[PHY0, PHY1], RF[Patha, path b, path c, path d] is Ok * - * Input: PADAPTER Adapter + * Input: struct adapter * Adapter * HW90_BLOCK_E CheckBlock * RF_RADIO_PATH_E eRFPath // it is used only when CheckBlock is HW90_BLOCK_RF * @@ -2036,7 +2036,7 @@ exit: *---------------------------------------------------------------------------*/ int PHY_CheckBBAndRFOK( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN HW90_BLOCK_E CheckBlock, IN RF_RADIO_PATH_E eRFPath ) @@ -2111,7 +2111,7 @@ PHY_CheckBBAndRFOK( VOID rtl8192c_PHY_GetHWRegOriginalValue( - IN PADAPTER Adapter + IN struct adapter * Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -2143,7 +2143,7 @@ rtl8192c_PHY_GetHWRegOriginalValue( // static u8 phy_DbmToTxPwrIdx( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN WIRELESS_MODE WirelessMode, IN int PowerInDbm ) @@ -2199,7 +2199,7 @@ phy_DbmToTxPwrIdx( // int phy_TxPwrIdxToDbm( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN WIRELESS_MODE WirelessMode, IN u8 TxPwrIdx ) @@ -2238,7 +2238,7 @@ phy_TxPwrIdxToDbm( * * Overview: This function is export to "common" moudule * - * Input: PADAPTER Adapter + * Input: struct adapter * Adapter * psByte Power Level * * Output: NONE @@ -2248,7 +2248,7 @@ phy_TxPwrIdxToDbm( *---------------------------------------------------------------------------*/ VOID PHY_GetTxPowerLevel8188E( - IN PADAPTER Adapter, + IN struct adapter * Adapter, OUT u32* powerlevel ) { @@ -2284,7 +2284,7 @@ PHY_GetTxPowerLevel8188E( #if 0 static void getTxPowerIndex( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN u8 channel, IN OUT u8* cckPowerLevel, IN OUT u8* ofdmPowerLevel @@ -2314,7 +2314,7 @@ static void getTxPowerIndex( #endif void getTxPowerIndex88E( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN u8 channel, IN OUT u8* cckPowerLevel, IN OUT u8* ofdmPowerLevel, @@ -2447,7 +2447,7 @@ void getTxPowerIndex88E( } void phy_PowerIndexCheck88E( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u8 channel, IN OUT u8 * cckPowerLevel, IN OUT u8 * ofdmPowerLevel, @@ -2527,7 +2527,7 @@ void phy_PowerIndexCheck88E( * Overview: This function is export to "HalCommon" moudule * We must consider RF path later!!!!!!! * - * Input: PADAPTER Adapter + * Input: struct adapter * Adapter * u1Byte channel * * Output: NONE @@ -2540,7 +2540,7 @@ void phy_PowerIndexCheck88E( *---------------------------------------------------------------------------*/ VOID PHY_SetTxPowerLevel8188E( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN u8 channel ) { @@ -2606,7 +2606,7 @@ PHY_SetTxPowerLevel8188E( // BOOLEAN PHY_UpdateTxPowerDbm8188E( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN int powerInDbm ) { @@ -2652,7 +2652,7 @@ PHY_UpdateTxPowerDbm8188E( void rtl8192c_PHY_SetBeaconHwReg( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN u16 BeaconInterval ) { @@ -2662,7 +2662,7 @@ rtl8192c_PHY_SetBeaconHwReg( VOID PHY_ScanOperationBackup8188E( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u8 Operation ) { @@ -2709,10 +2709,10 @@ PHY_ScanOperationBackup8188E( *---------------------------------------------------------------------------*/ static VOID _PHY_SetBWMode92C( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { -// PADAPTER Adapter = (PADAPTER)pTimer->Adapter; +// struct adapter * Adapter = (PADAPTER)pTimer->Adapter; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); u8 regBwOpMode; u8 regRRSR_RSC; @@ -2861,7 +2861,7 @@ _PHY_SetBWMode92C( * * Overview: This function is export to "HalCommon" moudule * - * Input: PADAPTER Adapter + * Input: struct adapter * Adapter * HT_CHANNEL_WIDTH Bandwidth //20M or 40M * * Output: NONE @@ -2872,7 +2872,7 @@ _PHY_SetBWMode92C( *---------------------------------------------------------------------------*/ VOID PHY_SetBWMode8188E( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN HT_CHANNEL_WIDTH Bandwidth, // 20M or 40M IN unsigned char Offset // Upper, Lower, or Don't care ) @@ -2937,7 +2937,7 @@ PHY_SetBWMode8188E( } -static void _PHY_SwChnl8192C(PADAPTER Adapter, u8 channel) +static void _PHY_SwChnl8192C(struct adapter *Adapter, u8 channel) { u8 eRFPath; u32 param1, param2; @@ -2967,7 +2967,7 @@ static void _PHY_SwChnl8192C(PADAPTER Adapter, u8 channel) // <20130708, James> A workaround to eliminate the 2480MHz spur for 8188E I-Cut void phy_SpurCalibration_8188E( - IN PADAPTER Adapter + IN struct adapter * Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -2985,11 +2985,11 @@ phy_SpurCalibration_8188E( } VOID PHY_SwChnl8188E( // Call after initialization - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u8 channel ) { - //PADAPTER Adapter = ADJUST_TO_ADAPTIVE_ADAPTER(pAdapter, _TRUE); + //struct adapter *Adapter = ADJUST_TO_ADAPTIVE_ADAPTER(pAdapter, _TRUE); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); u8 tmpchannel = pHalData->CurrentChannel; BOOLEAN bResult = _TRUE; @@ -3076,7 +3076,7 @@ PHY_SwChnl8188E( // Call after initialization static BOOLEAN phy_SwChnlStepByStep( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u8 channel, IN u8 *stage, IN u8 *step, @@ -3273,7 +3273,7 @@ phy_SetSwChnlCmdArray( static void phy_FinishSwChnlNow( // We should not call this function directly - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u8 channel ) { @@ -3302,7 +3302,7 @@ phy_FinishSwChnlNow( // We should not call this function directly // VOID PHY_SwChnlPhy8192C( // Only called during initialize - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u8 channel ) { @@ -3348,7 +3348,7 @@ PHY_SwChnlPhy8192C( // Only called during initialize // VOID PHY_SetMonitorMode8192C( - IN PADAPTER pAdapter, + IN struct adapter * pAdapter, IN BOOLEAN bEnableMonitorMode ) { @@ -3398,7 +3398,7 @@ PHY_SetMonitorMode8192C( *---------------------------------------------------------------------------*/ BOOLEAN PHY_CheckIsLegalRfPath8192C( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN u32 eRFPath) { // HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); @@ -3420,7 +3420,7 @@ PHY_CheckIsLegalRfPath8192C( } /* PHY_CheckIsLegalRfPath8192C */ static VOID _PHY_SetRFPathSwitch( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN BOOLEAN bMain, IN BOOLEAN is2T ) @@ -3456,7 +3456,7 @@ static VOID _PHY_SetRFPathSwitch( //return value TRUE => Main; FALSE => Aux static BOOLEAN _PHY_QueryRFPathSwitch( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN BOOLEAN is2T ) { @@ -3487,7 +3487,7 @@ static BOOLEAN _PHY_QueryRFPathSwitch( static VOID -_PHY_DumpRFReg(IN PADAPTER pAdapter) +_PHY_DumpRFReg(IN struct adapter *pAdapter) { u32 rfRegValue,rfRegOffset; @@ -3514,7 +3514,7 @@ _PHY_DumpRFReg(IN PADAPTER pAdapter) // VOID DumpBBDbgPort_92CU( - IN PADAPTER Adapter + IN struct adapter * Adapter ) { diff --git a/hal/rtl8188e_rf6052.c b/hal/rtl8188e_rf6052.c index 33f6397..08744e8 100755 --- a/hal/rtl8188e_rf6052.c +++ b/hal/rtl8188e_rf6052.c @@ -93,7 +93,7 @@ static RF_SHADOW_T RF_Shadow[RF6052_MAX_PATH][RF6052_MAX_REG]; * Firmwaer support the utility later. * *---------------------------------------------------------------------------*/ -void rtl8188e_RF_ChangeTxPath( IN PADAPTER Adapter, +void rtl8188e_RF_ChangeTxPath( IN struct adapter *Adapter, IN u16 DataRate) { // We do not support gain table change inACUT now !!!! Delete later !!! @@ -149,7 +149,7 @@ void rtl8188e_RF_ChangeTxPath( IN PADAPTER Adapter, * * Overview: This function is called by SetBWModeCallback8190Pci() only * - * Input: PADAPTER Adapter + * Input: struct adapter * Adapter * WIRELESS_BANDWIDTH_E Bandwidth //20M or 40M * * Output: NONE @@ -160,7 +160,7 @@ void rtl8188e_RF_ChangeTxPath( IN PADAPTER Adapter, *---------------------------------------------------------------------------*/ VOID rtl8188e_PHY_RF6052SetBandwidth( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN HT_CHANNEL_WIDTH Bandwidth) //20M or 40M { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -204,7 +204,7 @@ rtl8188e_PHY_RF6052SetBandwidth( VOID rtl8188e_PHY_RF6052SetCckTxPower( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN u8* pPowerlevel) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -336,7 +336,7 @@ rtl8188e_PHY_RF6052SetCckTxPower( // powerbase1 for HT MCS rates // static void getPowerBase( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u8* pPowerLevel, IN u8 Channel, IN OUT u32* OfdmBase, @@ -379,7 +379,7 @@ static void getPowerBase( // powerbase1 for HT MCS rates // void getPowerBase88E( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u8* pPowerLevelOFDM, IN u8* pPowerLevelBW20, IN u8* pPowerLevelBW40, @@ -422,7 +422,7 @@ void getPowerBase88E( } #if 0 static void getTxPowerWriteValByRegulatory( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u8 Channel, IN u8 index, IN u32* powerBase0, @@ -554,7 +554,7 @@ static void getTxPowerWriteValByRegulatory( } #endif void getTxPowerWriteValByRegulatory88E( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u8 Channel, IN u8 index, IN u32* powerBase0, @@ -734,7 +734,7 @@ void getTxPowerWriteValByRegulatory88E( } static void writeOFDMPowerReg88E( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u8 index, IN u32* pValue ) @@ -818,7 +818,7 @@ static void writeOFDMPowerReg88E( VOID rtl8188e_PHY_RF6052SetOFDMTxPower( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u8* pPowerLevelOFDM, IN u8* pPowerLevelBW20, IN u8* pPowerLevelBW40, @@ -863,7 +863,7 @@ rtl8188e_PHY_RF6052SetOFDMTxPower( static VOID phy_RF6052_Config_HardCode( - IN PADAPTER Adapter + IN struct adapter * Adapter ) { @@ -876,7 +876,7 @@ phy_RF6052_Config_HardCode( static int phy_RF6052_Config_ParaFile( - IN PADAPTER Adapter + IN struct adapter * Adapter ) { u32 u4RegValue; @@ -996,7 +996,7 @@ phy_RF6052_Config_ParaFile_Fail: int PHY_RF6052_Config8188E( - IN PADAPTER Adapter) + IN struct adapter * Adapter) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); int rtStatus = _SUCCESS; @@ -1071,7 +1071,7 @@ PHY_RF6052_Config8188E( *---------------------------------------------------------------------------*/ u32 PHY_RFShadowRead( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN RF_RADIO_PATH_E eRFPath, IN u32 Offset) { @@ -1082,7 +1082,7 @@ PHY_RFShadowRead( VOID PHY_RFShadowWrite( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN RF_RADIO_PATH_E eRFPath, IN u32 Offset, IN u32 Data) @@ -1095,7 +1095,7 @@ PHY_RFShadowWrite( BOOLEAN PHY_RFShadowCompare( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN RF_RADIO_PATH_E eRFPath, IN u32 Offset) { @@ -1121,7 +1121,7 @@ PHY_RFShadowCompare( VOID PHY_RFShadowRecorver( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN RF_RADIO_PATH_E eRFPath, IN u32 Offset) { @@ -1144,7 +1144,7 @@ PHY_RFShadowRecorver( VOID PHY_RFShadowCompareAll( - IN PADAPTER Adapter) + IN struct adapter * Adapter) { u32 eRFPath; u32 Offset; @@ -1162,7 +1162,7 @@ PHY_RFShadowCompareAll( VOID PHY_RFShadowRecorverAll( - IN PADAPTER Adapter) + IN struct adapter * Adapter) { u32 eRFPath; u32 Offset; @@ -1180,7 +1180,7 @@ PHY_RFShadowRecorverAll( VOID PHY_RFShadowCompareFlagSet( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN RF_RADIO_PATH_E eRFPath, IN u32 Offset, IN u8 Type) @@ -1193,7 +1193,7 @@ PHY_RFShadowCompareFlagSet( VOID PHY_RFShadowRecorverFlagSet( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN RF_RADIO_PATH_E eRFPath, IN u32 Offset, IN u8 Type) @@ -1206,7 +1206,7 @@ PHY_RFShadowRecorverFlagSet( VOID PHY_RFShadowCompareFlagSetAll( - IN PADAPTER Adapter) + IN struct adapter * Adapter) { u32 eRFPath; u32 Offset; @@ -1228,7 +1228,7 @@ PHY_RFShadowCompareFlagSetAll( VOID PHY_RFShadowRecorverFlagSetAll( - IN PADAPTER Adapter) + IN struct adapter * Adapter) { u32 eRFPath; u32 Offset; @@ -1249,7 +1249,7 @@ PHY_RFShadowRecorverFlagSetAll( VOID PHY_RFShadowRefresh( - IN PADAPTER Adapter) + IN struct adapter * Adapter) { u32 eRFPath; u32 Offset; diff --git a/hal/rtl8188e_rxdesc.c b/hal/rtl8188e_rxdesc.c index 7489a66..f538aac 100755 --- a/hal/rtl8188e_rxdesc.c +++ b/hal/rtl8188e_rxdesc.c @@ -37,7 +37,7 @@ static s32 translate2dbm(u8 signal_strength_idx) } -static void process_rssi(_adapter *padapter,union recv_frame *prframe) +static void process_rssi(struct adapter *padapter,union recv_frame *prframe) { u32 last_rssi, tmp_val; struct rx_pkt_attrib *pattrib = &prframe->u.hdr.attrib; @@ -93,7 +93,7 @@ static void process_rssi(_adapter *padapter,union recv_frame *prframe) -static void process_link_qual(_adapter *padapter,union recv_frame *prframe) +static void process_link_qual(struct adapter *padapter,union recv_frame *prframe) { u32 last_evm=0, tmpVal; struct rx_pkt_attrib *pattrib; @@ -156,8 +156,8 @@ static void process_link_qual(_adapter *padapter,union recv_frame *prframe) } -//void rtl8188e_process_phy_info(_adapter *padapter, union recv_frame *prframe) -void rtl8188e_process_phy_info(_adapter *padapter, void *prframe) +//void rtl8188e_process_phy_info(struct adapter *padapter, union recv_frame *prframe) +void rtl8188e_process_phy_info(struct adapter *padapter, void *prframe) { union recv_frame *precvframe = (union recv_frame *)prframe; @@ -267,7 +267,7 @@ void update_recvframe_phyinfo_88e( union recv_frame *precvframe, struct phy_stat *pphy_status) { - PADAPTER padapter = precvframe->u.hdr.adapter; + struct adapter * padapter = precvframe->u.hdr.adapter; struct rx_pkt_attrib *pattrib = &precvframe->u.hdr.attrib; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); PODM_PHY_INFO_T pPHYInfo = (PODM_PHY_INFO_T)(&pattrib->phy_info); diff --git a/hal/rtl8188e_sreset.c b/hal/rtl8188e_sreset.c index 7c588cb..ea7aec4 100755 --- a/hal/rtl8188e_sreset.c +++ b/hal/rtl8188e_sreset.c @@ -24,7 +24,7 @@ #ifdef DBG_CONFIG_ERROR_DETECT -void rtl8188e_sreset_xmit_status_check(_adapter *padapter) +void rtl8188e_sreset_xmit_status_check(struct adapter *padapter) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); struct sreset_priv *psrtpriv = &pHalData->srestpriv; @@ -78,7 +78,7 @@ void rtl8188e_sreset_xmit_status_check(_adapter *padapter) } } -void rtl8188e_sreset_linked_status_check(_adapter *padapter) +void rtl8188e_sreset_linked_status_check(struct adapter *padapter) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); struct sreset_priv *psrtpriv = &pHalData->srestpriv; diff --git a/hal/rtl8188e_xmit.c b/hal/rtl8188e_xmit.c index d472236..8fc63e6 100755 --- a/hal/rtl8188e_xmit.c +++ b/hal/rtl8188e_xmit.c @@ -46,7 +46,7 @@ void dump_txrpt_ccx_88e(void *buf) ); } -void handle_txrpt_ccx_88e(_adapter *adapter, u8 *buf) +void handle_txrpt_ccx_88e(struct adapter *adapter, u8 *buf) { struct txrpt_ccx_88e *txrpt_ccx = (struct txrpt_ccx_88e *)buf; @@ -63,7 +63,7 @@ void handle_txrpt_ccx_88e(_adapter *adapter, u8 *buf) } #endif //CONFIG_XMIT_ACK -void _dbg_dump_tx_info(_adapter *padapter,int frame_tag,struct tx_desc *ptxdesc) +void _dbg_dump_tx_info(struct adapter *padapter,int frame_tag,struct tx_desc *ptxdesc) { u8 bDumpTxPkt; u8 bDumpTxDesc = _FALSE; @@ -214,7 +214,7 @@ InsertEMContent_8188E( void UpdateEarlyModeInfo8188E(struct xmit_priv *pxmitpriv,struct xmit_buf *pxmitbuf ) { - //_adapter *padapter, struct xmit_frame *pxmitframe,struct tx_servq *ptxservq + //struct adapter *padapter, struct xmit_frame *pxmitframe,struct tx_servq *ptxservq int index,j; u16 offset,pktlen; PTXDESC ptxdesc; diff --git a/hal/rtl8188eu_led.c b/hal/rtl8188eu_led.c index 712965a..0d7dfc6 100755 --- a/hal/rtl8188eu_led.c +++ b/hal/rtl8188eu_led.c @@ -43,7 +43,7 @@ // void SwLedOn( - _adapter *padapter, + struct adapter *padapter, PLED_871x pLed ) { @@ -80,7 +80,7 @@ SwLedOn( // void SwLedOff( - _adapter *padapter, + struct adapter *padapter, PLED_871x pLed ) { @@ -140,7 +140,7 @@ exit: // void rtl8188eu_InitSwLeds( - _adapter *padapter + struct adapter *padapter ) { struct led_priv *pledpriv = &(padapter->ledpriv); @@ -159,7 +159,7 @@ rtl8188eu_InitSwLeds( // void rtl8188eu_DeInitSwLeds( - _adapter *padapter + struct adapter *padapter ) { struct led_priv *ledpriv = &(padapter->ledpriv); diff --git a/hal/rtl8188eu_recv.c b/hal/rtl8188eu_recv.c index eabf487..f1697b2 100755 --- a/hal/rtl8188eu_recv.c +++ b/hal/rtl8188eu_recv.c @@ -35,7 +35,7 @@ #include -void rtl8188eu_init_recvbuf(_adapter *padapter, struct recv_buf *precvbuf) +void rtl8188eu_init_recvbuf(struct adapter *padapter, struct recv_buf *precvbuf) { precvbuf->transfer_len = 0; @@ -52,7 +52,7 @@ void rtl8188eu_init_recvbuf(_adapter *padapter, struct recv_buf *precvbuf) } -int rtl8188eu_init_recv_priv(_adapter *padapter) +int rtl8188eu_init_recv_priv(struct adapter *padapter) { struct recv_priv *precvpriv = &padapter->recvpriv; int i, res = _SUCCESS; @@ -166,7 +166,7 @@ exit: return res; } -void rtl8188eu_free_recv_priv (_adapter *padapter) +void rtl8188eu_free_recv_priv (struct adapter *padapter) { int i; struct recv_buf *precvbuf; diff --git a/hal/rtl8188eu_xmit.c b/hal/rtl8188eu_xmit.c index 8372b67..c5c5c67 100755 --- a/hal/rtl8188eu_xmit.c +++ b/hal/rtl8188eu_xmit.c @@ -28,7 +28,7 @@ #include #include -s32 rtl8188eu_init_xmit_priv(_adapter *padapter) +s32 rtl8188eu_init_xmit_priv(struct adapter *padapter) { struct xmit_priv *pxmitpriv = &padapter->xmitpriv; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); @@ -43,11 +43,11 @@ s32 rtl8188eu_init_xmit_priv(_adapter *padapter) return _SUCCESS; } -void rtl8188eu_free_xmit_priv(_adapter *padapter) +void rtl8188eu_free_xmit_priv(struct adapter *padapter) { } -u8 urb_zero_packet_chk(_adapter *padapter, int sz) +u8 urb_zero_packet_chk(struct adapter *padapter, int sz) { u8 blnSetTxDescOffset; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); @@ -79,7 +79,7 @@ void rtl8188eu_cal_txdesc_chksum(struct tx_desc *ptxdesc) // Fw can tell Hw to send these packet derectly. // void rtl8188e_fill_fake_txdesc( - PADAPTER padapter, + struct adapter *padapter, u8* pDesc, u32 BufferLen, u8 IsPsPoll, @@ -227,7 +227,7 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz ,u8 bag int pull=0; uint qsel; u8 data_rate,pwr_status,offset; - _adapter *padapter = pxmitframe->padapter; + struct adapter *padapter = pxmitframe->padapter; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct pkt_attrib *pattrib = &pxmitframe->attrib; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); @@ -524,7 +524,7 @@ if (padapter->registrypriv.mp_mode == 0) * _SUCCESS ok * _FAIL something error */ -s32 rtl8188eu_xmit_buf_handler(PADAPTER padapter) +s32 rtl8188eu_xmit_buf_handler(struct adapter *padapter) { //PHAL_DATA_TYPE phal; struct xmit_priv *pxmitpriv; @@ -582,7 +582,7 @@ s32 rtl8188eu_xmit_buf_handler(PADAPTER padapter) #include #endif //for non-agg data frame or management frame -static s32 rtw_dump_xframe(_adapter *padapter, struct xmit_frame *pxmitframe) +static s32 rtw_dump_xframe(struct adapter *padapter, struct xmit_frame *pxmitframe) { s32 ret = _SUCCESS; s32 inner_ret = _SUCCESS; @@ -691,7 +691,7 @@ static u32 xmitframe_need_length(struct xmit_frame *pxmitframe) } #define IDEA_CONDITION 1 // check all packets before enqueue -s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf) +s32 rtl8188eu_xmitframe_complete(struct adapter *padapter, struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); struct xmit_frame *pxmitframe = NULL; @@ -995,7 +995,7 @@ s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv #else -s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf) +s32 rtl8188eu_xmitframe_complete(struct adapter *padapter, struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf) { struct hw_xmit *phwxmits; @@ -1074,7 +1074,7 @@ s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv -static s32 xmitframe_direct(_adapter *padapter, struct xmit_frame *pxmitframe) +static s32 xmitframe_direct(struct adapter *padapter, struct xmit_frame *pxmitframe) { s32 res = _SUCCESS; //DBG_8192C("==> %s \n",__FUNCTION__); @@ -1095,7 +1095,7 @@ static s32 xmitframe_direct(_adapter *padapter, struct xmit_frame *pxmitframe) * _TRUE dump packet directly * _FALSE enqueue packet */ -static s32 pre_xmitframe(_adapter *padapter, struct xmit_frame *pxmitframe) +static s32 pre_xmitframe(struct adapter *padapter, struct xmit_frame *pxmitframe) { _irqL irqL; s32 res; @@ -1104,7 +1104,7 @@ static s32 pre_xmitframe(_adapter *padapter, struct xmit_frame *pxmitframe) struct pkt_attrib *pattrib = &pxmitframe->attrib; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; #ifdef CONFIG_CONCURRENT_MODE - PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; struct mlme_priv *pbuddy_mlmepriv = &(pbuddy_adapter->mlmepriv); #endif @@ -1161,7 +1161,7 @@ enqueue: return _FALSE; } -s32 rtl8188eu_mgnt_xmit(_adapter *padapter, struct xmit_frame *pmgntframe) +s32 rtl8188eu_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe) { return rtw_dump_xframe(padapter, pmgntframe); } @@ -1171,12 +1171,12 @@ s32 rtl8188eu_mgnt_xmit(_adapter *padapter, struct xmit_frame *pmgntframe) * _TRUE dump packet directly ok * _FALSE temporary can't transmit packets to hardware */ -s32 rtl8188eu_hal_xmit(_adapter *padapter, struct xmit_frame *pxmitframe) +s32 rtl8188eu_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe) { return pre_xmitframe(padapter, pxmitframe); } -s32 rtl8188eu_hal_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe) +s32 rtl8188eu_hal_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitframe) { struct xmit_priv *pxmitpriv = &padapter->xmitpriv; s32 err; @@ -1210,7 +1210,7 @@ static void rtl8188eu_hostap_mgnt_xmit_cb(struct urb *urb) rtw_skb_free(skb); } -s32 rtl8188eu_hostap_mgnt_xmit_entry(_adapter *padapter, _pkt *pkt) +s32 rtl8188eu_hostap_mgnt_xmit_entry(struct adapter *padapter, _pkt *pkt) { u16 fc; int rc, len, pipe; diff --git a/hal/usb_halinit.c b/hal/usb_halinit.c index 99620b6..3fd4c17 100755 --- a/hal/usb_halinit.c +++ b/hal/usb_halinit.c @@ -59,7 +59,7 @@ static VOID _ConfigNormalChipOutEP_8188E( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN u8 NumOutPipe ) { @@ -87,7 +87,7 @@ _ConfigNormalChipOutEP_8188E( } static BOOLEAN HalUsbSetQueuePipeMapping8188EUsb( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN u8 NumInPipe, IN u8 NumOutPipe ) @@ -115,7 +115,7 @@ static BOOLEAN HalUsbSetQueuePipeMapping8188EUsb( } -void rtl8188eu_interface_configure(_adapter *padapter) +void rtl8188eu_interface_configure(struct adapter *padapter) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter); @@ -149,7 +149,7 @@ void rtl8188eu_interface_configure(_adapter *padapter) } -static u32 InitPowerOn_rtl8188eu(_adapter *padapter) +static u32 InitPowerOn_rtl8188eu(struct adapter *padapter) { u16 value16; u8 bMacPwrCtrlOn=_FALSE; @@ -186,7 +186,7 @@ static u32 InitPowerOn_rtl8188eu(_adapter *padapter) } -static void _dbg_dump_macreg(_adapter *padapter) +static void _dbg_dump_macreg(struct adapter *padapter) { u32 offset = 0; u32 val32 = 0; @@ -200,7 +200,7 @@ static void _dbg_dump_macreg(_adapter *padapter) } -static void _InitPABias(_adapter *padapter) +static void _InitPABias(struct adapter *padapter) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); u8 pa_setting; @@ -239,7 +239,7 @@ static void _InitPABias(_adapter *padapter) } } #ifdef CONFIG_BT_COEXIST -static void _InitBTCoexist(_adapter *padapter) +static void _InitBTCoexist(struct adapter *padapter) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); struct btcoexist_priv *pbtpriv = &(pHalData->bt_coexist); @@ -300,7 +300,7 @@ static void _InitBTCoexist(_adapter *padapter) //--------------------------------------------------------------- static VOID _SetMacID( - IN PADAPTER Adapter, u8* MacID + IN struct adapter *Adapter, u8* MacID ) { u32 i; @@ -316,7 +316,7 @@ _SetMacID( static VOID _SetBSSID( - IN PADAPTER Adapter, u8* BSSID + IN struct adapter *Adapter, u8* BSSID ) { u32 i; @@ -334,7 +334,7 @@ _SetBSSID( // Shall USB interface init this? static VOID _InitInterrupt( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { u32 imr,imr_ex; @@ -377,7 +377,7 @@ _InitInterrupt( static VOID _InitQueueReservedPage( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -426,7 +426,7 @@ _InitQueueReservedPage( static VOID _InitTxBufferBoundary( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u8 txpktbuf_bndy ) { @@ -445,7 +445,7 @@ _InitTxBufferBoundary( static VOID _InitPageBoundary( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { // RX Page Boundary @@ -471,7 +471,7 @@ _InitPageBoundary( static VOID _InitNormalChipRegPriority( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u16 beQ, IN u16 bkQ, IN u16 viQ, @@ -491,7 +491,7 @@ _InitNormalChipRegPriority( static VOID _InitNormalChipOneOutEpPriority( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -526,7 +526,7 @@ _InitNormalChipOneOutEpPriority( static VOID _InitNormalChipTwoOutEpPriority( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -579,7 +579,7 @@ _InitNormalChipTwoOutEpPriority( static VOID _InitNormalChipThreeOutEpPriority( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { struct registry_priv *pregistrypriv = &Adapter->registrypriv; @@ -606,7 +606,7 @@ _InitNormalChipThreeOutEpPriority( static VOID _InitQueuePriority( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -634,7 +634,7 @@ _InitQueuePriority( static VOID _InitHardwareDropIncorrectBulkOut( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { #ifdef ENABLE_USB_DROP_INCORRECT_OUT @@ -646,7 +646,7 @@ _InitHardwareDropIncorrectBulkOut( static VOID _InitNetworkType( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { u32 value32; @@ -661,7 +661,7 @@ _InitNetworkType( static VOID _InitTransferPageSize( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { // Tx page size is always 128. @@ -673,7 +673,7 @@ _InitTransferPageSize( static VOID _InitDriverInfoSize( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u8 drvInfoSize ) { @@ -682,7 +682,7 @@ _InitDriverInfoSize( static VOID _InitWMACSetting( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { //u4Byte value32; @@ -728,7 +728,7 @@ _InitWMACSetting( static VOID _InitAdaptiveCtrl( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { u16 value16; @@ -755,7 +755,7 @@ _InitAdaptiveCtrl( static VOID _InitRateFallback( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { // Set Data Auto Rate Fallback Retry Count register. @@ -769,7 +769,7 @@ _InitRateFallback( static VOID _InitEDCA( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { // Set Spec SIFS (used in NAV) @@ -792,7 +792,7 @@ _InitEDCA( static VOID _InitBeaconMaxError( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN BOOLEAN InfraMode ) { @@ -801,7 +801,7 @@ _InitBeaconMaxError( #ifdef CONFIG_LED -static void _InitHWLed(PADAPTER Adapter) +static void _InitHWLed(struct adapter *Adapter) { struct led_priv *pledpriv = &(Adapter->ledpriv); @@ -817,7 +817,7 @@ static void _InitHWLed(PADAPTER Adapter) static VOID _InitRDGSetting( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { rtw_write8(Adapter,REG_RD_CTRL,0xFF); @@ -827,7 +827,7 @@ _InitRDGSetting( static VOID _InitRxSetting( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { rtw_write32(Adapter, REG_MACID, 0x87654321); @@ -836,7 +836,7 @@ _InitRxSetting( static VOID _InitRetryFunction( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { u8 value8; @@ -866,7 +866,7 @@ _InitRetryFunction( *---------------------------------------------------------------------------*/ static VOID usb_AggSettingTxUpdate( - IN PADAPTER Adapter + IN struct adapter * Adapter ) { #ifdef CONFIG_USB_TX_AGGREGATION @@ -906,7 +906,7 @@ usb_AggSettingTxUpdate( *---------------------------------------------------------------------------*/ static VOID usb_AggSettingRxUpdate( - IN PADAPTER Adapter + IN struct adapter * Adapter ) { #ifdef CONFIG_USB_RX_AGGREGATION @@ -992,7 +992,7 @@ usb_AggSettingRxUpdate( static VOID InitUsbAggregationSetting( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -1008,7 +1008,7 @@ InitUsbAggregationSetting( } VOID HalRxAggr8188EUsb( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN BOOLEAN Value ) { @@ -1065,14 +1065,14 @@ HalRxAggr8188EUsb( *---------------------------------------------------------------------------*/ VOID USB_AggModeSwitch( - IN PADAPTER Adapter + IN struct adapter * Adapter ) { } // USB_AggModeSwitch static VOID _InitOperationMode( - IN PADAPTER Adapter + IN struct adapter * Adapter ) { } @@ -1080,7 +1080,7 @@ _InitOperationMode( static VOID _InitBeaconParameters( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -1105,7 +1105,7 @@ _InitBeaconParameters( static VOID _InitRFType( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { struct registry_priv *pregpriv = &Adapter->registrypriv; @@ -1135,7 +1135,7 @@ _InitRFType( static VOID _BeaconFunctionEnable( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN BOOLEAN Enable, IN BOOLEAN Linked ) @@ -1150,7 +1150,7 @@ _BeaconFunctionEnable( // Set CCK and OFDM Block "ON" static VOID _BBTurnOnBlock( - IN PADAPTER Adapter + IN struct adapter * Adapter ) { #if (DISABLE_BB_RF) @@ -1162,7 +1162,7 @@ static VOID _BBTurnOnBlock( } static VOID _RfPowerSave( - IN PADAPTER Adapter + IN struct adapter * Adapter ) { #if 0 @@ -1201,7 +1201,7 @@ enum { }; static VOID -_InitAntenna_Selection(IN PADAPTER Adapter) +_InitAntenna_Selection(IN struct adapter *Adapter) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -1229,7 +1229,7 @@ _InitAntenna_Selection(IN PADAPTER Adapter) // static VOID HalDetectSelectiveSuspendMode( - IN PADAPTER Adapter + IN struct adapter * Adapter ) { #if 0 @@ -1283,7 +1283,7 @@ HalDetectSelectiveSuspendMode( *---------------------------------------------------------------------------*/ static VOID HwSuspendModeEnable_88eu( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN u8 Type ) { @@ -1323,7 +1323,7 @@ HwSuspendModeEnable_88eu( } } // HwSuspendModeEnable92Cu -rt_rf_power_state RfOnOffDetect(IN PADAPTER pAdapter ) +rt_rf_power_state RfOnOffDetect(IN struct adapter *pAdapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); u8 val8; @@ -1345,9 +1345,9 @@ rt_rf_power_state RfOnOffDetect(IN PADAPTER pAdapter ) return rfpowerstate; } // HalDetectPwrDownMode -void _ps_open_RF(_adapter *padapter); +void _ps_open_RF(struct adapter *padapter); -u32 rtl8188eu_hal_init(PADAPTER Adapter) +u32 rtl8188eu_hal_init(struct adapter *Adapter) { u8 value8 = 0; u16 value16; @@ -1949,19 +1949,19 @@ _func_exit_; return status; } -void _ps_open_RF(_adapter *padapter) { +void _ps_open_RF(struct adapter *padapter) { //here call with bRegSSPwrLvl 1, bRegSSPwrLvl 2 needs to be verified //phy_SsPwrSwitch92CU(padapter, rf_on, 1); } -void _ps_close_RF(_adapter *padapter){ +void _ps_close_RF(struct adapter *padapter){ //here call with bRegSSPwrLvl 1, bRegSSPwrLvl 2 needs to be verified //phy_SsPwrSwitch92CU(padapter, rf_off, 1); } VOID hal_poweroff_rtl8188eu( - IN PADAPTER Adapter + IN struct adapter * Adapter ) { // PMGNT_INFO pMgntInfo = &(Adapter->MgntInfo); @@ -2045,7 +2045,7 @@ VOID hal_poweroff_rtl8188eu( rtw_hal_set_hwreg(Adapter, HW_VAR_APFM_ON_MAC, &bMacPwrCtrlOn); Adapter->bFWReady = _FALSE; } -static void rtl8188eu_hw_power_down(_adapter *padapter) +static void rtl8188eu_hw_power_down(struct adapter *padapter) { // 2010/-8/09 MH For power down module, we need to enable register block contrl reg at 0x1c. // Then enable power down control bit of register 0x04 BIT4 and BIT15 as 1. @@ -2055,7 +2055,7 @@ static void rtl8188eu_hw_power_down(_adapter *padapter) rtw_write16(padapter, REG_APS_FSMCO, 0x8812); } -u32 rtl8188eu_hal_deinit(PADAPTER Adapter) +u32 rtl8188eu_hal_deinit(struct adapter *Adapter) { struct pwrctrl_priv *pwrctl = adapter_to_pwrctl(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -2089,7 +2089,7 @@ u32 rtl8188eu_hal_deinit(PADAPTER Adapter) } -unsigned int rtl8188eu_inirp_init(PADAPTER Adapter) +unsigned int rtl8188eu_inirp_init(struct adapter *Adapter) { u8 i; struct recv_buf *precvbuf; @@ -2153,7 +2153,7 @@ _func_exit_; } -unsigned int rtl8188eu_inirp_deinit(PADAPTER Adapter) +unsigned int rtl8188eu_inirp_deinit(struct adapter *Adapter) { RT_TRACE(_module_hci_hal_init_c_,_drv_info_,("\n ===> usb_rx_deinit \n")); @@ -2264,7 +2264,7 @@ _GetChannelGroup( static VOID ReadTxPowerInfo( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN u8* PROMContent, IN BOOLEAN AutoLoadFail ) @@ -2349,7 +2349,7 @@ ReadTxPowerInfo( //------------------------------------------------------------------- static void _ReadIDs( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u8* PROMContent, IN BOOLEAN AutoloadFail ) @@ -2426,7 +2426,7 @@ _ReadIDs( static VOID _ReadMACAddress( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u8* PROMContent, IN BOOLEAN AutoloadFail ) @@ -2453,7 +2453,7 @@ _ReadMACAddress( static VOID _ReadBoardType( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u8* PROMContent, IN BOOLEAN AutoloadFail ) @@ -2464,7 +2464,7 @@ _ReadBoardType( static VOID _ReadLEDSetting( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u8* PROMContent, IN BOOLEAN AutoloadFail ) @@ -2488,7 +2488,7 @@ _ReadLEDSetting( static VOID _ReadThermalMeter( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u8* PROMContent, IN BOOLEAN AutoloadFail ) @@ -2524,7 +2524,7 @@ _ReadThermalMeter( static VOID _ReadRFSetting( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u8* PROMContent, IN BOOLEAN AutoloadFail ) @@ -2533,7 +2533,7 @@ _ReadRFSetting( static void _ReadPROMVersion( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u8* PROMContent, IN BOOLEAN AutoloadFail ) @@ -2552,7 +2552,7 @@ _ReadPROMVersion( static VOID readAntennaDiversity( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN u8 *hwinfo, IN BOOLEAN AutoLoadFail ) @@ -2587,7 +2587,7 @@ readAntennaDiversity( static VOID hal_InitPGData( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN OUT u8 *PROMContent ) { @@ -2627,7 +2627,7 @@ hal_InitPGData( } static void Hal_EfuseParsePIDVID_8188EU( - IN PADAPTER pAdapter, + IN struct adapter * pAdapter, IN u8* hwinfo, IN BOOLEAN AutoLoadFail ) @@ -2663,7 +2663,7 @@ Hal_EfuseParsePIDVID_8188EU( static void Hal_EfuseParseMACAddr_8188EU( - IN PADAPTER padapter, + IN struct adapter * padapter, IN u8* hwinfo, IN BOOLEAN AutoLoadFail ) @@ -2696,7 +2696,7 @@ Hal_EfuseParseMACAddr_8188EU( static void Hal_CustomizeByCustomerID_8188EU( - IN PADAPTER padapter + IN struct adapter * padapter ) { #if 0 @@ -2745,7 +2745,7 @@ Hal_CustomizeByCustomerID_8188EU( } // Read HW power down mode selection -static void _ReadPSSetting(IN PADAPTER Adapter,IN u8*PROMContent,IN u8 AutoloadFail) +static void _ReadPSSetting(IN struct adapter *Adapter,IN u8*PROMContent,IN u8 AutoloadFail) { #if 0 struct pwrctrl_priv *pwrctl = adapter_to_pwrctl(Adapter); @@ -2786,7 +2786,7 @@ static void _ReadPSSetting(IN PADAPTER Adapter,IN u8*PROMContent,IN u8 AutoloadF #ifdef CONFIG_EFUSE_CONFIG_FILE static u32 Hal_readPGDataFromConfigFile( - PADAPTER padapter) + struct adapter *padapter) { u32 i; struct file *fp; @@ -2828,7 +2828,7 @@ static u32 Hal_readPGDataFromConfigFile( static void Hal_ReadMACAddrFromFile_8188EU( - PADAPTER padapter + struct adapter * padapter ) { u32 i; @@ -2899,7 +2899,7 @@ Hal_ReadMACAddrFromFile_8188EU( static VOID readAdapterInfo_8188EU( - IN PADAPTER padapter + IN struct adapter *padapter ) { #if 1 @@ -2953,7 +2953,7 @@ readAdapterInfo_8188EU( } static void _ReadPROMContent( - IN PADAPTER Adapter + IN struct adapter * Adapter ) { EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(Adapter); @@ -2981,7 +2981,7 @@ static void _ReadPROMContent( static VOID _ReadRFType( - IN PADAPTER Adapter + IN struct adapter *Adapter ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -2993,7 +2993,7 @@ _ReadRFType( #endif } -static int _ReadAdapterInfo8188EU(PADAPTER Adapter) +static int _ReadAdapterInfo8188EU(struct adapter *Adapter) { //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); u32 start=rtw_get_current_time(); @@ -3016,7 +3016,7 @@ static int _ReadAdapterInfo8188EU(PADAPTER Adapter) } -static void ReadAdapterInfo8188EU(PADAPTER Adapter) +static void ReadAdapterInfo8188EU(struct adapter *Adapter) { // Read EEPROM size before call any EEPROM function Adapter->EepromAddressSize = GetEEPROMSize8188E(Adapter); @@ -3026,7 +3026,7 @@ static void ReadAdapterInfo8188EU(PADAPTER Adapter) #define GPIO_DEBUG_PORT_NUM 0 -static void rtl8192cu_trigger_gpio_0(_adapter *padapter) +static void rtl8192cu_trigger_gpio_0(struct adapter *padapter) { #ifdef CONFIG_USB_SUPPORT_ASYNC_VDN_REQ u32 gpioctrl; @@ -3041,7 +3041,7 @@ static void rtl8192cu_trigger_gpio_0(_adapter *padapter) #endif } -static void ResumeTxBeacon(_adapter *padapter) +static void ResumeTxBeacon(struct adapter *padapter) { HAL_DATA_TYPE* pHalData = GET_HAL_DATA(padapter); @@ -3054,7 +3054,7 @@ static void ResumeTxBeacon(_adapter *padapter) pHalData->RegReg542 |= BIT0; rtw_write8(padapter, REG_TBTT_PROHIBIT+2, pHalData->RegReg542); } -void UpdateInterruptMask8188EU(PADAPTER padapter,u8 bHIMR0 ,u32 AddMSR, u32 RemoveMSR) +void UpdateInterruptMask8188EU(struct adapter *padapter,u8 bHIMR0 ,u32 AddMSR, u32 RemoveMSR) { HAL_DATA_TYPE *pHalData; @@ -3079,7 +3079,7 @@ void UpdateInterruptMask8188EU(PADAPTER padapter,u8 bHIMR0 ,u32 AddMSR, u32 Remo } -static void StopTxBeacon(_adapter *padapter) +static void StopTxBeacon(struct adapter *padapter) { HAL_DATA_TYPE* pHalData = GET_HAL_DATA(padapter); @@ -3097,7 +3097,7 @@ static void StopTxBeacon(_adapter *padapter) } -static void hw_var_set_opmode(PADAPTER Adapter, u8 variable, u8* val) +static void hw_var_set_opmode(struct adapter *Adapter, u8 variable, u8* val) { u8 val8; u8 mode = *((u8 *)val); @@ -3329,7 +3329,7 @@ static void hw_var_set_opmode(PADAPTER Adapter, u8 variable, u8* val) } -static void hw_var_set_macaddr(PADAPTER Adapter, u8 variable, u8* val) +static void hw_var_set_macaddr(struct adapter *Adapter, u8 variable, u8* val) { u8 idx = 0; u32 reg_macid; @@ -3352,7 +3352,7 @@ static void hw_var_set_macaddr(PADAPTER Adapter, u8 variable, u8* val) } -static void hw_var_set_bssid(PADAPTER Adapter, u8 variable, u8* val) +static void hw_var_set_bssid(struct adapter *Adapter, u8 variable, u8* val) { u8 idx = 0; u32 reg_bssid; @@ -3375,7 +3375,7 @@ static void hw_var_set_bssid(PADAPTER Adapter, u8 variable, u8* val) } -static void hw_var_set_bcn_func(PADAPTER Adapter, u8 variable, u8* val) +static void hw_var_set_bcn_func(struct adapter *Adapter, u8 variable, u8* val) { u32 bcn_ctrl_reg; @@ -3402,13 +3402,13 @@ static void hw_var_set_bcn_func(PADAPTER Adapter, u8 variable, u8* val) } -static void hw_var_set_correct_tsf(PADAPTER Adapter, u8 variable, u8* val) +static void hw_var_set_correct_tsf(struct adapter *Adapter, u8 variable, u8* val) { #ifdef CONFIG_CONCURRENT_MODE u64 tsf; struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); - PADAPTER pbuddy_adapter = Adapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = Adapter->pbuddy_adapter; //tsf = pmlmeext->TSFValue - ((u32)pmlmeext->TSFValue % (pmlmeinfo->bcn_interval*1024)) -1024; //us tsf = pmlmeext->TSFValue - rtw_modular64(pmlmeext->TSFValue, (pmlmeinfo->bcn_interval*1024)) -1024; //us @@ -3498,11 +3498,11 @@ static void hw_var_set_correct_tsf(PADAPTER Adapter, u8 variable, u8* val) #endif } -static void hw_var_set_mlme_disconnect(PADAPTER Adapter, u8 variable, u8* val) +static void hw_var_set_mlme_disconnect(struct adapter *Adapter, u8 variable, u8* val) { #ifdef CONFIG_CONCURRENT_MODE //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); - PADAPTER pbuddy_adapter = Adapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = Adapter->pbuddy_adapter; if(check_buddy_mlmeinfo_state(Adapter, _HW_STATE_NOLINK_)) @@ -3531,7 +3531,7 @@ static void hw_var_set_mlme_disconnect(PADAPTER Adapter, u8 variable, u8* val) #endif } -static void hw_var_set_mlme_sitesurvey(PADAPTER Adapter, u8 variable, u8* val) +static void hw_var_set_mlme_sitesurvey(struct adapter *Adapter, u8 variable, u8* val) { #ifdef CONFIG_CONCURRENT_MODE HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); @@ -3588,7 +3588,7 @@ static void hw_var_set_mlme_sitesurvey(PADAPTER Adapter, u8 variable, u8* val) #endif } -static void hw_var_set_mlme_join(PADAPTER Adapter, u8 variable, u8* val) +static void hw_var_set_mlme_join(struct adapter *Adapter, u8 variable, u8* val) { #ifdef CONFIG_CONCURRENT_MODE u8 RetryLimit = 0x30; @@ -3671,7 +3671,7 @@ static void hw_var_set_mlme_join(PADAPTER Adapter, u8 variable, u8* val) #endif } -void SetHwReg8188EU(PADAPTER Adapter, u8 variable, u8* val) +void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); struct dm_priv *pdmpriv = &pHalData->dmpriv; @@ -4545,7 +4545,7 @@ _func_enter_; _func_exit_; } -void GetHwReg8188EU(PADAPTER Adapter, u8 variable, u8* val) +void GetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); DM_ODM_T *podmpriv = &pHalData->odmpriv; @@ -4636,7 +4636,7 @@ _func_exit_; // u8 GetHalDefVar8188EUsb( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN HAL_DEF_VARIABLE eVariable, IN PVOID pValue ) @@ -4725,7 +4725,7 @@ GetHalDefVar8188EUsb( u8 i; u8 bLinked = _FALSE; #ifdef CONFIG_CONCURRENT_MODE - PADAPTER pbuddy_adapter = Adapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = Adapter->pbuddy_adapter; #endif //CONFIG_CONCURRENT_MODE //if(check_fwstate(&Adapter->mlmepriv, _FW_LINKED)== _TRUE) @@ -4783,7 +4783,7 @@ GetHalDefVar8188EUsb( // u8 SetHalDefVar8188EUsb( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN HAL_DEF_VARIABLE eVariable, IN PVOID pValue ) @@ -4846,7 +4846,7 @@ SetHalDefVar8188EUsb( return bResult; } /* -u32 _update_92cu_basic_rate(_adapter *padapter, unsigned int mask) +u32 _update_92cu_basic_rate(struct adapter *padapter, unsigned int mask) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); #ifdef CONFIG_BT_COEXIST @@ -4874,7 +4874,7 @@ u32 _update_92cu_basic_rate(_adapter *padapter, unsigned int mask) return BrateCfg; } */ -void _update_response_rate(_adapter *padapter,unsigned int mask) +void _update_response_rate(struct adapter *padapter,unsigned int mask) { u8 RateIndex = 0; // Set RRSR rate table. @@ -4890,7 +4890,7 @@ void _update_response_rate(_adapter *padapter,unsigned int mask) rtw_write8(padapter, REG_INIRTS_RATE_SEL, RateIndex); } -void UpdateHalRAMask8188EUsb(PADAPTER padapter, u32 mac_id, u8 rssi_level) +void UpdateHalRAMask8188EUsb(struct adapter *padapter, u32 mac_id, u8 rssi_level) { //volatile unsigned int result; u8 init_rate=0; @@ -5033,7 +5033,7 @@ void UpdateHalRAMask8188EUsb(PADAPTER padapter, u32 mac_id, u8 rssi_level) } -void SetBeaconRelatedRegisters8188EUsb(PADAPTER padapter) +void SetBeaconRelatedRegisters8188EUsb(struct adapter *padapter) { u32 value32; //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); @@ -5090,7 +5090,7 @@ void SetBeaconRelatedRegisters8188EUsb(PADAPTER padapter) } -static void rtl8188eu_init_default_value(_adapter * padapter) +static void rtl8188eu_init_default_value(struct adapter * padapter) { PHAL_DATA_TYPE pHalData; struct pwrctrl_priv *pwrctrlpriv; @@ -5120,7 +5120,7 @@ static void rtl8188eu_init_default_value(_adapter * padapter) pHalData->odmpriv.RFCalibrateInfo.ThermalValue_HP[i] = 0; } -static u8 rtl8188eu_ps_func(PADAPTER Adapter,HAL_INTF_PS_FUNC efunc_id, u8 *val) +static u8 rtl8188eu_ps_func(struct adapter *Adapter,HAL_INTF_PS_FUNC efunc_id, u8 *val) { u8 bResult = _TRUE; switch(efunc_id){ @@ -5140,7 +5140,7 @@ static u8 rtl8188eu_ps_func(PADAPTER Adapter,HAL_INTF_PS_FUNC efunc_id, u8 *val) return bResult; } -void rtl8188eu_set_hal_ops(_adapter * padapter) +void rtl8188eu_set_hal_ops(struct adapter * padapter) { struct hal_ops *pHalFunc = &padapter->HalFunc; diff --git a/hal/usb_ops_linux.c b/hal/usb_ops_linux.c index 374d9ec..d917eef 100755 --- a/hal/usb_ops_linux.c +++ b/hal/usb_ops_linux.c @@ -30,7 +30,7 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u16 index, void *pdata, u16 len, u8 requesttype) { - _adapter *padapter = pintfhdl->padapter; + struct adapter *padapter = pintfhdl->padapter; struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter); struct usb_device *udev=pdvobjpriv->pusbdev; @@ -378,7 +378,7 @@ static int usb_writeN(struct intf_hdl *pintfhdl, u32 addr, u32 length, u8 *pdata } #ifdef CONFIG_SUPPORT_USB_INT -void interrupt_handler_8188eu(_adapter *padapter,u16 pkt_len,u8 *pbuf) +void interrupt_handler_8188eu(struct adapter *padapter,u16 pkt_len,u8 *pbuf) { HAL_DATA_TYPE *pHalData=GET_HAL_DATA(padapter); struct reportpwrstate_parm pwr_rpt; @@ -492,7 +492,7 @@ void interrupt_handler_8188eu(_adapter *padapter,u16 pkt_len,u8 *pbuf) static void usb_read_interrupt_complete(struct urb *purb, struct pt_regs *regs) { int err; - _adapter *padapter = (_adapter *)purb->context; + struct adapter *padapter = (struct adapter *)purb->context; if(padapter->bSurpriseRemoved || padapter->bDriverStopped||padapter->bReadPortCancel) { @@ -549,7 +549,7 @@ static u32 usb_read_interrupt(struct intf_hdl *pintfhdl, u32 addr) int err; unsigned int pipe; u32 ret = _SUCCESS; - _adapter *adapter = pintfhdl->padapter; + struct adapter *adapter = pintfhdl->padapter; struct dvobj_priv *pdvobj = adapter_to_dvobj(adapter); struct recv_priv *precvpriv = &adapter->recvpriv; struct usb_device *pusbd = pdvobj->pusbdev; @@ -585,8 +585,8 @@ static s32 pre_recv_entry(union recv_frame *precvframe, struct recv_stat *prxsta #ifdef CONFIG_CONCURRENT_MODE u8 *primary_myid, *secondary_myid, *paddr1; union recv_frame *precvframe_if2 = NULL; - _adapter *primary_padapter = precvframe->u.hdr.adapter; - _adapter *secondary_padapter = primary_padapter->pbuddy_adapter; + struct adapter *primary_padapter = precvframe->u.hdr.adapter; + struct adapter *secondary_padapter = primary_padapter->pbuddy_adapter; struct recv_priv *precvpriv = &primary_padapter->recvpriv; _queue *pfree_recv_queue = &precvpriv->free_recv_queue; u8 *pbuf = precvframe->u.hdr.rx_data; @@ -779,7 +779,7 @@ static s32 pre_recv_entry(union recv_frame *precvframe, struct recv_stat *prxsta } #ifdef CONFIG_USE_USB_BUFFER_ALLOC_RX -static int recvbuf2recvframe(_adapter *padapter, struct recv_buf *precvbuf) +static int recvbuf2recvframe(struct adapter *padapter, struct recv_buf *precvbuf) { u8 *pbuf; u8 shift_sz = 0; @@ -1005,7 +1005,7 @@ _exit_recvbuf2recvframe: void rtl8188eu_recv_tasklet(void *priv) { struct recv_buf *precvbuf = NULL; - _adapter *padapter = (_adapter*)priv; + struct adapter *padapter = (struct adapter*)priv; struct recv_priv *precvpriv = &padapter->recvpriv; while (NULL != (precvbuf = rtw_dequeue_recvbuf(&precvpriv->recv_buf_pending_queue))) @@ -1028,7 +1028,7 @@ void rtl8188eu_recv_tasklet(void *priv) static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs) { struct recv_buf *precvbuf = (struct recv_buf *)purb->context; - _adapter *padapter =(_adapter *)precvbuf->adapter; + struct adapter *padapter =(struct adapter *)precvbuf->adapter; struct recv_priv *precvpriv = &padapter->recvpriv; RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete!!!\n")); @@ -1119,7 +1119,7 @@ static u32 usb_read_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem) u32 ret = _SUCCESS; PURB purb = NULL; struct recv_buf *precvbuf = (struct recv_buf *)rmem; - _adapter *adapter = pintfhdl->padapter; + struct adapter *adapter = pintfhdl->padapter; struct dvobj_priv *pdvobj = adapter_to_dvobj(adapter); struct recv_priv *precvpriv = &adapter->recvpriv; struct usb_device *pusbd = pdvobj->pusbdev; @@ -1176,7 +1176,7 @@ _func_exit_; return ret; } #else // CONFIG_USE_USB_BUFFER_ALLOC_RX -static int recvbuf2recvframe(_adapter *padapter, _pkt *pskb) +static int recvbuf2recvframe(struct adapter *padapter, _pkt *pskb) { u8 *pbuf; u8 shift_sz = 0; @@ -1410,7 +1410,7 @@ _exit_recvbuf2recvframe: void rtl8188eu_recv_tasklet(void *priv) { _pkt *pskb; - _adapter *padapter = (_adapter*)priv; + struct adapter *padapter = (struct adapter*)priv; struct recv_priv *precvpriv = &padapter->recvpriv; while (NULL != (pskb = skb_dequeue(&precvpriv->rx_skb_queue))) @@ -1446,7 +1446,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs) _irqL irqL; uint isevt, *pbuf; struct recv_buf *precvbuf = (struct recv_buf *)purb->context; - _adapter *padapter =(_adapter *)precvbuf->adapter; + struct adapter *padapter =(struct adapter *)precvbuf->adapter; struct recv_priv *precvpriv = &padapter->recvpriv; RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete!!!\n")); @@ -1566,7 +1566,7 @@ static u32 usb_read_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem) u32 ret = _SUCCESS; PURB purb = NULL; struct recv_buf *precvbuf = (struct recv_buf *)rmem; - _adapter *adapter = pintfhdl->padapter; + struct adapter *adapter = pintfhdl->padapter; struct dvobj_priv *pdvobj = adapter_to_dvobj(adapter); struct recv_priv *precvpriv = &adapter->recvpriv; struct usb_device *pusbd = pdvobj->pusbdev; @@ -1669,7 +1669,7 @@ _func_exit_; void rtl8188eu_xmit_tasklet(void *priv) { int ret = _FALSE; - _adapter *padapter = (_adapter*)priv; + struct adapter *padapter = (struct adapter*)priv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv; if(check_fwstate(&padapter->mlmepriv, _FW_UNDER_SURVEY) == _TRUE) @@ -1728,7 +1728,7 @@ void rtl8188eu_set_intf_ops(struct _io_ops *pops) } -void rtl8188eu_set_hw_type(_adapter *padapter) +void rtl8188eu_set_hw_type(struct adapter *padapter) { padapter->chip_type = RTL8188E; padapter->HardwareType = HARDWARE_TYPE_RTL8188EU; diff --git a/include/Hal8188EPhyCfg.h b/include/Hal8188EPhyCfg.h index e9b97cc..a729277 100755 --- a/include/Hal8188EPhyCfg.h +++ b/include/Hal8188EPhyCfg.h @@ -215,18 +215,18 @@ typedef struct _R_ANTENNA_SELECT_CCK{ // // BB and RF register read/write // -u32 rtl8188e_PHY_QueryBBReg( IN PADAPTER Adapter, +u32 rtl8188e_PHY_QueryBBReg( IN struct adapter *Adapter, IN u32 RegAddr, IN u32 BitMask ); -void rtl8188e_PHY_SetBBReg( IN PADAPTER Adapter, +void rtl8188e_PHY_SetBBReg( IN struct adapter *Adapter, IN u32 RegAddr, IN u32 BitMask, IN u32 Data ); -u32 rtl8188e_PHY_QueryRFReg( IN PADAPTER Adapter, +u32 rtl8188e_PHY_QueryRFReg( IN struct adapter * Adapter, IN RF_RADIO_PATH_E eRFPath, IN u32 RegAddr, IN u32 BitMask ); -void rtl8188e_PHY_SetRFReg( IN PADAPTER Adapter, +void rtl8188e_PHY_SetRFReg( IN struct adapter * Adapter, IN RF_RADIO_PATH_E eRFPath, IN u32 RegAddr, IN u32 BitMask, @@ -236,57 +236,57 @@ void rtl8188e_PHY_SetRFReg( IN PADAPTER Adapter, // Initialization related function // /* MAC/BB/RF HAL config */ -int PHY_MACConfig8188E(IN PADAPTER Adapter ); -int PHY_BBConfig8188E(IN PADAPTER Adapter ); -int PHY_RFConfig8188E(IN PADAPTER Adapter ); +int PHY_MACConfig8188E(IN struct adapter *Adapter ); +int PHY_BBConfig8188E(IN struct adapter *Adapter ); +int PHY_RFConfig8188E(IN struct adapter *Adapter ); /* RF config */ -int rtl8188e_PHY_ConfigRFWithParaFile(IN PADAPTER Adapter, IN u8 * pFileName, RF_RADIO_PATH_E eRFPath); -int rtl8188e_PHY_ConfigRFWithHeaderFile( IN PADAPTER Adapter, +int rtl8188e_PHY_ConfigRFWithParaFile(IN struct adapter *Adapter, IN u8 * pFileName, RF_RADIO_PATH_E eRFPath); +int rtl8188e_PHY_ConfigRFWithHeaderFile( IN struct adapter * Adapter, IN RF_RADIO_PATH_E eRFPath); /* Read initi reg value for tx power setting. */ -void rtl8192c_PHY_GetHWRegOriginalValue( IN PADAPTER Adapter ); +void rtl8192c_PHY_GetHWRegOriginalValue( IN struct adapter * Adapter ); // // RF Power setting // -//extern BOOLEAN PHY_SetRFPowerState(IN PADAPTER Adapter, +//extern BOOLEAN PHY_SetRFPowerState(IN struct adapter * Adapter, // IN RT_RF_POWER_STATE eRFPowerState); // // BB TX Power R/W // -void PHY_GetTxPowerLevel8188E( IN PADAPTER Adapter, +void PHY_GetTxPowerLevel8188E( IN struct adapter * Adapter, OUT u32* powerlevel ); -void PHY_SetTxPowerLevel8188E( IN PADAPTER Adapter, +void PHY_SetTxPowerLevel8188E( IN struct adapter * Adapter, IN u8 channel ); -BOOLEAN PHY_UpdateTxPowerDbm8188E( IN PADAPTER Adapter, +BOOLEAN PHY_UpdateTxPowerDbm8188E( IN struct adapter *Adapter, IN int powerInDbm ); // VOID -PHY_ScanOperationBackup8188E(IN PADAPTER Adapter, +PHY_ScanOperationBackup8188E(IN struct adapter *Adapter, IN u8 Operation ); // // Switch bandwidth for 8192S // //extern void PHY_SetBWModeCallback8192C( IN PRT_TIMER pTimer ); -void PHY_SetBWMode8188E( IN PADAPTER pAdapter, +void PHY_SetBWMode8188E( IN struct adapter * pAdapter, IN HT_CHANNEL_WIDTH ChnlWidth, IN unsigned char Offset ); // // Set FW CMD IO for 8192S. // -//extern BOOLEAN HalSetIO8192C( IN PADAPTER Adapter, +//extern BOOLEAN HalSetIO8192C( IN struct adapter * Adapter, // IN IO_TYPE IOType); // // Set A2 entry to fw for 8192S // -extern void FillA2Entry8192C( IN PADAPTER Adapter, +extern void FillA2Entry8192C( IN struct adapter * Adapter, IN u8 index, IN u8* val); @@ -295,45 +295,45 @@ extern void FillA2Entry8192C( IN PADAPTER Adapter, // channel switch related funciton // //extern void PHY_SwChnlCallback8192C( IN PRT_TIMER pTimer ); -void PHY_SwChnl8188E( IN PADAPTER pAdapter, +void PHY_SwChnl8188E( IN struct adapter * pAdapter, IN u8 channel ); // Call after initialization -void PHY_SwChnlPhy8192C( IN PADAPTER pAdapter, +void PHY_SwChnlPhy8192C( IN struct adapter * pAdapter, IN u8 channel ); -void ChkFwCmdIoDone( IN PADAPTER Adapter); +void ChkFwCmdIoDone( IN struct adapter *Adapter); // // BB/MAC/RF other monitor API // -void PHY_SetMonitorMode8192C(IN PADAPTER pAdapter, +void PHY_SetMonitorMode8192C(IN struct adapter *pAdapter, IN BOOLEAN bEnableMonitorMode ); -BOOLEAN PHY_CheckIsLegalRfPath8192C(IN PADAPTER pAdapter, +BOOLEAN PHY_CheckIsLegalRfPath8192C(IN struct adapter *pAdapter, IN u32 eRFPath ); -VOID PHY_SetRFPathSwitch_8188E(IN PADAPTER pAdapter, IN BOOLEAN bMain); +VOID PHY_SetRFPathSwitch_8188E(IN struct adapter *pAdapter, IN BOOLEAN bMain); extern VOID PHY_SwitchEphyParameter( - IN PADAPTER Adapter + IN struct adapter * Adapter ); extern VOID PHY_EnableHostClkReq( - IN PADAPTER Adapter + IN struct adapter * Adapter ); BOOLEAN SetAntennaConfig92C( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u8 DefaultAnt ); #ifdef CONFIG_PHY_SETTING_WITH_ODM VOID storePwrIndexDiffRateOffset( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u32 RegAddr, IN u32 BitMask, IN u32 Data @@ -354,9 +354,9 @@ storePwrIndexDiffRateOffset( // Initialization related function // /* MAC/BB/RF HAL config */ -//extern s32 PHY_MACConfig8723(PADAPTER padapter); -//s32 PHY_BBConfig8723(PADAPTER padapter); -//s32 PHY_RFConfig8723(PADAPTER padapter); +//extern s32 PHY_MACConfig8723(struct adapter *padapter); +//s32 PHY_BBConfig8723(struct adapter *padapter); +//s32 PHY_RFConfig8723(struct adapter *padapter); @@ -421,7 +421,7 @@ storePwrIndexDiffRateOffset( #endif #if(SIC_ENABLE == 1) -VOID SIC_Init(IN PADAPTER Adapter); +VOID SIC_Init(IN struct adapter *Adapter); #endif diff --git a/include/Hal8192CPhyCfg.h b/include/Hal8192CPhyCfg.h index b27642c..0ab5a0e 100755 --- a/include/Hal8192CPhyCfg.h +++ b/include/Hal8192CPhyCfg.h @@ -250,18 +250,18 @@ typedef struct _R_ANTENNA_SELECT_CCK{ // // BB and RF register read/write // -u32 rtl8192c_PHY_QueryBBReg( IN PADAPTER Adapter, +u32 rtl8192c_PHY_QueryBBReg( IN struct adapter *Adapter, IN u32 RegAddr, IN u32 BitMask ); -void rtl8192c_PHY_SetBBReg( IN PADAPTER Adapter, +void rtl8192c_PHY_SetBBReg( IN struct adapter *Adapter, IN u32 RegAddr, IN u32 BitMask, IN u32 Data ); -u32 rtl8192c_PHY_QueryRFReg( IN PADAPTER Adapter, +u32 rtl8192c_PHY_QueryRFReg( IN struct adapter * Adapter, IN RF_RADIO_PATH_E eRFPath, IN u32 RegAddr, IN u32 BitMask ); -void rtl8192c_PHY_SetRFReg( IN PADAPTER Adapter, +void rtl8192c_PHY_SetRFReg( IN struct adapter * Adapter, IN RF_RADIO_PATH_E eRFPath, IN u32 RegAddr, IN u32 BitMask, @@ -271,62 +271,62 @@ void rtl8192c_PHY_SetRFReg( IN PADAPTER Adapter, // Initialization related function // /* MAC/BB/RF HAL config */ -int PHY_MACConfig8192C( IN PADAPTER Adapter ); -int PHY_BBConfig8192C( IN PADAPTER Adapter ); -int PHY_RFConfig8192C( IN PADAPTER Adapter ); +int PHY_MACConfig8192C( IN struct adapter *Adapter ); +int PHY_BBConfig8192C( IN struct adapter *Adapter ); +int PHY_RFConfig8192C( IN struct adapter *Adapter ); /* RF config */ -int rtl8192c_PHY_ConfigRFWithParaFile( IN PADAPTER Adapter, +int rtl8192c_PHY_ConfigRFWithParaFile( IN struct adapter *Adapter, IN u8* pFileName, IN RF_RADIO_PATH_E eRFPath); -int rtl8192c_PHY_ConfigRFWithHeaderFile( IN PADAPTER Adapter, +int rtl8192c_PHY_ConfigRFWithHeaderFile( IN struct adapter * Adapter, IN RF_RADIO_PATH_E eRFPath); /* BB/RF readback check for making sure init OK */ -int rtl8192c_PHY_CheckBBAndRFOK( IN PADAPTER Adapter, +int rtl8192c_PHY_CheckBBAndRFOK( IN struct adapter * Adapter, IN HW90_BLOCK_E CheckBlock, IN RF_RADIO_PATH_E eRFPath ); /* Read initi reg value for tx power setting. */ -void rtl8192c_PHY_GetHWRegOriginalValue( IN PADAPTER Adapter ); +void rtl8192c_PHY_GetHWRegOriginalValue( IN struct adapter * Adapter ); // // RF Power setting // -//extern BOOLEAN PHY_SetRFPowerState(IN PADAPTER Adapter, +//extern BOOLEAN PHY_SetRFPowerState(IN struct adapter * Adapter, // IN RT_RF_POWER_STATE eRFPowerState); // // BB TX Power R/W // -void PHY_GetTxPowerLevel8192C( IN PADAPTER Adapter, +void PHY_GetTxPowerLevel8192C( IN struct adapter * Adapter, OUT u32* powerlevel ); -void PHY_SetTxPowerLevel8192C( IN PADAPTER Adapter, +void PHY_SetTxPowerLevel8192C( IN struct adapter * Adapter, IN u8 channel ); -BOOLEAN PHY_UpdateTxPowerDbm8192C( IN PADAPTER Adapter, +BOOLEAN PHY_UpdateTxPowerDbm8192C( IN struct adapter *Adapter, IN int powerInDbm ); // VOID -PHY_ScanOperationBackup8192C(IN PADAPTER Adapter, +PHY_ScanOperationBackup8192C(IN struct adapter *Adapter, IN u8 Operation ); // // Switch bandwidth for 8192S // //extern void PHY_SetBWModeCallback8192C( IN PRT_TIMER pTimer ); -void PHY_SetBWMode8192C( IN PADAPTER pAdapter, +void PHY_SetBWMode8192C( IN struct adapter * pAdapter, IN HT_CHANNEL_WIDTH ChnlWidth, IN unsigned char Offset ); // // Set FW CMD IO for 8192S. // -//extern BOOLEAN HalSetIO8192C( IN PADAPTER Adapter, +//extern BOOLEAN HalSetIO8192C( IN struct adapter * Adapter, // IN IO_TYPE IOType); // // Set A2 entry to fw for 8192S // -extern void FillA2Entry8192C( IN PADAPTER Adapter, +extern void FillA2Entry8192C( IN struct adapter * Adapter, IN u8 index, IN u8* val); @@ -335,52 +335,52 @@ extern void FillA2Entry8192C( IN PADAPTER Adapter, // channel switch related funciton // //extern void PHY_SwChnlCallback8192C( IN PRT_TIMER pTimer ); -void PHY_SwChnl8192C( IN PADAPTER pAdapter, +void PHY_SwChnl8192C( IN struct adapter * pAdapter, IN u8 channel ); // Call after initialization -void PHY_SwChnlPhy8192C( IN PADAPTER pAdapter, +void PHY_SwChnlPhy8192C( IN struct adapter * pAdapter, IN u8 channel ); -void ChkFwCmdIoDone( IN PADAPTER Adapter); +void ChkFwCmdIoDone( IN struct adapter *Adapter); // // BB/MAC/RF other monitor API // -void PHY_SetMonitorMode8192C(IN PADAPTER pAdapter, +void PHY_SetMonitorMode8192C(IN struct adapter *pAdapter, IN BOOLEAN bEnableMonitorMode ); -BOOLEAN PHY_CheckIsLegalRfPath8192C(IN PADAPTER pAdapter, +BOOLEAN PHY_CheckIsLegalRfPath8192C(IN struct adapter *pAdapter, IN u32 eRFPath ); -VOID rtl8192c_PHY_SetRFPathSwitch(IN PADAPTER pAdapter, IN BOOLEAN bMain); +VOID rtl8192c_PHY_SetRFPathSwitch(IN struct adapter *pAdapter, IN BOOLEAN bMain); // // Modify the value of the hw register when beacon interval be changed. // void -rtl8192c_PHY_SetBeaconHwReg( IN PADAPTER Adapter, +rtl8192c_PHY_SetBeaconHwReg( IN struct adapter * Adapter, IN u16 BeaconInterval ); extern VOID PHY_SwitchEphyParameter( - IN PADAPTER Adapter + IN struct adapter * Adapter ); extern VOID PHY_EnableHostClkReq( - IN PADAPTER Adapter + IN struct adapter * Adapter ); BOOLEAN SetAntennaConfig92C( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u8 DefaultAnt ); #ifdef RTL8192C_RECONFIG_TO_1T1R -extern void PHY_Reconfig_To_1T1R(_adapter *padapter); +extern void PHY_Reconfig_To_1T1R(struct adapter *padapter); #endif /*--------------------------Exported Function prototype---------------------*/ diff --git a/include/Hal8192DPhyCfg.h b/include/Hal8192DPhyCfg.h index f2e55df..60f7ec0 100755 --- a/include/Hal8192DPhyCfg.h +++ b/include/Hal8192DPhyCfg.h @@ -299,22 +299,22 @@ typedef struct _R_ANTENNA_SELECT_CCK{ // // BB and RF register read/write // -void rtl8192d_PHY_SetBBReg1Byte( IN PADAPTER Adapter, +void rtl8192d_PHY_SetBBReg1Byte( IN struct adapter *Adapter, IN u32 RegAddr, IN u32 BitMask, IN u32 Data ); -u32 rtl8192d_PHY_QueryBBReg( IN PADAPTER Adapter, +u32 rtl8192d_PHY_QueryBBReg( IN struct adapter *Adapter, IN u32 RegAddr, IN u32 BitMask ); -void rtl8192d_PHY_SetBBReg( IN PADAPTER Adapter, +void rtl8192d_PHY_SetBBReg( IN struct adapter *Adapter, IN u32 RegAddr, IN u32 BitMask, IN u32 Data ); -u32 rtl8192d_PHY_QueryRFReg( IN PADAPTER Adapter, +u32 rtl8192d_PHY_QueryRFReg( IN struct adapter * Adapter, IN RF_RADIO_PATH_E eRFPath, IN u32 RegAddr, IN u32 BitMask ); -void rtl8192d_PHY_SetRFReg( IN PADAPTER Adapter, +void rtl8192d_PHY_SetRFReg( IN struct adapter * Adapter, IN RF_RADIO_PATH_E eRFPath, IN u32 RegAddr, IN u32 BitMask, @@ -324,62 +324,62 @@ void rtl8192d_PHY_SetRFReg( IN PADAPTER Adapter, // Initialization related function // /* MAC/BB/RF HAL config */ -extern int PHY_MACConfig8192D( IN PADAPTER Adapter ); -extern int PHY_BBConfig8192D( IN PADAPTER Adapter ); -extern int PHY_RFConfig8192D( IN PADAPTER Adapter ); +extern int PHY_MACConfig8192D( IN struct adapter *Adapter ); +extern int PHY_BBConfig8192D( IN struct adapter *Adapter ); +extern int PHY_RFConfig8192D( IN struct adapter *Adapter ); /* RF config */ -int rtl8192d_PHY_ConfigRFWithParaFile( IN PADAPTER Adapter, +int rtl8192d_PHY_ConfigRFWithParaFile( IN struct adapter *Adapter, IN u8* pFileName, IN RF_RADIO_PATH_E eRFPath); -int rtl8192d_PHY_ConfigRFWithHeaderFile( IN PADAPTER Adapter, +int rtl8192d_PHY_ConfigRFWithHeaderFile( IN struct adapter * Adapter, IN RF_CONTENT Content, IN RF_RADIO_PATH_E eRFPath); /* BB/RF readback check for making sure init OK */ -int rtl8192d_PHY_CheckBBAndRFOK( IN PADAPTER Adapter, +int rtl8192d_PHY_CheckBBAndRFOK( IN struct adapter * Adapter, IN HW90_BLOCK_E CheckBlock, IN RF_RADIO_PATH_E eRFPath ); /* Read initi reg value for tx power setting. */ -void rtl8192d_PHY_GetHWRegOriginalValue( IN PADAPTER Adapter ); +void rtl8192d_PHY_GetHWRegOriginalValue( IN struct adapter * Adapter ); // // RF Power setting // -//extern BOOLEAN PHY_SetRFPowerState(IN PADAPTER Adapter, +//extern BOOLEAN PHY_SetRFPowerState(IN struct adapter * Adapter, // IN RT_RF_POWER_STATE eRFPowerState); // // BB TX Power R/W // -void PHY_GetTxPowerLevel8192D( IN PADAPTER Adapter, +void PHY_GetTxPowerLevel8192D( IN struct adapter * Adapter, OUT u32* powerlevel ); -void PHY_SetTxPowerLevel8192D( IN PADAPTER Adapter, +void PHY_SetTxPowerLevel8192D( IN struct adapter * Adapter, IN u8 channel ); -BOOLEAN PHY_UpdateTxPowerDbm8192D( IN PADAPTER Adapter, +BOOLEAN PHY_UpdateTxPowerDbm8192D( IN struct adapter *Adapter, IN int powerInDbm ); // VOID -PHY_ScanOperationBackup8192D(IN PADAPTER Adapter, +PHY_ScanOperationBackup8192D(IN struct adapter *Adapter, IN u8 Operation ); // // Switch bandwidth for 8192S // //void PHY_SetBWModeCallback8192C( IN PRT_TIMER pTimer ); -void PHY_SetBWMode8192D( IN PADAPTER pAdapter, +void PHY_SetBWMode8192D( IN struct adapter * pAdapter, IN HT_CHANNEL_WIDTH ChnlWidth, IN unsigned char Offset ); // // Set FW CMD IO for 8192S. // -//extern BOOLEAN HalSetIO8192C( IN PADAPTER Adapter, +//extern BOOLEAN HalSetIO8192C( IN struct adapter * Adapter, // IN IO_TYPE IOType); // // Set A2 entry to fw for 8192S // -extern void FillA2Entry8192C( IN PADAPTER Adapter, +extern void FillA2Entry8192C( IN struct adapter * Adapter, IN u8 index, IN u8* val); @@ -388,22 +388,22 @@ extern void FillA2Entry8192C( IN PADAPTER Adapter, // channel switch related funciton // //extern void PHY_SwChnlCallback8192C( IN PRT_TIMER pTimer ); -void PHY_SwChnl8192D( IN PADAPTER pAdapter, +void PHY_SwChnl8192D( IN struct adapter * pAdapter, IN u8 channel ); // Call after initialization -void PHY_SwChnlPhy8192D( IN PADAPTER pAdapter, +void PHY_SwChnlPhy8192D( IN struct adapter * pAdapter, IN u8 channel ); -extern void ChkFwCmdIoDone( IN PADAPTER Adapter); +extern void ChkFwCmdIoDone( IN struct adapter *Adapter); // // BB/MAC/RF other monitor API // -void PHY_SetMonitorMode8192D(IN PADAPTER pAdapter, +void PHY_SetMonitorMode8192D(IN struct adapter *pAdapter, IN BOOLEAN bEnableMonitorMode ); -BOOLEAN PHY_CheckIsLegalRfPath8192D(IN PADAPTER pAdapter, +BOOLEAN PHY_CheckIsLegalRfPath8192D(IN struct adapter *pAdapter, IN u32 eRFPath ); @@ -411,66 +411,66 @@ BOOLEAN PHY_CheckIsLegalRfPath8192D(IN PADAPTER pAdapter, // Modify the value of the hw register when beacon interval be changed. // void -rtl8192d_PHY_SetBeaconHwReg( IN PADAPTER Adapter, +rtl8192d_PHY_SetBeaconHwReg( IN struct adapter * Adapter, IN u16 BeaconInterval ); extern VOID PHY_SwitchEphyParameter( - IN PADAPTER Adapter + IN struct adapter * Adapter ); extern VOID PHY_EnableHostClkReq( - IN PADAPTER Adapter + IN struct adapter * Adapter ); BOOLEAN SetAntennaConfig92C( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u8 DefaultAnt ); VOID PHY_UpdateBBRFConfiguration8192D( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN BOOLEAN bisBandSwitch ); VOID PHY_ReadMacPhyMode92D( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN BOOLEAN AutoloadFail ); VOID PHY_ConfigMacPhyMode92D( - IN PADAPTER Adapter + IN struct adapter *Adapter ); VOID PHY_ConfigMacPhyModeInfo92D( - IN PADAPTER Adapter + IN struct adapter *Adapter ); VOID PHY_ConfigMacCoexist_RFPage92D( - IN PADAPTER Adapter + IN struct adapter *Adapter ); VOID rtl8192d_PHY_InitRxSetting( - IN PADAPTER Adapter + IN struct adapter *Adapter ); VOID -rtl8192d_PHY_SetRFPathSwitch(IN PADAPTER pAdapter, IN BOOLEAN bMain); +rtl8192d_PHY_SetRFPathSwitch(IN struct adapter *pAdapter, IN BOOLEAN bMain); VOID HalChangeCCKStatus8192D( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN BOOLEAN bCCKDisable ); VOID -PHY_InitPABias92D(IN PADAPTER Adapter); +PHY_InitPABias92D(IN struct adapter *Adapter); /*--------------------------Exported Function prototype---------------------*/ diff --git a/include/Hal8723APhyCfg.h b/include/Hal8723APhyCfg.h index 3ec8972..08c0b0f 100755 --- a/include/Hal8723APhyCfg.h +++ b/include/Hal8723APhyCfg.h @@ -22,9 +22,9 @@ #include /* MAC/BB/RF HAL config */ -int PHY_BBConfig8723A( IN PADAPTER Adapter ); -int PHY_RFConfig8723A( IN PADAPTER Adapter ); -s32 PHY_MACConfig8723A(PADAPTER padapter); +int PHY_BBConfig8723A( IN struct adapter *Adapter ); +int PHY_RFConfig8723A( IN struct adapter *Adapter ); +s32 PHY_MACConfig8723A(struct adapter *padapter); #endif diff --git a/include/HalPwrSeqCmd.h b/include/HalPwrSeqCmd.h index 5cf122f..6709a65 100755 --- a/include/HalPwrSeqCmd.h +++ b/include/HalPwrSeqCmd.h @@ -128,7 +128,7 @@ typedef struct _WL_PWR_CFG_ // Prototype of protected function. //================================================================================ u8 HalPwrSeqCmdParsing( - PADAPTER padapter, + struct adapter * padapter, u8 CutVersion, u8 FabVersion, u8 InterfaceType, diff --git a/include/drv_types.h b/include/drv_types.h index 11810ea..c6ba93d 100755 --- a/include/drv_types.h +++ b/include/drv_types.h @@ -43,8 +43,6 @@ enum _NIC_VERSION { }; -typedef struct _ADAPTER _adapter, ADAPTER,*PADAPTER; - #ifdef CONFIG_80211N_HT #include #endif @@ -235,10 +233,10 @@ struct registry_priv #else #define is_primary_adapter(adapter) (1) #endif -#define GET_PRIMARY_ADAPTER(padapter) (((_adapter *)padapter)->dvobj->if1) +#define GET_PRIMARY_ADAPTER(padapter) (((struct adapter *)padapter)->dvobj->if1) -#define GET_IFACE_NUMS(padapter) (((_adapter *)padapter)->dvobj->iface_nums) -#define GET_ADAPTER(padapter, iface_id) (((_adapter *)padapter)->dvobj->padapters[iface_id]) +#define GET_IFACE_NUMS(padapter) (((struct adapter *)padapter)->dvobj->iface_nums) +#define GET_ADAPTER(padapter, iface_id) (((struct adapter *)padapter)->dvobj->padapters[iface_id]) enum _IFACE_ID { IFACE_ID0, //maping to PRIMARY_ADAPTER @@ -250,8 +248,8 @@ enum _IFACE_ID { struct dvobj_priv { - _adapter *if1; //PRIMARY_ADAPTER - _adapter *if2; //SECONDARY_ADAPTER + struct adapter *if1; //PRIMARY_ADAPTER + struct adapter *if2; //SECONDARY_ADAPTER s32 processing_dev_remove; @@ -266,7 +264,7 @@ struct dvobj_priv unsigned char oper_ch_offset;//PRIME_CHNL_OFFSET u32 on_oper_ch_time; - _adapter *padapters[IFACE_ID_MAX]; + struct adapter *padapters[IFACE_ID_MAX]; u8 iface_nums; // total number of ifaces used runtime //For 92D, DMDP have 2 interface. @@ -400,9 +398,9 @@ struct proxim { bool proxim_on; void *proximity_priv; - int (*proxim_rx)(_adapter *padapter, + int (*proxim_rx)(struct adapter *padapter, union recv_frame *precv_frame); - u8 (*proxim_get_var)(_adapter* padapter, u8 type); + u8 (*proxim_get_var)(struct adapter* padapter, u8 type); }; #endif //CONFIG_INTEL_PROXIM @@ -423,7 +421,7 @@ typedef struct loopbackdata }LOOPBACKDATA, *PLOOPBACKDATA; #endif -struct _ADAPTER{ +struct adapter { int DriverState;// for disable driver using module, use dongle to replace module. int pid[3];//process id from UI, 0:wps, 1:hostapd, 2:dhcpcd int bDongle;//build-in module or external dongle @@ -506,8 +504,8 @@ struct _ADAPTER{ _thread_hdl_ xmitThread; _thread_hdl_ recvThread; - void (*intf_start)(_adapter * adapter); - void (*intf_stop)(_adapter * adapter); + void (*intf_start)(struct adapter * adapter); + void (*intf_stop)(struct adapter * adapter); _nic_hdl pnetdev; @@ -548,7 +546,7 @@ struct _ADAPTER{ u8 bDisableAutosuspend; #endif - _adapter *pbuddy_adapter; + struct adapter *pbuddy_adapter; #if defined(CONFIG_CONCURRENT_MODE) || defined(CONFIG_DUALMAC_CONCURRENT) u8 isprimary; //is primary adapter or not @@ -604,7 +602,7 @@ struct _ADAPTER{ #define adapter_to_dvobj(adapter) (adapter->dvobj) #define adapter_to_pwrctl(adapter) (&(adapter->dvobj->pwrctl_priv)) -int rtw_handle_dualmac(_adapter *adapter, bool init); +int rtw_handle_dualmac(struct adapter *adapter, bool init); __inline static u8 *myid(struct eeprom_priv *peepriv) { diff --git a/include/gspi_hal.h b/include/gspi_hal.h index 672269f..bb57fef 100755 --- a/include/gspi_hal.h +++ b/include/gspi_hal.h @@ -20,9 +20,9 @@ #ifndef __GSPI_HAL_H__ #define __GSPI_HAL_H__ -void spi_int_dpc(PADAPTER padapter); +void spi_int_dpc(struct adapter *padapter); -void rtl8188es_set_hal_ops(PADAPTER padapter); +void rtl8188es_set_hal_ops(struct adapter *padapter); #define hal_set_hal_ops rtl8188es_set_hal_ops #endif //__GSPI_HAL_H__ diff --git a/include/gspi_ops.h b/include/gspi_ops.h index 03f4333..2b739ef 100755 --- a/include/gspi_ops.h +++ b/include/gspi_ops.h @@ -146,19 +146,19 @@ struct spi_more_data { unsigned long len; }; -void rtl8188es_set_hal_ops(PADAPTER padapter); +void rtl8188es_set_hal_ops(struct adapter *padapter); #define set_hal_ops rtl8188es_set_hal_ops -extern void spi_set_chip_endian(PADAPTER padapter); +extern void spi_set_chip_endian(struct adapter *padapter); extern void spi_set_intf_ops(struct _io_ops *pops); -extern void spi_set_chip_endian(PADAPTER padapter); -extern void InitInterrupt8723ASdio(PADAPTER padapter); -extern void InitSysInterrupt8723ASdio(PADAPTER padapter); -extern void EnableInterrupt8723ASdio(PADAPTER padapter); -extern void DisableInterrupt8723ASdio(PADAPTER padapter); -extern void spi_int_hdl(PADAPTER padapter); -extern u8 HalQueryTxBufferStatus8723ASdio(PADAPTER padapter); -extern void InitInterrupt8188ESdio(PADAPTER padapter); -extern void EnableInterrupt8188ESdio(PADAPTER padapter); -extern void DisableInterrupt8188ESdio(PADAPTER padapter); +extern void spi_set_chip_endian(struct adapter *padapter); +extern void InitInterrupt8723ASdio(struct adapter *padapter); +extern void InitSysInterrupt8723ASdio(struct adapter *padapter); +extern void EnableInterrupt8723ASdio(struct adapter *padapter); +extern void DisableInterrupt8723ASdio(struct adapter *padapter); +extern void spi_int_hdl(struct adapter *padapter); +extern u8 HalQueryTxBufferStatus8723ASdio(struct adapter *padapter); +extern void InitInterrupt8188ESdio(struct adapter *padapter); +extern void EnableInterrupt8188ESdio(struct adapter *padapter); +extern void DisableInterrupt8188ESdio(struct adapter *padapter); #endif //__GSPI_OPS_H__ diff --git a/include/gspi_osintf.h b/include/gspi_osintf.h index f00da10..b7946c4 100755 --- a/include/gspi_osintf.h +++ b/include/gspi_osintf.h @@ -26,9 +26,9 @@ #include #ifdef PLATFORM_OS_CE -extern NDIS_STATUS ce_sd_get_dev_hdl(PADAPTER padapter); -SD_API_STATUS ce_sd_int_callback(SD_DEVICE_HANDLE hDevice, PADAPTER padapter); -extern void sd_setup_irs(PADAPTER padapter); +extern NDIS_STATUS ce_sd_get_dev_hdl(struct adapter *padapter); +SD_API_STATUS ce_sd_int_callback(SD_DEVICE_HANDLE hDevice, struct adapter *padapter); +extern void sd_setup_irs(struct adapter *padapter); #endif #endif diff --git a/include/h2clbk.h b/include/h2clbk.h index 6034a02..17d6022 100755 --- a/include/h2clbk.h +++ b/include/h2clbk.h @@ -26,11 +26,11 @@ #include -void _lbk_cmd(PADAPTER Adapter); +void _lbk_cmd(struct adapter *Adapter); -void _lbk_rsp(PADAPTER Adapter); +void _lbk_rsp(struct adapter *Adapter); -void _lbk_evt(IN PADAPTER Adapter); +void _lbk_evt(IN struct adapter *Adapter); void h2c_event_callback(unsigned char *dev, unsigned char *pbuf); diff --git a/include/hal_com.h b/include/hal_com.h index e154278..ca131b7 100755 --- a/include/hal_com.h +++ b/include/hal_com.h @@ -153,7 +153,7 @@ void dump_chip_info(HAL_VERSION ChipVersion); u8 //return the final channel plan decision hal_com_get_channel_plan( - IN PADAPTER padapter, + IN struct adapter *padapter, IN u8 hw_channel_plan, //channel plan from HW (efuse/eeprom) IN u8 sw_channel_plan, //channel plan from SW (registry/module param) IN u8 def_channel_plan, //channel plan used when the former two is invalid @@ -163,23 +163,23 @@ hal_com_get_channel_plan( u8 MRateToHwRate(u8 rate); void HalSetBrateCfg( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN u8 *mBratesOS, OUT u16 *pBrateCfg); BOOLEAN Hal_MappingOutPipe( - IN PADAPTER pAdapter, + IN struct adapter *pAdapter, IN u8 NumOutPipe ); -void hal_init_macaddr(_adapter *adapter); +void hal_init_macaddr(struct adapter *adapter); -void c2h_evt_clear(_adapter *adapter); -s32 c2h_evt_read(_adapter *adapter, u8 *buf); +void c2h_evt_clear(struct adapter *adapter); +s32 c2h_evt_read(struct adapter *adapter, u8 *buf); -u8 SetHalDefVar(_adapter *adapter, HAL_DEF_VARIABLE variable, void *value); -u8 GetHalDefVar(_adapter *adapter, HAL_DEF_VARIABLE variable, void *value); +u8 SetHalDefVar(struct adapter *adapter, HAL_DEF_VARIABLE variable, void *value); +u8 GetHalDefVar(struct adapter *adapter, HAL_DEF_VARIABLE variable, void *value); #endif //__HAL_COMMON_H__ diff --git a/include/hal_intf.h b/include/hal_intf.h index 2048321..9aa6470 100755 --- a/include/hal_intf.h +++ b/include/hal_intf.h @@ -163,117 +163,117 @@ typedef enum _HAL_INTF_PS_FUNC{ typedef s32 (*c2h_id_filter)(u8 id); struct hal_ops { - u32 (*hal_power_on)(_adapter *padapter); - void (*hal_power_off)(_adapter *padapter); - u32 (*hal_init)(_adapter *padapter); - u32 (*hal_deinit)(_adapter *padapter); + u32 (*hal_power_on)(struct adapter *padapter); + void (*hal_power_off)(struct adapter *padapter); + u32 (*hal_init)(struct adapter *padapter); + u32 (*hal_deinit)(struct adapter *padapter); - void (*free_hal_data)(_adapter *padapter); + void (*free_hal_data)(struct adapter *padapter); - u32 (*inirp_init)(_adapter *padapter); - u32 (*inirp_deinit)(_adapter *padapter); + u32 (*inirp_init)(struct adapter *padapter); + u32 (*inirp_deinit)(struct adapter *padapter); - s32 (*init_xmit_priv)(_adapter *padapter); - void (*free_xmit_priv)(_adapter *padapter); + s32 (*init_xmit_priv)(struct adapter *padapter); + void (*free_xmit_priv)(struct adapter *padapter); - s32 (*init_recv_priv)(_adapter *padapter); - void (*free_recv_priv)(_adapter *padapter); + s32 (*init_recv_priv)(struct adapter *padapter); + void (*free_recv_priv)(struct adapter *padapter); - void (*InitSwLeds)(_adapter *padapter); - void (*DeInitSwLeds)(_adapter *padapter); + void (*InitSwLeds)(struct adapter *padapter); + void (*DeInitSwLeds)(struct adapter *padapter); - void (*dm_init)(_adapter *padapter); - void (*dm_deinit)(_adapter *padapter); - void (*read_chip_version)(_adapter *padapter); + void (*dm_init)(struct adapter *padapter); + void (*dm_deinit)(struct adapter *padapter); + void (*read_chip_version)(struct adapter *padapter); - void (*init_default_value)(_adapter *padapter); + void (*init_default_value)(struct adapter *padapter); - void (*intf_chip_configure)(_adapter *padapter); + void (*intf_chip_configure)(struct adapter *padapter); - void (*read_adapter_info)(_adapter *padapter); + void (*read_adapter_info)(struct adapter *padapter); - void (*enable_interrupt)(_adapter *padapter); - void (*disable_interrupt)(_adapter *padapter); - s32 (*interrupt_handler)(_adapter *padapter); + void (*enable_interrupt)(struct adapter *padapter); + void (*disable_interrupt)(struct adapter *padapter); + s32 (*interrupt_handler)(struct adapter *padapter); #ifdef CONFIG_WOWLAN - void (*clear_interrupt)(_adapter *padapter); + void (*clear_interrupt)(struct adapter *padapter); #endif - void (*set_bwmode_handler)(_adapter *padapter, HT_CHANNEL_WIDTH Bandwidth, u8 Offset); - void (*set_channel_handler)(_adapter *padapter, u8 channel); + void (*set_bwmode_handler)(struct adapter *padapter, HT_CHANNEL_WIDTH Bandwidth, u8 Offset); + void (*set_channel_handler)(struct adapter *padapter, u8 channel); - void (*hal_dm_watchdog)(_adapter *padapter); + void (*hal_dm_watchdog)(struct adapter *padapter); - void (*SetHwRegHandler)(_adapter *padapter, u8 variable,u8* val); - void (*GetHwRegHandler)(_adapter *padapter, u8 variable,u8* val); + void (*SetHwRegHandler)(struct adapter *padapter, u8 variable,u8* val); + void (*GetHwRegHandler)(struct adapter *padapter, u8 variable,u8* val); - u8 (*GetHalDefVarHandler)(_adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue); - u8 (*SetHalDefVarHandler)(_adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue); + u8 (*GetHalDefVarHandler)(struct adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue); + u8 (*SetHalDefVarHandler)(struct adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue); - void (*GetHalODMVarHandler)(_adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1,BOOLEAN bSet); - void (*SetHalODMVarHandler)(_adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1,BOOLEAN bSet); + void (*GetHalODMVarHandler)(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1,BOOLEAN bSet); + void (*SetHalODMVarHandler)(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1,BOOLEAN bSet); - void (*UpdateRAMaskHandler)(_adapter *padapter, u32 mac_id, u8 rssi_level); - void (*SetBeaconRelatedRegistersHandler)(_adapter *padapter); + void (*UpdateRAMaskHandler)(struct adapter *padapter, u32 mac_id, u8 rssi_level); + void (*SetBeaconRelatedRegistersHandler)(struct adapter *padapter); - void (*Add_RateATid)(_adapter *padapter, u32 bitmap, u8 arg, u8 rssi_level); + void (*Add_RateATid)(struct adapter *padapter, u32 bitmap, u8 arg, u8 rssi_level); - void (*run_thread)(_adapter *padapter); - void (*cancel_thread)(_adapter *padapter); + void (*run_thread)(struct adapter *padapter); + void (*cancel_thread)(struct adapter *padapter); #ifdef CONFIG_ANTENNA_DIVERSITY - u8 (*AntDivBeforeLinkHandler)(_adapter *padapter); - void (*AntDivCompareHandler)(_adapter *padapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src); + u8 (*AntDivBeforeLinkHandler)(struct adapter *padapter); + void (*AntDivCompareHandler)(struct adapter *padapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src); #endif - u8 (*interface_ps_func)(_adapter *padapter,HAL_INTF_PS_FUNC efunc_id, u8* val); + u8 (*interface_ps_func)(struct adapter *padapter,HAL_INTF_PS_FUNC efunc_id, u8* val); - s32 (*hal_xmit)(_adapter *padapter, struct xmit_frame *pxmitframe); - s32 (*mgnt_xmit)(_adapter *padapter, struct xmit_frame *pmgntframe); - s32 (*hal_xmitframe_enqueue)(_adapter *padapter, struct xmit_frame *pxmitframe); + s32 (*hal_xmit)(struct adapter *padapter, struct xmit_frame *pxmitframe); + s32 (*mgnt_xmit)(struct adapter *padapter, struct xmit_frame *pmgntframe); + s32 (*hal_xmitframe_enqueue)(struct adapter *padapter, struct xmit_frame *pxmitframe); - u32 (*read_bbreg)(_adapter *padapter, u32 RegAddr, u32 BitMask); - void (*write_bbreg)(_adapter *padapter, u32 RegAddr, u32 BitMask, u32 Data); - u32 (*read_rfreg)(_adapter *padapter, u32 eRFPath, u32 RegAddr, u32 BitMask); - void (*write_rfreg)(_adapter *padapter, u32 eRFPath, u32 RegAddr, u32 BitMask, u32 Data); + u32 (*read_bbreg)(struct adapter *padapter, u32 RegAddr, u32 BitMask); + void (*write_bbreg)(struct adapter *padapter, u32 RegAddr, u32 BitMask, u32 Data); + u32 (*read_rfreg)(struct adapter *padapter, u32 eRFPath, u32 RegAddr, u32 BitMask); + void (*write_rfreg)(struct adapter *padapter, u32 eRFPath, u32 RegAddr, u32 BitMask, u32 Data); #ifdef CONFIG_HOSTAPD_MLME - s32 (*hostap_mgnt_xmit_entry)(_adapter *padapter, _pkt *pkt); + s32 (*hostap_mgnt_xmit_entry)(struct adapter *padapter, _pkt *pkt); #endif - void (*EfusePowerSwitch)(_adapter *padapter, u8 bWrite, u8 PwrState); - void (*ReadEFuse)(_adapter *padapter, u8 efuseType, u16 _offset, u16 _size_byte, u8 *pbuf, BOOLEAN bPseudoTest); - void (*EFUSEGetEfuseDefinition)(_adapter *padapter, u8 efuseType, u8 type, void *pOut, BOOLEAN bPseudoTest); - u16 (*EfuseGetCurrentSize)(_adapter *padapter, u8 efuseType, BOOLEAN bPseudoTest); - int (*Efuse_PgPacketRead)(_adapter *padapter, u8 offset, u8 *data, BOOLEAN bPseudoTest); - int (*Efuse_PgPacketWrite)(_adapter *padapter, u8 offset, u8 word_en, u8 *data, BOOLEAN bPseudoTest); - u8 (*Efuse_WordEnableDataWrite)(_adapter *padapter, u16 efuse_addr, u8 word_en, u8 *data, BOOLEAN bPseudoTest); - BOOLEAN (*Efuse_PgPacketWrite_BT)(_adapter *padapter, u8 offset, u8 word_en, u8 *data, BOOLEAN bPseudoTest); + void (*EfusePowerSwitch)(struct adapter *padapter, u8 bWrite, u8 PwrState); + void (*ReadEFuse)(struct adapter *padapter, u8 efuseType, u16 _offset, u16 _size_byte, u8 *pbuf, BOOLEAN bPseudoTest); + void (*EFUSEGetEfuseDefinition)(struct adapter *padapter, u8 efuseType, u8 type, void *pOut, BOOLEAN bPseudoTest); + u16 (*EfuseGetCurrentSize)(struct adapter *padapter, u8 efuseType, BOOLEAN bPseudoTest); + int (*Efuse_PgPacketRead)(struct adapter *padapter, u8 offset, u8 *data, BOOLEAN bPseudoTest); + int (*Efuse_PgPacketWrite)(struct adapter *padapter, u8 offset, u8 word_en, u8 *data, BOOLEAN bPseudoTest); + u8 (*Efuse_WordEnableDataWrite)(struct adapter *padapter, u16 efuse_addr, u8 word_en, u8 *data, BOOLEAN bPseudoTest); + BOOLEAN (*Efuse_PgPacketWrite_BT)(struct adapter *padapter, u8 offset, u8 word_en, u8 *data, BOOLEAN bPseudoTest); #ifdef DBG_CONFIG_ERROR_DETECT - void (*sreset_init_value)(_adapter *padapter); - void (*sreset_reset_value)(_adapter *padapter); - void (*silentreset)(_adapter *padapter); - void (*sreset_xmit_status_check)(_adapter *padapter); - void (*sreset_linked_status_check) (_adapter *padapter); - u8 (*sreset_get_wifi_status)(_adapter *padapter); - bool (*sreset_inprogress)(_adapter *padapter); + void (*sreset_init_value)(struct adapter *padapter); + void (*sreset_reset_value)(struct adapter *padapter); + void (*silentreset)(struct adapter *padapter); + void (*sreset_xmit_status_check)(struct adapter *padapter); + void (*sreset_linked_status_check) (struct adapter *padapter); + u8 (*sreset_get_wifi_status)(struct adapter *padapter); + bool (*sreset_inprogress)(struct adapter *padapter); #endif #ifdef CONFIG_IOL - int (*IOL_exec_cmds_sync)(_adapter *padapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt); + int (*IOL_exec_cmds_sync)(struct adapter *padapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt); #endif #ifdef CONFIG_XMIT_THREAD_MODE - s32 (*xmit_thread_handler)(_adapter *padapter); + s32 (*xmit_thread_handler)(struct adapter *padapter); #endif - void (*hal_notch_filter)(_adapter * adapter, bool enable); - void (*hal_reset_security_engine)(_adapter * adapter); - s32 (*c2h_handler)(_adapter *padapter, struct c2h_evt_hdr *c2h_evt); + void (*hal_notch_filter)(struct adapter * adapter, bool enable); + void (*hal_reset_security_engine)(struct adapter * adapter); + s32 (*c2h_handler)(struct adapter *padapter, struct c2h_evt_hdr *c2h_evt); c2h_id_filter c2h_id_filter_ccx; #if defined(CONFIG_CHECK_BT_HANG) && defined(CONFIG_BT_COEXIST) - void (*hal_init_checkbthang_workqueue)(_adapter * padapter); - void (*hal_free_checkbthang_workqueue)(_adapter * padapter); - void (*hal_cancel_checkbthang_workqueue)(_adapter * padapter); - void (*hal_checke_bt_hang)(_adapter * padapter); + void (*hal_init_checkbthang_workqueue)(struct adapter * padapter); + void (*hal_free_checkbthang_workqueue)(struct adapter * padapter); + void (*hal_cancel_checkbthang_workqueue)(struct adapter * padapter); + void (*hal_checke_bt_hang)(struct adapter * padapter); #endif }; @@ -317,34 +317,34 @@ typedef enum _HARDWARE_TYPE{ // // RTL8192C Series // -#define IS_HARDWARE_TYPE_8192CE(_Adapter) (((PADAPTER)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8192CE) -#define IS_HARDWARE_TYPE_8192CU(_Adapter) (((PADAPTER)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8192CU) +#define IS_HARDWARE_TYPE_8192CE(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8192CE) +#define IS_HARDWARE_TYPE_8192CU(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8192CU) #define IS_HARDWARE_TYPE_8192C(_Adapter) \ (IS_HARDWARE_TYPE_8192CE(_Adapter) || IS_HARDWARE_TYPE_8192CU(_Adapter)) // // RTL8192D Series // -#define IS_HARDWARE_TYPE_8192DE(_Adapter) (((PADAPTER)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8192DE) -#define IS_HARDWARE_TYPE_8192DU(_Adapter) (((PADAPTER)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8192DU) +#define IS_HARDWARE_TYPE_8192DE(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8192DE) +#define IS_HARDWARE_TYPE_8192DU(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8192DU) #define IS_HARDWARE_TYPE_8192D(_Adapter) \ (IS_HARDWARE_TYPE_8192DE(_Adapter) || IS_HARDWARE_TYPE_8192DU(_Adapter)) // // RTL8723A Series // -#define IS_HARDWARE_TYPE_8723AE(_Adapter) (((PADAPTER)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8723AE) -#define IS_HARDWARE_TYPE_8723AU(_Adapter) (((PADAPTER)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8723AU) -#define IS_HARDWARE_TYPE_8723AS(_Adapter) (((PADAPTER)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8723AS) +#define IS_HARDWARE_TYPE_8723AE(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8723AE) +#define IS_HARDWARE_TYPE_8723AU(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8723AU) +#define IS_HARDWARE_TYPE_8723AS(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8723AS) #define IS_HARDWARE_TYPE_8723A(_Adapter) \ (IS_HARDWARE_TYPE_8723AE(_Adapter) || IS_HARDWARE_TYPE_8723AU(_Adapter) || IS_HARDWARE_TYPE_8723AS(_Adapter)) // // RTL8188E Series // -#define IS_HARDWARE_TYPE_8188EE(_Adapter) (((PADAPTER)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8188EE) -#define IS_HARDWARE_TYPE_8188EU(_Adapter) (((PADAPTER)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8188EU) -#define IS_HARDWARE_TYPE_8188ES(_Adapter) (((PADAPTER)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8188ES) +#define IS_HARDWARE_TYPE_8188EE(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8188EE) +#define IS_HARDWARE_TYPE_8188EU(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8188EU) +#define IS_HARDWARE_TYPE_8188ES(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8188ES) #define IS_HARDWARE_TYPE_8188E(_Adapter) \ (IS_HARDWARE_TYPE_8188EE(_Adapter) || IS_HARDWARE_TYPE_8188EU(_Adapter) || IS_HARDWARE_TYPE_8188ES(_Adapter)) @@ -386,102 +386,102 @@ struct wowlan_ioctl_param{ #define Rx_PatternPkt 0x23 #endif // CONFIG_WOWLAN -void rtw_hal_def_value_init(_adapter *padapter); +void rtw_hal_def_value_init(struct adapter *padapter); -void rtw_hal_free_data(_adapter *padapter); +void rtw_hal_free_data(struct adapter *padapter); -void rtw_hal_dm_init(_adapter *padapter); -void rtw_hal_dm_deinit(_adapter *padapter); -void rtw_hal_sw_led_init(_adapter *padapter); -void rtw_hal_sw_led_deinit(_adapter *padapter); +void rtw_hal_dm_init(struct adapter *padapter); +void rtw_hal_dm_deinit(struct adapter *padapter); +void rtw_hal_sw_led_init(struct adapter *padapter); +void rtw_hal_sw_led_deinit(struct adapter *padapter); -u32 rtw_hal_power_on(_adapter *padapter); -void rtw_hal_power_off(_adapter *padapter); -uint rtw_hal_init(_adapter *padapter); -uint rtw_hal_deinit(_adapter *padapter); -void rtw_hal_stop(_adapter *padapter); -void rtw_hal_set_hwreg(PADAPTER padapter, u8 variable, u8 *val); -void rtw_hal_get_hwreg(PADAPTER padapter, u8 variable, u8 *val); +u32 rtw_hal_power_on(struct adapter *padapter); +void rtw_hal_power_off(struct adapter *padapter); +uint rtw_hal_init(struct adapter *padapter); +uint rtw_hal_deinit(struct adapter *padapter); +void rtw_hal_stop(struct adapter *padapter); +void rtw_hal_set_hwreg(struct adapter *padapter, u8 variable, u8 *val); +void rtw_hal_get_hwreg(struct adapter *padapter, u8 variable, u8 *val); -void rtw_hal_chip_configure(_adapter *padapter); -void rtw_hal_read_chip_info(_adapter *padapter); -void rtw_hal_read_chip_version(_adapter *padapter); +void rtw_hal_chip_configure(struct adapter *padapter); +void rtw_hal_read_chip_info(struct adapter *padapter); +void rtw_hal_read_chip_version(struct adapter *padapter); -u8 rtw_hal_set_def_var(_adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue); -u8 rtw_hal_get_def_var(_adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue); +u8 rtw_hal_set_def_var(struct adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue); +u8 rtw_hal_get_def_var(struct adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue); -void rtw_hal_set_odm_var(_adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1,BOOLEAN bSet); -void rtw_hal_get_odm_var(_adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1,BOOLEAN bSet); +void rtw_hal_set_odm_var(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1,BOOLEAN bSet); +void rtw_hal_get_odm_var(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1,BOOLEAN bSet); -void rtw_hal_enable_interrupt(_adapter *padapter); -void rtw_hal_disable_interrupt(_adapter *padapter); +void rtw_hal_enable_interrupt(struct adapter *padapter); +void rtw_hal_disable_interrupt(struct adapter *padapter); -u32 rtw_hal_inirp_init(_adapter *padapter); -u32 rtw_hal_inirp_deinit(_adapter *padapter); +u32 rtw_hal_inirp_init(struct adapter *padapter); +u32 rtw_hal_inirp_deinit(struct adapter *padapter); -u8 rtw_hal_intf_ps_func(_adapter *padapter,HAL_INTF_PS_FUNC efunc_id, u8* val); +u8 rtw_hal_intf_ps_func(struct adapter *padapter,HAL_INTF_PS_FUNC efunc_id, u8* val); -s32 rtw_hal_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe); -s32 rtw_hal_xmit(_adapter *padapter, struct xmit_frame *pxmitframe); -s32 rtw_hal_mgnt_xmit(_adapter *padapter, struct xmit_frame *pmgntframe); +s32 rtw_hal_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitframe); +s32 rtw_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe); +s32 rtw_hal_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe); -s32 rtw_hal_init_xmit_priv(_adapter *padapter); -void rtw_hal_free_xmit_priv(_adapter *padapter); +s32 rtw_hal_init_xmit_priv(struct adapter *padapter); +void rtw_hal_free_xmit_priv(struct adapter *padapter); -s32 rtw_hal_init_recv_priv(_adapter *padapter); -void rtw_hal_free_recv_priv(_adapter *padapter); +s32 rtw_hal_init_recv_priv(struct adapter *padapter); +void rtw_hal_free_recv_priv(struct adapter *padapter); void rtw_hal_update_ra_mask(struct sta_info *psta, u8 rssi_level); -void rtw_hal_add_ra_tid(_adapter *padapter, u32 bitmap, u8 arg, u8 rssi_level); +void rtw_hal_add_ra_tid(struct adapter *padapter, u32 bitmap, u8 arg, u8 rssi_level); -void rtw_hal_start_thread(_adapter *padapter); -void rtw_hal_stop_thread(_adapter *padapter); +void rtw_hal_start_thread(struct adapter *padapter); +void rtw_hal_stop_thread(struct adapter *padapter); -void rtw_hal_bcn_related_reg_setting(_adapter *padapter); +void rtw_hal_bcn_related_reg_setting(struct adapter *padapter); -u32 rtw_hal_read_bbreg(_adapter *padapter, u32 RegAddr, u32 BitMask); -void rtw_hal_write_bbreg(_adapter *padapter, u32 RegAddr, u32 BitMask, u32 Data); -u32 rtw_hal_read_rfreg(_adapter *padapter, u32 eRFPath, u32 RegAddr, u32 BitMask); -void rtw_hal_write_rfreg(_adapter *padapter, u32 eRFPath, u32 RegAddr, u32 BitMask, u32 Data); +u32 rtw_hal_read_bbreg(struct adapter *padapter, u32 RegAddr, u32 BitMask); +void rtw_hal_write_bbreg(struct adapter *padapter, u32 RegAddr, u32 BitMask, u32 Data); +u32 rtw_hal_read_rfreg(struct adapter *padapter, u32 eRFPath, u32 RegAddr, u32 BitMask); +void rtw_hal_write_rfreg(struct adapter *padapter, u32 eRFPath, u32 RegAddr, u32 BitMask, u32 Data); -s32 rtw_hal_interrupt_handler(_adapter *padapter); +s32 rtw_hal_interrupt_handler(struct adapter *padapter); -void rtw_hal_set_bwmode(_adapter *padapter, HT_CHANNEL_WIDTH Bandwidth, u8 Offset); -void rtw_hal_set_chan(_adapter *padapter, u8 channel); -void rtw_hal_dm_watchdog(_adapter *padapter); +void rtw_hal_set_bwmode(struct adapter *padapter, HT_CHANNEL_WIDTH Bandwidth, u8 Offset); +void rtw_hal_set_chan(struct adapter *padapter, u8 channel); +void rtw_hal_dm_watchdog(struct adapter *padapter); #ifdef CONFIG_ANTENNA_DIVERSITY -u8 rtw_hal_antdiv_before_linked(_adapter *padapter); -void rtw_hal_antdiv_rssi_compared(_adapter *padapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src); +u8 rtw_hal_antdiv_before_linked(struct adapter *padapter); +void rtw_hal_antdiv_rssi_compared(struct adapter *padapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src); #endif #ifdef CONFIG_HOSTAPD_MLME -s32 rtw_hal_hostap_mgnt_xmit_entry(_adapter *padapter, _pkt *pkt); +s32 rtw_hal_hostap_mgnt_xmit_entry(struct adapter *padapter, _pkt *pkt); #endif #ifdef DBG_CONFIG_ERROR_DETECT -void rtw_hal_sreset_init(_adapter *padapter); -void rtw_hal_sreset_reset(_adapter *padapter); -void rtw_hal_sreset_reset_value(_adapter *padapter); -void rtw_hal_sreset_xmit_status_check(_adapter *padapter); -void rtw_hal_sreset_linked_status_check (_adapter *padapter); -u8 rtw_hal_sreset_get_wifi_status(_adapter *padapter); -bool rtw_hal_sreset_inprogress(_adapter *padapter); +void rtw_hal_sreset_init(struct adapter *padapter); +void rtw_hal_sreset_reset(struct adapter *padapter); +void rtw_hal_sreset_reset_value(struct adapter *padapter); +void rtw_hal_sreset_xmit_status_check(struct adapter *padapter); +void rtw_hal_sreset_linked_status_check (struct adapter *padapter); +u8 rtw_hal_sreset_get_wifi_status(struct adapter *padapter); +bool rtw_hal_sreset_inprogress(struct adapter *padapter); #endif #ifdef CONFIG_IOL -int rtw_hal_iol_cmd(ADAPTER *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt); +int rtw_hal_iol_cmd(struct adapter *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt); #endif #ifdef CONFIG_XMIT_THREAD_MODE -s32 rtw_hal_xmit_thread_handler(_adapter *padapter); +s32 rtw_hal_xmit_thread_handler(struct adapter *padapter); #endif -void rtw_hal_notch_filter(_adapter * adapter, bool enable); -void rtw_hal_reset_security_engine(_adapter * adapter); +void rtw_hal_notch_filter(struct adapter * adapter, bool enable); +void rtw_hal_reset_security_engine(struct adapter * adapter); -s32 rtw_hal_c2h_handler(_adapter *adapter, struct c2h_evt_hdr *c2h_evt); -c2h_id_filter rtw_hal_c2h_id_filter_ccx(_adapter *adapter); +s32 rtw_hal_c2h_handler(struct adapter *adapter, struct c2h_evt_hdr *c2h_evt); +c2h_id_filter rtw_hal_c2h_id_filter_ccx(struct adapter *adapter); #endif //__HAL_INTF_H__ diff --git a/include/ioctl_cfg80211.h b/include/ioctl_cfg80211.h index 88647e8..ed62975 100755 --- a/include/ioctl_cfg80211.h +++ b/include/ioctl_cfg80211.h @@ -81,7 +81,7 @@ struct rtw_wdev_priv { struct wireless_dev *rtw_wdev; - _adapter *padapter; + struct adapter *padapter; struct cfg80211_scan_request *scan_request; _lock scan_req_lock; @@ -109,37 +109,37 @@ struct rtw_wdev_priv #define wdev_to_priv(w) ((struct rtw_wdev_priv *)(wdev_priv(w))) -#define wiphy_to_adapter(x) (_adapter *)(((struct rtw_wdev_priv*)wiphy_priv(x))->padapter) +#define wiphy_to_adapter(x) (struct adapter *)(((struct rtw_wdev_priv*)wiphy_priv(x))->padapter) #define wiphy_to_wdev(x) (struct wireless_dev *)(((struct rtw_wdev_priv*)wiphy_priv(x))->rtw_wdev) -int rtw_wdev_alloc(_adapter *padapter, struct device *dev); +int rtw_wdev_alloc(struct adapter *padapter, struct device *dev); void rtw_wdev_free(struct wireless_dev *wdev); void rtw_wdev_unregister(struct wireless_dev *wdev); -void rtw_cfg80211_init_wiphy(_adapter *padapter); +void rtw_cfg80211_init_wiphy(struct adapter *padapter); -void rtw_cfg80211_surveydone_event_callback(_adapter *padapter); -struct cfg80211_bss *rtw_cfg80211_inform_bss(_adapter *padapter, struct wlan_network *pnetwork); -int rtw_cfg80211_check_bss(_adapter *padapter); -void rtw_cfg80211_ibss_indicate_connect(_adapter *padapter); -void rtw_cfg80211_indicate_connect(_adapter *padapter); -void rtw_cfg80211_indicate_disconnect(_adapter *padapter); +void rtw_cfg80211_surveydone_event_callback(struct adapter *padapter); +struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wlan_network *pnetwork); +int rtw_cfg80211_check_bss(struct adapter *padapter); +void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter); +void rtw_cfg80211_indicate_connect(struct adapter *padapter); +void rtw_cfg80211_indicate_disconnect(struct adapter *padapter); void rtw_cfg80211_indicate_scan_done(struct rtw_wdev_priv *pwdev_priv, bool aborted); #ifdef CONFIG_AP_MODE -void rtw_cfg80211_indicate_sta_assoc(_adapter *padapter, u8 *pmgmt_frame, uint frame_len); -void rtw_cfg80211_indicate_sta_disassoc(_adapter *padapter, unsigned char *da, unsigned short reason); +void rtw_cfg80211_indicate_sta_assoc(struct adapter *padapter, u8 *pmgmt_frame, uint frame_len); +void rtw_cfg80211_indicate_sta_disassoc(struct adapter *padapter, unsigned char *da, unsigned short reason); #endif //CONFIG_AP_MODE -void rtw_cfg80211_issue_p2p_provision_request(_adapter *padapter, const u8 *buf, size_t len); -void rtw_cfg80211_rx_p2p_action_public(_adapter *padapter, u8 *pmgmt_frame, uint frame_len); -void rtw_cfg80211_rx_action_p2p(_adapter *padapter, u8 *pmgmt_frame, uint frame_len); -void rtw_cfg80211_rx_action(_adapter *adapter, u8 *frame, uint frame_len, const char*msg); +void rtw_cfg80211_issue_p2p_provision_request(struct adapter *padapter, const u8 *buf, size_t len); +void rtw_cfg80211_rx_p2p_action_public(struct adapter *padapter, u8 *pmgmt_frame, uint frame_len); +void rtw_cfg80211_rx_action_p2p(struct adapter *padapter, u8 *pmgmt_frame, uint frame_len); +void rtw_cfg80211_rx_action(struct adapter *adapter, u8 *frame, uint frame_len, const char*msg); int rtw_cfg80211_set_mgnt_wpsp2pie(struct net_device *net, char *buf, int len, int type); -bool rtw_cfg80211_pwr_mgmt(_adapter *adapter); +bool rtw_cfg80211_pwr_mgmt(struct adapter *adapter); #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)) && !defined(COMPAT_KERNEL_RELEASE) #define rtw_cfg80211_rx_mgmt(adapter, freq, sig_dbm, buf, len, gfp) cfg80211_rx_mgmt((adapter)->pnetdev, freq, buf, len, gfp) diff --git a/include/mlme_osdep.h b/include/mlme_osdep.h index 7ab0e51..710077b 100755 --- a/include/mlme_osdep.h +++ b/include/mlme_osdep.h @@ -28,13 +28,13 @@ extern int time_after(u32 now, u32 old); #endif -extern void rtw_init_mlme_timer(_adapter *padapter); -extern void rtw_os_indicate_disconnect( _adapter *adapter ); -extern void rtw_os_indicate_connect( _adapter *adapter ); -void rtw_os_indicate_scan_done( _adapter *padapter, bool aborted); -extern void rtw_report_sec_ie(_adapter *adapter,u8 authmode,u8 *sec_ie); +extern void rtw_init_mlme_timer(struct adapter *padapter); +extern void rtw_os_indicate_disconnect( struct adapter *adapter ); +extern void rtw_os_indicate_connect( struct adapter *adapter ); +void rtw_os_indicate_scan_done( struct adapter *padapter, bool aborted); +extern void rtw_report_sec_ie(struct adapter *adapter,u8 authmode,u8 *sec_ie); -void rtw_reset_securitypriv( _adapter *adapter ); +void rtw_reset_securitypriv( struct adapter *adapter ); #endif //_MLME_OSDEP_H_ diff --git a/include/osdep_intf.h b/include/osdep_intf.h index 6e68b4e..dfad5d5 100755 --- a/include/osdep_intf.h +++ b/include/osdep_intf.h @@ -65,25 +65,25 @@ The protection mechanism is through the pending queue. }; #ifdef CONFIG_R871X_TEST -int rtw_start_pseudo_adhoc(_adapter *padapter); -int rtw_stop_pseudo_adhoc(_adapter *padapter); +int rtw_start_pseudo_adhoc(struct adapter *padapter); +int rtw_stop_pseudo_adhoc(struct adapter *padapter); #endif -u8 rtw_init_drv_sw(_adapter *padapter); -u8 rtw_free_drv_sw(_adapter *padapter); -u8 rtw_reset_drv_sw(_adapter *padapter); +u8 rtw_init_drv_sw(struct adapter *padapter); +u8 rtw_free_drv_sw(struct adapter *padapter); +u8 rtw_reset_drv_sw(struct adapter *padapter); -u32 rtw_start_drv_threads(_adapter *padapter); -void rtw_stop_drv_threads (_adapter *padapter); +u32 rtw_start_drv_threads(struct adapter *padapter); +void rtw_stop_drv_threads (struct adapter *padapter); #ifdef CONFIG_WOWLAN -void rtw_cancel_dynamic_chk_timer(_adapter *padapter); +void rtw_cancel_dynamic_chk_timer(struct adapter *padapter); #endif -void rtw_cancel_all_timer(_adapter *padapter); +void rtw_cancel_all_timer(struct adapter *padapter); int rtw_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); int rtw_init_netdev_name(struct net_device *pnetdev, const char *ifname); -struct net_device *rtw_init_netdev(_adapter *padapter); +struct net_device *rtw_init_netdev(struct adapter *padapter); #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,35)) u16 rtw_recv_select_queue(struct sk_buff *skb); @@ -97,32 +97,32 @@ static void rtw_proc_init_one(struct net_device *dev){} static void rtw_proc_remove_one(struct net_device *dev){} #endif //!CONFIG_PROC_DEBUG -void rtw_ips_dev_unload(_adapter *padapter); +void rtw_ips_dev_unload(struct adapter *padapter); #ifdef CONFIG_RF_GAIN_OFFSET -void rtw_bb_rf_gain_offset(_adapter *padapter); +void rtw_bb_rf_gain_offset(struct adapter *padapter); #endif //CONFIG_RF_GAIN_OFFSET #ifdef CONFIG_IPS -int rtw_ips_pwr_up(_adapter *padapter); -void rtw_ips_pwr_down(_adapter *padapter); +int rtw_ips_pwr_up(struct adapter *padapter); +void rtw_ips_pwr_down(struct adapter *padapter); #endif #ifdef CONFIG_CONCURRENT_MODE struct _io_ops; -_adapter *rtw_drv_if2_init(_adapter *primary_padapter, void (*set_intf_ops)(struct _io_ops *pops)); -void rtw_drv_if2_free(_adapter *if2); -void rtw_drv_if2_stop(_adapter *if2); +struct adapter *rtw_drv_if2_init(struct adapter *primary_padapter, void (*set_intf_ops)(struct _io_ops *pops)); +void rtw_drv_if2_free(struct adapter *if2); +void rtw_drv_if2_stop(struct adapter *if2); #endif -int rtw_drv_register_netdev(_adapter *padapter); +int rtw_drv_register_netdev(struct adapter *padapter); void rtw_ndev_destructor(_nic_hdl ndev); -int rtw_suspend_common(_adapter *padapter); -int rtw_resume_common(_adapter *padapter); +int rtw_suspend_common(struct adapter *padapter); +int rtw_resume_common(struct adapter *padapter); #ifdef CONFIG_ARP_KEEP_ALIVE -int rtw_gw_addr_query(_adapter *padapter); +int rtw_gw_addr_query(struct adapter *padapter); #endif #endif //_OSDEP_INTF_H_ diff --git a/include/pci_hal.h b/include/pci_hal.h index 2830d31..e5e3d79 100755 --- a/include/pci_hal.h +++ b/include/pci_hal.h @@ -158,7 +158,7 @@ static inline void NdisRawReadPortUlong(u32 port, u32 *pval) //*pval = readl((u8 *)RegAddr(port)); } -void rtl8188ee_set_hal_ops(_adapter * padapter); +void rtl8188ee_set_hal_ops(struct adapter * padapter); #define hal_set_hal_ops rtl8188ee_set_hal_ops #endif //__PCIE_HAL_H__ diff --git a/include/pci_ops.h b/include/pci_ops.h index 9247be6..f69d87a 100755 --- a/include/pci_ops.h +++ b/include/pci_ops.h @@ -26,13 +26,13 @@ #include -u32 rtl8188ee_init_desc_ring(_adapter * padapter); -u32 rtl8188ee_free_desc_ring(_adapter * padapter); -void rtl8188ee_reset_desc_ring(_adapter * padapter); +u32 rtl8188ee_init_desc_ring(struct adapter * padapter); +u32 rtl8188ee_free_desc_ring(struct adapter * padapter); +void rtl8188ee_reset_desc_ring(struct adapter * padapter); #ifdef CONFIG_64BIT_DMA -u8 PlatformEnable88EEDMA64(PADAPTER Adapter); +u8 PlatformEnable88EEDMA64(struct adapter *Adapter); #endif -int rtl8188ee_interrupt(PADAPTER Adapter); +int rtl8188ee_interrupt(struct adapter *Adapter); void rtl8188ee_xmit_tasklet(void *priv); void rtl8188ee_recv_tasklet(void *priv); void rtl8188ee_prepare_bcn_tasklet(void *priv); diff --git a/include/pci_osintf.h b/include/pci_osintf.h index 09715af..4e7af6d 100755 --- a/include/pci_osintf.h +++ b/include/pci_osintf.h @@ -25,8 +25,8 @@ #include -void rtw_pci_disable_aspm(_adapter *padapter); -void rtw_pci_enable_aspm(_adapter *padapter); +void rtw_pci_disable_aspm(struct adapter *padapter); +void rtw_pci_enable_aspm(struct adapter *padapter); #endif diff --git a/include/recv_osdep.h b/include/recv_osdep.h index 536ed31..4d4e98c 100755 --- a/include/recv_osdep.h +++ b/include/recv_osdep.h @@ -25,31 +25,31 @@ #include -extern sint _rtw_init_recv_priv(struct recv_priv *precvpriv, _adapter *padapter); +extern sint _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter); extern void _rtw_free_recv_priv (struct recv_priv *precvpriv); extern s32 rtw_recv_entry(union recv_frame *precv_frame); -extern int rtw_recv_indicatepkt(_adapter *adapter, union recv_frame *precv_frame); +extern int rtw_recv_indicatepkt(struct adapter *adapter, union recv_frame *precv_frame); extern void rtw_recv_returnpacket(IN _nic_hdl cnxt, IN _pkt *preturnedpkt); -extern void rtw_hostapd_mlme_rx(_adapter *padapter, union recv_frame *precv_frame); -extern void rtw_handle_tkip_mic_err(_adapter *padapter,u8 bgroup); +extern void rtw_hostapd_mlme_rx(struct adapter *padapter, union recv_frame *precv_frame); +extern void rtw_handle_tkip_mic_err(struct adapter *padapter,u8 bgroup); -int rtw_init_recv_priv(struct recv_priv *precvpriv, _adapter *padapter); +int rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter); void rtw_free_recv_priv (struct recv_priv *precvpriv); -int rtw_os_recv_resource_init(struct recv_priv *precvpriv, _adapter *padapter); -int rtw_os_recv_resource_alloc(_adapter *padapter, union recv_frame *precvframe); +int rtw_os_recv_resource_init(struct recv_priv *precvpriv, struct adapter *padapter); +int rtw_os_recv_resource_alloc(struct adapter *padapter, union recv_frame *precvframe); void rtw_os_recv_resource_free(struct recv_priv *precvpriv); -int rtw_os_recvbuf_resource_alloc(_adapter *padapter, struct recv_buf *precvbuf); -int rtw_os_recvbuf_resource_free(_adapter *padapter, struct recv_buf *precvbuf); +int rtw_os_recvbuf_resource_alloc(struct adapter *padapter, struct recv_buf *precvbuf); +int rtw_os_recvbuf_resource_free(struct adapter *padapter, struct recv_buf *precvbuf); -void rtw_os_read_port(_adapter *padapter, struct recv_buf *precvbuf); +void rtw_os_read_port(struct adapter *padapter, struct recv_buf *precvbuf); void rtw_init_recv_timer(struct recv_reorder_ctrl *preorder_ctrl); diff --git a/include/rtl8188e_cmd.h b/include/rtl8188e_cmd.h index 9899f67..a254844 100755 --- a/include/rtl8188e_cmd.h +++ b/include/rtl8188e_cmd.h @@ -153,24 +153,24 @@ struct P2P_PS_CTWPeriod_t { // host message to firmware cmd -void rtl8188e_set_FwPwrMode_cmd(PADAPTER padapter, u8 Mode); -void rtl8188e_set_FwJoinBssReport_cmd(PADAPTER padapter, u8 mstatus); -u8 rtl8188e_set_rssi_cmd(PADAPTER padapter, u8 *param); -u8 rtl8188e_set_raid_cmd(PADAPTER padapter, u32 mask); -void rtl8188e_Add_RateATid(PADAPTER padapter, u32 bitmap, u8 arg, u8 rssi_level); -//u8 rtl8192c_set_FwSelectSuspend_cmd(PADAPTER padapter, u8 bfwpoll, u16 period); +void rtl8188e_set_FwPwrMode_cmd(struct adapter *padapter, u8 Mode); +void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *padapter, u8 mstatus); +u8 rtl8188e_set_rssi_cmd(struct adapter *padapter, u8 *param); +u8 rtl8188e_set_raid_cmd(struct adapter *padapter, u32 mask); +void rtl8188e_Add_RateATid(struct adapter *padapter, u32 bitmap, u8 arg, u8 rssi_level); +//u8 rtl8192c_set_FwSelectSuspend_cmd(struct adapter *padapter, u8 bfwpoll, u16 period); #ifdef CONFIG_P2P -void rtl8188e_set_p2p_ps_offload_cmd(PADAPTER padapter, u8 p2p_ps_state); +void rtl8188e_set_p2p_ps_offload_cmd(struct adapter *padapter, u8 p2p_ps_state); #endif //CONFIG_P2P -void CheckFwRsvdPageContent(PADAPTER padapter); -void rtl8188e_set_FwMediaStatus_cmd(PADAPTER padapter, u16 mstatus_rpt ); +void CheckFwRsvdPageContent(struct adapter *padapter); +void rtl8188e_set_FwMediaStatus_cmd(struct adapter *padapter, u16 mstatus_rpt ); #ifdef CONFIG_TSF_RESET_OFFLOAD -//u8 rtl8188e_reset_tsf(_adapter *padapter, u8 reset_port); -int reset_tsf(PADAPTER Adapter, u8 reset_port ); +//u8 rtl8188e_reset_tsf(struct adapter *padapter, u8 reset_port); +int reset_tsf(struct adapter *Adapter, u8 reset_port ); #endif // CONFIG_TSF_RESET_OFFLOAD #define H2C_8188E_RSVDPAGE_LOC_LEN 5 @@ -236,8 +236,8 @@ typedef struct _SETAOAC_GLOBAL_INFO{ #define FW_WOW_FW_UNICAST_EN BIT(7) #define FW_ADOPT_USER BIT(1) -void rtl8188es_set_wowlan_cmd(_adapter* padapter, u8 enable); -void SetFwRelatedForWoWLAN8188ES(_adapter* padapter, u8 bHostIsGoingtoSleep); +void rtl8188es_set_wowlan_cmd(struct adapter* padapter, u8 enable); +void SetFwRelatedForWoWLAN8188ES(struct adapter* padapter, u8 bHostIsGoingtoSleep); #endif//CONFIG_WOWLAN //---------------------------------------------------------------------------------------------------------// diff --git a/include/rtl8188e_dm.h b/include/rtl8188e_dm.h index d35d27f..edc017c 100755 --- a/include/rtl8188e_dm.h +++ b/include/rtl8188e_dm.h @@ -162,18 +162,18 @@ struct dm_priv }; -void rtl8188e_init_dm_priv(IN PADAPTER Adapter); -void rtl8188e_deinit_dm_priv(IN PADAPTER Adapter); -void rtl8188e_InitHalDm(IN PADAPTER Adapter); -void rtl8188e_HalDmWatchDog(IN PADAPTER Adapter); +void rtl8188e_init_dm_priv(IN struct adapter *Adapter); +void rtl8188e_deinit_dm_priv(IN struct adapter *Adapter); +void rtl8188e_InitHalDm(IN struct adapter *Adapter); +void rtl8188e_HalDmWatchDog(IN struct adapter *Adapter); -//VOID rtl8192c_dm_CheckTXPowerTracking(IN PADAPTER Adapter); +//VOID rtl8192c_dm_CheckTXPowerTracking(IN struct adapter *Adapter); -//void rtl8192c_dm_RF_Saving(IN PADAPTER pAdapter, IN u8 bForceInNormal); +//void rtl8192c_dm_RF_Saving(IN struct adapter *pAdapter, IN u8 bForceInNormal); #ifdef CONFIG_ANTENNA_DIVERSITY -void AntDivCompare8188E(PADAPTER Adapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src); -u8 AntDivBeforeLink8188E(PADAPTER Adapter ); +void AntDivCompare8188E(struct adapter *Adapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src); +u8 AntDivBeforeLink8188E(struct adapter *Adapter ); #endif #endif diff --git a/include/rtl8188e_hal.h b/include/rtl8188e_hal.h index 1302863..a7499c3 100755 --- a/include/rtl8188e_hal.h +++ b/include/rtl8188e_hal.h @@ -650,64 +650,64 @@ typedef struct hal_data_8188e HAL_DATA_TYPE, *PHAL_DATA_TYPE; //#define RT_IS_FUNC_DISABLED(__pAdapter, __FuncBits) ( (__pAdapter)->DisabledFunctions & (__FuncBits) ) #ifdef CONFIG_PCI_HCI -void InterruptRecognized8188EE(PADAPTER Adapter, PRT_ISR_CONTENT pIsrContent); -void UpdateInterruptMask8188EE(PADAPTER Adapter, u32 AddMSR, u32 AddMSR1, u32 RemoveMSR, u32 RemoveMSR1); +void InterruptRecognized8188EE(struct adapter *Adapter, PRT_ISR_CONTENT pIsrContent); +void UpdateInterruptMask8188EE(struct adapter *Adapter, u32 AddMSR, u32 AddMSR1, u32 RemoveMSR, u32 RemoveMSR1); #endif //CONFIG_PCI_HCI // rtl8188e_hal_init.c #ifdef CONFIG_WOWLAN -s32 rtl8188e_FirmwareDownload(PADAPTER padapter, BOOLEAN bUsedWoWLANFw); +s32 rtl8188e_FirmwareDownload(struct adapter *padapter, BOOLEAN bUsedWoWLANFw); #else -s32 rtl8188e_FirmwareDownload(PADAPTER padapter); +s32 rtl8188e_FirmwareDownload(struct adapter *padapter); #endif -void _8051Reset88E(PADAPTER padapter); -void rtl8188e_InitializeFirmwareVars(PADAPTER padapter); +void _8051Reset88E(struct adapter *padapter); +void rtl8188e_InitializeFirmwareVars(struct adapter *padapter); -s32 InitLLTTable(PADAPTER padapter, u8 txpktbuf_bndy); -void Read_LLT_Tab(PADAPTER padapter); +s32 InitLLTTable(struct adapter *padapter, u8 txpktbuf_bndy); +void Read_LLT_Tab(struct adapter *padapter); // EFuse -u8 GetEEPROMSize8188E(PADAPTER padapter); -void Hal_InitPGData88E(PADAPTER padapter); -void Hal_EfuseParseIDCode88E(PADAPTER padapter, u8 *hwinfo); -void Hal_ReadTxPowerInfo88E(PADAPTER padapter,u8* hwinfo,BOOLEAN AutoLoadFail); +u8 GetEEPROMSize8188E(struct adapter *padapter); +void Hal_InitPGData88E(struct adapter *padapter); +void Hal_EfuseParseIDCode88E(struct adapter *padapter, u8 *hwinfo); +void Hal_ReadTxPowerInfo88E(struct adapter *padapter,u8* hwinfo,BOOLEAN AutoLoadFail); -void Hal_EfuseParseEEPROMVer88E(PADAPTER padapter, u8 *hwinfo, BOOLEAN AutoLoadFail); -void rtl8188e_EfuseParseChnlPlan(PADAPTER padapter, u8 *hwinfo, BOOLEAN AutoLoadFail); -void Hal_EfuseParseCustomerID88E(PADAPTER padapter, u8 *hwinfo, BOOLEAN AutoLoadFail); -void Hal_ReadAntennaDiversity88E (PADAPTER pAdapter,u8*PROMContent,BOOLEAN AutoLoadFail); -void Hal_ReadThermalMeter_88E(PADAPTER Adapter,u8* PROMContent,BOOLEAN AutoloadFail); -void Hal_EfuseParseXtal_8188E(PADAPTER pAdapter,u8* hwinfo,BOOLEAN AutoLoadFail); -void Hal_EfuseParseBoardType88E(PADAPTER pAdapter,u8* hwinfo,BOOLEAN AutoLoadFail); -void Hal_ReadPowerSavingMode88E(PADAPTER pAdapter,u8* hwinfo,BOOLEAN AutoLoadFail); +void Hal_EfuseParseEEPROMVer88E(struct adapter *padapter, u8 *hwinfo, BOOLEAN AutoLoadFail); +void rtl8188e_EfuseParseChnlPlan(struct adapter *padapter, u8 *hwinfo, BOOLEAN AutoLoadFail); +void Hal_EfuseParseCustomerID88E(struct adapter *padapter, u8 *hwinfo, BOOLEAN AutoLoadFail); +void Hal_ReadAntennaDiversity88E (struct adapter *pAdapter,u8*PROMContent,BOOLEAN AutoLoadFail); +void Hal_ReadThermalMeter_88E(struct adapter *Adapter,u8* PROMContent,BOOLEAN AutoloadFail); +void Hal_EfuseParseXtal_8188E(struct adapter *pAdapter,u8* hwinfo,BOOLEAN AutoLoadFail); +void Hal_EfuseParseBoardType88E(struct adapter *pAdapter,u8* hwinfo,BOOLEAN AutoLoadFail); +void Hal_ReadPowerSavingMode88E(struct adapter *pAdapter,u8* hwinfo,BOOLEAN AutoLoadFail); -BOOLEAN HalDetectPwrDownMode88E(PADAPTER Adapter); +BOOLEAN HalDetectPwrDownMode88E(struct adapter *Adapter); #ifdef CONFIG_WOWLAN -void Hal_DetectWoWMode(PADAPTER pAdapter); +void Hal_DetectWoWMode(struct adapter *pAdapter); #endif //CONFIG_WOWLAN #ifdef CONFIG_RF_GAIN_OFFSET -void Hal_ReadRFGainOffset(PADAPTER pAdapter,u8* hwinfo,BOOLEAN AutoLoadFail); +void Hal_ReadRFGainOffset(struct adapter *pAdapter,u8* hwinfo,BOOLEAN AutoLoadFail); #endif //CONFIG_RF_GAIN_OFFSET -//RT_CHANNEL_DOMAIN rtl8723a_HalMapChannelPlan(PADAPTER padapter, u8 HalChannelPlan); -//VERSION_8192C rtl8723a_ReadChipVersion(PADAPTER padapter); -//void rtl8723a_ReadBluetoothCoexistInfo(PADAPTER padapter, u8 *PROMContent, BOOLEAN AutoloadFail); -void Hal_InitChannelPlan(PADAPTER padapter); +//RT_CHANNEL_DOMAIN rtl8723a_HalMapChannelPlan(struct adapter *padapter, u8 HalChannelPlan); +//VERSION_8192C rtl8723a_ReadChipVersion(struct adapter *padapter); +//void rtl8723a_ReadBluetoothCoexistInfo(struct adapter *padapter, u8 *PROMContent, BOOLEAN AutoloadFail); +void Hal_InitChannelPlan(struct adapter *padapter); void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc); // register -void SetBcnCtrlReg(PADAPTER padapter, u8 SetBits, u8 ClearBits); +void SetBcnCtrlReg(struct adapter *padapter, u8 SetBits, u8 ClearBits); -void rtl8188e_start_thread(_adapter *padapter); -void rtl8188e_stop_thread(_adapter *padapter); +void rtl8188e_start_thread(struct adapter *padapter); +void rtl8188e_stop_thread(struct adapter *padapter); -void rtw_IOL_cmd_tx_pkt_buf_dump(ADAPTER *Adapter,int data_len); +void rtw_IOL_cmd_tx_pkt_buf_dump(struct adapter *Adapter,int data_len); #ifdef CONFIG_IOL_EFUSE_PATCH -s32 rtl8188e_iol_efuse_patch(PADAPTER padapter); +s32 rtl8188e_iol_efuse_patch(struct adapter *padapter); #endif//CONFIG_IOL_EFUSE_PATCH #endif //__RTL8188E_HAL_H__ diff --git a/include/rtl8188e_led.h b/include/rtl8188e_led.h index 2bafb83..ada0446 100755 --- a/include/rtl8188e_led.h +++ b/include/rtl8188e_led.h @@ -29,17 +29,17 @@ // Interface to manipulate LED objects. //================================================================================ #ifdef CONFIG_USB_HCI -void rtl8188eu_InitSwLeds(PADAPTER padapter); -void rtl8188eu_DeInitSwLeds(PADAPTER padapter); +void rtl8188eu_InitSwLeds(struct adapter *padapter); +void rtl8188eu_DeInitSwLeds(struct adapter *padapter); #endif #ifdef CONFIG_PCI_HCI -void rtl8188ee_gen_RefreshLedState(PADAPTER Adapter); -void rtl8188ee_InitSwLeds(PADAPTER padapter); -void rtl8188ee_DeInitSwLeds(PADAPTER padapter); +void rtl8188ee_gen_RefreshLedState(struct adapter *Adapter); +void rtl8188ee_InitSwLeds(struct adapter *padapter); +void rtl8188ee_DeInitSwLeds(struct adapter *padapter); #endif #ifdef CONFIG_SDIO_HCI -void rtl8188es_InitSwLeds(PADAPTER padapter); -void rtl8188es_DeInitSwLeds(PADAPTER padapter); +void rtl8188es_InitSwLeds(struct adapter *padapter); +void rtl8188es_DeInitSwLeds(struct adapter *padapter); #endif #endif diff --git a/include/rtl8188e_recv.h b/include/rtl8188e_recv.h index 2c190d0..bb923e4 100755 --- a/include/rtl8188e_recv.h +++ b/include/rtl8188e_recv.h @@ -117,28 +117,28 @@ typedef struct rxreport_8188e #ifdef CONFIG_SDIO_HCI -s32 rtl8188es_init_recv_priv(PADAPTER padapter); -void rtl8188es_free_recv_priv(PADAPTER padapter); -void rtl8188es_recv_hdl(PADAPTER padapter, struct recv_buf *precvbuf); +s32 rtl8188es_init_recv_priv(struct adapter *padapter); +void rtl8188es_free_recv_priv(struct adapter *padapter); +void rtl8188es_recv_hdl(struct adapter *padapter, struct recv_buf *precvbuf); #endif #ifdef CONFIG_USB_HCI #define INTERRUPT_MSG_FORMAT_LEN 60 -void rtl8188eu_init_recvbuf(_adapter *padapter, struct recv_buf *precvbuf); -s32 rtl8188eu_init_recv_priv(PADAPTER padapter); -void rtl8188eu_free_recv_priv(PADAPTER padapter); -void rtl8188eu_recv_hdl(PADAPTER padapter, struct recv_buf *precvbuf); +void rtl8188eu_init_recvbuf(struct adapter *padapter, struct recv_buf *precvbuf); +s32 rtl8188eu_init_recv_priv(struct adapter *padapter); +void rtl8188eu_free_recv_priv(struct adapter *padapter); +void rtl8188eu_recv_hdl(struct adapter *padapter, struct recv_buf *precvbuf); void rtl8188eu_recv_tasklet(void *priv); #endif #ifdef CONFIG_PCI_HCI -s32 rtl8188ee_init_recv_priv(PADAPTER padapter); -void rtl8188ee_free_recv_priv(PADAPTER padapter); +s32 rtl8188ee_init_recv_priv(struct adapter *padapter); +void rtl8188ee_free_recv_priv(struct adapter *padapter); #endif void rtl8188e_query_rx_phy_status(union recv_frame *prframe, struct phy_stat *pphy_stat); -void rtl8188e_process_phy_info(PADAPTER padapter, void *prframe); +void rtl8188e_process_phy_info(struct adapter *padapter, void *prframe); void update_recvframe_phyinfo_88e(union recv_frame *precvframe,struct phy_stat *pphy_status); void update_recvframe_attrib_88e( union recv_frame *precvframe, struct recv_stat *prxstat); diff --git a/include/rtl8188e_rf.h b/include/rtl8188e_rf.h index bafa6ad..67f43b5 100755 --- a/include/rtl8188e_rf.h +++ b/include/rtl8188e_rf.h @@ -25,17 +25,17 @@ #define RF6052_MAX_PATH 2 -int PHY_RF6052_Config8188E( IN PADAPTER Adapter ); -void rtl8188e_RF_ChangeTxPath( IN PADAPTER Adapter, +int PHY_RF6052_Config8188E( IN struct adapter * Adapter ); +void rtl8188e_RF_ChangeTxPath( IN struct adapter *Adapter, IN u16 DataRate); void rtl8188e_PHY_RF6052SetBandwidth( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN HT_CHANNEL_WIDTH Bandwidth); VOID rtl8188e_PHY_RF6052SetCckTxPower( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u8* pPowerlevel); VOID rtl8188e_PHY_RF6052SetOFDMTxPower( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u8* pPowerLevelOFDM, IN u8* pPowerLevelBW20, IN u8* pPowerLevelBW40, diff --git a/include/rtl8188e_sreset.h b/include/rtl8188e_sreset.h index 67ae34c..453ff46 100755 --- a/include/rtl8188e_sreset.h +++ b/include/rtl8188e_sreset.h @@ -26,8 +26,8 @@ #include #ifdef DBG_CONFIG_ERROR_DETECT -extern void rtl8188e_sreset_xmit_status_check(_adapter *padapter); -extern void rtl8188e_sreset_linked_status_check(_adapter *padapter); +extern void rtl8188e_sreset_xmit_status_check(struct adapter *padapter); +extern void rtl8188e_sreset_linked_status_check(struct adapter *padapter); #endif #endif diff --git a/include/rtl8188e_xmit.h b/include/rtl8188e_xmit.h index 842afc1..848e147 100755 --- a/include/rtl8188e_xmit.h +++ b/include/rtl8188e_xmit.h @@ -254,15 +254,15 @@ struct txrpt_ccx_88e { #define txrpt_ccx_sw_88e(txrpt_ccx) ((txrpt_ccx)->sw0 + ((txrpt_ccx)->sw1<<8)) #define txrpt_ccx_qtime_88e(txrpt_ccx) ((txrpt_ccx)->ccx_qtime0+((txrpt_ccx)->ccx_qtime1<<8)) -void rtl8188e_fill_fake_txdesc(PADAPTER padapter,u8*pDesc,u32 BufferLen,u8 IsPsPoll,u8 IsBTQosNull); +void rtl8188e_fill_fake_txdesc(struct adapter *padapter,u8*pDesc,u32 BufferLen,u8 IsPsPoll,u8 IsBTQosNull); #ifdef CONFIG_SDIO_HCI -s32 rtl8188es_init_xmit_priv(PADAPTER padapter); -void rtl8188es_free_xmit_priv(PADAPTER padapter); -s32 rtl8188es_hal_xmit(PADAPTER padapter, struct xmit_frame *pxmitframe); -s32 rtl8188es_mgnt_xmit(PADAPTER padapter, struct xmit_frame *pmgntframe); -s32 rtl8188es_hal_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe); +s32 rtl8188es_init_xmit_priv(struct adapter *padapter); +void rtl8188es_free_xmit_priv(struct adapter *padapter); +s32 rtl8188es_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe); +s32 rtl8188es_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe); +s32 rtl8188es_hal_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitframe); thread_return rtl8188es_xmit_thread(thread_context context); -s32 rtl8188es_xmit_buf_handler(PADAPTER padapter); +s32 rtl8188es_xmit_buf_handler(struct adapter *padapter); #define hal_xmit_handler rtl8188es_xmit_buf_handler #ifdef CONFIG_SDIO_TX_TASKLET @@ -271,24 +271,24 @@ void rtl8188es_xmit_tasklet(void *priv); #endif #ifdef CONFIG_USB_HCI -s32 rtl8188eu_init_xmit_priv(PADAPTER padapter); -void rtl8188eu_free_xmit_priv(PADAPTER padapter); -s32 rtl8188eu_hal_xmit(PADAPTER padapter, struct xmit_frame *pxmitframe); -s32 rtl8188eu_mgnt_xmit(PADAPTER padapter, struct xmit_frame *pmgntframe); -s32 rtl8188eu_hal_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe); -s32 rtl8188eu_xmit_buf_handler(PADAPTER padapter); +s32 rtl8188eu_init_xmit_priv(struct adapter *padapter); +void rtl8188eu_free_xmit_priv(struct adapter *padapter); +s32 rtl8188eu_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe); +s32 rtl8188eu_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe); +s32 rtl8188eu_hal_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitframe); +s32 rtl8188eu_xmit_buf_handler(struct adapter *padapter); #define hal_xmit_handler rtl8188eu_xmit_buf_handler void rtl8188eu_xmit_tasklet(void *priv); -s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf); +s32 rtl8188eu_xmitframe_complete(struct adapter *padapter, struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf); #endif #ifdef CONFIG_PCI_HCI -s32 rtl8188ee_init_xmit_priv(PADAPTER padapter); -void rtl8188ee_free_xmit_priv(PADAPTER padapter); +s32 rtl8188ee_init_xmit_priv(struct adapter *padapter); +void rtl8188ee_free_xmit_priv(struct adapter *padapter); struct xmit_buf *rtl8188ee_dequeue_xmitbuf(struct rtw_tx_ring *ring); -void rtl8188ee_xmitframe_resume(_adapter *padapter); -s32 rtl8188ee_hal_xmit(PADAPTER padapter, struct xmit_frame *pxmitframe); -s32 rtl8188ee_mgnt_xmit(PADAPTER padapter, struct xmit_frame *pmgntframe); +void rtl8188ee_xmitframe_resume(struct adapter *padapter); +s32 rtl8188ee_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe); +s32 rtl8188ee_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe); void rtl8188ee_xmit_tasklet(void *priv); #endif @@ -300,12 +300,12 @@ void UpdateEarlyModeInfo8188E(struct xmit_priv *pxmitpriv,struct xmit_buf *pxmit #ifdef CONFIG_XMIT_ACK void dump_txrpt_ccx_88e(void *buf); -void handle_txrpt_ccx_88e(_adapter *adapter, u8 *buf); +void handle_txrpt_ccx_88e(struct adapter *adapter, u8 *buf); #else #define dump_txrpt_ccx_88e(buf) do {} while(0) #define handle_txrpt_ccx_88e(adapter, buf) do {} while(0) #endif //CONFIG_XMIT_ACK -void _dbg_dump_tx_info(_adapter *padapter,int frame_tag,struct tx_desc *ptxdesc); +void _dbg_dump_tx_info(struct adapter *padapter,int frame_tag,struct tx_desc *ptxdesc); #endif //__RTL8188E_XMIT_H__ diff --git a/include/rtl8192c_cmd.h b/include/rtl8192c_cmd.h index de1be78..72174c0 100755 --- a/include/rtl8192c_cmd.h +++ b/include/rtl8192c_cmd.h @@ -86,30 +86,30 @@ struct P2P_PS_CTWPeriod_t { }; // host message to firmware cmd -void rtl8192c_set_FwPwrMode_cmd(_adapter*padapter, u8 Mode); -void rtl8192c_set_FwJoinBssReport_cmd(_adapter* padapter, u8 mstatus); -u8 rtl8192c_set_rssi_cmd(_adapter*padapter, u8 *param); -u8 rtl8192c_set_raid_cmd(_adapter*padapter, u32 mask, u8 arg); -void rtl8192c_Add_RateATid(PADAPTER pAdapter, u32 bitmap, u8 arg, u8 rssi_level); -u8 rtl8192c_set_FwSelectSuspend_cmd(_adapter*padapter,u8 bfwpoll, u16 period); +void rtl8192c_set_FwPwrMode_cmd(struct adapter*padapter, u8 Mode); +void rtl8192c_set_FwJoinBssReport_cmd(struct adapter* padapter, u8 mstatus); +u8 rtl8192c_set_rssi_cmd(struct adapter*padapter, u8 *param); +u8 rtl8192c_set_raid_cmd(struct adapter*padapter, u32 mask, u8 arg); +void rtl8192c_Add_RateATid(struct adapter *pAdapter, u32 bitmap, u8 arg, u8 rssi_level); +u8 rtl8192c_set_FwSelectSuspend_cmd(struct adapter*padapter,u8 bfwpoll, u16 period); #ifdef CONFIG_P2P -void rtl8192c_set_p2p_ps_offload_cmd(_adapter* padapter, u8 p2p_ps_state); +void rtl8192c_set_p2p_ps_offload_cmd(struct adapter* padapter, u8 p2p_ps_state); #endif //CONFIG_P2P #ifdef CONFIG_IOL typedef struct _IO_OFFLOAD_LOC{ u8 LocCmd; }IO_OFFLOAD_LOC, *PIO_OFFLOAD_LOC; -int rtl8192c_IOL_exec_cmds_sync(ADAPTER *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt); +int rtl8192c_IOL_exec_cmds_sync(struct adapter *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt); #endif //CONFIG_IOL #ifdef CONFIG_BEACON_DISABLE_OFFLOAD -u8 rtl8192c_dis_beacon_fun_cmd(_adapter* padapter); +u8 rtl8192c_dis_beacon_fun_cmd(struct adapter* padapter); #endif // CONFIG_BEACON_DISABLE_OFFLOAD #ifdef CONFIG_TSF_RESET_OFFLOAD -u8 rtl8192c_reset_tsf(_adapter *padapter, u8 reset_port); +u8 rtl8192c_reset_tsf(struct adapter *padapter, u8 reset_port); #endif // CONFIG_TSF_RESET_OFFLOAD #endif // __RTL8192C_CMD_H_ diff --git a/include/rtl8192c_dm.h b/include/rtl8192c_dm.h index b017fb2..aad3393 100755 --- a/include/rtl8192c_dm.h +++ b/include/rtl8192c_dm.h @@ -249,15 +249,15 @@ struct dm_priv // function prototype //============================================================ #ifdef CONFIG_BT_COEXIST -void rtl8192c_set_dm_bt_coexist(_adapter *padapter, u8 bStart); -void rtl8192c_issue_delete_ba(_adapter *padapter, u8 dir); +void rtl8192c_set_dm_bt_coexist(struct adapter *padapter, u8 bStart); +void rtl8192c_issue_delete_ba(struct adapter *padapter, u8 dir); #endif -void rtl8192c_init_dm_priv(IN PADAPTER Adapter); -void rtl8192c_deinit_dm_priv(IN PADAPTER Adapter); +void rtl8192c_init_dm_priv(IN struct adapter *Adapter); +void rtl8192c_deinit_dm_priv(IN struct adapter *Adapter); -void rtl8192c_InitHalDm( IN PADAPTER Adapter); -void rtl8192c_HalDmWatchDog(IN PADAPTER Adapter); +void rtl8192c_InitHalDm( IN struct adapter *Adapter); +void rtl8192c_HalDmWatchDog(IN struct adapter *Adapter); #endif //__HAL8190PCIDM_H__ diff --git a/include/rtl8192c_hal.h b/include/rtl8192c_hal.h index 2d54a19..0b0e348 100755 --- a/include/rtl8192c_hal.h +++ b/include/rtl8192c_hal.h @@ -629,8 +629,8 @@ typedef struct hal_data_8192ce HAL_DATA_TYPE, *PHAL_DATA_TYPE; #define RT_IS_FUNC_DISABLED(__pAdapter, __FuncBits) ( (__pAdapter)->DisabledFunctions & (__FuncBits) ) #define IS_MULTI_FUNC_CHIP(_Adapter) (((((PHAL_DATA_TYPE)(_Adapter->HalData))->MultiFunc) & (RT_MULTI_FUNC_BT|RT_MULTI_FUNC_GPS)) ? _TRUE : _FALSE) -void InterruptRecognized8192CE(PADAPTER Adapter, PRT_ISR_CONTENT pIsrContent); -VOID UpdateInterruptMask8192CE(PADAPTER Adapter, u32 AddMSR, u32 AddMSR1, u32 RemoveMSR, u32 RemoveMSR1); +void InterruptRecognized8192CE(struct adapter *Adapter, PRT_ISR_CONTENT pIsrContent); +VOID UpdateInterruptMask8192CE(struct adapter *Adapter, u32 AddMSR, u32 AddMSR1, u32 RemoveMSR, u32 RemoveMSR1); #endif #ifdef CONFIG_USB_HCI @@ -832,16 +832,16 @@ typedef struct hal_data_8192cu HAL_DATA_TYPE, *PHAL_DATA_TYPE; #define INCLUDE_MULTI_FUNC_BT(_Adapter) (GET_HAL_DATA(_Adapter)->MultiFunc & RT_MULTI_FUNC_BT) #define INCLUDE_MULTI_FUNC_GPS(_Adapter) (GET_HAL_DATA(_Adapter)->MultiFunc & RT_MULTI_FUNC_GPS) -VOID rtl8192c_FirmwareSelfReset(IN PADAPTER Adapter); -int FirmwareDownload92C(IN PADAPTER Adapter); -VOID InitializeFirmwareVars92C(PADAPTER Adapter); -u8 GetEEPROMSize8192C(PADAPTER Adapter); -void rtl8192c_EfuseParseChnlPlan(PADAPTER padapter, u8 *hwinfo, BOOLEAN AutoLoadFail); +VOID rtl8192c_FirmwareSelfReset(IN struct adapter *Adapter); +int FirmwareDownload92C(IN struct adapter *Adapter); +VOID InitializeFirmwareVars92C(struct adapter *Adapter); +u8 GetEEPROMSize8192C(struct adapter *Adapter); +void rtl8192c_EfuseParseChnlPlan(struct adapter *padapter, u8 *hwinfo, BOOLEAN AutoLoadFail); -HAL_VERSION rtl8192c_ReadChipVersion(IN PADAPTER Adapter); -void rtl8192c_ReadBluetoothCoexistInfo(PADAPTER Adapter, u8 *PROMContent, BOOLEAN AutoloadFail); -//void rtl8192c_free_hal_data(_adapter * padapter); -VOID rtl8192c_EfuseParseIDCode(PADAPTER pAdapter, u8 *hwinfo); +HAL_VERSION rtl8192c_ReadChipVersion(IN struct adapter *Adapter); +void rtl8192c_ReadBluetoothCoexistInfo(struct adapter *Adapter, u8 *PROMContent, BOOLEAN AutoloadFail); +//void rtl8192c_free_hal_data(struct adapter * padapter); +VOID rtl8192c_EfuseParseIDCode(struct adapter *pAdapter, u8 *hwinfo); void rtl8192c_set_hal_ops(struct hal_ops *pHalFunc); s32 c2h_id_filter_ccx_8192c(u8 id); diff --git a/include/rtl8192c_led.h b/include/rtl8192c_led.h index df2a999..0cdc87d 100755 --- a/include/rtl8192c_led.h +++ b/include/rtl8192c_led.h @@ -29,13 +29,13 @@ // Interface to manipulate LED objects. //================================================================================ #ifdef CONFIG_USB_HCI -void rtl8192cu_InitSwLeds(_adapter *padapter); -void rtl8192cu_DeInitSwLeds(_adapter *padapter); +void rtl8192cu_InitSwLeds(struct adapter *padapter); +void rtl8192cu_DeInitSwLeds(struct adapter *padapter); #endif #ifdef CONFIG_PCI_HCI -void rtl8192ce_gen_RefreshLedState(PADAPTER Adapter); -void rtl8192ce_InitSwLeds(_adapter *padapter); -void rtl8192ce_DeInitSwLeds(_adapter *padapter); +void rtl8192ce_gen_RefreshLedState(struct adapter *Adapter); +void rtl8192ce_InitSwLeds(struct adapter *padapter); +void rtl8192ce_DeInitSwLeds(struct adapter *padapter); #endif #endif diff --git a/include/rtl8192c_recv.h b/include/rtl8192c_recv.h index 0a237dc..55651d6 100755 --- a/include/rtl8192c_recv.h +++ b/include/rtl8192c_recv.h @@ -130,14 +130,14 @@ typedef struct _INTERRUPT_MSG_FORMAT_EX{ unsigned int MSG_EX; }INTERRUPT_MSG_FORMAT_EX,*PINTERRUPT_MSG_FORMAT_EX; -void rtl8192cu_init_recvbuf(_adapter *padapter, struct recv_buf *precvbuf); -int rtl8192cu_init_recv_priv(_adapter * padapter); -void rtl8192cu_free_recv_priv(_adapter * padapter); +void rtl8192cu_init_recvbuf(struct adapter *padapter, struct recv_buf *precvbuf); +int rtl8192cu_init_recv_priv(struct adapter * padapter); +void rtl8192cu_free_recv_priv(struct adapter * padapter); #endif #ifdef CONFIG_PCI_HCI -int rtl8192ce_init_recv_priv(_adapter * padapter); -void rtl8192ce_free_recv_priv(_adapter * padapter); +int rtl8192ce_init_recv_priv(struct adapter * padapter); +void rtl8192ce_free_recv_priv(struct adapter * padapter); #endif void rtl8192c_translate_rx_signal_stuff(union recv_frame *precvframe, struct phy_stat *pphy_status); diff --git a/include/rtl8192c_rf.h b/include/rtl8192c_rf.h index 2d6bd8c..213a1b4 100755 --- a/include/rtl8192c_rf.h +++ b/include/rtl8192c_rf.h @@ -71,19 +71,19 @@ // // RF RL6052 Series API // -void rtl8192c_RF_ChangeTxPath( IN PADAPTER Adapter, +void rtl8192c_RF_ChangeTxPath( IN struct adapter *Adapter, IN u16 DataRate); void rtl8192c_PHY_RF6052SetBandwidth( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN HT_CHANNEL_WIDTH Bandwidth); VOID rtl8192c_PHY_RF6052SetCckTxPower( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u8* pPowerlevel); VOID rtl8192c_PHY_RF6052SetOFDMTxPower( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u8* pPowerLevel, IN u8 Channel); -int PHY_RF6052_Config8192C( IN PADAPTER Adapter ); +int PHY_RF6052_Config8192C( IN struct adapter * Adapter ); /*--------------------------Exported Function prototype---------------------*/ diff --git a/include/rtl8192c_sreset.h b/include/rtl8192c_sreset.h index 93c3628..3859707 100755 --- a/include/rtl8192c_sreset.h +++ b/include/rtl8192c_sreset.h @@ -26,8 +26,8 @@ #include #ifdef DBG_CONFIG_ERROR_DETECT -extern void rtl8192c_sreset_xmit_status_check(_adapter *padapter); -extern void rtl8192c_sreset_linked_status_check(_adapter *padapter); +extern void rtl8192c_sreset_xmit_status_check(struct adapter *padapter); +extern void rtl8192c_sreset_linked_status_check(struct adapter *padapter); #endif #endif diff --git a/include/rtl8192c_xmit.h b/include/rtl8192c_xmit.h index 332856c..fc49f52 100755 --- a/include/rtl8192c_xmit.h +++ b/include/rtl8192c_xmit.h @@ -112,7 +112,7 @@ struct txrpt_ccx_8192c { #ifdef CONFIG_XMIT_ACK void dump_txrpt_ccx_8192c(void *buf); -void handle_txrpt_ccx_8192c(_adapter *adapter, void *buf); +void handle_txrpt_ccx_8192c(struct adapter *adapter, void *buf); #else #define dump_txrpt_ccx_8192c(buf) do {} while(0) #define handle_txrpt_ccx_8192c(adapter, buf) do {} while(0) @@ -124,39 +124,39 @@ void handle_txrpt_ccx_8192c(_adapter *adapter, void *buf); #define MAX_TX_AGG_PACKET_NUMBER 0xFF #endif -s32 rtl8192cu_init_xmit_priv(_adapter * padapter); +s32 rtl8192cu_init_xmit_priv(struct adapter * padapter); -void rtl8192cu_free_xmit_priv(_adapter * padapter); +void rtl8192cu_free_xmit_priv(struct adapter * padapter); void rtl8192cu_cal_txdesc_chksum(struct tx_desc *ptxdesc); -s32 rtl8192cu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf); +s32 rtl8192cu_xmitframe_complete(struct adapter *padapter, struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf); -s32 rtl8192cu_mgnt_xmit(_adapter *padapter, struct xmit_frame *pmgntframe); +s32 rtl8192cu_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe); -s32 rtl8192cu_hal_xmit(_adapter *padapter, struct xmit_frame *pxmitframe); +s32 rtl8192cu_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe); #ifdef CONFIG_HOSTAPD_MLME -s32 rtl8192cu_hostap_mgnt_xmit_entry(_adapter *padapter, _pkt *pkt); +s32 rtl8192cu_hostap_mgnt_xmit_entry(struct adapter *padapter, _pkt *pkt); #endif #endif #ifdef CONFIG_PCI_HCI -s32 rtl8192ce_init_xmit_priv(_adapter * padapter); -void rtl8192ce_free_xmit_priv(_adapter * padapter); +s32 rtl8192ce_init_xmit_priv(struct adapter * padapter); +void rtl8192ce_free_xmit_priv(struct adapter * padapter); s32 rtl8192ce_enqueue_xmitbuf(struct rtw_tx_ring *ring, struct xmit_buf *pxmitbuf); struct xmit_buf *rtl8192ce_dequeue_xmitbuf(struct rtw_tx_ring *ring); -void rtl8192ce_xmitframe_resume(_adapter *padapter); +void rtl8192ce_xmitframe_resume(struct adapter *padapter); -s32 rtl8192ce_mgnt_xmit(_adapter *padapter, struct xmit_frame *pmgntframe); +s32 rtl8192ce_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe); -s32 rtl8192ce_hal_xmit(_adapter *padapter, struct xmit_frame *pxmitframe); +s32 rtl8192ce_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe); #ifdef CONFIG_HOSTAPD_MLME -s32 rtl8192ce_hostap_mgnt_xmit_entry(_adapter *padapter, _pkt *pkt); +s32 rtl8192ce_hostap_mgnt_xmit_entry(struct adapter *padapter, _pkt *pkt); #endif #endif diff --git a/include/rtl8192d_cmd.h b/include/rtl8192d_cmd.h index ef571f1..eb16654 100755 --- a/include/rtl8192d_cmd.h +++ b/include/rtl8192d_cmd.h @@ -86,16 +86,16 @@ struct cmd_msg_parm { }; -void FillH2CCmd92D(_adapter* padapter, u8 ElementID, u32 CmdLen, u8* pCmdBuffer); +void FillH2CCmd92D(struct adapter* padapter, u8 ElementID, u32 CmdLen, u8* pCmdBuffer); // host message to firmware cmd -void rtl8192d_set_FwPwrMode_cmd(_adapter*padapter, u8 Mode); -void rtl8192d_set_FwJoinBssReport_cmd(_adapter* padapter, u8 mstatus); -u8 rtl8192d_set_rssi_cmd(_adapter*padapter, u8 *param); -u8 rtl8192d_set_raid_cmd(_adapter*padapter, u32 mask, u8 arg); -void rtl8192d_Add_RateATid(PADAPTER pAdapter, u32 bitmap, u8 arg, u8 rssi_level); +void rtl8192d_set_FwPwrMode_cmd(struct adapter*padapter, u8 Mode); +void rtl8192d_set_FwJoinBssReport_cmd(struct adapter* padapter, u8 mstatus); +u8 rtl8192d_set_rssi_cmd(struct adapter*padapter, u8 *param); +u8 rtl8192d_set_raid_cmd(struct adapter*padapter, u32 mask, u8 arg); +void rtl8192d_Add_RateATid(struct adapter *pAdapter, u32 bitmap, u8 arg, u8 rssi_level); #ifdef CONFIG_P2P -void rtl8192d_set_p2p_ps_offload_cmd(_adapter* padapter, u8 p2p_ps_state); +void rtl8192d_set_p2p_ps_offload_cmd(struct adapter* padapter, u8 p2p_ps_state); #endif //CONFIG_P2P #endif diff --git a/include/rtl8192d_dm.h b/include/rtl8192d_dm.h index b7b91b6..9a0d6d7 100755 --- a/include/rtl8192d_dm.h +++ b/include/rtl8192d_dm.h @@ -173,11 +173,11 @@ struct dm_priv //============================================================ // function prototype //============================================================ -void rtl8192d_init_dm_priv(IN PADAPTER Adapter); -void rtl8192d_deinit_dm_priv(IN PADAPTER Adapter); +void rtl8192d_init_dm_priv(IN struct adapter *Adapter); +void rtl8192d_deinit_dm_priv(IN struct adapter *Adapter); -void rtl8192d_InitHalDm(IN PADAPTER Adapter); -void rtl8192d_HalDmWatchDog(IN PADAPTER Adapter); +void rtl8192d_InitHalDm(IN struct adapter *Adapter); +void rtl8192d_HalDmWatchDog(IN struct adapter *Adapter); #endif //__HAL8190PCIDM_H__ diff --git a/include/rtl8192d_hal.h b/include/rtl8192d_hal.h index 97083f0..e85a5da 100755 --- a/include/rtl8192d_hal.h +++ b/include/rtl8192d_hal.h @@ -622,8 +622,8 @@ typedef struct hal_data_8192de HAL_DATA_TYPE, *PHAL_DATA_TYPE; #define RT_ENABLE_FUNC(__pAdapter, __FuncBits) ((__pAdapter)->DisabledFunctions &= (~((RT_DF_TYPE)(__FuncBits)))) #define RT_IS_FUNC_DISABLED(__pAdapter, __FuncBits) ( (__pAdapter)->DisabledFunctions & (__FuncBits) ) -void InterruptRecognized8192DE(PADAPTER Adapter, PRT_ISR_CONTENT pIsrContent); -VOID UpdateInterruptMask8192DE(PADAPTER Adapter, u32 AddMSR, u32 RemoveMSR); +void InterruptRecognized8192DE(struct adapter *Adapter, PRT_ISR_CONTENT pIsrContent); +VOID UpdateInterruptMask8192DE(struct adapter *Adapter, u32 AddMSR, u32 RemoveMSR); #endif #ifdef CONFIG_USB_HCI @@ -838,17 +838,17 @@ typedef struct hal_data_8192du HAL_DATA_TYPE, *PHAL_DATA_TYPE; #define GET_HAL_DATA(__pAdapter) ((HAL_DATA_TYPE *)((__pAdapter)->HalData)) #define GET_RF_TYPE(priv) (GET_HAL_DATA(priv)->rf_type) -int FirmwareDownload92D(IN PADAPTER Adapter); -VOID rtl8192d_FirmwareSelfReset(IN PADAPTER Adapter); -void rtl8192d_ReadChipVersion(IN PADAPTER Adapter); -VOID rtl8192d_EfuseParseChnlPlan(PADAPTER Adapter, u8 *hwinfo, BOOLEAN AutoLoadFail); -VOID rtl8192d_ReadTxPowerInfo(PADAPTER Adapter, u8* PROMContent, BOOLEAN AutoLoadFail); -VOID rtl8192d_ResetDualMacSwitchVariables(IN PADAPTER Adapter); -u8 GetEEPROMSize8192D(PADAPTER Adapter); -BOOLEAN PHY_CheckPowerOffFor8192D(PADAPTER Adapter); -VOID PHY_SetPowerOnFor8192D(PADAPTER Adapter); -//void PHY_ConfigMacPhyMode92D(PADAPTER Adapter); -void rtl8192d_free_hal_data(_adapter * padapter); +int FirmwareDownload92D(IN struct adapter *Adapter); +VOID rtl8192d_FirmwareSelfReset(IN struct adapter *Adapter); +void rtl8192d_ReadChipVersion(IN struct adapter *Adapter); +VOID rtl8192d_EfuseParseChnlPlan(struct adapter *Adapter, u8 *hwinfo, BOOLEAN AutoLoadFail); +VOID rtl8192d_ReadTxPowerInfo(struct adapter *Adapter, u8* PROMContent, BOOLEAN AutoLoadFail); +VOID rtl8192d_ResetDualMacSwitchVariables(IN struct adapter *Adapter); +u8 GetEEPROMSize8192D(struct adapter *Adapter); +BOOLEAN PHY_CheckPowerOffFor8192D(struct adapter *Adapter); +VOID PHY_SetPowerOnFor8192D(struct adapter *Adapter); +//void PHY_ConfigMacPhyMode92D(struct adapter *Adapter); +void rtl8192d_free_hal_data(struct adapter * padapter); void rtl8192d_set_hal_ops(struct hal_ops *pHalFunc); #endif diff --git a/include/rtl8192d_led.h b/include/rtl8192d_led.h index c75df2e..26e00c8 100755 --- a/include/rtl8192d_led.h +++ b/include/rtl8192d_led.h @@ -29,14 +29,14 @@ // Interface to manipulate LED objects. //================================================================================ #ifdef CONFIG_USB_HCI -void rtl8192du_InitSwLeds(_adapter *padapter); -void rtl8192du_DeInitSwLeds(_adapter *padapter); +void rtl8192du_InitSwLeds(struct adapter *padapter); +void rtl8192du_DeInitSwLeds(struct adapter *padapter); #endif #ifdef CONFIG_PCI_HCI -void rtl8192de_gen_RefreshLedState(PADAPTER Adapter); -void rtl8192de_InitSwLeds(_adapter *padapter); -void rtl8192de_DeInitSwLeds(_adapter *padapter); +void rtl8192de_gen_RefreshLedState(struct adapter *Adapter); +void rtl8192de_InitSwLeds(struct adapter *padapter); +void rtl8192de_DeInitSwLeds(struct adapter *padapter); #endif #endif diff --git a/include/rtl8192d_recv.h b/include/rtl8192d_recv.h index 5ffec39..fed709c 100755 --- a/include/rtl8192d_recv.h +++ b/include/rtl8192d_recv.h @@ -122,14 +122,14 @@ typedef struct _INTERRUPT_MSG_FORMAT_EX{ unsigned int MSG_EX; }INTERRUPT_MSG_FORMAT_EX,*PINTERRUPT_MSG_FORMAT_EX; -void rtl8192du_init_recvbuf(_adapter *padapter, struct recv_buf *precvbuf); -int rtl8192du_init_recv_priv(_adapter * padapter); -void rtl8192du_free_recv_priv(_adapter * padapter); +void rtl8192du_init_recvbuf(struct adapter *padapter, struct recv_buf *precvbuf); +int rtl8192du_init_recv_priv(struct adapter * padapter); +void rtl8192du_free_recv_priv(struct adapter * padapter); #endif #ifdef CONFIG_PCI_HCI -int rtl8192de_init_recv_priv(_adapter * padapter); -void rtl8192de_free_recv_priv(_adapter * padapter); +int rtl8192de_init_recv_priv(struct adapter * padapter); +void rtl8192de_free_recv_priv(struct adapter * padapter); #endif void rtl8192d_translate_rx_signal_stuff(union recv_frame *precvframe, struct phy_stat *pphy_status); diff --git a/include/rtl8192d_rf.h b/include/rtl8192d_rf.h index 8fc17e2..03f9d3c 100755 --- a/include/rtl8192d_rf.h +++ b/include/rtl8192d_rf.h @@ -71,23 +71,23 @@ // // RF RL6052 Series API // -void rtl8192d_RF_ChangeTxPath( IN PADAPTER Adapter, +void rtl8192d_RF_ChangeTxPath( IN struct adapter *Adapter, IN u16 DataRate); void rtl8192d_PHY_RF6052SetBandwidth( - IN PADAPTER Adapter, + IN struct adapter * Adapter, IN HT_CHANNEL_WIDTH Bandwidth); VOID rtl8192d_PHY_RF6052SetCckTxPower( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u8* pPowerlevel); VOID rtl8192d_PHY_RF6052SetOFDMTxPower( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u8* pPowerLevel, IN u8 Channel); -int PHY_RF6052_Config8192D( IN PADAPTER Adapter ); +int PHY_RF6052_Config8192D( IN struct adapter * Adapter ); -BOOLEAN rtl8192d_PHY_EnableAnotherPHY(IN PADAPTER Adapter, IN BOOLEAN bMac0); +BOOLEAN rtl8192d_PHY_EnableAnotherPHY(IN struct adapter *Adapter, IN BOOLEAN bMac0); -void rtl8192d_PHY_PowerDownAnotherPHY(IN PADAPTER Adapter, IN BOOLEAN bMac0); +void rtl8192d_PHY_PowerDownAnotherPHY(IN struct adapter *Adapter, IN BOOLEAN bMac0); /*--------------------------Exported Function prototype---------------------*/ diff --git a/include/rtl8192d_xmit.h b/include/rtl8192d_xmit.h index 54f0511..87e9260 100755 --- a/include/rtl8192d_xmit.h +++ b/include/rtl8192d_xmit.h @@ -127,7 +127,7 @@ struct txrpt_ccx_8192d { #ifdef CONFIG_XMIT_ACK void dump_txrpt_ccx_8192d(void *buf); -void handle_txrpt_ccx_8192d(_adapter *adapter, void *buf); +void handle_txrpt_ccx_8192d(struct adapter *adapter, void *buf); #else #define dump_txrpt_ccx_8192d(buf) do {} while(0) #define handle_txrpt_ccx_8192d(adapter, buf) do {} while(0) @@ -139,39 +139,39 @@ void handle_txrpt_ccx_8192d(_adapter *adapter, void *buf); #define MAX_TX_AGG_PACKET_NUMBER 0xFF #endif -s32 rtl8192du_init_xmit_priv(_adapter * padapter); +s32 rtl8192du_init_xmit_priv(struct adapter * padapter); -void rtl8192du_free_xmit_priv(_adapter * padapter); +void rtl8192du_free_xmit_priv(struct adapter * padapter); void rtl8192du_cal_txdesc_chksum(struct tx_desc *ptxdesc); -s32 rtl8192du_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf); +s32 rtl8192du_xmitframe_complete(struct adapter *padapter, struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf); -s32 rtl8192du_mgnt_xmit(_adapter *padapter, struct xmit_frame *pmgntframe); +s32 rtl8192du_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe); -s32 rtl8192du_hal_xmit(_adapter *padapter, struct xmit_frame *pxmitframe); +s32 rtl8192du_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe); #ifdef CONFIG_HOSTAPD_MLME -s32 rtl8192du_hostap_mgnt_xmit_entry(_adapter *padapter, _pkt *pkt); +s32 rtl8192du_hostap_mgnt_xmit_entry(struct adapter *padapter, _pkt *pkt); #endif #endif #ifdef CONFIG_PCI_HCI -s32 rtl8192de_init_xmit_priv(_adapter * padapter); -void rtl8192de_free_xmit_priv(_adapter * padapter); +s32 rtl8192de_init_xmit_priv(struct adapter * padapter); +void rtl8192de_free_xmit_priv(struct adapter * padapter); s32 rtl8192de_enqueue_xmitbuf(struct rtw_tx_ring *ring, struct xmit_buf *pxmitbuf); struct xmit_buf *rtl8192de_dequeue_xmitbuf(struct rtw_tx_ring *ring); -void rtl8192de_xmitframe_resume(_adapter *padapter); +void rtl8192de_xmitframe_resume(struct adapter *padapter); -s32 rtl8192de_mgnt_xmit(_adapter *padapter, struct xmit_frame *pmgntframe); +s32 rtl8192de_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe); -s32 rtl8192de_hal_xmit(_adapter *padapter, struct xmit_frame *pxmitframe); +s32 rtl8192de_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe); #ifdef CONFIG_HOSTAPD_MLME -s32 rtl8192de_hostap_mgnt_xmit_entry(_adapter *padapter, _pkt *pkt); +s32 rtl8192de_hostap_mgnt_xmit_entry(struct adapter *padapter, _pkt *pkt); #endif #endif diff --git a/include/rtl8723a_bt-coexist.h b/include/rtl8723a_bt-coexist.h deleted file mode 100755 index 78d64b8..0000000 --- a/include/rtl8723a_bt-coexist.h +++ /dev/null @@ -1,1816 +0,0 @@ -/****************************************************************************** - * - * Copyright(c) 2007 - 2012 Realtek Corporation. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA - * - * - ******************************************************************************/ -#ifndef __RTL8723A_BT_COEXIST_H__ -#define __RTL8723A_BT_COEXIST_H__ - -#include -#include "../hal/OUTSRC/odm_precomp.h" - - -#define __BT_C__ 1 -#define __BT_HANDLEPACKET_C__ 1 -#define __BT_HCI_C__ 1 -#define __HALBTC87231ANT_C__ 1 -#define __HALBTC87232ANT_C__ 1 -#define __HALBTC8723_C__ 1 -#define __HALBTCCSR1ANT_C__ 1 -#define __HALBTCCSR2ANT_C__ 1 -#define __HALBTCOEXIST_C__ 1 -#define __HALBT_C__ 1 - -#ifdef __BT_C__ // COMMON/BT.h - -// HEADER/PlatformDef.h -typedef enum _RT_MEDIA_STATUS { - RT_MEDIA_DISCONNECT = 0, - RT_MEDIA_CONNECT = 1 -} RT_MEDIA_STATUS; - -// ===== Below this line is sync from SD7 driver COMMON/BT.h ===== - -#define BT_TMP_BUF_SIZE 100 - -void BT_SignalCompensation(PADAPTER padapter, u8 *rssi_wifi, u8 *rssi_bt); -void BT_WifiScanNotify(PADAPTER padapter, u8 scanType); -void BT_WifiAssociateNotify(PADAPTER padapter, u8 action); -void BT_WifiMediaStatusNotify(PADAPTER padapter, RT_MEDIA_STATUS mstatus); -void BT_SpecialPacketNotify(PADAPTER padapter); -void BT_HaltProcess(PADAPTER padapter); -void BT_LpsLeave(PADAPTER padapter); - - -#define BT_HsConnectionEstablished(Adapter) _FALSE -// ===== End of sync from SD7 driver COMMON/BT.h ===== -#endif // __BT_C__ - -#ifdef __BT_HCI_C__ // COMMON/bt_hci.h - -// HEADER/SecurityType.h -#define TKIP_ENC_KEY_POS 32 //(KEK_LEN+KEK_LEN) -#define MAXRSNIELEN 256 - -// HEADER/QoSType.h -#if 0 -// -// BSS QOS data. -// Ref: BssDscr in 8185 code. [def. in BssDscr.h] -// -typedef struct _BSS_QOS -{ - // Part 0. Ref. 8185 QoS code (From Emily) - QOS_MODE bdQoSMode; - u8 bdWMMIEBuf[MAX_WMMELE_LENGTH]; - OCTET_STRING bdWMMIE; - - QOS_ELE_SUBTYPE EleSubType; - - // Part 2. EDCA Parameter (perAC) - u8 *pWMMInfoEle; - u8 *pWMMParamEle; - - // QBSS Load. - u8 QBssLoad[QBSS_LOAD_SIZE]; - u8 bQBssLoadValid; -} BSS_QOS, *PBSS_QOS; -#endif - -// COMMON/Protocol802_11.h -//---------------------------------------------------------------------------- -// 802.11 Management frame Status Code field -//---------------------------------------------------------------------------- -typedef struct _OCTET_STRING{ - u8 *Octet; - u16 Length; -} OCTET_STRING, *POCTET_STRING; - - -//====================================================================================== -// AES_CCMP specific -//====================================================================================== -enum -{ - AESCCMP_BLK_SIZE = 16, // # octets in an AES block - AESCCMP_MAX_PACKET = 4*512, // largest packet size - AESCCMP_N_RESERVED = 0, // reserved nonce octet value - AESCCMP_A_DATA = 0x40, // the Adata bit in the flags - AESCCMP_M_SHIFT = 3, // how much to shift the 3-bit M field - AESCCMP_L_SHIFT = 0, // how much to shift the 3-bit L field - AESCCMP_L_SIZE = 2, // size of the l(m) length field (in octets) - AESCCMP_OFFSET_SC = 22, - AESCCMP_OFFSET_DURATION = 4, - AESCCMP_OFFSET_A2 = 10, - AESCCMP_OFFSET_A4 = 24, - AESCCMP_QC_TID_MASK = 0x0f, - AESCCMP_BLK_SIZE_TOTAL = 16*16, // Added by Annie for CKIP AES MIC BSOD, 2006-08-17. - // 16*8 < 4*60 Resove to 16*16 -}; - -// -// Key Length -// -#define PMK_LEN 32 -#define PTK_LEN_TKIP 64 -#define GTK_LEN 32 -#define KEY_NONCE_LEN 32 - - -// COMMON/Dot11d.h -typedef struct _CHNL_TXPOWER_TRIPLE -{ - u8 FirstChnl; - u8 NumChnls; - s8 MaxTxPowerInDbm; -} CHNL_TXPOWER_TRIPLE, *PCHNL_TXPOWER_TRIPLE; - - -// ===== Below this line is sync from SD7 driver COMMON/bt_hci.h ===== -#define BT_THREAD 0 -#if(BT_THREAD == 1) -#define SENDTXMEHTOD 2 -#else -#define SENDTXMEHTOD 1 // 0=workitem, 1= SendDirectily, 2=thread -#endif - -//============================================= -// The following is for BT 3.0 + HS HCI COMMAND ERRORS CODES -//============================================= - -#define Max80211PALPDUSize 1492 -#define Max80211AMPASSOCLen 672 -#define MinGUserPrio 4 -#define MaxGUserPrio 7 -#define BEUserPrio0 0 -#define BEUserPrio1 3 -#define Max80211BeaconPeriod 2000 -#define ShortRangeModePowerMax 4 - -#define BT_Default_Chnl 10 -#define ACLDataHeaderLen 4 - -#define BTTotalDataBlockNum 0x100 -#define BTLocalBufNum 0x200 -#define BTMaxDataBlockLen 0x800 -#define BTTOTALBANDWIDTH 0x7530 -#define BTMAXBANDGUBANDWIDTH 0x4e20 -#define TmpLocalBufSize 0x100 -#define BTSynDataPacketLength 0xff -//============================================= - -#define BTMaxAuthCount 5 -#define BTMaxAsocCount 5 - -#define MAX_LOGICAL_LINK_NUM 2 //temporarily define -#define MAX_BT_ASOC_ENTRY_NUM 2 //temporarily define - -#define INVALID_PL_HANDLE 0xff -#define INVALID_ENTRY_NUM 0xff -//============================================= - -#define CAM_BT_START_INDEX (HALF_CAM_ENTRY - 4) // MAX_BT_ASOC_ENTRY_NUM : 4 !!! -#define BT_HWCAM_STAR CAM_BT_START_INDEX // We used HALF_CAM_ENTRY ~ HALF_CAM_ENTRY -MAX_BT_ASOC_ENTRY_NUM - -typedef enum _HCI_STATUS -{ - HCI_STATUS_SUCCESS =0x00, //Success - HCI_STATUS_UNKNOW_HCI_CMD =0x01, //Unknown HCI Command - HCI_STATUS_UNKNOW_CONNECT_ID =0X02, //Unknown Connection Identifier - HCI_STATUS_HW_FAIL =0X03, //Hardware Failure - HCI_STATUS_PAGE_TIMEOUT =0X04, //Page Timeout - HCI_STATUS_AUTH_FAIL =0X05, //Authentication Failure - HCI_STATUS_PIN_OR_KEY_MISSING =0X06, //PIN or Key Missing - HCI_STATUS_MEM_CAP_EXCEED =0X07, //Memory Capacity Exceeded - HCI_STATUS_CONNECT_TIMEOUT =0X08, //Connection Timeout - HCI_STATUS_CONNECT_LIMIT =0X09, //Connection Limit Exceeded - HCI_STATUS_SYN_CONNECT_LIMIT =0X0a, //Synchronous Connection Limit To A Device Exceeded - HCI_STATUS_ACL_CONNECT_EXISTS =0X0b, //ACL Connection Already Exists - HCI_STATUS_CMD_DISALLOW =0X0c, //Command Disallowed - HCI_STATUS_CONNECT_RJT_LIMIT_RESOURCE =0X0d, //Connection Rejected due to Limited Resources - HCI_STATUS_CONNECT_RJT_SEC_REASON =0X0e, //Connection Rejected Due To Security Reasons - HCI_STATUS_CONNECT_RJT_UNACCEPT_BD_ADDR =0X0f, //Connection Rejected due to Unacceptable BD_ADDR - HCI_STATUS_CONNECT_ACCEPT_TIMEOUT =0X10, //Connection Accept Timeout Exceeded - HCI_STATUS_UNSUPPORT_FEATURE_PARA_VALUE =0X11, //Unsupported Feature or Parameter Value - HCI_STATUS_INVALID_HCI_CMD_PARA_VALUE =0X12, //Invalid HCI Command Parameters - HCI_STATUS_REMOTE_USER_TERMINATE_CONNECT =0X13, //Remote User Terminated Connection - HCI_STATUS_REMOTE_DEV_TERMINATE_LOW_RESOURCE =0X14, //Remote Device Terminated Connection due to Low Resources - HCI_STATUS_REMOTE_DEV_TERMINATE_CONNECT_POWER_OFF =0X15, //Remote Device Terminated Connection due to Power Off - HCI_STATUS_CONNECT_TERMINATE_LOCAL_HOST =0X16, //Connection Terminated By Local Host - HCI_STATUS_REPEATE_ATTEMPT =0X17, //Repeated Attempts - HCI_STATUS_PAIR_NOT_ALLOW =0X18, //Pairing Not Allowed - HCI_STATUS_UNKNOW_LMP_PDU =0X19, //Unknown LMP PDU - HCI_STATUS_UNSUPPORT_REMOTE_LMP_FEATURE =0X1a, //Unsupported Remote Feature / Unsupported LMP Feature - HCI_STATUS_SOC_OFFSET_REJECT =0X1b, //SCO Offset Rejected - HCI_STATUS_SOC_INTERVAL_REJECT =0X1c, //SCO Interval Rejected - HCI_STATUS_SOC_AIR_MODE_REJECT =0X1d,//SCO Air Mode Rejected - HCI_STATUS_INVALID_LMP_PARA =0X1e, //Invalid LMP Parameters - HCI_STATUS_UNSPECIFIC_ERROR =0X1f, //Unspecified Error - HCI_STATUS_UNSUPPORT_LMP_PARA_VALUE =0X20, //Unsupported LMP Parameter Value - HCI_STATUS_ROLE_CHANGE_NOT_ALLOW =0X21, //Role Change Not Allowed - HCI_STATUS_LMP_RESPONSE_TIMEOUT =0X22, //LMP Response Timeout - HCI_STATUS_LMP_ERROR_TRANSACTION_COLLISION =0X23, //LMP Error Transaction Collision - HCI_STATUS_LMP_PDU_NOT_ALLOW =0X24, //LMP PDU Not Allowed - HCI_STATUS_ENCRYPTION_MODE_NOT_ALLOW =0X25, //Encryption Mode Not Acceptable - HCI_STATUS_LINK_KEY_CAN_NOT_CHANGE =0X26, //Link Key Can Not be Changed - HCI_STATUS_REQUEST_QOS_NOT_SUPPORT =0X27, //Requested QoS Not Supported - HCI_STATUS_INSTANT_PASSED =0X28, //Instant Passed - HCI_STATUS_PAIRING_UNIT_KEY_NOT_SUPPORT =0X29, //Pairing With Unit Key Not Supported - HCI_STATUS_DIFFERENT_TRANSACTION_COLLISION =0X2a, //Different Transaction Collision - HCI_STATUS_RESERVE_1 =0X2b, //Reserved - HCI_STATUS_QOS_UNACCEPT_PARA =0X2c, //QoS Unacceptable Parameter - HCI_STATUS_QOS_REJECT =0X2d, //QoS Rejected - HCI_STATUS_CHNL_CLASSIFICATION_NOT_SUPPORT =0X2e, //Channel Classification Not Supported - HCI_STATUS_INSUFFICIENT_SECURITY =0X2f, //Insufficient Security - HCI_STATUS_PARA_OUT_OF_RANGE =0x30, //Parameter Out Of Mandatory Range - HCI_STATUS_RESERVE_2 =0X31, //Reserved - HCI_STATUS_ROLE_SWITCH_PENDING =0X32, //Role Switch Pending - HCI_STATUS_RESERVE_3 =0X33, //Reserved - HCI_STATUS_RESERVE_SOLT_VIOLATION =0X34, //Reserved Slot Violation - HCI_STATUS_ROLE_SWITCH_FAIL =0X35, //Role Switch Failed - HCI_STATUS_EXTEND_INQUIRY_RSP_TOO_LARGE =0X36, //Extended Inquiry Response Too Large - HCI_STATUS_SEC_SIMPLE_PAIRING_NOT_SUPPORT =0X37, //Secure Simple Pairing Not Supported By Host. - HCI_STATUS_HOST_BUSY_PAIRING =0X38, //Host Busy - Pairing - HCI_STATUS_CONNECT_REJ_NOT_SUIT_CHNL_FOUND =0X39, //Connection Rejected due to No Suitable Channel Found - HCI_STATUS_CONTROLLER_BUSY =0X3a //CONTROLLER BUSY -} HCI_STATUS,*PHCI_STATUS; - -//============================================= -// The following is for BT 3.0 + HS HCI COMMAND -//============================================= - -//bit 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 -// | OCF | OGF | -// - -//OGF 0x01 -#define OGF_LINK_CONTROL_COMMANDS 0x01 -typedef enum _LINK_CONTROL_COMMANDS -{ - HCI_INQUIRY =0x0001, - HCI_INQUIRY_CANCEL =0x0002, - HCI_PERIODIC_INQUIRY_MODE =0x0003, - HCI_EXIT_PERIODIC_INQUIRY_MODE =0x0004, - HCI_CREATE_CONNECTION =0x0005, - HCI_DISCONNECT =0x0006, - HCI_CREATE_CONNECTION_CANCEL =0x0008, - HCI_ACCEPT_CONNECTIONREQUEST =0x0009, - HCI_REJECT_CONNECTION_REQUEST =0x000a, - HCI_LINK_KEY_REQUEST_REPLY =0x000b, - HCI_LINK_KEY_REQUEST_NEGATIVE_REPLY =0x000c, - HCI_PIN_CODE_REQUEST_REPLY =0x000d, - HCI_PIN_CODE_REQUEST_NEGATIVE_REPLY =0x000e, - HCI_CHANGE_CONNECTION_PACKET_TYPE =0x000f, - HCI_AUTHENTICATION_REQUESTED =0x0011, - HCI_SET_CONNECTION_ENCRYPTION =0x0013, - HCI_CHANGE_CONNECTION_LINK_KEY =0x0015, - HCI_MASTER_LINK_KEY =0x0017, - HCI_REMOTE_NAME_REQUEST =0x0019, - HCI_REMOTE_NAME_REQUEST_CANCEL =0x001a, - HCI_READ_REMOTE_SUPPORTED_FEATURES =0x001b, - HCI_READ_REMOTE_EXTENDED_FEATURES =0x001c, - HCI_READ_REMOTE_VERSION_INFORMATION =0x001d, - HCI_READ_CLOCK_OFFSET =0x001f, - HCI_READ_LMP_HANDLE =0x0020, - HCI_SETUP_SYNCHRONOUS_CONNECTION =0x0028, - HCI_ACCEPT_SYNCHRONOUS_CONNECTION_REQUEST =0x0029, - HCI_REJECT_SYNCHRONOUS_CONNECTION_REQUEST =0x002a, - HCI_IO_CAPABILITY_REQUEST_REPLY =0x002b, - HCI_USER_CONFIRMATION_REQUEST_REPLY =0x002c, - HCI_USER_CONFIRMATION_REQUEST_NEGATIVE_REPLY =0x002d, - HCI_USER_PASSKEY_REQUEST_REPLY =0x002e, - HCI_USER_PASSKEY_REQUESTNEGATIVE_REPLY =0x002f, - HCI_REMOTE_OOB_DATA_REQUEST_REPLY =0x0030, - HCI_REMOTE_OOB_DATA_REQUEST_NEGATIVE_REPLY =0x0033, - HCI_IO_CAPABILITY_REQUEST_NEGATIVE_REPLY =0x0034, - HCI_CREATE_PHYSICAL_LINK =0x0035, - HCI_ACCEPT_PHYSICAL_LINK =0x0036, - HCI_DISCONNECT_PHYSICAL_LINK =0x0037, - HCI_CREATE_LOGICAL_LINK =0x0038, - HCI_ACCEPT_LOGICAL_LINK =0x0039, - HCI_DISCONNECT_LOGICAL_LINK =0x003a, - HCI_LOGICAL_LINK_CANCEL =0x003b, - HCI_FLOW_SPEC_MODIFY =0x003c -} LINK_CONTROL_COMMANDS,*PLINK_CONTROL_COMMANDS; - -//OGF 0x02 -#define OGF_HOLD_MODE_COMMAND 0x02 -typedef enum _HOLD_MODE_COMMAND -{ - HCI_HOLD_MODE =0x0001, - HCI_SNIFF_MODE =0x0002, - HCI_EXIT_SNIFF_MODE =0x0003, - HCI_PARK_STATE =0x0005, - HCI_EXIT_PARK_STATE =0x0006, - HCI_QOS_SETUP =0x0007, - HCI_ROLE_DISCOVERY =0x0009, - HCI_SWITCH_ROLE =0x000b, - HCI_READ_LINK_POLICY_SETTINGS =0x000c, - HCI_WRITE_LINK_POLICY_SETTINGS =0x000d, - HCI_READ_DEFAULT_LINK_POLICY_SETTINGS =0x000e, - HCI_WRITE_DEFAULT_LINK_POLICY_SETTINGS =0x000f, - HCI_FLOW_SPECIFICATION =0x0010, - HCI_SNIFF_SUBRATING =0x0011 -} HOLD_MODE_COMMAND,*PHOLD_MODE_COMMAND; - -//OGF 0x03 -#define OGF_SET_EVENT_MASK_COMMAND 0x03 -typedef enum _SET_EVENT_MASK_COMMAND -{ - HCI_SET_EVENT_MASK =0x0001, - HCI_RESET =0x0003, - HCI_SET_EVENT_FILTER =0x0005, - HCI_FLUSH =0x0008, - HCI_READ_PIN_TYPE =0x0009, - HCI_WRITE_PIN_TYPE =0x000a, - HCI_CREATE_NEW_UNIT_KEY =0x000b, - HCI_READ_STORED_LINK_KEY =0x000d, - HCI_WRITE_STORED_LINK_KEY =0x0011, - HCI_DELETE_STORED_LINK_KEY =0x0012, - HCI_WRITE_LOCAL_NAME =0x0013, - HCI_READ_LOCAL_NAME =0x0014, - HCI_READ_CONNECTION_ACCEPT_TIMEOUT =0x0015, - HCI_WRITE_CONNECTION_ACCEPT_TIMEOUT =0x0016, - HCI_READ_PAGE_TIMEOUT =0x0017, - HCI_WRITE_PAGE_TIMEOUT =0x0018, - HCI_READ_SCAN_ENABLE =0x0019, - HCI_WRITE_SCAN_ENABLE =0x001a, - HCI_READ_PAGE_SCAN_ACTIVITY =0x001b, - HCI_WRITE_PAGE_SCAN_ACTIVITY =0x001c, - HCI_READ_INQUIRY_SCAN_ACTIVITY =0x001d, - HCI_WRITE_INQUIRY_SCAN_ACTIVITY =0x001e, - HCI_READ_AUTHENTICATION_ENABLE =0x001f, - HCI_WRITE_AUTHENTICATION_ENABLE =0x0020, - HCI_READ_CLASS_OF_DEVICE =0x0023, - HCI_WRITE_CLASS_OF_DEVICE =0x0024, - HCI_READ_VOICE_SETTING =0x0025, - HCI_WRITE_VOICE_SETTING =0x0026, - HCI_READ_AUTOMATIC_FLUSH_TIMEOUT =0x0027, - HCI_WRITE_AUTOMATIC_FLUSH_TIMEOUT =0x0028, - HCI_READ_NUM_BROADCAST_RETRANSMISSIONS =0x0029, - HCI_WRITE_NUM_BROADCAST_RETRANSMISSIONS =0x002a, - HCI_READ_HOLD_MODE_ACTIVITY =0x002b, - HCI_WRITE_HOLD_MODE_ACTIVITY =0x002c, - HCI_READ_SYNCHRONOUS_FLOW_CONTROL_ENABLE =0x002e, - HCI_WRITE_SYNCHRONOUS_FLOW_CONTROL_ENABLE =0x002f, - HCI_SET_CONTROLLER_TO_HOST_FLOW_CONTROL =0x0031, - HCI_HOST_BUFFER_SIZE =0x0033, - HCI_HOST_NUMBER_OF_COMPLETED_PACKETS =0x0035, - HCI_READ_LINK_SUPERVISION_TIMEOUT =0x0036, - HCI_WRITE_LINK_SUPERVISION_TIMEOUT =0x0037, - HCI_READ_NUMBER_OF_SUPPORTED_IAC =0x0038, - HCI_READ_CURRENT_IAC_LAP =0x0039, - HCI_WRITE_CURRENT_IAC_LAP =0x003a, - HCI_READ_PAGE_SCAN_MODE =0x003d, - HCI_WRITE_PAGE_SCAN_MODE =0x003e, - HCI_SET_AFH_HOST_CHANNEL_CLASSIFICATION =0x003f, - HCI_READ_INQUIRY_SCAN_TYPE =0x0042, - HCI_WRITE_INQUIRY_SCAN_TYPE =0x0043, - HCI_READ_INQUIRY_MODE =0x0044, - HCI_WRITE_INQUIRY_MODE =0x0045, - HCI_READ_PAGE_SCAN_TYPE =0x0046, - HCI_WRITE_PAGE_SCAN_TYPE =0x0047, - HCI_READ_AFH_CHANNEL_ASSESSMENT_MODE =0x0048, - HCI_WRITE_AFH_CHANNEL_ASSESSMENT_MODE =0x0049, - HCI_READ_EXTENDED_INQUIRY_RESPONSE =0x0051, - HCI_WRITE_EXTENDED_INQUIRY_RESPONSE =0x0052, - HCI_REFRESH_ENCRYPTION_KEY =0x0053, - HCI_READ_SIMPLE_PAIRING_MODE =0x0055, - HCI_WRITE_SIMPLE_PAIRING_MODE =0x0056, - HCI_READ_LOCAL_OOB_DATA =0x0057, - HCI_READ_INQUIRY_RESPONSE_TRANSMIT_POWER_LEVEL =0x0058, - HCI_WRITE_INQUIRY_TRANSMIT_POWER_LEVEL =0x0059, - HCI_READ_DEFAULT_ERRONEOUS_DATA_REPORTING =0x005a, - HCI_WRITE_DEFAULT_ERRONEOUS_DATA_REPORTING =0x005b, - HCI_ENHANCED_FLUSH =0x005f, - HCI_SEND_KEYPRESS_NOTIFICATION =0x0060, - HCI_READ_LOGICAL_LINK_ACCEPT_TIMEOUT =0x0061, - HCI_WRITE_LOGICAL_LINK_ACCEPT_TIMEOUT =0x0062, - HCI_SET_EVENT_MASK_PAGE_2 =0x0063, - HCI_READ_LOCATION_DATA =0x0064, - HCI_WRITE_LOCATION_DATA =0x0065, - HCI_READ_FLOW_CONTROL_MODE =0x0066, - HCI_WRITE_FLOW_CONTROL_MODE =0x0067, - HCI_READ_ENHANCE_TRANSMIT_POWER_LEVEL =0x0068, - HCI_READ_BEST_EFFORT_FLUSH_TIMEOUT =0x0069, - HCI_WRITE_BEST_EFFORT_FLUSH_TIMEOUT =0x006a, - HCI_SHORT_RANGE_MODE =0x006b -}SET_EVENT_MASK_COMMAND,*PSET_EVENT_MASK_COMMAND; - -//OGF 0x04 -#define OGF_INFORMATIONAL_PARAMETERS 0x04 -typedef enum _INFORMATIONAL_PARAMETERS -{ - HCI_READ_LOCAL_VERSION_INFORMATION =0x0001, - HCI_READ_LOCAL_SUPPORTED_COMMANDS =0x0002, - HCI_READ_LOCAL_SUPPORTED_FEATURES =0x0003, - HCI_READ_LOCAL_EXTENDED_FEATURES =0x0004, - HCI_READ_BUFFER_SIZE =0x0005, - HCI_READ_BD_ADDR =0x0009, - HCI_READ_DATA_BLOCK_SIZE =0x000a -} INFORMATIONAL_PARAMETERS,*PINFORMATIONAL_PARAMETERS; - -//OGF 0x05 -#define OGF_STATUS_PARAMETERS 0x05 -typedef enum _STATUS_PARAMETERS -{ - HCI_READ_FAILED_CONTACT_COUNTER =0x0001, - HCI_RESET_FAILED_CONTACT_COUNTER =0x0002, - HCI_READ_LINK_QUALITY =0x0003, - HCI_READ_RSSI =0x0005, - HCI_READ_AFH_CHANNEL_MAP =0x0006, - HCI_READ_CLOCK =0x0007, - HCI_READ_ENCRYPTION_KEY_SIZE =0x0008, - HCI_READ_LOCAL_AMP_INFO =0x0009, - HCI_READ_LOCAL_AMP_ASSOC =0x000a, - HCI_WRITE_REMOTE_AMP_ASSOC =0x000b -} STATUS_PARAMETERS,*PSTATUS_PARAMETERS; - -//OGF 0x06 -#define OGF_TESTING_COMMANDS 0x06 -typedef enum _TESTING_COMMANDS -{ - HCI_READ_LOOPBACK_MODE =0x0001, - HCI_WRITE_LOOPBACK_MODE =0x0002, - HCI_ENABLE_DEVICE_UNDER_TEST_MODE =0x0003, - HCI_WRITE_SIMPLE_PAIRING_DEBUG_MODE =0x0004, - HCI_ENABLE_AMP_RECEIVER_REPORTS =0x0007, - HCI_AMP_TEST_END =0x0008, - HCI_AMP_TEST_COMMAND =0x0009 -} TESTING_COMMANDS,*PTESTING_COMMANDS; - -//OGF 0x3f -#define OGF_EXTENSION 0X3f -typedef enum _HCI_EXTENSION_COMMANDS -{ - HCI_SET_ACL_LINK_DATA_FLOW_MODE =0x0010, - HCI_SET_ACL_LINK_STATUS =0x0020, - HCI_SET_SCO_LINK_STATUS =0x0030, - HCI_SET_RSSI_VALUE =0x0040, - HCI_SET_CURRENT_BLUETOOTH_STATUS =0x0041, - - //The following is for RTK8723 - HCI_EXTENSION_VERSION_NOTIFY =0x0100, - HCI_LINK_STATUS_NOTIFY =0x0101, - HCI_BT_OPERATION_NOTIFY =0x0102, - HCI_ENABLE_WIFI_SCAN_NOTIFY =0x0103, - - - //The following is for IVT - HCI_WIFI_CURRENT_CHANNEL =0x0300, - HCI_WIFI_CURRENT_BANDWIDTH =0x0301, - HCI_WIFI_CONNECTION_STATUS =0x0302, -} HCI_EXTENSION_COMMANDS,*PHCI_EXTENSION_COMMANDS; - -typedef enum _BT_SPEC -{ - BT_SPEC_1_0_b =0x00, - BT_SPEC_1_1 =0x01, - BT_SPEC_1_2 =0x02, - BT_SPEC_2_0_EDR =0x03, - BT_SPEC_2_1_EDR =0x04, - BT_SPEC_3_0_HS =0x05, - BT_SPEC_4_0 =0x06 -} BT_SPEC,*PBT_SPEC; - -//============================================= -// The following is for BT 3.0 + HS EVENTS -//============================================= -typedef enum _HCI_EVENT -{ - HCI_EVENT_INQUIRY_COMPLETE =0x01, - HCI_EVENT_INQUIRY_RESULT =0x02, - HCI_EVENT_CONNECTION_COMPLETE =0x03, - HCI_EVENT_CONNECTION_REQUEST =0x04, - HCI_EVENT_DISCONNECTION_COMPLETE =0x05, - HCI_EVENT_AUTHENTICATION_COMPLETE =0x06, - HCI_EVENT_REMOTE_NAME_REQUEST_COMPLETE =0x07, - HCI_EVENT_ENCRYPTION_CHANGE =0x08, - HCI_EVENT_CHANGE_LINK_KEY_COMPLETE =0x09, - HCI_EVENT_MASTER_LINK_KEY_COMPLETE =0x0a, - HCI_EVENT_READ_REMOTE_SUPPORT_FEATURES_COMPLETE =0x0b, - HCI_EVENT_READ_REMOTE_VER_INFO_COMPLETE =0x0c, - HCI_EVENT_QOS_SETUP_COMPLETE =0x0d, - HCI_EVENT_COMMAND_COMPLETE =0x0e, - HCI_EVENT_COMMAND_STATUS =0x0f, - HCI_EVENT_HARDWARE_ERROR =0x10, - HCI_EVENT_FLUSH_OCCRUED =0x11, - HCI_EVENT_ROLE_CHANGE =0x12, - HCI_EVENT_NUMBER_OF_COMPLETE_PACKETS =0x13, - HCI_EVENT_MODE_CHANGE =0x14, - HCI_EVENT_RETURN_LINK_KEYS =0x15, - HCI_EVENT_PIN_CODE_REQUEST =0x16, - HCI_EVENT_LINK_KEY_REQUEST =0x17, - HCI_EVENT_LINK_KEY_NOTIFICATION =0x18, - HCI_EVENT_LOOPBACK_COMMAND =0x19, - HCI_EVENT_DATA_BUFFER_OVERFLOW =0x1a, - HCI_EVENT_MAX_SLOTS_CHANGE =0x1b, - HCI_EVENT_READ_CLOCK_OFFSET_COMPLETE =0x1c, - HCI_EVENT_CONNECT_PACKET_TYPE_CHANGE =0x1d, - HCI_EVENT_QOS_VIOLATION =0x1e, - HCI_EVENT_PAGE_SCAN_REPETITION_MODE_CHANGE =0x20, - HCI_EVENT_FLOW_SEPC_COMPLETE =0x21, - HCI_EVENT_INQUIRY_RESULT_WITH_RSSI =0x22, - HCI_EVENT_READ_REMOTE_EXT_FEATURES_COMPLETE =0x23, - HCI_EVENT_SYNC_CONNECT_COMPLETE =0x2c, - HCI_EVENT_SYNC_CONNECT_CHANGE =0x2d, - HCI_EVENT_SNIFFER_SUBRATING =0x2e, - HCI_EVENT_EXTENTED_INQUIRY_RESULT =0x2f, - HCI_EVENT_ENCRYPTION_KEY_REFLASH_COMPLETE =0x30, - HCI_EVENT_IO_CAPIBILITY_COMPLETE =0x31, - HCI_EVENT_IO_CAPIBILITY_RESPONSE =0x32, - HCI_EVENT_USER_CONFIRMTION_REQUEST =0x33, - HCI_EVENT_USER_PASSKEY_REQUEST =0x34, - HCI_EVENT_REMOTE_OOB_DATA_REQUEST =0x35, - HCI_EVENT_SIMPLE_PAIRING_COMPLETE =0x36, - HCI_EVENT_LINK_SUPERVISION_TIMEOUT_CHANGE =0x38, - HCI_EVENT_ENHANCED_FLUSH_COMPLETE =0x39, - HCI_EVENT_USER_PASSKEY_NOTIFICATION =0x3b, - HCI_EVENT_KEYPRESS_NOTIFICATION =0x3c, - HCI_EVENT_REMOTE_HOST_SUPPORT_FEATURES_NOTIFICATION =0x3d, - HCI_EVENT_PHY_LINK_COMPLETE =0x40, - HCI_EVENT_CHANNEL_SELECT =0x41, - HCI_EVENT_DISCONNECT_PHY_LINK_COMPLETE =0x42, - HCI_EVENT_PHY_LINK_LOSS_EARLY_WARNING =0x43, - HCI_EVENT_PHY_LINK_RECOVER =0x44, - HCI_EVENT_LOGICAL_LINK_COMPLETE =0x45, - HCI_EVENT_DISCONNECT_LOGICAL_LINK_COMPLETE =0x46, - HCI_EVENT_FLOW_SPEC_MODIFY_COMPLETE =0x47, - HCI_EVENT_NUM_OF_COMPLETE_DATA_BLOCKS =0x48, - HCI_EVENT_AMP_START_TEST =0x49, - HCI_EVENT_AMP_TEST_END =0x4a, - HCI_EVENT_AMP_RECEIVER_REPORT =0x4b, - HCI_EVENT_SHORT_RANGE_MODE_CHANGE_COMPLETE =0x4c, - HCI_EVENT_AMP_STATUS_CHANGE =0x4d, - HCI_EVENT_EXTENSION_RTK =0xfe, - HCI_EVENT_EXTENSION_MOTO =0xff, -}HCI_EVENT, *PHCI_EVENT; - -typedef enum _HCI_EXTENSION_EVENT_MOTO -{ - HCI_EVENT_GET_BT_RSSI =0x01, -} HCI_EXTENSION_EVENT_MOTO, *PHCI_EXTENSION_EVENT_MOTO; - -typedef enum _HCI_EXTENSION_EVENT_RTK -{ - HCI_EVENT_EXT_WIFI_SCAN_NOTIFY =0x01, -} HCI_EXTENSION_EVENT_RTK, *PHCI_EXTENSION_EVENT_RTK; - -typedef enum _HCI_EVENT_MASK_PAGE_2 -{ - EMP2_HCI_EVENT_PHY_LINK_COMPLETE =0x0000000000000001, - EMP2_HCI_EVENT_CHANNEL_SELECT =0x0000000000000002, - EMP2_HCI_EVENT_DISCONNECT_PHY_LINK_COMPLETE =0x0000000000000004, - EMP2_HCI_EVENT_PHY_LINK_LOSS_EARLY_WARNING =0x0000000000000008, - EMP2_HCI_EVENT_PHY_LINK_RECOVER =0x0000000000000010, - EMP2_HCI_EVENT_LOGICAL_LINK_COMPLETE =0x0000000000000020, - EMP2_HCI_EVENT_DISCONNECT_LOGICAL_LINK_COMPLETE =0x0000000000000040, - EMP2_HCI_EVENT_FLOW_SPEC_MODIFY_COMPLETE =0x0000000000000080, - EMP2_HCI_EVENT_NUM_OF_COMPLETE_DATA_BLOCKS =0x0000000000000100, - EMP2_HCI_EVENT_AMP_START_TEST =0x0000000000000200, - EMP2_HCI_EVENT_AMP_TEST_END =0x0000000000000400, - EMP2_HCI_EVENT_AMP_RECEIVER_REPORT =0x0000000000000800, - EMP2_HCI_EVENT_SHORT_RANGE_MODE_CHANGE_COMPLETE =0x0000000000001000, - EMP2_HCI_EVENT_AMP_STATUS_CHANGE =0x0000000000002000, -} HCI_EVENT_MASK_PAGE_2, *PHCI_EVENT_MASK_PAGE_2; - -typedef enum _HCI_STATE_MACHINE -{ - HCI_STATE_STARTING =0x01, - HCI_STATE_CONNECTING =0x02, - HCI_STATE_AUTHENTICATING =0x04, - HCI_STATE_CONNECTED =0x08, - HCI_STATE_DISCONNECTING =0x10, - HCI_STATE_DISCONNECTED =0x20 -} HCI_STATE_MACHINE, *PHCI_STATE_MACHINE; - -typedef enum _AMP_ASSOC_STRUCTURE_TYPE -{ - AMP_MAC_ADDR =0x01, - AMP_PREFERRED_CHANNEL_LIST =0x02, - AMP_CONNECTED_CHANNEL =0x03, - AMP_80211_PAL_CAP_LIST =0x04, - AMP_80211_PAL_VISION =0x05, - AMP_RESERVED_FOR_TESTING =0x33 -} AMP_ASSOC_STRUCTURE_TYPE, *PAMP_ASSOC_STRUCTURE_TYPE; - -typedef enum _AMP_BTAP_TYPE -{ - AMP_BTAP_NONE, - AMP_BTAP_CREATOR, - AMP_BTAP_JOINER -} AMP_BTAP_TYPE, *PAMP_BTAP_TYPE; - -typedef enum _HCI_STATE_WITH_CMD -{ - STATE_CMD_CREATE_PHY_LINK, - STATE_CMD_ACCEPT_PHY_LINK, - STATE_CMD_DISCONNECT_PHY_LINK, - STATE_CMD_CONNECT_ACCEPT_TIMEOUT, - STATE_CMD_MAC_START_COMPLETE, - STATE_CMD_MAC_START_FAILED, - STATE_CMD_MAC_CONNECT_COMPLETE, - STATE_CMD_MAC_CONNECT_FAILED, - STATE_CMD_MAC_DISCONNECT_INDICATE, - STATE_CMD_MAC_CONNECT_CANCEL_INDICATE, - STATE_CMD_4WAY_FAILED, - STATE_CMD_4WAY_SUCCESSED, - STATE_CMD_ENTER_STATE, - STATE_CMD_NO_SUCH_CMD, -} HCI_STATE_WITH_CMD, *PHCI_STATE_WITH_CMD; - -typedef enum _HCI_SERVICE_TYPE -{ - SERVICE_NO_TRAFFIC, - SERVICE_BEST_EFFORT, - SERVICE_GUARANTEE -} HCI_SERVICE_TYPE, *PHCI_SERVICE_TYPE; - -typedef enum _HCI_TRAFFIC_MODE -{ - TRAFFIC_MODE_BEST_EFFORT =0x00, - TRAFFIC_MODE_GUARANTEED_LATENCY =0x01, - TRAFFIC_MODE_GUARANTEED_BANDWIDTH =0x02, - TRAFFIC_MODE_GUARANTEED_LATENCY_AND_BANDWIDTH =0x03 -} HCI_TRAFFIC_MODE, *PHCI_TRAFFIC_MODE; - -#define HCIOPCODE(_OCF, _OGF) (_OGF<<10|_OCF) -#define HCIOPCODELOW(_OCF, _OGF) (u8)(HCIOPCODE(_OCF, _OGF)&0x00ff) -#define HCIOPCODEHIGHT(_OCF, _OGF) (u8)(HCIOPCODE(_OCF, _OGF)>>8) - -#define TWOBYTE_HIGHTBYTE(_DATA) (u8)(_DATA>>8) -#define TWOBYTE_LOWBYTE(_DATA) (u8)(_DATA) - -typedef enum _AMP_STATUS -{ - AMP_STATUS_AVA_PHY_PWR_DWN = 0x0, - AMP_STATUS_BT_USE_ONLY = 0x1, - AMP_STATUS_NO_CAPACITY_FOR_BT = 0x2, - AMP_STATUS_LOW_CAPACITY_FOR_BT = 0x3, - AMP_STATUS_MEDIUM_CAPACITY_FOR_BT = 0x4, - AMP_STATUS_HIGH_CAPACITY_FOR_BT = 0x5, - AMP_STATUS_FULL_CAPACITY_FOR_BT = 0x6 -} AMP_STATUS, *PAMP_STATUS; - -typedef enum -{ - Type_BT_4way1st = 0, - Type_BT_4way2nd = 1, - Type_BT_4way3rd = 2, - Type_BT_4way4th = 3, - Type_BT_unknow = 4 -} BT_WPAMsgType; - -typedef enum _BT_CONNECT_TYPE -{ - BT_CONNECT_AUTH_REQ =0x00, - BT_CONNECT_AUTH_RSP =0x01, - BT_CONNECT_ASOC_REQ =0x02, - BT_CONNECT_ASOC_RSP =0x03, - BT_DISCONNECT =0x04 -} BT_CONNECT_TYPE, *PBT_CONNECT_TYPE; - -typedef enum _BT_LL_SERVICE_TYPE -{ - BT_LL_BE = 0x01, - BT_LL_GU = 0x02 -} BT_LL_SERVICE_TYPE; - -typedef enum _BT_LL_FLOWSPEC -{ - BT_TX_BE_FS, //TX best effort flowspec - BT_RX_BE_FS, //RX best effort flowspec - BT_TX_GU_FS, //TX guaranteed latency flowspec - BT_RX_GU_FS, //RX guaranteed latency flowspec - BT_TX_BE_AGG_FS, //TX aggregated best effort flowspec - BT_RX_BE_AGG_FS, //RX aggregated best effort flowspec - BT_TX_GU_BW_FS, //TX guaranteed bandwidth flowspec - BT_RX_GU_BW_FS, //RX guaranteed bandwidth flowspec - BT_TX_GU_LARGE_FS, //TX guaranteed latency flowspec, for testing only - BT_RX_GU_LARGE_FS, //RX guaranteed latency flowspec, for testing only -} BT_LL_FLOWSPEC; - -typedef enum _BT_TRAFFIC_MODE -{ - BT_MOTOR_EXT_BE = 0x00, //Best Effort. Default. for HCRP, PAN, SDP, RFCOMM-based profiles like FTP,OPP, SPP, DUN, etc. - BT_MOTOR_EXT_GUL = 0x01, //Guaranteed Latency. This type of traffic is used e.g. for HID and AVRCP. - BT_MOTOR_EXT_GUB = 0X02, //Guaranteed Bandwidth. - BT_MOTOR_EXT_GULB = 0X03 //Guaranteed Latency and Bandwidth. for A2DP and VDP. -} BT_TRAFFIC_MODE; - -typedef enum _BT_TRAFFIC_MODE_PROFILE -{ - BT_PROFILE_NONE, - BT_PROFILE_A2DP, - BT_PROFILE_PAN, - BT_PROFILE_HID, - BT_PROFILE_SCO -} BT_TRAFFIC_MODE_PROFILE; - -typedef enum _BT_LINK_ROLE -{ - BT_LINK_MASTER = 0, - BT_LINK_SLAVE = 1 -} BT_LINK_ROLE; - -typedef enum _BT_STATE_WPA_AUTH -{ - STATE_WPA_AUTH_UNINITIALIZED, - STATE_WPA_AUTH_WAIT_PACKET_1, // Join - STATE_WPA_AUTH_WAIT_PACKET_2, // Creat - STATE_WPA_AUTH_WAIT_PACKET_3, - STATE_WPA_AUTH_WAIT_PACKET_4, - STATE_WPA_AUTH_SUCCESSED -} BT_STATE_WPA_AUTH, *PBT_STATE_WPA_AUTH; - -#define BT_WPA_AUTH_TIMEOUT_PERIOD 1000 -#define BTMaxWPAAuthReTransmitCoun 5 - -#define MAX_AMP_ASSOC_FRAG_LEN 248 -#define TOTAL_ALLOCIATE_ASSOC_LEN 1000 - -typedef struct _HCI_FLOW_SPEC -{ - u8 Identifier; - u8 ServiceType; - u16 MaximumSDUSize; - u32 SDUInterArrivalTime; - u32 AccessLatency; - u32 FlushTimeout; -} HCI_FLOW_SPEC, *PHCI_FLOW_SPEC; - -typedef struct _HCI_LOG_LINK_CMD_DATA -{ - u8 BtPhyLinkhandle; - u16 BtLogLinkhandle; - u8 BtTxFlowSpecID; - HCI_FLOW_SPEC Tx_Flow_Spec; - HCI_FLOW_SPEC Rx_Flow_Spec; - u32 TxPacketCount; - u32 BestEffortFlushTimeout; - - u8 bLLCompleteEventIsSet; - - u8 bLLCancelCMDIsSetandComplete; -} HCI_LOG_LINK_CMD_DATA, *PHCI_LOG_LINK_CMD_DATA; - -typedef struct _HCI_PHY_LINK_CMD_DATA -{ - //Physical_Link_Handle - u8 BtPhyLinkhandle; - - u16 LinkSuperversionTimeout; - - //u16 SuperTimeOutCnt; - - //Dedicated_AMP_Key_Length - u8 BtAMPKeyLen; - //Dedicated_AMP_Key_Type - u8 BtAMPKeyType; - //Dedicated_AMP_Key - u8 BtAMPKey[PMK_LEN]; -} HCI_PHY_LINK_CMD_DATA, *PHCI_PHY_LINK_CMD_DATA; - -typedef struct _AMP_ASSOC_STRUCTURE -{ - //TYPE ID - u8 TypeID; - //Length - u16 Length; - //Value - u8 Data[1]; -} AMP_ASSOC_STRUCTURE, *PAMP_ASSOC_STRUCTURE; - -typedef struct _AMP_PREF_CHNL_REGULATORY -{ - u8 reXId; - u8 regulatoryClass; - u8 coverageClass; -} AMP_PREF_CHNL_REGULATORY, *PAMP_PREF_CHNL_REGULATORY; - -typedef struct _AMP_ASSOC_CMD_DATA -{ - //Physical_Link_Handle - u8 BtPhyLinkhandle; - //Length_So_Far - u16 LenSoFar; - - u16 MaxRemoteASSOCLen; - //AMP_ASSOC_Remaining_Length - u16 AMPAssocRemLen; - //AMP_ASSOC_fragment - void *AMPAssocfragment; -} AMP_ASSOC_CMD_DATA, *PAMP_ASSOC_CMD_DATA; - -typedef struct _HCI_LINK_INFO -{ - u16 ConnectHandle; - u8 IncomingTrafficMode; - u8 OutgoingTrafficMode; - u8 BTProfile; - u8 BTCoreSpec; - s8 BT_RSSI; - u8 TrafficProfile; - u8 linkRole; -} HCI_LINK_INFO, *PHCI_LINK_INFO; - -typedef struct _HCI_EXT_CONFIG -{ - HCI_LINK_INFO linkInfo[MAX_BT_ASOC_ENTRY_NUM]; - u8 btOperationCode; - u16 CurrentConnectHandle; - u8 CurrentIncomingTrafficMode; - u8 CurrentOutgoingTrafficMode; - s8 MIN_BT_RSSI; - u8 NumberOfHandle; - u8 NumberOfSCO; - u8 CurrentBTStatus; - u16 HCIExtensionVer; - - //Bt coexist related - u8 btProfileCase; - u8 btProfileAction; - u8 bManualControl; - u8 bBTBusy; - u8 bBTA2DPBusy; - u8 bEnableWifiScanNotify; - - u8 bHoldForBtOperation; - u32 bHoldPeriodCnt; - -}HCI_EXT_CONFIG, *PHCI_EXT_CONFIG; - -typedef struct _HCI_ACL_PACKET_DATA -{ - u16 ACLDataPacketLen; - u8 SyncDataPacketLen; - u16 TotalNumACLDataPackets; - u16 TotalSyncNumDataPackets; -} HCI_ACL_PACKET_DATA, *PHCI_ACL_PACKET_DATA; - -typedef struct _HCI_PHY_LINK_BSS_INFO -{ - u16 bdCap; // capability information - - // Qos related. Added by Annie, 2005-11-01. -// BSS_QOS BssQos; // not implement yet - -} HCI_PHY_LINK_BSS_INFO, *PHCI_PHY_LINK_BSS_INFO; - -typedef struct _PACKET_IRP_HCICMD_DATA -{ - u16 OCF:10; - u16 OGF:6; - u8 Length; - u8 Data[1]; -} PACKET_IRP_HCICMD_DATA, *PPACKET_IRP_HCICMD_DATA; - -typedef struct _BT_ASOC_ENTRY -{ - u8 bUsed; - u8 mAssoc; - u8 b4waySuccess; - u8 Bssid[6]; - HCI_PHY_LINK_CMD_DATA PhyLinkCmdData; - - HCI_LOG_LINK_CMD_DATA LogLinkCmdData[MAX_LOGICAL_LINK_NUM]; - - HCI_ACL_PACKET_DATA ACLPacketsData; - - AMP_ASSOC_CMD_DATA AmpAsocCmdData; - OCTET_STRING BTSsid; - u8 BTSsidBuf[33]; - - HCI_STATUS PhyLinkDisconnectReason; - - u8 bSendSupervisionPacket; - //u8 CurrentSuervisionPacketSendNum; - //u8 LastSuervisionPacketSendNum; - u32 NoRxPktCnt; - //Is Creator or Joiner - AMP_BTAP_TYPE AMPRole; - - //BT current state - u8 BtCurrentState; - //BT next state - u8 BtNextState; - - u8 bNeedPhysLinkCompleteEvent; - - HCI_STATUS PhysLinkCompleteStatus; - - u8 BTRemoteMACAddr[6]; - - u32 BTCapability; - - u8 SyncDataPacketLen; - - u16 TotalSyncNumDataPackets; - u16 TotalNumACLDataPackets; - - u8 ShortRangeMode; - - u8 PTK[PTK_LEN_TKIP]; - u8 GTK[GTK_LEN]; - u8 ANonce[KEY_NONCE_LEN]; - u8 SNonce[KEY_NONCE_LEN]; - u64 KeyReplayCounter; - u8 WPAAuthReplayCount; - u8 AESKeyBuf[AESCCMP_BLK_SIZE_TOTAL]; - u8 PMK[PMK_LEN]; - BT_STATE_WPA_AUTH BTWPAAuthState; - s32 UndecoratedSmoothedPWDB; - - // Add for HW security !! - u8 HwCAMIndex; // Cam index - u8 bPeerQosSta; - - u32 rxSuvpPktCnt; -}BT_ASOC_ENTRY, *PBT_ASOC_ENTRY; - -typedef struct _BT_TRAFFIC_STATISTICS -{ - u8 bTxBusyTraffic; - u8 bRxBusyTraffic; - u8 bIdle; - u32 TxPktCntInPeriod; - u32 RxPktCntInPeriod; - u64 TxPktLenInPeriod; - u64 RxPktLenInPeriod; -} BT_TRAFFIC_STATISTICS, *PBT_TRAFFIC_STATISTICS; - -typedef struct _BT_MGNT -{ - u8 bBTConnectInProgress; - u8 bLogLinkInProgress; - u8 bPhyLinkInProgress; - u8 bPhyLinkInProgressStartLL; - u8 BtCurrentPhyLinkhandle; - u16 BtCurrentLogLinkhandle; - u8 CurrentConnectEntryNum; - u8 DisconnectEntryNum; - u8 CurrentBTConnectionCnt; - BT_CONNECT_TYPE BTCurrentConnectType; - BT_CONNECT_TYPE BTReceiveConnectPkt; - u8 BTAuthCount; - u8 BTAsocCount; - u8 bStartSendSupervisionPkt; - u8 BtOperationOn; - u8 BTNeedAMPStatusChg; - u8 JoinerNeedSendAuth; - HCI_PHY_LINK_BSS_INFO bssDesc; - HCI_EXT_CONFIG ExtConfig; - u8 bNeedNotifyAMPNoCap; - u8 bCreateSpportQos; - u8 bSupportProfile; - u8 BTChannel; - u8 CheckChnlIsSuit; - u8 bBtScan; - u8 btLogoTest; -} BT_MGNT, *PBT_MGNT; - -typedef struct _BT_HCI_DBG_INFO -{ - u32 hciCmdCnt; - u32 hciCmdCntUnknown; - u32 hciCmdCntCreatePhyLink; - u32 hciCmdCntAcceptPhyLink; - u32 hciCmdCntDisconnectPhyLink; - u32 hciCmdPhyLinkStatus; - u32 hciCmdCntCreateLogLink; - u32 hciCmdCntAcceptLogLink; - u32 hciCmdCntDisconnectLogLink; - u32 hciCmdCntReadLocalAmpAssoc; - u32 hciCmdCntWriteRemoteAmpAssoc; - u32 hciCmdCntSetAclLinkStatus; - u32 hciCmdCntSetScoLinkStatus; - u32 hciCmdCntExtensionVersionNotify; - u32 hciCmdCntLinkStatusNotify; -} BT_HCI_DBG_INFO, *PBT_HCI_DBG_INFO; - -typedef struct _BT_IRP_DBG_INFO -{ - u32 irpMJCreate; - // Io Control - u32 irpIoControl; - u32 irpIoCtrlHciCmd; - u32 irpIoCtrlHciEvent; - u32 irpIoCtrlHciTxData; - u32 irpIoCtrlHciRxData; - u32 irpIoCtrlUnknown; - - u32 irpIoCtrlHciTxData1s; -} BT_IRP_DBG_INFO, *PBT_IRP_DBG_INFO; - -typedef struct _BT_PACKET_DBG_INFO -{ - u32 btPktTxProbReq; - u32 btPktRxProbReq; - u32 btPktRxProbReqFail; - u32 btPktTxProbRsp; - u32 btPktRxProbRsp; - u32 btPktTxAuth; - u32 btPktRxAuth; - u32 btPktRxAuthButDrop; - u32 btPktTxAssocReq; - u32 btPktRxAssocReq; - u32 btPktRxAssocReqButDrop; - u32 btPktTxAssocRsp; - u32 btPktRxAssocRsp; - u32 btPktTxDisassoc; - u32 btPktRxDisassoc; - u32 btPktRxDeauth; - u32 btPktTx4way1st; - u32 btPktRx4way1st; - u32 btPktTx4way2nd; - u32 btPktRx4way2nd; - u32 btPktTx4way3rd; - u32 btPktRx4way3rd; - u32 btPktTx4way4th; - u32 btPktRx4way4th; - u32 btPktTxLinkSuperReq; - u32 btPktRxLinkSuperReq; - u32 btPktTxLinkSuperRsp; - u32 btPktRxLinkSuperRsp; - u32 btPktTxData; - u32 btPktRxData; -} BT_PACKET_DBG_INFO, *PBT_PACKET_DBG_INFO; - -typedef struct _BT_DBG -{ - u8 dbgCtrl; - u32 dbgProfile; - BT_HCI_DBG_INFO dbgHciInfo; - BT_IRP_DBG_INFO dbgIrpInfo; - BT_PACKET_DBG_INFO dbgBtPkt; -} BT_DBG, *PBT_DBG; - -typedef struct _BT_HCI_INFO -{ - //802.11 Pal version specifier - u8 BTPalVersion; - u16 BTPalCompanyID; - u16 BTPalsubversion; - - //Connected channel list - u16 BTConnectChnlListLen; - u8 BTConnectChnllist[64]; - - //Fail contact counter - u16 FailContactCount; - - //Event mask - u64 BTEventMask; - u64 BTEventMaskPage2; - - //timeout var - u16 ConnAcceptTimeout; - u16 LogicalAcceptTimeout; - u16 PageTimeout; - - u8 LocationDomainAware; - u16 LocationDomain; - u8 LocationDomainOptions; - u8 LocationOptions; - - u8 FlowControlMode; - - //Preferred channel list - u16 BtPreChnlListLen; - u8 BTPreChnllist[64]; - - u16 enFlush_LLH; //enhanced flush handle - u16 FLTO_LLH; //enhanced flush handle - - //========================================== - //Test command only. - u8 bInTestMode; - u8 bTestIsEnd; - u8 bTestNeedReport; - u8 TestScenario; - u8 TestReportInterval; - u8 TestCtrType; - u32 TestEventType; - u16 TestNumOfFrame; - u16 TestNumOfErrFrame; - u16 TestNumOfBits; - u16 TestNumOfErrBits; - //========================================== -} BT_HCI_INFO, *PBT_HCI_INFO; - -typedef struct _BT_TRAFFIC -{ - // Add for check replay data - u8 LastRxUniFragNum; - u16 LastRxUniSeqNum; - - //s32 EntryMaxUndecoratedSmoothedPWDB; - //s32 EntryMinUndecoratedSmoothedPWDB; - - BT_TRAFFIC_STATISTICS Bt30TrafficStatistics; -} BT_TRAFFIC, *PBT_TRAFFIC; - -#define RT_WORK_ITEM _workitem -#define RT_THREAD _thread_hdl_ - -typedef struct _BT_SECURITY -{ - // WPA auth state - // May need to remove to BTSecInfo ... - //BT_STATE_WPA_AUTH BTWPAAuthState; - //u8 PMK[PMK_LEN]; - RT_TIMER BTWPAAuthTimer; - OCTET_STRING RSNIE; - u8 RSNIEBuf[MAXRSNIELEN]; - u8 bRegNoEncrypt; - u8 bUsedHwEncrypt; // It is define by OS version !! -} BT_SECURITY, *PBT_SECURITY; - -typedef struct _BT30Info -{ - PADAPTER padapter; - BT_ASOC_ENTRY BtAsocEntry[MAX_BT_ASOC_ENTRY_NUM]; - BT_MGNT BtMgnt; - BT_DBG BtDbg; - BT_HCI_INFO BtHciInfo; - BT_TRAFFIC BtTraffic; - BT_SECURITY BtSec; - -#if(BT_THREAD == 0) - RT_WORK_ITEM HCICmdWorkItem; - RT_TIMER BTHCICmdTimer; -#endif -#if (SENDTXMEHTOD==0) - RT_WORK_ITEM HCISendACLDataWorkItem; - RT_TIMER BTHCISendAclDataTimer; -#elif(SENDTXMEHTOD==2) - RT_THREAD BTTxThread; -#endif - RT_WORK_ITEM BTPsDisableWorkItem; - RT_WORK_ITEM BTConnectWorkItem; - RT_TIMER BTHCIDiscardAclDataTimer; - RT_TIMER BTHCIJoinTimeoutTimer; - RT_TIMER BTTestSendPacketTimer; - RT_TIMER BTSupervisionPktTimer; - RT_TIMER BTDisconnectPhyLinkTimer; - RT_TIMER BTBeaconTimer; - u8 BTBeaconTmrOn; - - RT_TIMER BTPsDisableTimer; - RT_TIMER BTAuthTimeoutTimer; - RT_TIMER BTAsocTimeoutTimer; - - PVOID pBtChnlList; -}BT30Info, *PBT30Info; - -typedef struct _PACKET_IRP_ACL_DATA -{ - u16 Handle:12; - u16 PB_Flag:2; - u16 BC_Flag:2; - u16 Length; - u8 Data[1]; -} PACKET_IRP_ACL_DATA, *PPACKET_IRP_ACL_DATA; - -typedef struct _PACKET_IRP_HCIEVENT_DATA -{ - u8 EventCode; - u8 Length; - u8 Data[1]; -} PACKET_IRP_HCIEVENT_DATA, *PPACKET_IRP_HCIEVENT_DATA; - -typedef struct _COMMON_TRIPLE -{ - u8 byte_1st; - u8 byte_2nd; - u8 byte_3rd; -} COMMON_TRIPLE, *PCOMMON_TRIPLE; - -#define COUNTRY_STR_LEN 3 // country string len=3 - -#define LOCAL_PMK 0 - -typedef enum _HCI_WIFI_CONNECT_STATUS -{ - HCI_WIFI_NOT_CONNECTED =0x0, - HCI_WIFI_CONNECTED =0x1, - HCI_WIFI_CONNECT_IN_PROGRESS =0x2, -} HCI_WIFI_CONNECT_STATUS, *PHCI_WIFI_CONNECT_STATUS; - -typedef enum _HCI_EXT_BT_OPERATION -{ - HCI_BT_OP_NONE = 0x0, - HCI_BT_OP_INQUIRY_START = 0x1, - HCI_BT_OP_INQUIRY_FINISH = 0x2, - HCI_BT_OP_PAGING_START = 0x3, - HCI_BT_OP_PAGING_SUCCESS = 0x4, - HCI_BT_OP_PAGING_UNSUCCESS = 0x5, - HCI_BT_OP_PAIRING_START = 0x6, - HCI_BT_OP_PAIRING_FINISH = 0x7, - HCI_BT_OP_BT_DEV_ENABLE = 0x8, - HCI_BT_OP_BT_DEV_DISABLE = 0x9, - HCI_BT_OP_MAX -} HCI_EXT_BT_OPERATION, *PHCI_EXT_BT_OPERATION; - -//====================================== -// Function proto type -//====================================== -#define RT_LIST_ENTRY _list -typedef struct _BTData_ENTRY -{ - RT_LIST_ENTRY List; - void *pDataBlock; -} BTData_ENTRY, *PBTData_ENTRY; - -#define BTHCI_SM_WITH_INFO(_Adapter, _StateToEnter, _StateCmd, _EntryNum) \ -{ \ - RTPRINT(FIOCTL, IOCTL_STATE, ("[BT state change] caused by ""%s"", line=%d\n", __FUNCTION__, __LINE__)); \ - BTHCI_StateMachine(_Adapter, _StateToEnter, _StateCmd, _EntryNum);\ -} - -void BTHCI_EventParse(PADAPTER padapter, void *pEvntData, u32 dataLen); -#define BT_EventParse BTHCI_EventParse -u8 BTHCI_HsConnectionEstablished(PADAPTER padapter); -void BTHCI_UpdateBTProfileRTKToMoto(PADAPTER padapter); -void BTHCI_WifiScanNotify(PADAPTER padapter, u8 scanType); -void BTHCI_StateMachine(PADAPTER padapter, u8 StateToEnter, HCI_STATE_WITH_CMD StateCmd, u8 EntryNum); -void BTHCI_DisconnectPeer(PADAPTER padapter, u8 EntryNum); -void BTHCI_EventNumOfCompletedDataBlocks(PADAPTER padapter); -void BTHCI_EventAMPStatusChange(PADAPTER padapter, u8 AMP_Status); -void BTHCI_DisconnectAll(PADAPTER padapter); -HCI_STATUS BTHCI_HandleHCICMD(PADAPTER padapter, PPACKET_IRP_HCICMD_DATA pHciCmd); - -// ===== End of sync from SD7 driver COMMON/bt_hci.h ===== -#endif // __BT_HCI_C__ - -#ifdef __HALBTC87231ANT_C__ // HAL/BTCoexist/HalBtc87231Ant.h -// ===== Below this line is sync from SD7 driver HAL/BTCoexist/HalBtc87231Ant.h ===== -#define GET_BT_INFO(padapter) (&GET_HAL_DATA(padapter)->BtInfo) - -#define BTC_FOR_SCAN_START 1 -#define BTC_FOR_SCAN_FINISH 0 - -#define BT_TXRX_CNT_THRES_1 1200 -#define BT_TXRX_CNT_THRES_2 1400 -#define BT_TXRX_CNT_THRES_3 3000 -#define BT_TXRX_CNT_LEVEL_0 0 // < 1200 -#define BT_TXRX_CNT_LEVEL_1 1 // >= 1200 && < 1400 -#define BT_TXRX_CNT_LEVEL_2 2 // >= 1400 -#define BT_TXRX_CNT_LEVEL_3 3 // >= 3000 - -typedef enum _BT_STATE_1ANT{ - BT_INFO_STATE_DISABLED = 0, - BT_INFO_STATE_NO_CONNECTION = 1, - BT_INFO_STATE_CONNECT_IDLE = 2, - BT_INFO_STATE_INQ_OR_PAG = 3, - BT_INFO_STATE_ACL_ONLY_BUSY = 4, - BT_INFO_STATE_SCO_ONLY_BUSY = 5, - BT_INFO_STATE_ACL_SCO_BUSY = 6, - BT_INFO_STATE_ACL_INQ_OR_PAG = 7, - BT_INFO_STATE_MAX = 8 -} BT_STATE_1ANT, *PBT_STATE_1ANT; - -typedef struct _BTDM_8723A_1ANT -{ - u8 prePsTdma; - u8 curPsTdma; - u8 psTdmaDuAdjType; - u8 bPrePsTdmaOn; - u8 bCurPsTdmaOn; - u8 preWifiPara; - u8 curWifiPara; - u8 preCoexWifiCon; - u8 curCoexWifiCon; - u8 wifiRssiThresh; - - u32 psTdmaMonitorCnt; - u32 psTdmaGlobalCnt; - - //DurationAdjust For SCO - u32 psTdmaMonitorCntForSCO; - u8 psTdmaDuAdjTypeForSCO; - u8 RSSI_WiFi_Last; - u8 RSSI_BT_Last; - - u8 bWiFiHalt; - u8 bRAChanged; -} BTDM_8723A_1ANT, *PBTDM_8723A_1ANT; - -void BTDM_1AntSignalCompensation(PADAPTER padapter, u8 *rssi_wifi, u8 *rssi_bt); -void BTDM_1AntForDhcp(PADAPTER padapter); -void BTDM_1AntBtCoexist8723A(PADAPTER padapter); - -// ===== End of sync from SD7 driver HAL/BTCoexist/HalBtc87231Ant.h ===== -#endif // __HALBTC87231ANT_C__ - -#ifdef __HALBTC87232ANT_C__ // HAL/BTCoexist/HalBtc87232Ant.h -// ===== Below this line is sync from SD7 driver HAL/BTCoexist/HalBtc87232Ant.h ===== -typedef enum _BT_2ANT_BT_STATUS{ - BT_2ANT_BT_STATUS_IDLE = 0x0, - BT_2ANT_BT_STATUS_CONNECTED_IDLE = 0x1, - BT_2ANT_BT_STATUS_NON_IDLE = 0x2, - BT_2ANT_BT_STATUS_MAX -}BT_2ANT_BT_STATUS,*PBT_2ANT_BT_STATUS; - -typedef enum _BT_2ANT_COEX_ALGO{ - BT_2ANT_COEX_ALGO_UNDEFINED = 0x0, - BT_2ANT_COEX_ALGO_SCO = 0x1, - BT_2ANT_COEX_ALGO_HID = 0x2, - BT_2ANT_COEX_ALGO_A2DP = 0x3, - BT_2ANT_COEX_ALGO_PANEDR = 0x4, - BT_2ANT_COEX_ALGO_PANHS = 0x5, - BT_2ANT_COEX_ALGO_PANEDR_A2DP = 0x6, - BT_2ANT_COEX_ALGO_PANEDR_HID = 0x7, - BT_2ANT_COEX_ALGO_HID_A2DP_PANEDR = 0x8, - BT_2ANT_COEX_ALGO_HID_A2DP = 0x9, - BT_2ANT_COEX_ALGO_HID_A2DP_PANHS = 0xA, - BT_2ANT_COEX_ALGO_MAX = 0xB, -}BT_2ANT_COEX_ALGO,*PBT_2ANT_COEX_ALGO; - -typedef struct _BTDM_8723A_2ANT -{ - u8 bPreDecBtPwr; - u8 bCurDecBtPwr; - - u8 preWlanActHi; - u8 curWlanActHi; - u8 preWlanActLo; - u8 curWlanActLo; - - u8 preFwDacSwingLvl; - u8 curFwDacSwingLvl; - - u8 bPreRfRxLpfShrink; - u8 bCurRfRxLpfShrink; - - u8 bPreLowPenaltyRa; - u8 bCurLowPenaltyRa; - - u8 preBtRetryIndex; - u8 curBtRetryIndex; - - u8 bPreDacSwingOn; - u32 preDacSwingLvl; - u8 bCurDacSwingOn; - u32 curDacSwingLvl; - - u8 bPreAdcBackOff; - u8 bCurAdcBackOff; - - u8 bPreAgcTableEn; - u8 bCurAgcTableEn; - - u32 preVal0x6c0; - u32 curVal0x6c0; - u32 preVal0x6c8; - u32 curVal0x6c8; - u8 preVal0x6cc; - u8 curVal0x6cc; - - u8 bCurIgnoreWlanAct; - u8 bPreIgnoreWlanAct; - - u8 prePsTdma; - u8 curPsTdma; - u8 psTdmaDuAdjType; - u8 bPrePsTdmaOn; - u8 bCurPsTdmaOn; - - u8 preAlgorithm; - u8 curAlgorithm; - u8 bResetTdmaAdjust; - - - u8 btStatus; -} BTDM_8723A_2ANT, *PBTDM_8723A_2ANT; -void BTDM_2AntBtCoexist8723A(PADAPTER padapter); -// ===== End of sync from SD7 driver HAL/BTCoexist/HalBtc87232Ant.h ===== -#endif // __HALBTC87232ANT_C__ - -#ifdef __HALBTC8723_C__ // HAL/BTCoexist/HalBtc8723.h -// ===== Below this line is sync from SD7 driver HAL/BTCoexist/HalBtc8723.h ===== - -#define BT_Q_PKT_OFF 0 -#define BT_Q_PKT_ON 1 - -#define BT_TX_PWR_OFF 0 -#define BT_TX_PWR_ON 1 - -// TDMA mode definition -#define TDMA_2ANT 0 -#define TDMA_1ANT 1 -#define TDMA_NAV_OFF 0 -#define TDMA_NAV_ON 1 -#define TDMA_DAC_SWING_OFF 0 -#define TDMA_DAC_SWING_ON 1 - -#define BT_RSSI_LEVEL_H 0 -#define BT_RSSI_LEVEL_M 1 -#define BT_RSSI_LEVEL_L 2 - -// PTA mode related definition -#define BT_PTA_MODE_OFF 0 -#define BT_PTA_MODE_ON 1 - -// Penalty Tx Rate Adaptive -#define BT_TX_RATE_ADAPTIVE_NORMAL 0 -#define BT_TX_RATE_ADAPTIVE_LOW_PENALTY 1 - -// RF Corner -#define BT_RF_RX_LPF_CORNER_RESUME 0 -#define BT_RF_RX_LPF_CORNER_SHRINK 1 - -#define BT_INFO_ACL BIT(0) -#define BT_INFO_SCO BIT(1) -#define BT_INFO_INQ_PAG BIT(2) -#define BT_INFO_ACL_BUSY BIT(3) -#define BT_INFO_SCO_BUSY BIT(4) -#define BT_INFO_HID BIT(5) -#define BT_INFO_A2DP BIT(6) -#define BT_INFO_FTP BIT(7) - - - -typedef struct _BT_COEXIST_8723A -{ - u32 highPriorityTx; - u32 highPriorityRx; - u32 lowPriorityTx; - u32 lowPriorityRx; - u8 btRssi; - u8 TotalAntNum; - u8 bC2hBtInfoSupport; - u8 c2hBtInfo; - u8 c2hBtInfoOriginal; - u8 prec2hBtInfo; // for 1Ant - u8 bC2hBtInquiryPage; - u64 btInqPageStartTime; // for 2Ant - u8 c2hBtProfile; // for 1Ant - u8 btRetryCnt; - u16 AclTp; - u8 btInfoExt; - u8 bC2hBtInfoReqSent; - u8 bForceFwBtInfo; - u8 bForceA2dpSink; -// u8 bForceLps; -// u8 bBtPwrSaveMode; - BTDM_8723A_2ANT btdm2Ant; - BTDM_8723A_1ANT btdm1Ant; -} BT_COEXIST_8723A, *PBT_COEXIST_8723A; - -void BTDM_SetFwChnlInfo(PADAPTER padapter, RT_MEDIA_STATUS mstatus); -u8 BTDM_IsWifiConnectionExist(PADAPTER padapter); -void BTDM_SetFw3a(PADAPTER padapter, u8 byte1, u8 byte2, u8 byte3, u8 byte4, u8 byte5); -void BTDM_QueryBtInformation(PADAPTER padapter); -void BTDM_SetSwRfRxLpfCorner(PADAPTER padapter, u8 type); -void BTDM_SetSwPenaltyTxRateAdaptive(PADAPTER padapter, u8 raType); -void BTDM_SetFwDecBtPwr(PADAPTER padapter, u8 bDecBtPwr); -u8 BTDM_BtProfileSupport(PADAPTER padapter); -void BTDM_LpsLeave(PADAPTER padapter); -u8 BTDM_1Ant8723A(PADAPTER padapter); -u8 BTDM_GetBtState8723A(PADAPTER padapter); -u8 BTDM_IsBtInquiryPage8723A(PADAPTER padapter); -#define BT_1Ant BTDM_1Ant8723A -#define BT_GetBtState BTDM_GetBtState8723A -#define BT_IsBtInquiryPage BTDM_IsBtInquiryPage8723A - -// ===== End of sync from SD7 driver HAL/BTCoexist/HalBtc8723.h ===== -#endif // __HALBTC8723_C__ - -#ifdef __HALBTCCSR1ANT_C__ // HAL/BTCoexist/HalBtcCsr1Ant.h -// ===== Below this line is sync from SD7 driver HAL/BTCoexist/HalBtcCsr1Ant.h ===== - -enum BT_A2DP_INDEX{ - BT_A2DP_INDEX0 =0, // 32,12; the most critical for BT - BT_A2DP_INDEX1, // 12,24 - BT_A2DP_INDEX2, // 0,0 - BT_A2DP_INDEX_MAX -}; - -#define BT_A2DP_STATE_NOT_ENTERED 0 -#define BT_A2DP_STATE_DETECTING 1 -#define BT_A2DP_STATE_DETECTED 2 - -#define BTDM_ANT_BT_IDLE 0 -#define BTDM_ANT_WIFI 1 -#define BTDM_ANT_BT 2 - - -void BTDM_SingleAnt(PADAPTER padapter, u8 bSingleAntOn, u8 bInterruptOn, u8 bMultiNAVOn); -void BTDM_CheckBTIdleChange1Ant(PADAPTER padapter); - -// ===== End of sync from SD7 driver HAL/BTCoexist/HalBtcCsr1Ant.h ===== -#endif // __HALBTCCSR1ANT_C__ - -#ifdef __HALBTCCSR2ANT_C__ // HAL/BTCoexist/HalBtcCsr2Ant.h -// ===== Below this line is sync from SD7 driver HAL/BTCoexist/HalBtcCsr2Ant.h ===== - -//=========================================== -// For old core stack before v251 -//=========================================== -#define BT_RSSI_STATE_NORMAL_POWER BIT0 -#define BT_RSSI_STATE_AMDPU_OFF BIT1 -#define BT_RSSI_STATE_SPECIAL_LOW BIT2 -#define BT_RSSI_STATE_BG_EDCA_LOW BIT3 -#define BT_RSSI_STATE_TXPOWER_LOW BIT4 - -#define BT_DACSWING_OFF 0 -#define BT_DACSWING_M4 1 -#define BT_DACSWING_M7 2 -#define BT_DACSWING_M10 3 - -void BTDM_DiminishWiFi(PADAPTER Adapter, u8 bDACOn, u8 bInterruptOn, u8 DACSwingLevel, u8 bNAVOn); - -// ===== End of sync from SD7 driver HAL/BTCoexist/HalBtcCsr2Ant.h ===== -#endif // __HALBTCCSR2ANT_C__ - -#ifdef __HALBTCOEXIST_C__ // HAL/BTCoexist/HalBtCoexist.h - -// HEADER/TypeDef.h -#define MAX_FW_SUPPORT_MACID_NUM 64 -#define WIFI_BUSY_TRAFFIC_TH 25 - -// ===== Below this line is sync from SD7 driver HAL/BTCoexist/HalBtCoexist.h ===== - -#define FW_VER_BT_REG 62 -#define FW_VER_BT_REG1 74 -#define REG_BT_ACTIVE 0x444 -#define REG_BT_STATE 0x448 -#define REG_BT_POLLING1 0x44c -#define REG_BT_POLLING 0x700 - -#define REG_BT_ACTIVE_OLD 0x488 -#define REG_BT_STATE_OLD 0x48c -#define REG_BT_POLLING_OLD 0x490 - -// The reg define is for 8723 -#define REG_HIGH_PRIORITY_TXRX 0x770 -#define REG_LOW_PRIORITY_TXRX 0x774 - -#define BT_FW_COEX_THRESH_TOL 6 -#define BT_FW_COEX_THRESH_20 20 -#define BT_FW_COEX_THRESH_23 23 -#define BT_FW_COEX_THRESH_25 25 -#define BT_FW_COEX_THRESH_30 30 -#define BT_FW_COEX_THRESH_35 35 -#define BT_FW_COEX_THRESH_40 40 -#define BT_FW_COEX_THRESH_45 45 -#define BT_FW_COEX_THRESH_47 47 -#define BT_FW_COEX_THRESH_50 50 -#define BT_FW_COEX_THRESH_55 55 -#define BT_FW_COEX_THRESH_65 65 - -#define BT_COEX_STATE_BT30 BIT(0) -#define BT_COEX_STATE_WIFI_HT20 BIT(1) -#define BT_COEX_STATE_WIFI_HT40 BIT(2) -#define BT_COEX_STATE_WIFI_LEGACY BIT(3) - -#define BT_COEX_STATE_WIFI_RSSI_LOW BIT(4) -#define BT_COEX_STATE_WIFI_RSSI_MEDIUM BIT(5) -#define BT_COEX_STATE_WIFI_RSSI_HIGH BIT(6) -#define BT_COEX_STATE_DEC_BT_POWER BIT(7) - -#define BT_COEX_STATE_WIFI_IDLE BIT(8) -#define BT_COEX_STATE_WIFI_UPLINK BIT(9) -#define BT_COEX_STATE_WIFI_DOWNLINK BIT(10) - -#define BT_COEX_STATE_BT_INQ_PAGE BIT(11) -#define BT_COEX_STATE_BT_IDLE BIT(12) -#define BT_COEX_STATE_BT_UPLINK BIT(13) -#define BT_COEX_STATE_BT_DOWNLINK BIT(14) -//=========================================== -// Todo: Remove these definitions -#define BT_COEX_STATE_BT_PAN_IDLE BIT(15) -#define BT_COEX_STATE_BT_PAN_UPLINK BIT(16) -#define BT_COEX_STATE_BT_PAN_DOWNLINK BIT(17) -#define BT_COEX_STATE_BT_A2DP_IDLE BIT(18) -//=========================================== -#define BT_COEX_STATE_BT_RSSI_LOW BIT(19) - -#define BT_COEX_STATE_PROFILE_HID BIT(20) -#define BT_COEX_STATE_PROFILE_A2DP BIT(21) -#define BT_COEX_STATE_PROFILE_PAN BIT(22) -#define BT_COEX_STATE_PROFILE_SCO BIT(23) - -#define BT_COEX_STATE_WIFI_RSSI_1_LOW BIT(24) -#define BT_COEX_STATE_WIFI_RSSI_1_MEDIUM BIT(25) -#define BT_COEX_STATE_WIFI_RSSI_1_HIGH BIT(26) - -#define BT_COEX_STATE_WIFI_RSSI_BEACON_LOW BIT(27) -#define BT_COEX_STATE_WIFI_RSSI_BEACON_MEDIUM BIT(28) -#define BT_COEX_STATE_WIFI_RSSI_BEACON_HIGH BIT(29) - - -#define BT_COEX_STATE_BTINFO_COMMON BIT30 -#define BT_COEX_STATE_BTINFO_B_HID_SCOESCO BIT31 -#define BT_COEX_STATE_BTINFO_B_FTP_A2DP BIT32 - -#define BT_COEX_STATE_BT_CNT_LEVEL_0 BIT33 -#define BT_COEX_STATE_BT_CNT_LEVEL_1 BIT34 -#define BT_COEX_STATE_BT_CNT_LEVEL_2 BIT35 -#define BT_COEX_STATE_BT_CNT_LEVEL_3 BIT36 - -#define BT_RSSI_STATE_HIGH 0 -#define BT_RSSI_STATE_MEDIUM 1 -#define BT_RSSI_STATE_LOW 2 -#define BT_RSSI_STATE_STAY_HIGH 3 -#define BT_RSSI_STATE_STAY_MEDIUM 4 -#define BT_RSSI_STATE_STAY_LOW 5 - - - -#define BT_AGCTABLE_OFF 0 -#define BT_AGCTABLE_ON 1 - -#define BT_BB_BACKOFF_OFF 0 -#define BT_BB_BACKOFF_ON 1 - -#define BT_FW_NAV_OFF 0 -#define BT_FW_NAV_ON 1 - - -#define BT_COEX_MECH_NONE 0 -#define BT_COEX_MECH_SCO 1 -#define BT_COEX_MECH_HID 2 -#define BT_COEX_MECH_A2DP 3 -#define BT_COEX_MECH_PAN 4 -#define BT_COEX_MECH_HID_A2DP 5 -#define BT_COEX_MECH_HID_PAN 6 -#define BT_COEX_MECH_PAN_A2DP 7 -#define BT_COEX_MECH_HID_SCO_ESCO 8 -#define BT_COEX_MECH_FTP_A2DP 9 -#define BT_COEX_MECH_COMMON 10 -#define BT_COEX_MECH_MAX 11 -//=========================================== -// BT Dbg Ctrl -//=========================================== -#define BT_DBG_PROFILE_NONE 0 -#define BT_DBG_PROFILE_SCO 1 -#define BT_DBG_PROFILE_HID 2 -#define BT_DBG_PROFILE_A2DP 3 -#define BT_DBG_PROFILE_PAN 4 -#define BT_DBG_PROFILE_HID_A2DP 5 -#define BT_DBG_PROFILE_HID_PAN 6 -#define BT_DBG_PROFILE_PAN_A2DP 7 -#define BT_DBG_PROFILE_MAX 9 -//=========================================== - -typedef struct _BT_COEXIST_STR -{ - u8 BluetoothCoexist; - u8 BT_Ant_Num; - u8 BT_CoexistType; - u8 BT_Ant_isolation; //0:good, 1:bad - u8 BT_RadioSharedType; - u32 Ratio_Tx; - u32 Ratio_PRI; - u8 bInitlized; - u32 BtRfRegOrigin1E; - u32 BtRfRegOrigin1F; - u8 bBTBusyTraffic; - u8 bBTTrafficModeSet; - u8 bBTNonTrafficModeSet; - BT_TRAFFIC_STATISTICS BT21TrafficStatistics; - u64 CurrentState; - u64 PreviousState; - u8 preRssiState; - u8 preRssiState1; - u8 preRssiStateBeacon; - u8 bFWCoexistAllOff; - u8 bSWCoexistAllOff; - u8 bHWCoexistAllOff; - u8 bBalanceOn; - u8 bSingleAntOn; - u8 bInterruptOn; - u8 bMultiNAVOn; - u8 PreWLANActH; - u8 PreWLANActL; - u8 WLANActH; - u8 WLANActL; - u8 A2DPState; - u8 AntennaState; - u32 lastBtEdca; - u16 last_aggr_num; - u8 bEDCAInitialized; - u8 exec_cnt; - u8 b8723aAgcTableOn; - u8 b92DAgcTableOn; - BT_COEXIST_8723A halCoex8723; - u8 btActiveZeroCnt; - u8 bCurBtDisabled; - u8 bPreBtDisabled; - u8 bNeedToRoamForBtDisableEnable; - u8 fw3aVal[5]; -}BT_COEXIST_STR, *PBT_COEXIST_STR; - - -void BTDM_CheckAntSelMode(PADAPTER padapter); -void BTDM_FwC2hBtRssi(PADAPTER padapter, u8 *tmpBuf); -#define BT_FwC2hBtRssi BTDM_FwC2hBtRssi -void BTDM_FwC2hBtInfo(PADAPTER padapter, u8 *tmpBuf, u8 length); -#define BT_FwC2hBtInfo BTDM_FwC2hBtInfo -void BTDM_DisplayBtCoexInfo(PADAPTER padapter); -#define BT_DisplayBtCoexInfo BTDM_DisplayBtCoexInfo -void BTDM_RejectAPAggregatedPacket(PADAPTER padapter, u8 bReject); -u8 BTDM_IsHT40(PADAPTER padapter); -u8 BTDM_Legacy(PADAPTER padapter); -void BTDM_CheckWiFiState(PADAPTER padapter); -s32 BTDM_GetRxSS(PADAPTER padapter); -u8 BTDM_CheckCoexBcnRssiState(PADAPTER padapter, u8 levelNum, u8 RssiThresh, u8 RssiThresh1); -u8 BTDM_CheckCoexRSSIState1(PADAPTER padapter, u8 levelNum, u8 RssiThresh, u8 RssiThresh1); -u8 BTDM_CheckCoexRSSIState(PADAPTER padapter, u8 levelNum, u8 RssiThresh, u8 RssiThresh1); -u8 BTDM_DisableEDCATurbo(PADAPTER padapter); -#define BT_DisableEDCATurbo BTDM_DisableEDCATurbo -void BTDM_Balance(PADAPTER padapter, u8 bBalanceOn, u8 ms0, u8 ms1); -void BTDM_AGCTable(PADAPTER padapter, u8 type); -void BTDM_BBBackOffLevel(PADAPTER padapter, u8 type); -void BTDM_FWCoexAllOff(PADAPTER padapter); -void BTDM_SWCoexAllOff(PADAPTER padapter); -void BTDM_HWCoexAllOff(PADAPTER padapter); -void BTDM_CoexAllOff(PADAPTER padapter); -void BTDM_TurnOffBtCoexistBeforeEnterIPS(PADAPTER padapter); -void BTDM_SignalCompensation(PADAPTER padapter, u8 *rssi_wifi, u8 *rssi_bt); -void BTDM_Coexist(PADAPTER padapter); -#define BT_CoexistMechanism BTDM_Coexist -void BTDM_UpdateCoexState(PADAPTER padapter); -u8 BTDM_IsSameCoexistState(PADAPTER padapter); -void BTDM_PWDBMonitor(PADAPTER padapter); -u8 BTDM_IsBTBusy(PADAPTER padapter); -#define BT_IsBtBusy BTDM_IsBTBusy -u8 BTDM_IsWifiBusy(PADAPTER padapter); -u8 BTDM_IsCoexistStateChanged(PADAPTER padapter); -u8 BTDM_IsWifiUplink(PADAPTER padapter); -u8 BTDM_IsWifiDownlink(PADAPTER padapter); -u8 BTDM_IsBTHSMode(PADAPTER padapter); -u8 BTDM_IsBTUplink(PADAPTER padapter); -u8 BTDM_IsBTDownlink(PADAPTER padapter); -void BTDM_AdjustForBtOperation(PADAPTER padapter); -void BTDM_ForHalt(PADAPTER padapter); -void BTDM_WifiScanNotify(PADAPTER padapter, u8 scanType); -void BTDM_WifiAssociateNotify(PADAPTER padapter, u8 action); -void BTDM_MediaStatusNotify(PADAPTER padapter, RT_MEDIA_STATUS mstatus); -void BTDM_ForDhcp(PADAPTER padapter); -void BTDM_ResetActionProfileState(PADAPTER padapter); -void BTDM_SetBtCoexCurrAntNum(PADAPTER padapter, u8 antNum); -#define BT_SetBtCoexCurrAntNum BTDM_SetBtCoexCurrAntNum -u8 BTDM_IsActionSCO(PADAPTER padapter); -u8 BTDM_IsActionHID(PADAPTER padapter); -u8 BTDM_IsActionA2DP(PADAPTER padapter); -u8 BTDM_IsActionPAN(PADAPTER padapter); -u8 BTDM_IsActionHIDA2DP(PADAPTER padapter); -u8 BTDM_IsActionHIDPAN(PADAPTER padapter); -u8 BTDM_IsActionPANA2DP(PADAPTER padapter); -u8 BTDM_IsBtDisabled(PADAPTER padapter); -#define BT_IsBtDisabled BTDM_IsBtDisabled -sint BTDM_CheckFWState(PADAPTER padapter, sint state); -u32 BTDM_BtTxRxCounterH(PADAPTER padapter); -u32 BTDM_BtTxRxCounterL(PADAPTER padapter); - -// ===== End of sync from SD7 driver HAL/BTCoexist/HalBtCoexist.h ===== -#endif // __HALBTCOEXIST_C__ - -#ifdef __HALBT_C__ // HAL/HalBT.h -// ===== Below this line is sync from SD7 driver HAL/HalBT.h ===== - -#define RTS_CTS_NO_LEN_LIMIT 0 - -u8 HALBT_GetPGAntNum(PADAPTER padapter); -#define BT_GetPGAntNum HALBT_GetPGAntNum -void HALBT_SetKey(PADAPTER padapter, u8 EntryNum); -void HALBT_RemoveKey(PADAPTER padapter, u8 EntryNum); -void HALBT_InitBTVars8723A(PADAPTER padapter); -#define HALBT_InitHalVars HALBT_InitBTVars8723A -#define BT_InitHalVars HALBT_InitHalVars -u8 HALBT_IsBTExist(PADAPTER padapter); -#define BT_IsBtExist HALBT_IsBTExist -u8 HALBT_BTChipType(PADAPTER padapter); -void HALBT_InitHwConfig(PADAPTER padapter); -#define BT_InitHwConfig HALBT_InitHwConfig -void HALBT_SetRtsCtsNoLenLimit(PADAPTER padapter); - -// ===== End of sync from SD7 driver HAL/HalBT.c ===== -#endif // __HALBT_C__ - -#define _bt_dbg_off_ 0 -#define _bt_dbg_on_ 1 - -extern u32 BTCoexDbgLevel; - - - -#endif // __RTL8723A_BT_COEXIST_H__ - diff --git a/include/rtl8723a_cmd.h b/include/rtl8723a_cmd.h deleted file mode 100755 index 91202dc..0000000 --- a/include/rtl8723a_cmd.h +++ /dev/null @@ -1,229 +0,0 @@ -/****************************************************************************** - * - * Copyright(c) 2007 - 2012 Realtek Corporation. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA - * - * - ******************************************************************************/ -#ifndef __RTL8723A_CMD_H__ -#define __RTL8723A_CMD_H__ - - -#define H2C_BT_FW_PATCH_LEN 3 -#define H2C_BT_PWR_FORCE_LEN 3 - -enum cmd_msg_element_id -{ - NONE_CMDMSG_EID, - AP_OFFLOAD_EID = 0, - SET_PWRMODE_EID = 1, - JOINBSS_RPT_EID = 2, - RSVD_PAGE_EID = 3, - RSSI_4_EID = 4, - RSSI_SETTING_EID = 5, - MACID_CONFIG_EID = 6, - MACID_PS_MODE_EID = 7, - P2P_PS_OFFLOAD_EID = 8, - SELECTIVE_SUSPEND_ROF_CMD = 9, - BT_QUEUE_PKT_EID = 17, - BT_ANT_TDMA_EID = 20, - BT_2ANT_HID_EID = 21, - P2P_PS_CTW_CMD_EID = 32, - FORCE_BT_TX_PWR_EID = 33, - SET_TDMA_WLAN_ACT_TIME_EID = 34, - SET_BT_TX_RETRY_INDEX_EID = 35, - HID_PROFILE_ENABLE_EID = 36, - BT_IGNORE_WLAN_ACT_EID = 37, - BT_PTA_MANAGER_UPDATE_ENABLE_EID = 38, - DAC_SWING_VALUE_EID = 41, - TRADITIONAL_TDMA_EN_EID = 51, - H2C_BT_FW_PATCH = 54, - B_TYPE_TDMA_EID = 58, - SCAN_EN_EID = 59, - LOWPWR_LPS_EID = 71, - H2C_RESET_TSF = 75, - MAX_CMDMSG_EID -}; - -struct cmd_msg_parm { - u8 eid; //element id - u8 sz; // sz - u8 buf[6]; -}; - -typedef struct _SETPWRMODE_PARM -{ - u8 Mode; - u8 SmartPS; - u8 AwakeInterval; // unit: beacon interval - u8 bAllQueueUAPSD; - -#if 0 - u8 LowRxBCN:1; - u8 AutoAntSwitch:1; - u8 PSAllowBTHighPriority:1; - u8 rsvd43:5; -#else -#define SETPM_LOWRXBCN BIT(0) -#define SETPM_AUTOANTSWITCH BIT(1) -#define SETPM_PSALLOWBTHIGHPRI BIT(2) - u8 BcnAntMode; -#endif -}__attribute__((__packed__)) SETPWRMODE_PARM, *PSETPWRMODE_PARM; - -struct H2C_SS_RFOFF_PARAM{ - u8 ROFOn; // 1: on, 0:off - u16 gpio_period; // unit: 1024 us -}__attribute__ ((packed)); - - -typedef struct JOINBSSRPT_PARM{ - u8 OpMode; // RT_MEDIA_STATUS -}JOINBSSRPT_PARM, *PJOINBSSRPT_PARM; - -typedef struct _RSVDPAGE_LOC { - u8 LocProbeRsp; - u8 LocPsPoll; - u8 LocNullData; - u8 LocQosNull; - u8 LocBTQosNull; -} RSVDPAGE_LOC, *PRSVDPAGE_LOC; - -struct P2P_PS_Offload_t { - u8 Offload_En:1; - u8 role:1; // 1: Owner, 0: Client - u8 CTWindow_En:1; - u8 NoA0_En:1; - u8 NoA1_En:1; - u8 AllStaSleep:1; // Only valid in Owner - u8 discovery:1; - u8 rsvd:1; -}; - -struct P2P_PS_CTWPeriod_t { - u8 CTWPeriod; //TU -}; - - -typedef struct _B_TYPE_TDMA_PARM -{ -#if 0 - u8 En:1; - u8 FixAntennaInBTSide:1; - u8 TxPspoll:1; - u8 val870:1; // value of 870, when disable - u8 AutoWakeUp:1; - u8 NoPS:1; - u8 WlanHighPriority:1; - u8 rsvd07:1; -#else -#define B_TDMA_EN BIT(0) -#define B_TDMA_FIXANTINBT BIT(1) -#define B_TDMA_TXPSPOLL BIT(2) -#define B_TDMA_VAL870 BIT(3) -#define B_TDMA_AUTOWAKEUP BIT(4) -#define B_TDMA_NOPS BIT(5) -#define B_TDMA_WLANHIGHPRI BIT(6) - u8 option; -#endif - - u8 TBTTOnPeriod; - u8 MedPeriod; - u8 rsvd30; -}__attribute__((__packed__)) B_TYPE_TDMA_PARM, *PB_TYPE_TDMA_PARM; - -typedef struct _SCAN_EN_PARM { -#if 0 - u8 En:1; - u8 rsvd01:7; -#else - u8 En; -#endif -}__attribute__((__packed__)) SCAN_EN_PARM, *PSCAN_EN_PARM; - -// BT_PWR -#define SET_H2CCMD_BT_PWR_IDX(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE_8BIT(__pH2CCmd, 0, 8, __Value) - -// BT_FW_PATCH -#if 0 -#define SET_H2CCMD_BT_FW_PATCH_ENABLE(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE(__pH2CCmd, 0, 8, __Value) -#define SET_H2CCMD_BT_FW_PATCH_SIZE(__pH2CCmd, __Value) SET_BITS_TO_LE_2BYTE((__pH2CCmd)+1, 0, 16, __Value) -#else -#define SET_H2CCMD_BT_FW_PATCH_ENABLE(__pH2CCmd, __Value) SET_BITS_TO_LE_4BYTE(__pH2CCmd, 0, 8, __Value) // SET_BITS_TO_LE_1BYTE(__pH2CCmd, 0, 8, __Value) -#define SET_H2CCMD_BT_FW_PATCH_SIZE(__pH2CCmd, __Value) SET_BITS_TO_LE_4BYTE(__pH2CCmd, 8, 16, __Value) // SET_BITS_TO_LE_2BYTE((__pH2CCmd)+1, 0, 16, __Value) -#endif - -#if 0 -/* - * H2C_LOWPWR_LPS - * h2c cmd = 71 - * byte1[6:0]= bcn count : how many bcn not recevied should return to old mechanism - * byte1[7] = enable : enable mechanism - * byte2=bcn period : bcn recv time of this AP, unit 32 us - * byte3= drop threshold : how many pkts be droped, rx dma should be release - * byte4 = max early period - * byte5 = max bcn timeout period - */ -#define SET_H2CCMD_LOWPWR_LPS_BCN_COUNT(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE(__pH2CCmd, 0, 4, __Value) -#define SET_H2CCMD_LOWPWR_LPS_TB_BCN_THRESH(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE(__pH2CCmd, 4, 3, __Value) -#define SET_H2CCMD_LOWPWR_LPS_ENABLE(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE(__pH2CCmd, 7, 1, __Value) -#define SET_H2CCMD_LOWPWR_LPS_BCN_PERIOD(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE_8BIT((__pH2CCmd)+1, 0, 8, __Value) -#define SET_H2CCMD_LOWPWR_LPS_BCN_DROP_THRESH(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE_8BIT((__pH2CCmd)+2, 0, 8, __Value) -#define SET_H2CCMD_LOWPWR_LPS_MAX_EARLY_PERIOD(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE_8BIT((__pH2CCmd)+3, 0, 8, __Value) -#define SET_H2CCMD_LOWPWR_LPS_MAX_BCN_TO_PERIOD(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE_8BIT((__pH2CCmd)+4, 0, 8, __Value) -#else -typedef struct _LOWPWR_LPS_PARM -{ - u8 bcn_count:4; - u8 tb_bcn_threshold:3; - u8 enable:1; - u8 bcn_interval; - u8 drop_threshold; - u8 max_early_period; - u8 max_bcn_timeout_period; -}__attribute__((__packed__)) LOWPWR_LPS_PARM, *PLOWPWR_LPS_PARM; -#endif - - -// host message to firmware cmd -void rtl8723a_set_FwPwrMode_cmd(PADAPTER padapter, u8 Mode); -void rtl8723a_set_FwJoinBssReport_cmd(PADAPTER padapter, u8 mstatus); -#ifdef CONFIG_BT_COEXIST -void rtl8723a_set_BTCoex_AP_mode_FwRsvdPkt_cmd(PADAPTER padapter); -#endif -u8 rtl8192c_set_rssi_cmd(PADAPTER padapter, u8 *param); -//u8 rtl8723a_set_rssi_cmd(PADAPTER padapter, u8 *param); -u8 rtl8192c_set_raid_cmd(PADAPTER padapter, u32 mask, u8 arg); -//u8 rtl8723a_set_raid_cmd(PADAPTER padapter, u32 mask, u8 arg); -void rtl8192c_Add_RateATid(PADAPTER padapter, u32 bitmap, u8 arg, u8 rssi_level); -//void rtl8723a_Add_RateATid(PADAPTER padapter, u32 bitmap, u8 arg); -u8 rtl8192c_set_FwSelectSuspend_cmd(PADAPTER padapter, u8 bfwpoll, u16 period); -//u8 rtl8723a_set_FwSelectSuspend_cmd(PADAPTER padapter, u8 bfwpoll, u16 period); - -#ifdef CONFIG_P2P -void rtl8192c_set_p2p_ps_offload_cmd(PADAPTER padapter, u8 p2p_ps_state); -//void rtl8723a_set_p2p_ps_offload_cmd(PADAPTER padapter, u8 p2p_ps_state); -#endif //CONFIG_P2P - -void CheckFwRsvdPageContent(PADAPTER padapter); - -void rtl8723a_set_FwMediaStatus_cmd(PADAPTER padapter, u16 mstatus_rpt ); - -#endif - -#ifdef CONFIG_TSF_RESET_OFFLOAD -u8 rtl8723c_reset_tsf(_adapter *padapter, u8 reset_port); -#endif // CONFIG_TSF_RESET_OFFLOAD - diff --git a/include/rtl8723a_dm.h b/include/rtl8723a_dm.h deleted file mode 100755 index 7b5da5a..0000000 --- a/include/rtl8723a_dm.h +++ /dev/null @@ -1,194 +0,0 @@ -/****************************************************************************** - * - * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA - * - * - ******************************************************************************/ -#ifndef __RTL8723A_DM_H__ -#define __RTL8723A_DM_H__ -//============================================================ -// Description: -// -// This file is for 8723A dynamic mechanism only -// -// -//============================================================ -#define DYNAMIC_FUNC_BT BIT(0) - -enum{ - UP_LINK, - DOWN_LINK, -}; -//============================================================ -// structure and define -//============================================================ - -//###### duplicate code,will move to ODM ######### -#define IQK_MAC_REG_NUM 4 -#define IQK_ADDA_REG_NUM 16 -#define IQK_BB_REG_NUM 9 -#define HP_THERMAL_NUM 8 -//###### duplicate code,will move to ODM ######### -struct dm_priv -{ - u8 DM_Type; - u8 DMFlag; - u8 InitDMFlag; - u32 InitODMFlag; - - //* Upper and Lower Signal threshold for Rate Adaptive*/ - int UndecoratedSmoothedPWDB; - int UndecoratedSmoothedCCK; - int EntryMinUndecoratedSmoothedPWDB; - int EntryMaxUndecoratedSmoothedPWDB; - int MinUndecoratedPWDBForDM; - int LastMinUndecoratedPWDBForDM; - - s32 UndecoratedSmoothedBeacon; - #ifdef CONFIG_BT_COEXIST - s32 BT_EntryMinUndecoratedSmoothedPWDB; - s32 BT_EntryMaxUndecoratedSmoothedPWDB; - #endif - -//###### duplicate code,will move to ODM ######### -/* - //for DIG - u8 bDMInitialGainEnable; - u8 binitialized; // for dm_initial_gain_Multi_STA use. - DIG_T DM_DigTable; - - PS_T DM_PSTable; - - FALSE_ALARM_STATISTICS FalseAlmCnt; - - //for rate adaptive, in fact, 88c/92c fw will handle this - u8 bUseRAMask; - RATE_ADAPTIVE RateAdaptive; -*/ - //for High Power - u8 bDynamicTxPowerEnable; - u8 LastDTPLvl; - u8 DynamicTxHighPowerLvl;//Add by Jacken Tx Power Control for Near/Far Range 2008/03/06 - - //for tx power tracking - u8 bTXPowerTracking; - u8 TXPowercount; - u8 bTXPowerTrackingInit; - u8 TxPowerTrackControl; //for mp mode, turn off txpwrtracking as default - u8 TM_Trigger; - - u8 ThermalMeter[2]; // ThermalMeter, index 0 for RFIC0, and 1 for RFIC1 - u8 ThermalValue; - u8 ThermalValue_LCK; - u8 ThermalValue_IQK; - u8 ThermalValue_DPK; - - u8 bRfPiEnable; - - //for APK - u32 APKoutput[2][2]; //path A/B; output1_1a/output1_2a - u8 bAPKdone; - u8 bAPKThermalMeterIgnore; - u8 bDPdone; - u8 bDPPathAOK; - u8 bDPPathBOK; - - //for IQK - u32 RegC04; - u32 Reg874; - u32 RegC08; - u32 RegB68; - u32 RegB6C; - u32 Reg870; - u32 Reg860; - u32 Reg864; - u32 ADDA_backup[IQK_ADDA_REG_NUM]; - u32 IQK_MAC_backup[IQK_MAC_REG_NUM]; - u32 IQK_BB_backup_recover[9]; - u32 IQK_BB_backup[IQK_BB_REG_NUM]; - u8 PowerIndex_backup[6]; - - u8 bCCKinCH14; - - u8 CCK_index; - u8 OFDM_index[2]; - - u8 bDoneTxpower; - u8 CCK_index_HP; - u8 OFDM_index_HP[2]; - u8 ThermalValue_HP[HP_THERMAL_NUM]; - u8 ThermalValue_HP_index; - - //for TxPwrTracking - s32 RegE94; - s32 RegE9C; - s32 RegEB4; - s32 RegEBC; - - u32 TXPowerTrackingCallbackCnt; //cosa add for debug - - u32 prv_traffic_idx; // edca turbo - -/* - // for dm_RF_Saving - u8 initialize; - u32 rf_saving_Reg874; - u32 rf_saving_RegC70; - u32 rf_saving_Reg85C; - u32 rf_saving_RegA74; -*/ - //for Antenna diversity -#ifdef CONFIG_ANTENNA_DIVERSITY -// SWAT_T DM_SWAT_Table; -#endif - -#ifdef CONFIG_SW_ANTENNA_DIVERSITY -// _timer SwAntennaSwitchTimer; -/* - u64 lastTxOkCnt; - u64 lastRxOkCnt; - u64 TXByteCnt_A; - u64 TXByteCnt_B; - u64 RXByteCnt_A; - u64 RXByteCnt_B; - u8 DoubleComfirm; - u8 TrafficLoad; -*/ -#endif - - s32 OFDM_Pkt_Cnt; - u8 RSSI_Select; -// u8 DIG_Dynamic_MIN ; -//###### duplicate code,will move to ODM ######### - // Add for Reading Initial Data Rate SEL Register 0x484 during watchdog. Using for fill tx desc. 2011.3.21 by Thomas - u8 INIDATA_RATE[32]; -}; - - -//============================================================ -// function prototype -//============================================================ - -void rtl8723a_init_dm_priv(PADAPTER padapter); -void rtl8723a_deinit_dm_priv(PADAPTER padapter); - -void rtl8723a_InitHalDm(PADAPTER padapter); -void rtl8723a_HalDmWatchDog(PADAPTER padapter); - - - -#endif - diff --git a/include/rtl8723a_hal.h b/include/rtl8723a_hal.h deleted file mode 100755 index 2111999..0000000 --- a/include/rtl8723a_hal.h +++ /dev/null @@ -1,849 +0,0 @@ -/****************************************************************************** - * - * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA - * - * - ******************************************************************************/ -#ifndef __RTL8723A_HAL_H__ -#define __RTL8723A_HAL_H__ - -#include "rtl8723a_spec.h" -#include "rtl8723a_pg.h" -#include "Hal8723APhyReg.h" -#include "Hal8723APhyCfg.h" -#include "rtl8723a_rf.h" -#ifdef CONFIG_BT_COEXIST -#include "rtl8723a_bt-coexist.h" -#endif -#include "rtl8723a_dm.h" -#include "rtl8723a_recv.h" -#include "rtl8723a_xmit.h" -#include "rtl8723a_cmd.h" -#ifdef DBG_CONFIG_ERROR_DETECT -#include "rtl8723a_sreset.h" -#endif -#include "rtw_efuse.h" - -#include "../hal/OUTSRC/odm_precomp.h" - -#if defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI) - - //2TODO: We should define 8192S firmware related macro settings here!! - #define RTL819X_DEFAULT_RF_TYPE RF_1T2R - #define RTL819X_TOTAL_RF_PATH 2 - -//--------------------------------------------------------------------- -// RTL8723S From file -//--------------------------------------------------------------------- - #define RTL8723_FW_UMC_IMG "rtl8723S\\rtl8723fw.bin" - #define RTL8723_FW_UMC_B_IMG "rtl8723S\\rtl8723fw_B.bin" - #define RTL8723_PHY_REG "rtl8723S\\PHY_REG_1T.txt" - #define RTL8723_PHY_RADIO_A "rtl8723S\\radio_a_1T.txt" - #define RTL8723_PHY_RADIO_B "rtl8723S\\radio_b_1T.txt" - #define RTL8723_AGC_TAB "rtl8723S\\AGC_TAB_1T.txt" - #define RTL8723_PHY_MACREG "rtl8723S\\MAC_REG.txt" - #define RTL8723_PHY_REG_PG "rtl8723S\\PHY_REG_PG.txt" - #define RTL8723_PHY_REG_MP "rtl8723S\\PHY_REG_MP.txt" - -//--------------------------------------------------------------------- -// RTL8723S From header -//--------------------------------------------------------------------- - - // Fw Array - #define Rtl8723_FwImageArray Rtl8723SFwImgArray - #define Rtl8723_FwUMCBCutImageArrayWithBT Rtl8723SFwUMCBCutImgArrayWithBT - #define Rtl8723_FwUMCBCutImageArrayWithoutBT Rtl8723SFwUMCBCutImgArrayWithoutBT - - #define Rtl8723_ImgArrayLength Rtl8723SImgArrayLength - #define Rtl8723_UMCBCutImgArrayWithBTLength Rtl8723SUMCBCutImgArrayWithBTLength - #define Rtl8723_UMCBCutImgArrayWithoutBTLength Rtl8723SUMCBCutImgArrayWithoutBTLength - - #define Rtl8723_PHY_REG_Array_PG Rtl8723SPHY_REG_Array_PG - #define Rtl8723_PHY_REG_Array_PGLength Rtl8723SPHY_REG_Array_PGLength -#if MP_DRIVER == 1 - #define Rtl8723E_FwBTImgArray Rtl8723EFwBTImgArray - #define Rtl8723E_FwBTImgArrayLength Rtl8723EBTImgArrayLength - - #define Rtl8723_FwUMCBCutMPImageArray Rtl8723SFwUMCBCutMPImgArray - #define Rtl8723_UMCBCutMPImgArrayLength Rtl8723SUMCBCutMPImgArrayLength - - #define Rtl8723_PHY_REG_Array_MP Rtl8723SPHY_REG_Array_MP - #define Rtl8723_PHY_REG_Array_MPLength Rtl8723SPHY_REG_Array_MPLength -#endif - -#ifndef CONFIG_PHY_SETTING_WITH_ODM - // MAC/BB/PHY Array - #define Rtl8723_MAC_Array Rtl8723SMAC_2T_Array - //#define Rtl8723_AGCTAB_2TArray Rtl8723SAGCTAB_2TArray - #define Rtl8723_AGCTAB_1TArray Rtl8723SAGCTAB_1TArray - //#define Rtl8723_PHY_REG_2TArray Rtl8723SPHY_REG_2TArray - #define Rtl8723_PHY_REG_1TArray Rtl8723SPHY_REG_1TArray - //#define Rtl8723_RadioA_2TArray Rtl8723SRadioA_2TArray - #define Rtl8723_RadioA_1TArray Rtl8723SRadioA_1TArray - //#define Rtl8723_RadioB_2TArray Rtl8723SRadioB_2TArray - #define Rtl8723_RadioB_1TArray Rtl8723SRadioB_1TArray - - // Array length - #define Rtl8723_MAC_ArrayLength Rtl8723SMAC_2T_ArrayLength - #define Rtl8723_AGCTAB_1TArrayLength Rtl8723SAGCTAB_1TArrayLength - #define Rtl8723_PHY_REG_1TArrayLength Rtl8723SPHY_REG_1TArrayLength - - #define Rtl8723_RadioA_1TArrayLength Rtl8723SRadioA_1TArrayLength - #define Rtl8723_RadioB_1TArrayLength Rtl8723SRadioB_1TArrayLength -#endif // CONFIG_PHY_SETTING_WITH_ODM -#endif // CONFIG_SDIO_HCI - -#ifdef CONFIG_USB_HCI - - //2TODO: We should define 8192S firmware related macro settings here!! - #define RTL819X_DEFAULT_RF_TYPE RF_1T2R - #define RTL819X_TOTAL_RF_PATH 2 - - //TODO: The following need to check!! - #define RTL8723_FW_UMC_IMG "rtl8192CU\\rtl8723fw.bin" - #define RTL8723_FW_UMC_B_IMG "rtl8192CU\\rtl8723fw_B.bin" - #define RTL8723_PHY_REG "rtl8723S\\PHY_REG_1T.txt" - #define RTL8723_PHY_RADIO_A "rtl8723S\\radio_a_1T.txt" - #define RTL8723_PHY_RADIO_B "rtl8723S\\radio_b_1T.txt" - #define RTL8723_AGC_TAB "rtl8723S\\AGC_TAB_1T.txt" - #define RTL8723_PHY_MACREG "rtl8723S\\MAC_REG.txt" - #define RTL8723_PHY_REG_PG "rtl8723S\\PHY_REG_PG.txt" - #define RTL8723_PHY_REG_MP "rtl8723S\\PHY_REG_MP.txt" - -//--------------------------------------------------------------------- -// RTL8723S From header -//--------------------------------------------------------------------- - - // Fw Array - #define Rtl8723_FwImageArray Rtl8723UFwImgArray - #define Rtl8723_FwUMCBCutImageArrayWithBT Rtl8723UFwUMCBCutImgArrayWithBT - #define Rtl8723_FwUMCBCutImageArrayWithoutBT Rtl8723UFwUMCBCutImgArrayWithoutBT - - #define Rtl8723_ImgArrayLength Rtl8723UImgArrayLength - #define Rtl8723_UMCBCutImgArrayWithBTLength Rtl8723UUMCBCutImgArrayWithBTLength - #define Rtl8723_UMCBCutImgArrayWithoutBTLength Rtl8723UUMCBCutImgArrayWithoutBTLength - - #define Rtl8723_PHY_REG_Array_PG Rtl8723UPHY_REG_Array_PG - #define Rtl8723_PHY_REG_Array_PGLength Rtl8723UPHY_REG_Array_PGLength - -#if MP_DRIVER == 1 - #define Rtl8723E_FwBTImgArray Rtl8723EFwBTImgArray - #define Rtl8723E_FwBTImgArrayLength Rtl8723EBTImgArrayLength - - #define Rtl8723_FwUMCBCutMPImageArray Rtl8723SFwUMCBCutMPImgArray - #define Rtl8723_UMCBCutMPImgArrayLength Rtl8723SUMCBCutMPImgArrayLength - - #define Rtl8723_PHY_REG_Array_MP Rtl8723UPHY_REG_Array_MP - #define Rtl8723_PHY_REG_Array_MPLength Rtl8723UPHY_REG_Array_MPLength -#endif -#ifndef CONFIG_PHY_SETTING_WITH_ODM - // MAC/BB/PHY Array - #define Rtl8723_MAC_Array Rtl8723UMAC_2T_Array - //#define Rtl8723_AGCTAB_2TArray Rtl8723UAGCTAB_2TArray - #define Rtl8723_AGCTAB_1TArray Rtl8723UAGCTAB_1TArray - //#define Rtl8723_PHY_REG_2TArray Rtl8723UPHY_REG_2TArray - #define Rtl8723_PHY_REG_1TArray Rtl8723UPHY_REG_1TArray - //#define Rtl8723_RadioA_2TArray Rtl8723URadioA_2TArray - #define Rtl8723_RadioA_1TArray Rtl8723URadioA_1TArray - //#define Rtl8723_RadioB_2TArray Rtl8723URadioB_2TArray - #define Rtl8723_RadioB_1TArray Rtl8723URadioB_1TArray - - - - // Array length - - #define Rtl8723_MAC_ArrayLength Rtl8723UMAC_2T_ArrayLength - #define Rtl8723_AGCTAB_1TArrayLength Rtl8723UAGCTAB_1TArrayLength - #define Rtl8723_PHY_REG_1TArrayLength Rtl8723UPHY_REG_1TArrayLength - - - #define Rtl8723_RadioA_1TArrayLength Rtl8723URadioA_1TArrayLength - #define Rtl8723_RadioB_1TArrayLength Rtl8723URadioB_1TArrayLength -#endif -#endif - -#define DRVINFO_SZ 4 // unit is 8bytes -#define PageNum_128(_Len) (u32)(((_Len)>>7) + ((_Len)&0x7F ? 1:0)) - -#define FW_8723A_SIZE 0x8000 -#define FW_8723A_START_ADDRESS 0x1000 -#define FW_8723A_END_ADDRESS 0x1FFF //0x5FFF - -#define MAX_PAGE_SIZE 4096 // @ page : 4k bytes - -#define IS_FW_HEADER_EXIST(_pFwHdr) ((le16_to_cpu(_pFwHdr->Signature)&0xFFF0) == 0x92C0 ||\ - (le16_to_cpu(_pFwHdr->Signature)&0xFFF0) == 0x88C0 ||\ - (le16_to_cpu(_pFwHdr->Signature)&0xFFF0) == 0x2300) - -typedef enum _FIRMWARE_SOURCE { - FW_SOURCE_IMG_FILE = 0, - FW_SOURCE_HEADER_FILE = 1, //from header file -} FIRMWARE_SOURCE, *PFIRMWARE_SOURCE; - -typedef struct _RT_FIRMWARE { - FIRMWARE_SOURCE eFWSource; -#ifdef CONFIG_EMBEDDED_FWIMG - u8* szFwBuffer; -#else - u8 szFwBuffer[FW_8723A_SIZE]; -#endif - u32 ulFwLength; - -#ifdef CONFIG_EMBEDDED_FWIMG - u8* szBTFwBuffer; -#else - u8 szBTFwBuffer[FW_8723A_SIZE]; -#endif - u32 ulBTFwLength; -} RT_FIRMWARE, *PRT_FIRMWARE, RT_FIRMWARE_8723A, *PRT_FIRMWARE_8723A; - -// -// This structure must be cared byte-ordering -// -// Added by tynli. 2009.12.04. -typedef struct _RT_8723A_FIRMWARE_HDR -{ - // 8-byte alinment required - - //--- LONG WORD 0 ---- - u16 Signature; // 92C0: test chip; 92C, 88C0: test chip; 88C1: MP A-cut; 92C1: MP A-cut - u8 Category; // AP/NIC and USB/PCI - u8 Function; // Reserved for different FW function indcation, for further use when driver needs to download different FW in different conditions - u16 Version; // FW Version - u8 Subversion; // FW Subversion, default 0x00 - u16 Rsvd1; - - - //--- LONG WORD 1 ---- - u8 Month; // Release time Month field - u8 Date; // Release time Date field - u8 Hour; // Release time Hour field - u8 Minute; // Release time Minute field - u16 RamCodeSize; // The size of RAM code - u16 Rsvd2; - - //--- LONG WORD 2 ---- - u32 SvnIdx; // The SVN entry index - u32 Rsvd3; - - //--- LONG WORD 3 ---- - u32 Rsvd4; - u32 Rsvd5; -}RT_8723A_FIRMWARE_HDR, *PRT_8723A_FIRMWARE_HDR; - -#define DRIVER_EARLY_INT_TIME 0x05 -#define BCN_DMA_ATIME_INT_TIME 0x02 - -#ifdef CONFIG_USB_RX_AGGREGATION - -typedef enum _USB_RX_AGG_MODE{ - USB_RX_AGG_DISABLE, - USB_RX_AGG_DMA, - USB_RX_AGG_USB, - USB_RX_AGG_MIX -}USB_RX_AGG_MODE; - -#define MAX_RX_DMA_BUFFER_SIZE 10240 // 10K for 8192C RX DMA buffer - -#endif - - -// BK, BE, VI, VO, HCCA, MANAGEMENT, COMMAND, HIGH, BEACON. -#define MAX_TX_QUEUE 9 - -#define TX_SELE_HQ BIT(0) // High Queue -#define TX_SELE_LQ BIT(1) // Low Queue -#define TX_SELE_NQ BIT(2) // Normal Queue - -// Note: We will divide number of page equally for each queue other than public queue! -#define TX_TOTAL_PAGE_NUMBER 0xF8 -#define TX_PAGE_BOUNDARY (TX_TOTAL_PAGE_NUMBER + 1) - -// For Normal Chip Setting -// (HPQ + LPQ + NPQ + PUBQ) shall be TX_TOTAL_PAGE_NUMBER -#define NORMAL_PAGE_NUM_PUBQ 0xE7 -#define NORMAL_PAGE_NUM_HPQ 0x0C -#define NORMAL_PAGE_NUM_LPQ 0x02 -#define NORMAL_PAGE_NUM_NPQ 0x02 - -// For Test Chip Setting -// (HPQ + LPQ + PUBQ) shall be TX_TOTAL_PAGE_NUMBER -#define TEST_PAGE_NUM_PUBQ 0x7E - -// For Test Chip Setting -#define WMM_TEST_TX_TOTAL_PAGE_NUMBER 0xF5 -#define WMM_TEST_TX_PAGE_BOUNDARY (WMM_TEST_TX_TOTAL_PAGE_NUMBER + 1) //F6 - -#define WMM_TEST_PAGE_NUM_PUBQ 0xA3 -#define WMM_TEST_PAGE_NUM_HPQ 0x29 -#define WMM_TEST_PAGE_NUM_LPQ 0x29 - -// Note: For Normal Chip Setting, modify later -#define WMM_NORMAL_TX_TOTAL_PAGE_NUMBER 0xF5 -#define WMM_NORMAL_TX_PAGE_BOUNDARY (WMM_TEST_TX_TOTAL_PAGE_NUMBER + 1) //F6 - -#define WMM_NORMAL_PAGE_NUM_PUBQ 0xB0 -#define WMM_NORMAL_PAGE_NUM_HPQ 0x29 -#define WMM_NORMAL_PAGE_NUM_LPQ 0x1C -#define WMM_NORMAL_PAGE_NUM_NPQ 0x1C - - -//------------------------------------------------------------------------- -// Chip specific -//------------------------------------------------------------------------- -#define CHIP_BONDING_IDENTIFIER(_value) (((_value)>>22)&0x3) -#define CHIP_BONDING_92C_1T2R 0x1 -#define CHIP_BONDING_88C_USB_MCARD 0x2 -#define CHIP_BONDING_88C_USB_HP 0x1 - -#include "HalVerDef.h" -#include "hal_com.h" - -//------------------------------------------------------------------------- -// Channel Plan -//------------------------------------------------------------------------- -enum ChannelPlan -{ - CHPL_FCC = 0, - CHPL_IC = 1, - CHPL_ETSI = 2, - CHPL_SPAIN = 3, - CHPL_FRANCE = 4, - CHPL_MKK = 5, - CHPL_MKK1 = 6, - CHPL_ISRAEL = 7, - CHPL_TELEC = 8, - CHPL_GLOBAL = 9, - CHPL_WORLD = 10, -}; - -#define HAL_EFUSE_MEMORY - -#define EFUSE_REAL_CONTENT_LEN 512 -#define EFUSE_MAP_LEN 128 -#define EFUSE_MAX_SECTION 16 -#define EFUSE_IC_ID_OFFSET 506 //For some inferiority IC purpose. added by Roger, 2009.09.02. -#define AVAILABLE_EFUSE_ADDR(addr) (addr < EFUSE_REAL_CONTENT_LEN) -// -// -// To prevent out of boundary programming case, -// leave 1byte and program full section -// 9bytes + 1byt + 5bytes and pre 1byte. -// For worst case: -// | 1byte|----8bytes----|1byte|--5bytes--| -// | | Reserved(14bytes) | -// - -// PG data exclude header, dummy 6 bytes frome CP test and reserved 1byte. -#define EFUSE_OOB_PROTECT_BYTES 15 - -#define EFUSE_REAL_CONTENT_LEN_8723A 512 -#define EFUSE_MAP_LEN_8723A 256 -#define EFUSE_MAX_SECTION_8723A 32 - -//======================================================== -// EFUSE for BT definition -//======================================================== -#define EFUSE_BT_REAL_BANK_CONTENT_LEN 512 -#define EFUSE_BT_REAL_CONTENT_LEN 1536 // 512*3 -#define EFUSE_BT_MAP_LEN 1024 // 1k bytes -#define EFUSE_BT_MAX_SECTION 128 // 1024/8 - -#define EFUSE_PROTECT_BYTES_BANK 16 - -// -// For RTL8723 WiFi/BT/GPS multi-function configuration. 2010.10.06. -// -typedef enum _RT_MULTI_FUNC { - RT_MULTI_FUNC_NONE = 0x00, - RT_MULTI_FUNC_WIFI = 0x01, - RT_MULTI_FUNC_BT = 0x02, - RT_MULTI_FUNC_GPS = 0x04, -} RT_MULTI_FUNC, *PRT_MULTI_FUNC; - -// -// For RTL8723 WiFi PDn/GPIO polarity control configuration. 2010.10.08. -// -typedef enum _RT_POLARITY_CTL { - RT_POLARITY_LOW_ACT = 0, - RT_POLARITY_HIGH_ACT = 1, -} RT_POLARITY_CTL, *PRT_POLARITY_CTL; - -// For RTL8723 regulator mode. by tynli. 2011.01.14. -typedef enum _RT_REGULATOR_MODE { - RT_SWITCHING_REGULATOR = 0, - RT_LDO_REGULATOR = 1, -} RT_REGULATOR_MODE, *PRT_REGULATOR_MODE; - -// Description: Determine the types of C2H events that are the same in driver and Fw. -// Fisrt constructed by tynli. 2009.10.09. -typedef enum _RTL8192C_C2H_EVT -{ - C2H_DBG = 0, - C2H_TSF = 1, - C2H_AP_RPT_RSP = 2, - C2H_CCX_TX_RPT = 3, // The FW notify the report of the specific tx packet. - C2H_BT_RSSI = 4, - C2H_BT_OP_MODE = 5, - C2H_EXT_RA_RPT = 6, - C2H_HW_INFO_EXCH = 10, - C2H_C2H_H2C_TEST = 11, - C2H_BT_INFO = 12, - C2H_BT_MP_INFO = 15, - MAX_C2HEVENT -} RTL8192C_C2H_EVT; - -typedef struct hal_data_8723a -{ - HAL_VERSION VersionID; - RT_CUSTOMER_ID CustomerID; - - u16 FirmwareVersion; - u16 FirmwareVersionRev; - u16 FirmwareSubVersion; - u16 FirmwareSignature; - - //current WIFI_PHY values - u32 ReceiveConfig; - WIRELESS_MODE CurrentWirelessMode; - HT_CHANNEL_WIDTH CurrentChannelBW; - u8 CurrentChannel; - u8 nCur40MhzPrimeSC;// Control channel sub-carrier - - u16 BasicRateSet; - - //rf_ctrl - u8 rf_chip; - u8 rf_type; - u8 NumTotalRFPath; - - u8 BoardType; - u8 CrystalCap; - // - // EEPROM setting. - // - u8 EEPROMVersion; - u16 EEPROMVID; - u16 EEPROMPID; - u16 EEPROMSVID; - u16 EEPROMSDID; - u8 EEPROMCustomerID; - u8 EEPROMSubCustomerID; - u8 EEPROMRegulatory; - u8 EEPROMThermalMeter; - u8 EEPROMBluetoothCoexist; - u8 EEPROMBluetoothType; - u8 EEPROMBluetoothAntNum; - u8 EEPROMBluetoothAntIsolation; - u8 EEPROMBluetoothRadioShared; - - u8 bTXPowerDataReadFromEEPORM; - u8 bAPKThermalMeterIgnore; - - u8 bIQKInitialized; - u8 bAntennaDetected; - - u8 TxPwrLevelCck[RF_PATH_MAX][CHANNEL_MAX_NUMBER]; - u8 TxPwrLevelHT40_1S[RF_PATH_MAX][CHANNEL_MAX_NUMBER]; // For HT 40MHZ pwr - u8 TxPwrLevelHT40_2S[RF_PATH_MAX][CHANNEL_MAX_NUMBER]; // For HT 40MHZ pwr - u8 TxPwrHt20Diff[RF_PATH_MAX][CHANNEL_MAX_NUMBER];// HT 20<->40 Pwr diff - u8 TxPwrLegacyHtDiff[RF_PATH_MAX][CHANNEL_MAX_NUMBER];// For HT<->legacy pwr diff - // For power group - u8 PwrGroupHT20[RF_PATH_MAX][CHANNEL_MAX_NUMBER]; - u8 PwrGroupHT40[RF_PATH_MAX][CHANNEL_MAX_NUMBER]; - - u8 LegacyHTTxPowerDiff;// Legacy to HT rate power diff - - // Read/write are allow for following hardware information variables - u8 framesync; - u32 framesyncC34; - u8 framesyncMonitor; - u8 DefaultInitialGain[4]; - u8 pwrGroupCnt; - u32 MCSTxPowerLevelOriginalOffset[7][16]; - u32 CCKTxPowerLevelOriginalOffset; - - u32 AntennaTxPath; // Antenna path Tx - u32 AntennaRxPath; // Antenna path Rx - u8 ExternalPA; - - u8 bLedOpenDrain; // Support Open-drain arrangement for controlling the LED. Added by Roger, 2009.10.16. - - //u32 LedControlNum; - //u32 LedControlMode; - //u32 TxPowerTrackControl; - u8 b1x1RecvCombine; // for 1T1R receive combining - - // For EDCA Turbo mode -// u8 bIsAnyNonBEPkts; // Adapter->recvpriv.bIsAnyNonBEPkts -// u8 bCurrentTurboEDCA; -// u8 bForcedDisableTurboEDCA; -// u8 bIsCurRDLState; // pdmpriv->prv_traffic_idx - - u32 AcParam_BE; //Original parameter for BE, use for EDCA turbo. - - //vivi, for tx power tracking, 20080407 - //u16 TSSI_13dBm; - //u32 Pwr_Track; - // The current Tx Power Level - u8 CurrentCckTxPwrIdx; - u8 CurrentOfdm24GTxPwrIdx; - - BB_REGISTER_DEFINITION_T PHYRegDef[4]; //Radio A/B/C/D - - BOOLEAN bRFPathRxEnable[4]; // We support 4 RF path now. - - u32 RfRegChnlVal[2]; - - u8 bCckHighPower; - - //RDG enable - BOOLEAN bRDGEnable; - - //for host message to fw - u8 LastHMEBoxNum; - - u8 fw_ractrl; - u8 RegTxPause; - // Beacon function related global variable. - u32 RegBcnCtrlVal; - u8 RegFwHwTxQCtrl; - u8 RegReg542; - - struct dm_priv dmpriv; - DM_ODM_T odmpriv; - //_lock odm_stainfo_lock; -#ifdef DBG_CONFIG_ERROR_DETECT - struct sreset_priv srestpriv; -#endif - -#ifdef CONFIG_BT_COEXIST - u8 bBTMode; - // BT only. - BT30Info BtInfo; - // For bluetooth co-existance - BT_COEXIST_STR bt_coexist; -#endif - -#ifdef CONFIG_ANTENNA_DIVERSITY - u8 CurAntenna; - - // SW Antenna Switch - s32 RSSI_sum_A; - s32 RSSI_sum_B; - s32 RSSI_cnt_A; - s32 RSSI_cnt_B; - u8 RSSI_test; - u8 AntDivCfg; -#endif - - u8 bDumpRxPkt;//for debug - u8 FwRsvdPageStartOffset; //2010.06.23. Added by tynli. Reserve page start offset except beacon in TxQ. - - // 2010/08/09 MH Add CU power down mode. - u8 pwrdown; - - // Add for dual MAC 0--Mac0 1--Mac1 - u32 interfaceIndex; - - u8 OutEpQueueSel; - u8 OutEpNumber; - - // 2010/12/10 MH Add for USB aggreation mode dynamic shceme. - BOOLEAN UsbRxHighSpeedMode; - - // 2010/11/22 MH Add for slim combo debug mode selective. - // This is used for fix the drawback of CU TSMC-A/UMC-A cut. HW auto suspend ability. Close BT clock. - BOOLEAN SlimComboDbg; - - // - // Add For EEPROM Efuse switch and Efuse Shadow map Setting - // - u8 EepromOrEfuse; -// u8 EfuseMap[2][HWSET_MAX_SIZE_512]; //92C:256bytes, 88E:512bytes, we use union set (512bytes) - u16 EfuseUsedBytes; - u8 EfuseUsedPercentage; -#ifdef HAL_EFUSE_MEMORY - EFUSE_HAL EfuseHal; -#endif - - // Interrupt relatd register information. - u32 SysIntrStatus; - u32 SysIntrMask; - - // - // 2011/02/23 MH Add for 8723 mylti function definition. The define should be moved to an - // independent file in the future. - // - //------------------------8723-----------------------------------------// - RT_MULTI_FUNC MultiFunc; // For multi-function consideration. - RT_POLARITY_CTL PolarityCtl; // For Wifi PDn Polarity control. - RT_REGULATOR_MODE RegulatorMode; // switching regulator or LDO - //------------------------8723-----------------------------------------// - // - // 2011/02/23 MH Add for 8723 mylti function definition. The define should be moved to an - // independent file in the future. - - BOOLEAN bMACFuncEnable; - -#ifdef CONFIG_P2P - struct P2P_PS_Offload_t p2p_ps_offload; -#endif - - - // - // For USB Interface HAL related - // -#ifdef CONFIG_USB_HCI - u32 UsbBulkOutSize; - - // Interrupt relatd register information. - u32 IntArray[2]; - u32 IntrMask[2]; -#endif - - - // - // For SDIO Interface HAL related - // - - // Auto FSM to Turn On, include clock, isolation, power control for MAC only - u8 bMacPwrCtrlOn; - -#if defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI) - // - // SDIO ISR Related - // -// u32 IntrMask[1]; -// u32 IntrMaskToSet[1]; -// LOG_INTERRUPT InterruptLog; - u32 sdio_himr; - u32 sdio_hisr; - - // - // SDIO Tx FIFO related. - // - // HIQ, MID, LOW, PUB free pages; padapter->xmitpriv.free_txpg - u8 SdioTxFIFOFreePage[SDIO_TX_FREE_PG_QUEUE]; - _lock SdioTxFIFOFreePageLock; - - // - // SDIO Rx FIFO related. - // - u8 SdioRxFIFOCnt; - u16 SdioRxFIFOSize; -#endif -} HAL_DATA_8723A, *PHAL_DATA_8723A; - -#if 0 -#define HAL_DATA_TYPE HAL_DATA_8723A -#define PHAL_DATA_TYPE PHAL_DATA_8723A -#else -typedef struct hal_data_8723a HAL_DATA_TYPE, *PHAL_DATA_TYPE; -#endif - -#define GET_HAL_DATA(__pAdapter) ((HAL_DATA_TYPE *)((__pAdapter)->HalData)) -#define GET_RF_TYPE(priv) (GET_HAL_DATA(priv)->rf_type) - -#define INCLUDE_MULTI_FUNC_BT(_Adapter) (GET_HAL_DATA(_Adapter)->MultiFunc & RT_MULTI_FUNC_BT) -#define INCLUDE_MULTI_FUNC_GPS(_Adapter) (GET_HAL_DATA(_Adapter)->MultiFunc & RT_MULTI_FUNC_GPS) - -typedef struct rxreport_8723a -{ - u32 pktlen:14; - u32 crc32:1; - u32 icverr:1; - u32 drvinfosize:4; - u32 security:3; - u32 qos:1; - u32 shift:2; - u32 physt:1; - u32 swdec:1; - u32 ls:1; - u32 fs:1; - u32 eor:1; - u32 own:1; - - u32 macid:5; - u32 tid:4; - u32 hwrsvd:4; - u32 amsdu:1; - u32 paggr:1; - u32 faggr:1; - u32 a1fit:4; - u32 a2fit:4; - u32 pam:1; - u32 pwr:1; - u32 md:1; - u32 mf:1; - u32 type:2; - u32 mc:1; - u32 bc:1; - - u32 seq:12; - u32 frag:4; - u32 nextpktlen:14; - u32 nextind:1; - u32 rsvd0831:1; - - u32 rxmcs:6; - u32 rxht:1; - u32 gf:1; - u32 splcp:1; - u32 bw:1; - u32 htc:1; - u32 eosp:1; - u32 bssidfit:2; - u32 rsvd1214:16; - u32 unicastwake:1; - u32 magicwake:1; - - u32 pattern0match:1; - u32 pattern1match:1; - u32 pattern2match:1; - u32 pattern3match:1; - u32 pattern4match:1; - u32 pattern5match:1; - u32 pattern6match:1; - u32 pattern7match:1; - u32 pattern8match:1; - u32 pattern9match:1; - u32 patternamatch:1; - u32 patternbmatch:1; - u32 patterncmatch:1; - u32 rsvd1613:19; - - u32 tsfl; - - u32 bassn:12; - u32 bavld:1; - u32 rsvd2413:19; -} RXREPORT, *PRXREPORT; - -typedef struct phystatus_8723a -{ - u32 rxgain_a:7; - u32 trsw_a:1; - u32 rxgain_b:7; - u32 trsw_b:1; - u32 chcorr_l:16; - - u32 sigqualcck:8; - u32 cfo_a:8; - u32 cfo_b:8; - u32 chcorr_h:8; - - u32 noisepwrdb_h:8; - u32 cfo_tail_a:8; - u32 cfo_tail_b:8; - u32 rsvd0824:8; - - u32 rsvd1200:8; - u32 rxevm_a:8; - u32 rxevm_b:8; - u32 rxsnr_a:8; - - u32 rxsnr_b:8; - u32 noisepwrdb_l:8; - u32 rsvd1616:8; - u32 postsnr_a:8; - - u32 postsnr_b:8; - u32 csi_a:8; - u32 csi_b:8; - u32 targetcsi_a:8; - - u32 targetcsi_b:8; - u32 sigevm:8; - u32 maxexpwr:8; - u32 exintflag:1; - u32 sgien:1; - u32 rxsc:2; - u32 idlelong:1; - u32 anttrainen:1; - u32 antselb:1; - u32 antsel:1; -} PHYSTATUS, *PPHYSTATUS; - - -// rtl8723a_hal_init.c -int FirmwareDownloadBT(IN PADAPTER Adapter, PRT_FIRMWARE_8723A pFirmware); -s32 rtl8723a_FirmwareDownload(PADAPTER padapter); -void rtl8723a_FirmwareSelfReset(PADAPTER padapter); -void rtl8723a_InitializeFirmwareVars(PADAPTER padapter); -void _8051Reset8723A(PADAPTER padapter); - -void rtl8723a_InitAntenna_Selection(PADAPTER padapter); -void rtl8723a_DeinitAntenna_Selection(PADAPTER padapter); -void rtl8723a_CheckAntenna_Selection(PADAPTER padapter); -void rtl8723a_init_default_value(PADAPTER padapter); - -s32 InitLLTTable(PADAPTER padapter, u32 boundary); - -s32 CardDisableHWSM(PADAPTER padapter, u8 resetMCU); -s32 CardDisableWithoutHWSM(PADAPTER padapter); - -// EFuse -u8 GetEEPROMSize8723A(PADAPTER padapter); -void Hal_InitPGData(PADAPTER padapter, u8 *PROMContent); -void Hal_EfuseParseIDCode(PADAPTER padapter, u8 *hwinfo); -void Hal_EfuseParseTxPowerInfo_8723A(PADAPTER padapter, u8 *PROMContent, BOOLEAN AutoLoadFail); -void Hal_EfuseParseBTCoexistInfo_8723A(PADAPTER padapter, u8 *hwinfo, BOOLEAN AutoLoadFail); -void Hal_EfuseParseEEPROMVer(PADAPTER padapter, u8 *hwinfo, BOOLEAN AutoLoadFail); -void rtl8723a_EfuseParseChnlPlan(PADAPTER padapter, u8 *hwinfo, BOOLEAN AutoLoadFail); -void Hal_EfuseParseCustomerID(PADAPTER padapter, u8 *hwinfo, BOOLEAN AutoLoadFail); -void Hal_EfuseParseAntennaDiversity(PADAPTER padapter, u8 *hwinfo, BOOLEAN AutoLoadFail); -void Hal_EfuseParseRateIndicationOption(PADAPTER padapter, u8 *hwinfo, BOOLEAN AutoLoadFail); -void Hal_EfuseParseXtal_8723A(PADAPTER pAdapter, u8 *hwinfo, u8 AutoLoadFail); -void Hal_EfuseParseThermalMeter_8723A(PADAPTER padapter, u8 *hwinfo, u8 AutoLoadFail); - -//RT_CHANNEL_DOMAIN rtl8723a_HalMapChannelPlan(PADAPTER padapter, u8 HalChannelPlan); -//VERSION_8192C rtl8723a_ReadChipVersion(PADAPTER padapter); -//void rtl8723a_ReadBluetoothCoexistInfo(PADAPTER padapter, u8 *PROMContent, BOOLEAN AutoloadFail); -void Hal_InitChannelPlan(PADAPTER padapter); - -void rtl8723a_set_hal_ops(struct hal_ops *pHalFunc); -void SetHwReg8723A(PADAPTER padapter, u8 variable, u8 *val); -void GetHwReg8723A(PADAPTER padapter, u8 variable, u8 *val); -#ifdef CONFIG_BT_COEXIST -void rtl8723a_SingleDualAntennaDetection(PADAPTER padapter); -#endif - -// register -void SetBcnCtrlReg(PADAPTER padapter, u8 SetBits, u8 ClearBits); -void rtl8723a_InitBeaconParameters(PADAPTER padapter); -void rtl8723a_InitBeaconMaxError(PADAPTER padapter, u8 InfraMode); - -void rtl8723a_start_thread(_adapter *padapter); -void rtl8723a_stop_thread(_adapter *padapter); - -s32 c2h_id_filter_ccx_8723a(u8 id); - - -#if defined(CONFIG_CHECK_BT_HANG) && defined(CONFIG_BT_COEXIST) -void rtl8723a_init_checkbthang_workqueue(_adapter * padapter); -void rtl8723a_free_checkbthang_workqueue(_adapter * padapter); -void rtl8723a_cancel_checkbthang_workqueue(_adapter * padapter); -void rtl8723a_hal_check_bt_hang(_adapter * padapter); -#endif - - -#ifdef CONFIG_RF_GAIN_OFFSET -void Hal_ReadRFGainOffset(PADAPTER pAdapter,u8* hwinfo,BOOLEAN AutoLoadFail); -#endif //CONFIG_RF_GAIN_OFFSET - -#endif - diff --git a/include/rtl8723a_led.h b/include/rtl8723a_led.h deleted file mode 100755 index 1af4199..0000000 --- a/include/rtl8723a_led.h +++ /dev/null @@ -1,50 +0,0 @@ -/****************************************************************************** - * - * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA - * - * - ******************************************************************************/ -#ifndef __RTL8723A_LED_H__ -#define __RTL8723A_LED_H__ - -#include -#include -#include - - -//================================================================================ -// Interface to manipulate LED objects. -//================================================================================ -#ifdef CONFIG_USB_HCI -void rtl8723au_InitSwLeds(PADAPTER padapter); -void rtl8723au_DeInitSwLeds(PADAPTER padapter); -#endif -#ifdef CONFIG_PCI_HCI -void rtl8723ae_gen_RefreshLedState(PADAPTER Adapter); -void rtl8723ae_InitSwLeds(PADAPTER padapter); -void rtl8723ae_DeInitSwLeds(PADAPTER padapter); -#endif -#ifdef CONFIG_SDIO_HCI -void rtl8723as_InitSwLeds(PADAPTER padapter); -void rtl8723as_DeInitSwLeds(PADAPTER padapter); -#endif -#ifdef CONFIG_GSPI_HCI -void rtl8723as_InitSwLeds(PADAPTER padapter); -void rtl8723as_DeInitSwLeds(PADAPTER padapter); -#endif - -#endif - diff --git a/include/rtl8723a_pg.h b/include/rtl8723a_pg.h deleted file mode 100755 index 68cc098..0000000 --- a/include/rtl8723a_pg.h +++ /dev/null @@ -1,146 +0,0 @@ -/****************************************************************************** - * - * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA - * - * - ******************************************************************************/ -#ifndef __RTL8723A_PG_H__ -#define __RTL8723A_PG_H__ - -//==================================================== -// EEPROM/Efuse PG Offset for 8723E/8723U/8723S -//==================================================== -#define EEPROM_CCK_TX_PWR_INX_8723A 0x10 -#define EEPROM_HT40_1S_TX_PWR_INX_8723A 0x16 -#define EEPROM_HT20_TX_PWR_INX_DIFF_8723A 0x1C -#define EEPROM_OFDM_TX_PWR_INX_DIFF_8723A 0x1F -#define EEPROM_HT40_MAX_PWR_OFFSET_8723A 0x22 -#define EEPROM_HT20_MAX_PWR_OFFSET_8723A 0x25 - -#define EEPROM_ChannelPlan_8723A 0x28 -#define EEPROM_TSSI_A_8723A 0x29 -#define EEPROM_THERMAL_METER_8723A 0x2A -#define RF_OPTION1_8723A 0x2B -#define RF_OPTION2_8723A 0x2C -#define RF_OPTION3_8723A 0x2D -#define RF_OPTION4_8723A 0x2E -#define EEPROM_VERSION_8723A 0x30 -#define EEPROM_CustomID_8723A 0x31 -#define EEPROM_SubCustomID_8723A 0x32 -#define EEPROM_XTAL_K_8723A 0x33 -#define EEPROM_Chipset_8723A 0x34 - -// RTL8723AE -#define EEPROM_VID_8723AE 0x49 -#define EEPROM_DID_8723AE 0x4B -#define EEPROM_SVID_8723AE 0x4D -#define EEPROM_SMID_8723AE 0x4F -#define EEPROM_MAC_ADDR_8723AE 0x67 - -// RTL8723AU -#define EEPROM_MAC_ADDR_8723AU 0xC6 -#define EEPROM_VID_8723AU 0xB7 -#define EEPROM_PID_8723AU 0xB9 - -// RTL8723AS -#define EEPROM_MAC_ADDR_8723AS 0xAA - -//==================================================== -// EEPROM/Efuse Value Type -//==================================================== -#define EETYPE_TX_PWR 0x0 - -//==================================================== -// EEPROM/Efuse Default Value -//==================================================== -#define EEPROM_Default_CrystalCap_8723A 0x20 - - -//---------------------------------------------------------------------------- -// EEPROM/EFUSE data structure definition. -//---------------------------------------------------------------------------- -#define MAX_RF_PATH_NUM 2 -#define MAX_CHNL_GROUP 3+9 -typedef struct _TxPowerInfo -{ - u8 CCKIndex[MAX_RF_PATH_NUM][MAX_CHNL_GROUP]; - u8 HT40_1SIndex[MAX_RF_PATH_NUM][MAX_CHNL_GROUP]; - u8 HT40_2SIndexDiff[MAX_RF_PATH_NUM][MAX_CHNL_GROUP]; - u8 HT20IndexDiff[MAX_RF_PATH_NUM][MAX_CHNL_GROUP]; - u8 OFDMIndexDiff[MAX_RF_PATH_NUM][MAX_CHNL_GROUP]; - u8 HT40MaxOffset[MAX_RF_PATH_NUM][MAX_CHNL_GROUP]; - u8 HT20MaxOffset[MAX_RF_PATH_NUM][MAX_CHNL_GROUP]; - u8 TSSI_A[3]; - u8 TSSI_B[3]; - u8 TSSI_A_5G[3]; //5GL/5GM/5GH - u8 TSSI_B_5G[3]; -} TxPowerInfo, *PTxPowerInfo; - -#if 0 -#define MAX_RF_PATH 4 -#define MAX_CHNL_GROUP_24G 6 -#define MAX_CHNL_GROUP_5G 14 - -// It must always set to 4, otherwise read efuse table secquence will be wrong. -#define MAX_TX_COUNT 4 - -typedef struct _TxPowerInfo24G -{ - u8 IndexCCK_Base[MAX_RF_PATH][MAX_CHNL_GROUP_24G]; - u8 IndexBW40_Base[MAX_RF_PATH][MAX_CHNL_GROUP_24G-1]; - //If only one tx, only BW20 and OFDM are used. - s8 CCK_Diff[MAX_RF_PATH][MAX_TX_COUNT]; - s8 OFDM_Diff[MAX_RF_PATH][MAX_TX_COUNT]; - s8 BW20_Diff[MAX_RF_PATH][MAX_TX_COUNT]; - s8 BW40_Diff[MAX_RF_PATH][MAX_TX_COUNT]; -} TxPowerInfo24G, *PTxPowerInfo24G; - -typedef struct _TxPowerInfo5G -{ - u8 IndexBW40_Base[MAX_RF_PATH][MAX_CHNL_GROUP_5G]; - //If only one tx, only BW20, OFDM, BW80 and BW160 are used. - s8 OFDM_Diff[MAX_RF_PATH][MAX_TX_COUNT]; - s8 BW20_Diff[MAX_RF_PATH][MAX_TX_COUNT]; - s8 BW40_Diff[MAX_RF_PATH][MAX_TX_COUNT]; - s8 BW80_Diff[MAX_RF_PATH][MAX_TX_COUNT]; - s8 BW160_Diff[MAX_RF_PATH][MAX_TX_COUNT]; -} TxPowerInfo5G, *PTxPowerInfo5G; -#endif - -typedef enum _BT_Ant_NUM -{ - Ant_x2 = 0, - Ant_x1 = 1 -} BT_Ant_NUM, *PBT_Ant_NUM; - -typedef enum _BT_CoType -{ - BT_2Wire = 0, - BT_ISSC_3Wire = 1, - BT_Accel = 2, - BT_CSR_BC4 = 3, - BT_CSR_BC8 = 4, - BT_RTL8756 = 5, - BT_RTL8723A = 6 -} BT_CoType, *PBT_CoType; - -typedef enum _BT_RadioShared -{ - BT_Radio_Shared = 0, - BT_Radio_Individual = 1, -} BT_RadioShared, *PBT_RadioShared; -#endif - diff --git a/include/rtl8723a_recv.h b/include/rtl8723a_recv.h deleted file mode 100755 index 9883167..0000000 --- a/include/rtl8723a_recv.h +++ /dev/null @@ -1,41 +0,0 @@ -/****************************************************************************** - * - * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA - * - * - ******************************************************************************/ -#ifndef __RTL8723A_RECV_H__ -#define __RTL8723A_RECV_H__ - -#include - - -#if defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI) -#ifdef CONFIG_DIRECT_RECV -void rtl8723as_recv(PADAPTER padapter, struct recv_buf *precvbuf); -#endif -s32 rtl8723as_init_recv_priv(PADAPTER padapter); -void rtl8723as_free_recv_priv(PADAPTER padapter); -#endif - -void rtl8192c_query_rx_phy_status(union recv_frame *prframe, struct phy_stat *pphy_stat); -void rtl8192c_process_phy_info(PADAPTER padapter, void *prframe); -#ifdef CONFIG_USB_HCI -void update_recvframe_attrib(union recv_frame *precvframe, struct recv_stat *prxstat); -void update_recvframe_phyinfo(union recv_frame *precvframe, struct phy_stat *pphy_info); -#endif -#endif - diff --git a/include/rtl8723a_rf.h b/include/rtl8723a_rf.h deleted file mode 100755 index 187702f..0000000 --- a/include/rtl8723a_rf.h +++ /dev/null @@ -1,27 +0,0 @@ -/****************************************************************************** - * - * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA - * - * - ******************************************************************************/ -#ifndef __RTL8723A_RF_H__ -#define __RTL8723A_RF_H__ - -#include "rtl8192c_rf.h" -int PHY_RF6052_Config8723A( IN PADAPTER Adapter ); - -#endif - diff --git a/include/rtl8723a_spec.h b/include/rtl8723a_spec.h deleted file mode 100755 index a51bc5a..0000000 --- a/include/rtl8723a_spec.h +++ /dev/null @@ -1,538 +0,0 @@ -/****************************************************************************** - * - * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA - * - *******************************************************************************/ -#ifndef __RTL8723A_SPEC_H__ -#define __RTL8723A_SPEC_H__ - -#include - - -//============================================================================ -// 8723A Regsiter offset definition -//============================================================================ -#define HAL_8723A_NAV_UPPER_UNIT 128 // micro-second - -//----------------------------------------------------- -// -// 0x0000h ~ 0x00FFh System Configuration -// -//----------------------------------------------------- -#define REG_SYSON_REG_LOCK 0x001C - - -//----------------------------------------------------- -// -// 0x0100h ~ 0x01FFh MACTOP General Configuration -// -//----------------------------------------------------- -#define REG_FTIMR 0x0138 - - -//----------------------------------------------------- -// -// 0x0200h ~ 0x027Fh TXDMA Configuration -// -//----------------------------------------------------- - - -//----------------------------------------------------- -// -// 0x0280h ~ 0x02FFh RXDMA Configuration -// -//----------------------------------------------------- - - -//----------------------------------------------------- -// -// 0x0300h ~ 0x03FFh PCIe -// -//----------------------------------------------------- - - -//----------------------------------------------------- -// -// 0x0400h ~ 0x047Fh Protocol Configuration -// -//----------------------------------------------------- -//#define REG_EARLY_MODE_CONTROL 0x4D0 -#define REG_MACID_NO_LINK 0x4D0 - -//----------------------------------------------------- -// -// 0x0500h ~ 0x05FFh EDCA Configuration -// -//----------------------------------------------------- - -//2 BCN_CTRL -#define DIS_ATIM BIT(0) -#define DIS_BCNQ_SUB BIT(1) -#define DIS_TSF_UDT BIT(4) - - -//----------------------------------------------------- -// -// 0x0600h ~ 0x07FFh WMAC Configuration -// -//----------------------------------------------------- -// -// Note: -// The NAV upper value is very important to WiFi 11n 5.2.3 NAV test. The default value is -// always too small, but the WiFi TestPlan test by 25,000 microseconds of NAV through sending -// CTS in the air. We must update this value greater than 25,000 microseconds to pass the item. -// The offset of NAV_UPPER in 8192C Spec is incorrect, and the offset should be 0x0652. Commented -// by SD1 Scott. -// By Bruce, 2011-07-18. -// -#define REG_NAV_UPPER 0x0652 // unit of 128 - -#define REG_BT_COEX_TABLE_1 0x06C0 -#define REG_BT_COEX_TABLE_2 0x06C4 - -//============================================================================ -// 8723 Regsiter Bit and Content definition -//============================================================================ - -//----------------------------------------------------- -// -// 0x0000h ~ 0x00FFh System Configuration -// -//----------------------------------------------------- - -//2 SPS0_CTRL - -//2 SYS_ISO_CTRL - -//2 SYS_FUNC_EN - -//2 APS_FSMCO -#define EN_WLON BIT(16) - -//2 SYS_CLKR - -//2 9346CR - -//2 AFE_MISC - -//2 SPS0_CTRL - -//2 SPS_OCP_CFG - -//2 SYSON_REG_LOCK -#define WLOCK_ALL BIT(0) -#define WLOCK_00 BIT(1) -#define WLOCK_04 BIT(2) -#define WLOCK_08 BIT(3) -#define WLOCK_40 BIT(4) -#define WLOCK_1C_B6 BIT(5) -#define R_DIS_PRST_1 BIT(6) -#define LOCK_ALL_EN BIT(7) - -//2 RF_CTRL - -//2 LDOA15_CTRL - -//2 LDOV12D_CTRL - -//2 AFE_XTAL_CTRL - -//2 AFE_PLL_CTRL - -//2 EFUSE_CTRL - -//2 EFUSE_TEST (For RTL8723 partially) - -//2 PWR_DATA - -//2 CAL_TIMER - -//2 ACLK_MON - -//2 GPIO_MUXCFG - -//2 GPIO_PIN_CTRL - -//2 GPIO_INTM - -//2 LEDCFG - -//2 FSIMR - -//2 FSISR - -//2 HSIMR -// 8723 Host System Interrupt Mask Register (offset 0x58, 32 byte) -#define HSIMR_GPIO12_0_INT_EN BIT(0) -#define HSIMR_SPS_OCP_INT_EN BIT(5) -#define HSIMR_RON_INT_EN BIT(6) -#define HSIMR_PDNINT_EN BIT(7) -#define HSIMR_GPIO9_INT_EN BIT(25) - -//2 HSISR -// 8723 Host System Interrupt Status Register (offset 0x5C, 32 byte) -#define HSISR_GPIO12_0_INT BIT(0) -#define HSISR_SPS_OCP_INT BIT(5) -#define HSISR_RON_INT BIT(6) -#define HSISR_PDNINT BIT(7) -#define HSISR_GPIO9_INT BIT(25) - -// interrupt mask which needs to clear -#define MASK_HSISR_CLEAR (HSISR_GPIO12_0_INT |\ - HSISR_SPS_OCP_INT |\ - HSISR_RON_INT |\ - HSISR_PDNINT |\ - HSISR_GPIO9_INT) - -//2 MCUFWDL -#define RAM_DL_SEL BIT7 // 1:RAM, 0:ROM - -//2 HPON_FSM - -//2 SYS_CFG -#define RTL_ID BIT(23) // TestChip ID, 1:Test(RLE); 0:MP(RL) -#define SPS_SEL BIT(24) // 1:LDO regulator mode; 0:Switching regulator mode - - -//----------------------------------------------------- -// -// 0x0100h ~ 0x01FFh MACTOP General Configuration -// -//----------------------------------------------------- - -//2 Function Enable Registers - -//2 CR -#define CALTMR_EN BIT(10) - -//2 PBP - Page Size Register - -//2 TX/RXDMA - -//2 TRXFF_BNDY - -//2 LLT_INIT - -//2 BB_ACCESS_CTRL - - -//----------------------------------------------------- -// -// 0x0200h ~ 0x027Fh TXDMA Configuration -// -//----------------------------------------------------- - -//2 RQPN - -//2 TDECTRL - -//2 TDECTL - -//2 TXDMA_OFFSET_CHK - - -//----------------------------------------------------- -// -// 0x0400h ~ 0x047Fh Protocol Configuration -// -//----------------------------------------------------- - -//2 FWHW_TXQ_CTRL - -//2 INIRTSMCS_SEL - -//2 SPEC SIFS - -//2 RRSR - -//2 ARFR - -//2 AGGLEN_LMT_L - -//2 RL - -//2 DARFRC - -//2 RARFRC - - -//----------------------------------------------------- -// -// 0x0500h ~ 0x05FFh EDCA Configuration -// -//----------------------------------------------------- - -//2 EDCA setting - -//2 EDCA_VO_PARAM - -//2 SIFS_CCK - -//2 SIFS_OFDM - -//2 TBTT PROHIBIT - -//2 REG_RD_CTRL - -//2 BCN_CTRL - -//2 ACMHWCTRL - - -//----------------------------------------------------- -// -// 0x0600h ~ 0x07FFh WMAC Configuration -// -//----------------------------------------------------- - -//2 APSD_CTRL - -//2 BWOPMODE - -//2 TCR - -//2 RCR - -//2 RX_PKT_LIMIT - -//2 RX_DLK_TIME - -//2 MBIDCAMCFG - -//2 AMPDU_MIN_SPACE - -//2 RXERR_RPT - -//2 SECCFG - - -//----------------------------------------------------- -// -// 0xFE00h ~ 0xFE55h RTL8723 SDIO Configuration -// -//----------------------------------------------------- - -// I/O bus domain address mapping -#define SDIO_LOCAL_BASE 0x10250000 -#define WLAN_IOREG_BASE 0x10260000 -#define FIRMWARE_FIFO_BASE 0x10270000 -#define TX_HIQ_BASE 0x10310000 -#define TX_MIQ_BASE 0x10320000 -#define TX_LOQ_BASE 0x10330000 -#define RX_RX0FF_BASE 0x10340000 - -// SDIO host local register space mapping. -#define SDIO_LOCAL_MSK 0x0FFF -#define WLAN_IOREG_MSK 0x7FFF -#define WLAN_FIFO_MSK 0x1FFF // Aggregation Length[12:0] -#define WLAN_RX0FF_MSK 0x0003 - -#define SDIO_WITHOUT_REF_DEVICE_ID 0 // Without reference to the SDIO Device ID -#define SDIO_LOCAL_DEVICE_ID 0 // 0b[16], 000b[15:13] -#define WLAN_TX_HIQ_DEVICE_ID 4 // 0b[16], 100b[15:13] -#define WLAN_TX_MIQ_DEVICE_ID 5 // 0b[16], 101b[15:13] -#define WLAN_TX_LOQ_DEVICE_ID 6 // 0b[16], 110b[15:13] -#define WLAN_RX0FF_DEVICE_ID 7 // 0b[16], 111b[15:13] -#define WLAN_IOREG_DEVICE_ID 8 // 1b[16] - -// SDIO Tx Free Page Index -#define HI_QUEUE_IDX 0 -#define MID_QUEUE_IDX 1 -#define LOW_QUEUE_IDX 2 -#define PUBLIC_QUEUE_IDX 3 - -#define SDIO_MAX_TX_QUEUE 3 // HIQ, MIQ and LOQ -#define SDIO_MAX_RX_QUEUE 1 - -#define SDIO_REG_TX_CTRL 0x0000 // SDIO Tx Control -#define SDIO_REG_HIMR 0x0014 // SDIO Host Interrupt Mask -#define SDIO_REG_HISR 0x0018 // SDIO Host Interrupt Service Routine -#define SDIO_REG_HCPWM 0x0019 // HCI Current Power Mode -#define SDIO_REG_RX0_REQ_LEN 0x001C // RXDMA Request Length -#define SDIO_REG_FREE_TXPG 0x0020 // Free Tx Buffer Page -#define SDIO_REG_HCPWM1 0x0024 // HCI Current Power Mode 1 -#define SDIO_REG_HCPWM2 0x0026 // HCI Current Power Mode 2 -#define SDIO_REG_HTSFR_INFO 0x0030 // HTSF Informaion -#define SDIO_REG_HRPWM1 0x0080 // HCI Request Power Mode 1 -#define SDIO_REG_HRPWM2 0x0082 // HCI Request Power Mode 2 -#define SDIO_REG_HPS_CLKR 0x0084 // HCI Power Save Clock -#define SDIO_REG_HSUS_CTRL 0x0086 // SDIO HCI Suspend Control -#define SDIO_REG_HIMR_ON 0x0090 // SDIO Host Extension Interrupt Mask Always -#define SDIO_REG_HISR_ON 0x0091 // SDIO Host Extension Interrupt Status Always - -#define SDIO_HIMR_DISABLED 0 - -// SDIO Host Interrupt Mask Register -#define SDIO_HIMR_RX_REQUEST_MSK BIT0 -#define SDIO_HIMR_AVAL_MSK BIT1 -#define SDIO_HIMR_TXERR_MSK BIT2 -#define SDIO_HIMR_RXERR_MSK BIT3 -#define SDIO_HIMR_TXFOVW_MSK BIT4 -#define SDIO_HIMR_RXFOVW_MSK BIT5 -#define SDIO_HIMR_TXBCNOK_MSK BIT6 -#define SDIO_HIMR_TXBCNERR_MSK BIT7 -#define SDIO_HIMR_BCNERLY_INT_MSK BIT16 -#define SDIO_HIMR_C2HCMD_MSK BIT17 -#define SDIO_HIMR_CPWM1_MSK BIT18 -#define SDIO_HIMR_CPWM2_MSK BIT19 -#define SDIO_HIMR_HSISR_IND_MSK BIT20 -#define SDIO_HIMR_GTINT3_IND_MSK BIT21 -#define SDIO_HIMR_GTINT4_IND_MSK BIT22 -#define SDIO_HIMR_PSTIMEOUT_MSK BIT23 -#define SDIO_HIMR_OCPINT_MSK BIT24 -#define SDIO_HIMR_ATIMEND_MSK BIT25 -#define SDIO_HIMR_ATIMEND_E_MSK BIT26 -#define SDIO_HIMR_CTWEND_MSK BIT27 - -// SDIO Host Interrupt Service Routine -#define SDIO_HISR_RX_REQUEST BIT0 -#define SDIO_HISR_AVAL BIT1 -#define SDIO_HISR_TXERR BIT2 -#define SDIO_HISR_RXERR BIT3 -#define SDIO_HISR_TXFOVW BIT4 -#define SDIO_HISR_RXFOVW BIT5 -#define SDIO_HISR_TXBCNOK BIT6 -#define SDIO_HISR_TXBCNERR BIT7 -#define SDIO_HISR_BCNERLY_INT BIT16 -#define SDIO_HISR_C2HCMD BIT17 -#define SDIO_HISR_CPWM1 BIT18 -#define SDIO_HISR_CPWM2 BIT19 -#define SDIO_HISR_HSISR_IND BIT20 -#define SDIO_HISR_GTINT3_IND BIT21 -#define SDIO_HISR_GTINT4_IND BIT22 -#define SDIO_HISR_PSTIMEOUT BIT23 -#define SDIO_HISR_OCPINT BIT24 -#define SDIO_HISR_ATIMEND BIT25 -#define SDIO_HISR_ATIMEND_E BIT26 -#define SDIO_HISR_CTWEND BIT27 - -#define MASK_SDIO_HISR_CLEAR (SDIO_HISR_TXERR |\ - SDIO_HISR_RXERR |\ - SDIO_HISR_TXFOVW |\ - SDIO_HISR_RXFOVW |\ - SDIO_HISR_TXBCNOK |\ - SDIO_HISR_TXBCNERR |\ - SDIO_HISR_C2HCMD |\ - SDIO_HISR_CPWM1 |\ - SDIO_HISR_CPWM2 |\ - SDIO_HISR_HSISR_IND |\ - SDIO_HISR_GTINT3_IND |\ - SDIO_HISR_GTINT4_IND |\ - SDIO_HISR_PSTIMEOUT |\ - SDIO_HISR_OCPINT) - -// SDIO HCI Suspend Control Register -#define HCI_RESUME_PWR_RDY BIT1 -#define HCI_SUS_CTRL BIT0 - -// SDIO Tx FIFO related -#define SDIO_TX_FREE_PG_QUEUE 4 // The number of Tx FIFO free page -#define SDIO_TX_FIFO_PAGE_SZ 128 - -// vivi added for new cam search flow, 20091028 -#define SCR_TxUseBroadcastDK BIT6 // Force Tx Use Broadcast Default Key -#define SCR_RxUseBroadcastDK BIT7 // Force Rx Use Broadcast Default Key - - -//---------------------------------------------------------------------------- -// 8723 EFUSE -//---------------------------------------------------------------------------- -#ifdef HWSET_MAX_SIZE -#undef HWSET_MAX_SIZE -#endif -#define HWSET_MAX_SIZE 256 - - -//----------------------------------------------------------------------------- -//USB interrupt -//----------------------------------------------------------------------------- -#define UHIMR_TIMEOUT2 BIT31 -#define UHIMR_TIMEOUT1 BIT30 -#define UHIMR_PSTIMEOUT BIT29 -#define UHIMR_GTINT4 BIT28 -#define UHIMR_GTINT3 BIT27 -#define UHIMR_TXBCNERR BIT26 -#define UHIMR_TXBCNOK BIT25 -#define UHIMR_TSF_BIT32_TOGGLE BIT24 -#define UHIMR_BCNDMAINT3 BIT23 -#define UHIMR_BCNDMAINT2 BIT22 -#define UHIMR_BCNDMAINT1 BIT21 -#define UHIMR_BCNDMAINT0 BIT20 -#define UHIMR_BCNDOK3 BIT19 -#define UHIMR_BCNDOK2 BIT18 -#define UHIMR_BCNDOK1 BIT17 -#define UHIMR_BCNDOK0 BIT16 -#define UHIMR_HSISR_IND BIT15 -#define UHIMR_BCNDMAINT_E BIT14 -//RSVD BIT13 -#define UHIMR_CTW_END BIT12 -//RSVD BIT11 -#define UHIMR_C2HCMD BIT10 -#define UHIMR_CPWM2 BIT9 -#define UHIMR_CPWM BIT8 -#define UHIMR_HIGHDOK BIT7 // High Queue DMA OK Interrupt -#define UHIMR_MGNTDOK BIT6 // Management Queue DMA OK Interrupt -#define UHIMR_BKDOK BIT5 // AC_BK DMA OK Interrupt -#define UHIMR_BEDOK BIT4 // AC_BE DMA OK Interrupt -#define UHIMR_VIDOK BIT3 // AC_VI DMA OK Interrupt -#define UHIMR_VODOK BIT2 // AC_VO DMA Interrupt -#define UHIMR_RDU BIT1 // Receive Descriptor Unavailable -#define UHIMR_ROK BIT0 // Receive DMA OK Interrupt - -// USB Host Interrupt Status Extension bit -#define UHIMR_BCNDMAINT7 BIT23 -#define UHIMR_BCNDMAINT6 BIT22 -#define UHIMR_BCNDMAINT5 BIT21 -#define UHIMR_BCNDMAINT4 BIT20 -#define UHIMR_BCNDOK7 BIT19 -#define UHIMR_BCNDOK6 BIT18 -#define UHIMR_BCNDOK5 BIT17 -#define UHIMR_BCNDOK4 BIT16 -// bit14-15: RSVD -#define UHIMR_ATIMEND_E BIT13 -#define UHIMR_ATIMEND BIT12 -#define UHIMR_TXERR BIT11 -#define UHIMR_RXERR BIT10 -#define UHIMR_TXFOVW BIT9 -#define UHIMR_RXFOVW BIT8 -// bit2-7: RSVD -#define UHIMR_OCPINT BIT1 -// bit0: RSVD - -#define REG_USB_HIMR 0xFE38 -#define REG_USB_HIMRE 0xFE3C -#define REG_USB_HISR 0xFE78 -#define REG_USB_HISRE 0xFE7C - -#define USB_INTR_CPWM_OFFSET 16 -#define USB_INTR_CONTENT_HISR_OFFSET 48 -#define USB_INTR_CONTENT_HISRE_OFFSET 52 -#define USB_INTR_CONTENT_LENGTH 56 -#define USB_C2H_CMDID_OFFSET 0 -#define USB_C2H_SEQ_OFFSET 1 -#define USB_C2H_EVENT_OFFSET 2 -//============================================================================ -// General definitions -//============================================================================ - -#ifdef CONFIG_RF_GAIN_OFFSET -#define EEPROM_RF_GAIN_OFFSET 0x2F -#define EEPROM_RF_GAIN_VAL 0x1F6 -#endif //CONFIG_RF_GAIN_OFFSET - - -#endif - diff --git a/include/rtl8723a_sreset.h b/include/rtl8723a_sreset.h deleted file mode 100755 index c6ca4dc..0000000 --- a/include/rtl8723a_sreset.h +++ /dev/null @@ -1,33 +0,0 @@ -/****************************************************************************** - * - * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA - * - * - ******************************************************************************/ -#ifndef _RTL8188E_SRESET_H_ -#define _RTL8188E_SRESET_H_ - -#include -#include -#include -#include - -#ifdef DBG_CONFIG_ERROR_DETECT -extern void rtl8723a_sreset_xmit_status_check(_adapter *padapter); -extern void rtl8723a_sreset_linked_status_check(_adapter *padapter); -#endif -#endif - diff --git a/include/rtl8723a_xmit.h b/include/rtl8723a_xmit.h deleted file mode 100755 index c365843..0000000 --- a/include/rtl8723a_xmit.h +++ /dev/null @@ -1,238 +0,0 @@ -/****************************************************************************** - * - * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA - * - * - ******************************************************************************/ -#ifndef __RTL8723A_XMIT_H__ -#define __RTL8723A_XMIT_H__ - -#include - -// -//defined for TX DESC Operation -// - -#define MAX_TID (15) - -//OFFSET 0 -#define OFFSET_SZ 0 -#define OFFSET_SHT 16 -#define BMC BIT(24) -#define LSG BIT(26) -#define FSG BIT(27) -#define OWN BIT(31) - - -//OFFSET 4 -#define PKT_OFFSET_SZ 0 -#define BK BIT(6) -#define QSEL_SHT 8 -#define Rate_ID_SHT 16 -#define NAVUSEHDR BIT(20) -#define PKT_OFFSET_SHT 26 -#define HWPC BIT(31) - -//OFFSET 8 -#define AGG_EN BIT(29) - -//OFFSET 12 -#define SEQ_SHT 16 - -//OFFSET 16 -#define QoS BIT(6) -#define HW_SEQ_EN BIT(7) -#define USERATE BIT(8) -#define DISDATAFB BIT(10) -#define DATA_SHORT BIT(24) -#define DATA_BW BIT(25) - -//OFFSET 20 -#define SGI BIT(6) - -typedef struct txdesc_8723a -{ - u32 pktlen:16; - u32 offset:8; - u32 bmc:1; - u32 htc:1; - u32 ls:1; - u32 fs:1; - u32 linip:1; - u32 noacm:1; - u32 gf:1; - u32 own:1; - - u32 macid:5; - u32 agg_en:1; - u32 bk:1; - u32 rd_en:1; - u32 qsel:5; - u32 rd_nav_ext:1; - u32 lsig_txop_en:1; - u32 pifs:1; - u32 rate_id:4; - u32 navusehdr:1; - u32 en_desc_id:1; - u32 sectype:2; - u32 rsvd0424:2; - u32 pkt_offset:5; // unit: 8 bytes - u32 rsvd0431:1; - - u32 rts_rc:6; - u32 data_rc:6; - u32 rsvd0812:2; - u32 bar_rty_th:2; - u32 rsvd0816:1; - u32 morefrag:1; - u32 raw:1; - u32 ccx:1; - u32 ampdu_density:3; - u32 bt_null:1; - u32 ant_sel_a:1; - u32 ant_sel_b:1; - u32 tx_ant_cck:2; - u32 tx_antl:2; - u32 tx_ant_ht:2; - - u32 nextheadpage:8; - u32 tailpage:8; - u32 seq:12; - u32 cpu_handle:1; - u32 tag1:1; - u32 trigger_int:1; - u32 hwseq_en:1; - - u32 rtsrate:5; - u32 ap_dcfe:1; - u32 hwseq_sel:2; - u32 userate:1; - u32 disrtsfb:1; - u32 disdatafb:1; - u32 cts2self:1; - u32 rtsen:1; - u32 hw_rts_en:1; - u32 port_id:1; - u32 rsvd1615:3; - u32 wait_dcts:1; - u32 cts2ap_en:1; - u32 data_sc:2; - u32 data_stbc:2; - u32 data_short:1; - u32 data_bw:1; - u32 rts_short:1; - u32 rts_bw:1; - u32 rts_sc:2; - u32 vcs_stbc:2; - - u32 datarate:6; - u32 sgi:1; - u32 try_rate:1; - u32 data_ratefb_lmt:5; - u32 rts_ratefb_lmt:4; - u32 rty_lmt_en:1; - u32 data_rt_lmt:6; - u32 usb_txagg_num:8; - - u32 txagg_a:5; - u32 txagg_b:5; - u32 use_max_len:1; - u32 max_agg_num:5; - u32 mcsg1_max_len:4; - u32 mcsg2_max_len:4; - u32 mcsg3_max_len:4; - u32 mcs7_sgi_max_len:4; - - u32 checksum:16; // TxBuffSize(PCIe)/CheckSum(USB) - u32 mcsg4_max_len:4; - u32 mcsg5_max_len:4; - u32 mcsg6_max_len:4; - u32 mcs15_sgi_max_len:4; -}TXDESC, *PTXDESC; - -#define txdesc_set_ccx_sw_8723a(txdesc, value) \ - do { \ - ((struct txdesc_8723a *)(txdesc))->mcsg4_max_len = (((value)>>8) & 0x0f); \ - ((struct txdesc_8723a *)(txdesc))->mcs15_sgi_max_len= (((value)>>4) & 0x0f); \ - ((struct txdesc_8723a *)(txdesc))->mcsg6_max_len = ((value) & 0x0f); \ - } while (0) - -struct txrpt_ccx_8723a { - /* offset 0 */ - u8 tag1:1; - u8 rsvd:4; - u8 int_bt:1; - u8 int_tri:1; - u8 int_ccx:1; - - /* offset 1 */ - u8 mac_id:5; - u8 pkt_drop:1; - u8 pkt_ok:1; - u8 bmc:1; - - /* offset 2 */ - u8 retry_cnt:6; - u8 lifetime_over:1; - u8 retry_over:1; - - /* offset 3 */ - u8 ccx_qtime0; - u8 ccx_qtime1; - - /* offset 5 */ - u8 final_data_rate; - - /* offset 6 */ - u8 sw1:4; - u8 qsel:4; - - /* offset 7 */ - u8 sw0; -}; - -#define txrpt_ccx_sw_8723a(txrpt_ccx) ((txrpt_ccx)->sw0 + ((txrpt_ccx)->sw1<<8)) -#define txrpt_ccx_qtime_8723a(txrpt_ccx) ((txrpt_ccx)->ccx_qtime0+((txrpt_ccx)->ccx_qtime1<<8)) - -#ifdef CONFIG_XMIT_ACK -void dump_txrpt_ccx_8723a(void *buf); -void handle_txrpt_ccx_8723a(_adapter *adapter, void *buf); -#else -#define dump_txrpt_ccx_8723a(buf) do {} while(0) -#define handle_txrpt_ccx_8723a(adapter, buf) do {} while(0) -#endif //CONFIG_XMIT_ACK - -void rtl8723a_update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem); -void rtl8723a_fill_fake_txdesc(PADAPTER padapter, u8 *pDesc, u32 BufferLen, u8 IsPsPoll, u8 IsBTQosNull); - -#if defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI) -s32 rtl8723as_init_xmit_priv(PADAPTER padapter); -void rtl8723as_free_xmit_priv(PADAPTER padapter); -s32 rtl8723as_hal_xmit(PADAPTER padapter, struct xmit_frame *pxmitframe); -s32 rtl8723as_mgnt_xmit(PADAPTER padapter, struct xmit_frame *pmgntframe); -s32 rtl8723as_hal_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe); -s32 rtl8723as_xmit_buf_handler(PADAPTER padapter); -thread_return rtl8723as_xmit_thread(thread_context context); -#define hal_xmit_handler rtl8723as_xmit_buf_handler -#endif - -#ifdef CONFIG_USB_HCI -s32 rtl8723au_hal_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe); -s32 rtl8723au_xmit_buf_handler(PADAPTER padapter); -#define hal_xmit_handler rtl8723au_xmit_buf_handler -#endif -#endif - diff --git a/include/rtw_ap.h b/include/rtw_ap.h index a93e1e8..4731900 100755 --- a/include/rtw_ap.h +++ b/include/rtw_ap.h @@ -28,38 +28,38 @@ #ifdef CONFIG_AP_MODE //external function -extern void rtw_indicate_sta_assoc_event(_adapter *padapter, struct sta_info *psta); -extern void rtw_indicate_sta_disassoc_event(_adapter *padapter, struct sta_info *psta); +extern void rtw_indicate_sta_assoc_event(struct adapter *padapter, struct sta_info *psta); +extern void rtw_indicate_sta_disassoc_event(struct adapter *padapter, struct sta_info *psta); -void init_mlme_ap_info(_adapter *padapter); -void free_mlme_ap_info(_adapter *padapter); -//void update_BCNTIM(_adapter *padapter); -void rtw_add_bcn_ie(_adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index, u8 *data, u8 len); -void rtw_remove_bcn_ie(_adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index); -void update_beacon(_adapter *padapter, u8 ie_id, u8 *oui, u8 tx); -void add_RATid(_adapter *padapter, struct sta_info *psta, u8 rssi_level); -void expire_timeout_chk(_adapter *padapter); -void update_sta_info_apmode(_adapter *padapter, struct sta_info *psta); -int rtw_check_beacon_data(_adapter *padapter, u8 *pbuf, int len); -void rtw_ap_restore_network(_adapter *padapter); -void rtw_set_macaddr_acl(_adapter *padapter, int mode); -int rtw_acl_add_sta(_adapter *padapter, u8 *addr); -int rtw_acl_remove_sta(_adapter *padapter, u8 *addr); +void init_mlme_ap_info(struct adapter *padapter); +void free_mlme_ap_info(struct adapter *padapter); +//void update_BCNTIM(struct adapter *padapter); +void rtw_add_bcn_ie(struct adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index, u8 *data, u8 len); +void rtw_remove_bcn_ie(struct adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index); +void update_beacon(struct adapter *padapter, u8 ie_id, u8 *oui, u8 tx); +void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level); +void expire_timeout_chk(struct adapter *padapter); +void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta); +int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len); +void rtw_ap_restore_network(struct adapter *padapter); +void rtw_set_macaddr_acl(struct adapter *padapter, int mode); +int rtw_acl_add_sta(struct adapter *padapter, u8 *addr); +int rtw_acl_remove_sta(struct adapter *padapter, u8 *addr); #ifdef CONFIG_NATIVEAP_MLME -void associated_clients_update(_adapter *padapter, u8 updated); -void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta); -u8 bss_cap_update_on_sta_leave(_adapter *padapter, struct sta_info *psta); -void sta_info_update(_adapter *padapter, struct sta_info *psta); -void ap_sta_info_defer_update(_adapter *padapter, struct sta_info *psta); -u8 ap_free_sta(_adapter *padapter, struct sta_info *psta, bool active, u16 reason); -int rtw_sta_flush(_adapter *padapter); -int rtw_ap_inform_ch_switch(_adapter *padapter, u8 new_ch, u8 ch_offset); -void start_ap_mode(_adapter *padapter); -void stop_ap_mode(_adapter *padapter); +void associated_clients_update(struct adapter *padapter, u8 updated); +void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta); +u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta); +void sta_info_update(struct adapter *padapter, struct sta_info *psta); +void ap_sta_info_defer_update(struct adapter *padapter, struct sta_info *psta); +u8 ap_free_sta(struct adapter *padapter, struct sta_info *psta, bool active, u16 reason); +int rtw_sta_flush(struct adapter *padapter); +int rtw_ap_inform_ch_switch(struct adapter *padapter, u8 new_ch, u8 ch_offset); +void start_ap_mode(struct adapter *padapter); +void stop_ap_mode(struct adapter *padapter); #endif #endif //end of CONFIG_AP_MODE #endif -void update_bmc_sta(_adapter *padapter); +void update_bmc_sta(struct adapter *padapter); diff --git a/include/rtw_br_ext.h b/include/rtw_br_ext.h index c8d7801..a9b637f 100755 --- a/include/rtw_br_ext.h +++ b/include/rtw_br_ext.h @@ -70,7 +70,7 @@ struct br_ext_info { unsigned int nat25sc_disable; }; -void nat25_db_cleanup(_adapter *priv); +void nat25_db_cleanup(struct adapter *priv); #endif // _RTW_BR_EXT_H_ diff --git a/include/rtw_bt_mp.h b/include/rtw_bt_mp.h index 1574661..78d2864 100755 --- a/include/rtw_bt_mp.h +++ b/include/rtw_bt_mp.h @@ -196,7 +196,7 @@ typedef enum _BT_REPORT_TYPE{ VOID MPTBT_Test( - IN PADAPTER Adapter, + IN struct adapter *Adapter, IN u1Byte opCode, IN u1Byte byte1, IN u1Byte byte2, @@ -205,7 +205,7 @@ MPTBT_Test( NDIS_STATUS MPTBT_SendOidBT( - IN PADAPTER pAdapter, + IN struct adapter * pAdapter, IN PVOID InformationBuffer, IN ULONG InformationBufferLength, OUT PULONG BytesRead, @@ -214,7 +214,7 @@ MPTBT_SendOidBT( VOID MPTBT_FwC2hBtMpCtrl( - PADAPTER Adapter, + struct adapter *Adapter, pu1Byte tmpBuf, u1Byte length ); @@ -222,7 +222,7 @@ MPTBT_FwC2hBtMpCtrl( void MPh2c_timeout_handle(void *FunctionContext); VOID mptbt_BtControlProcess( - PADAPTER Adapter, + struct adapter *Adapter, PVOID pInBuf ); diff --git a/include/rtw_cmd.h b/include/rtw_cmd.h index 3525514..6f64bb9 100755 --- a/include/rtw_cmd.h +++ b/include/rtw_cmd.h @@ -40,7 +40,7 @@ #define CMDBUFF_ALIGN_SZ 512 struct cmd_obj { - _adapter *padapter; + struct adapter *padapter; u16 cmdcode; u8 res; u8 *parmbuf; @@ -66,7 +66,7 @@ u32 rsp_cnt; u8 cmdthd_running; u8 stop_req; - _adapter *padapter; + struct adapter *padapter; }; #ifdef CONFIG_EVENT_THREAD_MODE @@ -140,7 +140,7 @@ extern struct evt_obj *rtw_dequeue_evt(_queue *queue); extern void rtw_free_evt_obj(struct evt_obj *pcmd); #endif -void rtw_stop_cmd_thread(_adapter *adapter); +void rtw_stop_cmd_thread(struct adapter *adapter); thread_return rtw_cmd_thread(thread_context context); extern u32 rtw_init_cmd_priv (struct cmd_priv *pcmdpriv); @@ -151,7 +151,7 @@ extern void rtw_free_evt_priv (struct evt_priv *pevtpriv); extern void rtw_cmd_clr_isr(struct cmd_priv *pcmdpriv); extern void rtw_evt_notify_isr(struct evt_priv *pevtpriv); #ifdef CONFIG_P2P -u8 p2p_protocol_wk_cmd(_adapter*padapter, int intCmdType ); +u8 p2p_protocol_wk_cmd(struct adapter*padapter, int intCmdType ); #endif //CONFIG_P2P enum rtw_drvextra_cmd_id @@ -926,81 +926,81 @@ Result: #define H2C_CMD_OVERFLOW 0x06 #define H2C_RESERVED 0x07 -extern u8 rtw_setassocsta_cmd(_adapter *padapter, u8 *mac_addr); -extern u8 rtw_setstandby_cmd(_adapter *padapter, uint action); -u8 rtw_sitesurvey_cmd(_adapter *padapter, NDIS_802_11_SSID *ssid, int ssid_num, struct rtw_ieee80211_channel *ch, int ch_num); -extern u8 rtw_createbss_cmd(_adapter *padapter); -extern u8 rtw_createbss_cmd_ex(_adapter *padapter, unsigned char *pbss, unsigned int sz); -extern u8 rtw_setphy_cmd(_adapter *padapter, u8 modem, u8 ch); -extern u8 rtw_setstakey_cmd(_adapter *padapter, u8 *psta, u8 unicast_key, bool enqueue); -extern u8 rtw_clearstakey_cmd(_adapter *padapter, u8 *psta, u8 entry, u8 enqueue); -extern u8 rtw_joinbss_cmd(_adapter *padapter, struct wlan_network* pnetwork); -u8 rtw_disassoc_cmd(_adapter *padapter, u32 deauth_timeout_ms, bool enqueue); -extern u8 rtw_setopmode_cmd(_adapter *padapter, NDIS_802_11_NETWORK_INFRASTRUCTURE networktype, bool enqueue); -extern u8 rtw_setdatarate_cmd(_adapter *padapter, u8 *rateset); -extern u8 rtw_setbasicrate_cmd(_adapter *padapter, u8 *rateset); -extern u8 rtw_setbbreg_cmd(_adapter * padapter, u8 offset, u8 val); -extern u8 rtw_setrfreg_cmd(_adapter * padapter, u8 offset, u32 val); -extern u8 rtw_getbbreg_cmd(_adapter * padapter, u8 offset, u8 * pval); -extern u8 rtw_getrfreg_cmd(_adapter * padapter, u8 offset, u8 * pval); -extern u8 rtw_setrfintfs_cmd(_adapter *padapter, u8 mode); -extern u8 rtw_setrttbl_cmd(_adapter *padapter, struct setratable_parm *prate_table); -extern u8 rtw_getrttbl_cmd(_adapter *padapter, struct getratable_rsp *pval); +extern u8 rtw_setassocsta_cmd(struct adapter *padapter, u8 *mac_addr); +extern u8 rtw_setstandby_cmd(struct adapter *padapter, uint action); +u8 rtw_sitesurvey_cmd(struct adapter *padapter, NDIS_802_11_SSID *ssid, int ssid_num, struct rtw_ieee80211_channel *ch, int ch_num); +extern u8 rtw_createbss_cmd(struct adapter *padapter); +extern u8 rtw_createbss_cmd_ex(struct adapter *padapter, unsigned char *pbss, unsigned int sz); +extern u8 rtw_setphy_cmd(struct adapter *padapter, u8 modem, u8 ch); +extern u8 rtw_setstakey_cmd(struct adapter *padapter, u8 *psta, u8 unicast_key, bool enqueue); +extern u8 rtw_clearstakey_cmd(struct adapter *padapter, u8 *psta, u8 entry, u8 enqueue); +extern u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network* pnetwork); +u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deauth_timeout_ms, bool enqueue); +extern u8 rtw_setopmode_cmd(struct adapter *padapter, NDIS_802_11_NETWORK_INFRASTRUCTURE networktype, bool enqueue); +extern u8 rtw_setdatarate_cmd(struct adapter *padapter, u8 *rateset); +extern u8 rtw_setbasicrate_cmd(struct adapter *padapter, u8 *rateset); +extern u8 rtw_setbbreg_cmd(struct adapter * padapter, u8 offset, u8 val); +extern u8 rtw_setrfreg_cmd(struct adapter * padapter, u8 offset, u32 val); +extern u8 rtw_getbbreg_cmd(struct adapter * padapter, u8 offset, u8 * pval); +extern u8 rtw_getrfreg_cmd(struct adapter * padapter, u8 offset, u8 * pval); +extern u8 rtw_setrfintfs_cmd(struct adapter *padapter, u8 mode); +extern u8 rtw_setrttbl_cmd(struct adapter *padapter, struct setratable_parm *prate_table); +extern u8 rtw_getrttbl_cmd(struct adapter *padapter, struct getratable_rsp *pval); -extern u8 rtw_gettssi_cmd(_adapter *padapter, u8 offset,u8 *pval); -extern u8 rtw_setfwdig_cmd(_adapter*padapter, u8 type); -extern u8 rtw_setfwra_cmd(_adapter*padapter, u8 type); +extern u8 rtw_gettssi_cmd(struct adapter *padapter, u8 offset,u8 *pval); +extern u8 rtw_setfwdig_cmd(struct adapter*padapter, u8 type); +extern u8 rtw_setfwra_cmd(struct adapter*padapter, u8 type); -extern u8 rtw_addbareq_cmd(_adapter*padapter, u8 tid, u8 *addr); +extern u8 rtw_addbareq_cmd(struct adapter*padapter, u8 tid, u8 *addr); // add for CONFIG_IEEE80211W, none 11w also can use -extern u8 rtw_reset_securitypriv_cmd(_adapter*padapter); -extern u8 rtw_free_assoc_resources_cmd(_adapter *padapter); -extern u8 rtw_dynamic_chk_wk_cmd(_adapter *adapter); +extern u8 rtw_reset_securitypriv_cmd(struct adapter*padapter); +extern u8 rtw_free_assoc_resources_cmd(struct adapter *padapter); +extern u8 rtw_dynamic_chk_wk_cmd(struct adapter *adapter); -u8 rtw_lps_ctrl_wk_cmd(_adapter*padapter, u8 lps_ctrl_type, u8 enqueue); +u8 rtw_lps_ctrl_wk_cmd(struct adapter*padapter, u8 lps_ctrl_type, u8 enqueue); #if (RATE_ADAPTIVE_SUPPORT==1) -u8 rtw_rpt_timer_cfg_cmd(_adapter*padapter, u16 minRptTime); +u8 rtw_rpt_timer_cfg_cmd(struct adapter*padapter, u16 minRptTime); #endif #ifdef CONFIG_ANTENNA_DIVERSITY -extern u8 rtw_antenna_select_cmd(_adapter*padapter, u8 antenna,u8 enqueue); +extern u8 rtw_antenna_select_cmd(struct adapter*padapter, u8 antenna,u8 enqueue); #endif -extern u8 rtw_ps_cmd(_adapter*padapter); +extern u8 rtw_ps_cmd(struct adapter*padapter); #ifdef CONFIG_AP_MODE -u8 rtw_chk_hi_queue_cmd(_adapter*padapter); +u8 rtw_chk_hi_queue_cmd(struct adapter*padapter); #endif -u8 rtw_set_ch_cmd(_adapter*padapter, u8 ch, u8 bw, u8 ch_offset, u8 enqueue); -extern u8 rtw_set_chplan_cmd(_adapter*padapter, u8 chplan, u8 enqueue); -extern u8 rtw_led_blink_cmd(_adapter*padapter, PLED_871x pLed); -extern u8 rtw_set_csa_cmd(_adapter*padapter, u8 new_ch_no); -extern u8 rtw_tdls_cmd(_adapter*padapter, u8 *addr, u8 option); +u8 rtw_set_ch_cmd(struct adapter*padapter, u8 ch, u8 bw, u8 ch_offset, u8 enqueue); +extern u8 rtw_set_chplan_cmd(struct adapter*padapter, u8 chplan, u8 enqueue); +extern u8 rtw_led_blink_cmd(struct adapter*padapter, PLED_871x pLed); +extern u8 rtw_set_csa_cmd(struct adapter*padapter, u8 new_ch_no); +extern u8 rtw_tdls_cmd(struct adapter*padapter, u8 *addr, u8 option); -extern u8 rtw_c2h_wk_cmd(PADAPTER padapter, u8 *c2h_evt); +extern u8 rtw_c2h_wk_cmd(struct adapter *padapter, u8 *c2h_evt); #ifdef CONFIG_DETECT_C2H_BY_POLLING -extern u8 rtw_event_polling_cmd(_adapter*padapter); +extern u8 rtw_event_polling_cmd(struct adapter*padapter); #endif -u8 rtw_drvextra_cmd_hdl(_adapter *padapter, unsigned char *pbuf); +u8 rtw_drvextra_cmd_hdl(struct adapter *padapter, unsigned char *pbuf); -extern void rtw_survey_cmd_callback(_adapter *padapter, struct cmd_obj *pcmd); -extern void rtw_disassoc_cmd_callback(_adapter *padapter, struct cmd_obj *pcmd); -extern void rtw_joinbss_cmd_callback(_adapter *padapter, struct cmd_obj *pcmd); -extern void rtw_createbss_cmd_callback(_adapter *padapter, struct cmd_obj *pcmd); -extern void rtw_getbbrfreg_cmdrsp_callback(_adapter *padapter, struct cmd_obj *pcmd); -extern void rtw_readtssi_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd); +extern void rtw_survey_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd); +extern void rtw_disassoc_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd); +extern void rtw_joinbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd); +extern void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd); +extern void rtw_getbbrfreg_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pcmd); +extern void rtw_readtssi_cmdrsp_callback(struct adapter* padapter, struct cmd_obj *pcmd); -extern void rtw_setstaKey_cmdrsp_callback(_adapter *padapter, struct cmd_obj *pcmd); -extern void rtw_setassocsta_cmdrsp_callback(_adapter *padapter, struct cmd_obj *pcmd); -extern void rtw_getrttbl_cmdrsp_callback(_adapter *padapter, struct cmd_obj *pcmd); +extern void rtw_setstaKey_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pcmd); +extern void rtw_setassocsta_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pcmd); +extern void rtw_getrttbl_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pcmd); struct _cmd_callback { u32 cmd_code; - void (*callback)(_adapter *padapter, struct cmd_obj *cmd); + void (*callback)(struct adapter *padapter, struct cmd_obj *cmd); }; enum rtw_h2c_cmd diff --git a/include/rtw_eeprom.h b/include/rtw_eeprom.h index d6cb6d1..9a1b8b9 100755 --- a/include/rtw_eeprom.h +++ b/include/rtw_eeprom.h @@ -150,12 +150,12 @@ struct eeprom_priv }; -extern void eeprom_write16(_adapter *padapter, u16 reg, u16 data); -extern u16 eeprom_read16(_adapter *padapter, u16 reg); -extern void read_eeprom_content(_adapter *padapter); -extern void eeprom_read_sz(_adapter * padapter, u16 reg,u8* data, u32 sz); +extern void eeprom_write16(struct adapter *padapter, u16 reg, u16 data); +extern u16 eeprom_read16(struct adapter *padapter, u16 reg); +extern void read_eeprom_content(struct adapter *padapter); +extern void eeprom_read_sz(struct adapter * padapter, u16 reg,u8* data, u32 sz); -extern void read_eeprom_content_by_attrib(_adapter * padapter ); +extern void read_eeprom_content_by_attrib(struct adapter * padapter ); #ifdef CONFIG_ADAPTOR_INFO_CACHING_FILE extern int isAdaptorInfoFileValid(void); diff --git a/include/rtw_efuse.h b/include/rtw_efuse.h index 7edcce9..5ca3a04 100755 --- a/include/rtw_efuse.h +++ b/include/rtw_efuse.h @@ -123,30 +123,30 @@ extern u8 fakeBTEfuseInitMap[]; extern u8 fakeBTEfuseModifiedMap[]; /*------------------------Export global variable----------------------------*/ -u8 efuse_GetCurrentSize(PADAPTER padapter, u16 *size); -u16 efuse_GetMaxSize(PADAPTER padapter); -u8 rtw_efuse_access(PADAPTER padapter, u8 bRead, u16 start_addr, u16 cnts, u8 *data); -u8 rtw_efuse_map_read(PADAPTER padapter, u16 addr, u16 cnts, u8 *data); -u8 rtw_efuse_map_write(PADAPTER padapter, u16 addr, u16 cnts, u8 *data); -u8 rtw_BT_efuse_map_read(PADAPTER padapter, u16 addr, u16 cnts, u8 *data); -u8 rtw_BT_efuse_map_write(PADAPTER padapter, u16 addr, u16 cnts, u8 *data); +u8 efuse_GetCurrentSize(struct adapter *padapter, u16 *size); +u16 efuse_GetMaxSize(struct adapter *padapter); +u8 rtw_efuse_access(struct adapter *padapter, u8 bRead, u16 start_addr, u16 cnts, u8 *data); +u8 rtw_efuse_map_read(struct adapter *padapter, u16 addr, u16 cnts, u8 *data); +u8 rtw_efuse_map_write(struct adapter *padapter, u16 addr, u16 cnts, u8 *data); +u8 rtw_BT_efuse_map_read(struct adapter *padapter, u16 addr, u16 cnts, u8 *data); +u8 rtw_BT_efuse_map_write(struct adapter *padapter, u16 addr, u16 cnts, u8 *data); -u16 Efuse_GetCurrentSize(PADAPTER pAdapter, u8 efuseType, BOOLEAN bPseudoTest); +u16 Efuse_GetCurrentSize(struct adapter *pAdapter, u8 efuseType, BOOLEAN bPseudoTest); u8 Efuse_CalculateWordCnts(u8 word_en); -void ReadEFuseByte(PADAPTER Adapter, u16 _offset, u8 *pbuf, BOOLEAN bPseudoTest) ; -void EFUSE_GetEfuseDefinition(PADAPTER pAdapter, u8 efuseType, u8 type, void *pOut, BOOLEAN bPseudoTest); -u8 efuse_OneByteRead(PADAPTER pAdapter, u16 addr, u8 *data, BOOLEAN bPseudoTest); -u8 efuse_OneByteWrite(PADAPTER pAdapter, u16 addr, u8 data, BOOLEAN bPseudoTest); +void ReadEFuseByte(struct adapter *Adapter, u16 _offset, u8 *pbuf, BOOLEAN bPseudoTest) ; +void EFUSE_GetEfuseDefinition(struct adapter *pAdapter, u8 efuseType, u8 type, void *pOut, BOOLEAN bPseudoTest); +u8 efuse_OneByteRead(struct adapter *pAdapter, u16 addr, u8 *data, BOOLEAN bPseudoTest); +u8 efuse_OneByteWrite(struct adapter *pAdapter, u16 addr, u8 data, BOOLEAN bPseudoTest); -void Efuse_PowerSwitch(PADAPTER pAdapter,u8 bWrite,u8 PwrState); -int Efuse_PgPacketRead(PADAPTER pAdapter, u8 offset, u8 *data, BOOLEAN bPseudoTest); -int Efuse_PgPacketWrite(PADAPTER pAdapter, u8 offset, u8 word_en, u8 *data, BOOLEAN bPseudoTest); +void Efuse_PowerSwitch(struct adapter *pAdapter,u8 bWrite,u8 PwrState); +int Efuse_PgPacketRead(struct adapter *pAdapter, u8 offset, u8 *data, BOOLEAN bPseudoTest); +int Efuse_PgPacketWrite(struct adapter *pAdapter, u8 offset, u8 word_en, u8 *data, BOOLEAN bPseudoTest); void efuse_WordEnableDataRead(u8 word_en, u8 *sourdata, u8 *targetdata); -u8 Efuse_WordEnableDataWrite(PADAPTER pAdapter, u16 efuse_addr, u8 word_en, u8 *data, BOOLEAN bPseudoTest); +u8 Efuse_WordEnableDataWrite(struct adapter *pAdapter, u16 efuse_addr, u8 word_en, u8 *data, BOOLEAN bPseudoTest); -u8 EFUSE_Read1Byte(PADAPTER pAdapter, u16 Address); -void EFUSE_ShadowMapUpdate(PADAPTER pAdapter, u8 efuseType, BOOLEAN bPseudoTest); -void EFUSE_ShadowRead(PADAPTER pAdapter, u8 Type, u16 Offset, u32 *Value); +u8 EFUSE_Read1Byte(struct adapter *pAdapter, u16 Address); +void EFUSE_ShadowMapUpdate(struct adapter *pAdapter, u8 efuseType, BOOLEAN bPseudoTest); +void EFUSE_ShadowRead(struct adapter *pAdapter, u8 Type, u16 Offset, u32 *Value); #endif diff --git a/include/rtw_event.h b/include/rtw_event.h index 5de86e7..e810745 100755 --- a/include/rtw_event.h +++ b/include/rtw_event.h @@ -112,7 +112,7 @@ struct c2hlbk_event{ struct fwevent { u32 parmsize; - void (*event_callback)(_adapter *dev, u8 *pbuf); + void (*event_callback)(struct adapter *dev, u8 *pbuf); }; diff --git a/include/rtw_io.h b/include/rtw_io.h index 696fe97..6d91b62 100755 --- a/include/rtw_io.h +++ b/include/rtw_io.h @@ -162,7 +162,7 @@ struct io_req { #endif #endif - void (*_async_io_callback)(_adapter *padater, struct io_req *pio_req, u8 *cnxt); + void (*_async_io_callback)(struct adapter *padater, struct io_req *pio_req, u8 *cnxt); u8 *cnxt; #ifdef PLATFORM_OS_XP @@ -197,7 +197,7 @@ struct intf_hdl { u16 len; u16 done_len; */ - _adapter *padapter; + struct adapter *padapter; struct dvobj_priv *pintf_dev;// pointer to &(padapter->dvobjpriv); struct _io_ops io_ops; @@ -349,15 +349,15 @@ struct io_queue { struct io_priv{ - _adapter *padapter; + struct adapter *padapter; struct intf_hdl intf; }; -extern uint ioreq_flush(_adapter *adapter, struct io_queue *ioqueue); +extern uint ioreq_flush(struct adapter *adapter, struct io_queue *ioqueue); extern void sync_ioreq_enqueue(struct io_req *preq,struct io_queue *ioqueue); -extern uint sync_ioreq_flush(_adapter *adapter, struct io_queue *ioqueue); +extern uint sync_ioreq_flush(struct adapter *adapter, struct io_queue *ioqueue); extern uint free_ioreq(struct io_req *preq, struct io_queue *pio_queue); @@ -366,43 +366,43 @@ extern struct io_req *alloc_ioreq(struct io_queue *pio_q); extern uint register_intf_hdl(u8 *dev, struct intf_hdl *pintfhdl); extern void unregister_intf_hdl(struct intf_hdl *pintfhdl); -extern void _rtw_attrib_read(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem); -extern void _rtw_attrib_write(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem); +extern void _rtw_attrib_read(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem); +extern void _rtw_attrib_write(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem); -extern u8 _rtw_read8(_adapter *adapter, u32 addr); -extern u16 _rtw_read16(_adapter *adapter, u32 addr); -extern u32 _rtw_read32(_adapter *adapter, u32 addr); -extern void _rtw_read_mem(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem); -extern void _rtw_read_port(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem); -extern void _rtw_read_port_cancel(_adapter *adapter); +extern u8 _rtw_read8(struct adapter *adapter, u32 addr); +extern u16 _rtw_read16(struct adapter *adapter, u32 addr); +extern u32 _rtw_read32(struct adapter *adapter, u32 addr); +extern void _rtw_read_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem); +extern void _rtw_read_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem); +extern void _rtw_read_port_cancel(struct adapter *adapter); -extern int _rtw_write8(_adapter *adapter, u32 addr, u8 val); -extern int _rtw_write16(_adapter *adapter, u32 addr, u16 val); -extern int _rtw_write32(_adapter *adapter, u32 addr, u32 val); -extern int _rtw_writeN(_adapter *adapter, u32 addr, u32 length, u8 *pdata); +extern int _rtw_write8(struct adapter *adapter, u32 addr, u8 val); +extern int _rtw_write16(struct adapter *adapter, u32 addr, u16 val); +extern int _rtw_write32(struct adapter *adapter, u32 addr, u32 val); +extern int _rtw_writeN(struct adapter *adapter, u32 addr, u32 length, u8 *pdata); -extern int _rtw_write8_async(_adapter *adapter, u32 addr, u8 val); -extern int _rtw_write16_async(_adapter *adapter, u32 addr, u16 val); -extern int _rtw_write32_async(_adapter *adapter, u32 addr, u32 val); +extern int _rtw_write8_async(struct adapter *adapter, u32 addr, u8 val); +extern int _rtw_write16_async(struct adapter *adapter, u32 addr, u16 val); +extern int _rtw_write32_async(struct adapter *adapter, u32 addr, u32 val); -extern void _rtw_write_mem(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem); -extern u32 _rtw_write_port(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem); -u32 _rtw_write_port_and_wait(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem, int timeout_ms); -extern void _rtw_write_port_cancel(_adapter *adapter); +extern void _rtw_write_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem); +extern u32 _rtw_write_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem); +u32 _rtw_write_port_and_wait(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem, int timeout_ms); +extern void _rtw_write_port_cancel(struct adapter *adapter); #ifdef DBG_IO bool match_read_sniff_ranges(u16 addr, u16 len); bool match_write_sniff_ranges(u16 addr, u16 len); -extern u8 dbg_rtw_read8(_adapter *adapter, u32 addr, const char *caller, const int line); -extern u16 dbg_rtw_read16(_adapter *adapter, u32 addr, const char *caller, const int line); -extern u32 dbg_rtw_read32(_adapter *adapter, u32 addr, const char *caller, const int line); +extern u8 dbg_rtw_read8(struct adapter *adapter, u32 addr, const char *caller, const int line); +extern u16 dbg_rtw_read16(struct adapter *adapter, u32 addr, const char *caller, const int line); +extern u32 dbg_rtw_read32(struct adapter *adapter, u32 addr, const char *caller, const int line); -extern int dbg_rtw_write8(_adapter *adapter, u32 addr, u8 val, const char *caller, const int line); -extern int dbg_rtw_write16(_adapter *adapter, u32 addr, u16 val, const char *caller, const int line); -extern int dbg_rtw_write32(_adapter *adapter, u32 addr, u32 val, const char *caller, const int line); -extern int dbg_rtw_writeN(_adapter *adapter, u32 addr ,u32 length , u8 *data, const char *caller, const int line); +extern int dbg_rtw_write8(struct adapter *adapter, u32 addr, u8 val, const char *caller, const int line); +extern int dbg_rtw_write16(struct adapter *adapter, u32 addr, u16 val, const char *caller, const int line); +extern int dbg_rtw_write32(struct adapter *adapter, u32 addr, u32 val, const char *caller, const int line); +extern int dbg_rtw_writeN(struct adapter *adapter, u32 addr ,u32 length , u8 *data, const char *caller, const int line); #define rtw_read8(adapter, addr) dbg_rtw_read8((adapter), (addr), __FUNCTION__, __LINE__) #define rtw_read16(adapter, addr) dbg_rtw_read16((adapter), (addr), __FUNCTION__, __LINE__) @@ -447,47 +447,47 @@ extern int dbg_rtw_writeN(_adapter *adapter, u32 addr ,u32 length , u8 *data, co #define rtw_write_port_cancel(adapter) _rtw_write_port_cancel((adapter)) #endif //DBG_IO -extern void rtw_write_scsi(_adapter *adapter, u32 cnt, u8 *pmem); +extern void rtw_write_scsi(struct adapter *adapter, u32 cnt, u8 *pmem); //ioreq -extern void ioreq_read8(_adapter *adapter, u32 addr, u8 *pval); -extern void ioreq_read16(_adapter *adapter, u32 addr, u16 *pval); -extern void ioreq_read32(_adapter *adapter, u32 addr, u32 *pval); -extern void ioreq_write8(_adapter *adapter, u32 addr, u8 val); -extern void ioreq_write16(_adapter *adapter, u32 addr, u16 val); -extern void ioreq_write32(_adapter *adapter, u32 addr, u32 val); +extern void ioreq_read8(struct adapter *adapter, u32 addr, u8 *pval); +extern void ioreq_read16(struct adapter *adapter, u32 addr, u16 *pval); +extern void ioreq_read32(struct adapter *adapter, u32 addr, u32 *pval); +extern void ioreq_write8(struct adapter *adapter, u32 addr, u8 val); +extern void ioreq_write16(struct adapter *adapter, u32 addr, u16 val); +extern void ioreq_write32(struct adapter *adapter, u32 addr, u32 val); -extern uint async_read8(_adapter *adapter, u32 addr, u8 *pbuff, - void (*_async_io_callback)(_adapter *padater, struct io_req *pio_req, u8 *cnxt), u8 *cnxt); -extern uint async_read16(_adapter *adapter, u32 addr, u8 *pbuff, - void (*_async_io_callback)(_adapter *padater, struct io_req *pio_req, u8 *cnxt), u8 *cnxt); -extern uint async_read32(_adapter *adapter, u32 addr, u8 *pbuff, - void (*_async_io_callback)(_adapter *padater, struct io_req *pio_req, u8 *cnxt), u8 *cnxt); +extern uint async_read8(struct adapter *adapter, u32 addr, u8 *pbuff, + void (*_async_io_callback)(struct adapter *padater, struct io_req *pio_req, u8 *cnxt), u8 *cnxt); +extern uint async_read16(struct adapter *adapter, u32 addr, u8 *pbuff, + void (*_async_io_callback)(struct adapter *padater, struct io_req *pio_req, u8 *cnxt), u8 *cnxt); +extern uint async_read32(struct adapter *adapter, u32 addr, u8 *pbuff, + void (*_async_io_callback)(struct adapter *padater, struct io_req *pio_req, u8 *cnxt), u8 *cnxt); -extern void async_read_mem(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem); -extern void async_read_port(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem); +extern void async_read_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem); +extern void async_read_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem); -extern void async_write8(_adapter *adapter, u32 addr, u8 val, - void (*_async_io_callback)(_adapter *padater, struct io_req *pio_req, u8 *cnxt), u8 *cnxt); -extern void async_write16(_adapter *adapter, u32 addr, u16 val, - void (*_async_io_callback)(_adapter *padater, struct io_req *pio_req, u8 *cnxt), u8 *cnxt); -extern void async_write32(_adapter *adapter, u32 addr, u32 val, - void (*_async_io_callback)(_adapter *padater, struct io_req *pio_req, u8 *cnxt), u8 *cnxt); +extern void async_write8(struct adapter *adapter, u32 addr, u8 val, + void (*_async_io_callback)(struct adapter *padater, struct io_req *pio_req, u8 *cnxt), u8 *cnxt); +extern void async_write16(struct adapter *adapter, u32 addr, u16 val, + void (*_async_io_callback)(struct adapter *padater, struct io_req *pio_req, u8 *cnxt), u8 *cnxt); +extern void async_write32(struct adapter *adapter, u32 addr, u32 val, + void (*_async_io_callback)(struct adapter *padater, struct io_req *pio_req, u8 *cnxt), u8 *cnxt); -extern void async_write_mem(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem); -extern void async_write_port(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem); +extern void async_write_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem); +extern void async_write_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem); -int rtw_init_io_priv(_adapter *padapter, void (*set_intf_ops)(struct _io_ops *pops)); +int rtw_init_io_priv(struct adapter *padapter, void (*set_intf_ops)(struct _io_ops *pops)); -extern uint alloc_io_queue(_adapter *adapter); -extern void free_io_queue(_adapter *adapter); +extern uint alloc_io_queue(struct adapter *adapter); +extern void free_io_queue(struct adapter *adapter); extern void async_bus_io(struct io_queue *pio_q); extern void bus_sync_io(struct io_queue *pio_q); extern u32 _ioreq2rwmem(struct io_queue *pio_q); -extern void dev_power_down(_adapter * Adapter, u8 bpwrup); +extern void dev_power_down(struct adapter * Adapter, u8 bpwrup); /* #define RTL_R8(reg) rtw_read8(padapter, reg) diff --git a/include/rtw_ioctl_set.h b/include/rtw_ioctl_set.h index d3fa0d0..b50764b 100755 --- a/include/rtw_ioctl_set.h +++ b/include/rtw_ioctl_set.h @@ -32,25 +32,25 @@ typedef struct _BSSIDInfo { } BSSIDInfo, *PBSSIDInfo; -u8 rtw_set_802_11_add_key(_adapter * padapter, NDIS_802_11_KEY * key); -u8 rtw_set_802_11_authentication_mode(_adapter *pdapter, NDIS_802_11_AUTHENTICATION_MODE authmode); -u8 rtw_set_802_11_bssid(_adapter* padapter, u8 *bssid); -u8 rtw_set_802_11_add_wep(_adapter * padapter, NDIS_802_11_WEP * wep); -u8 rtw_set_802_11_disassociate(_adapter * padapter); -u8 rtw_set_802_11_bssid_list_scan(_adapter* padapter, NDIS_802_11_SSID *pssid, int ssid_max_num); -u8 rtw_set_802_11_infrastructure_mode(_adapter * padapter, NDIS_802_11_NETWORK_INFRASTRUCTURE networktype); -u8 rtw_set_802_11_remove_wep(_adapter * padapter, u32 keyindex); -u8 rtw_set_802_11_ssid(_adapter * padapter, NDIS_802_11_SSID * ssid); -u8 rtw_set_802_11_connect(_adapter* padapter, u8 *bssid, NDIS_802_11_SSID *ssid); -u8 rtw_set_802_11_remove_key(_adapter * padapter, NDIS_802_11_REMOVE_KEY * key); +u8 rtw_set_802_11_add_key(struct adapter * padapter, NDIS_802_11_KEY * key); +u8 rtw_set_802_11_authentication_mode(struct adapter *pdapter, NDIS_802_11_AUTHENTICATION_MODE authmode); +u8 rtw_set_802_11_bssid(struct adapter* padapter, u8 *bssid); +u8 rtw_set_802_11_add_wep(struct adapter * padapter, NDIS_802_11_WEP * wep); +u8 rtw_set_802_11_disassociate(struct adapter * padapter); +u8 rtw_set_802_11_bssid_list_scan(struct adapter* padapter, NDIS_802_11_SSID *pssid, int ssid_max_num); +u8 rtw_set_802_11_infrastructure_mode(struct adapter * padapter, NDIS_802_11_NETWORK_INFRASTRUCTURE networktype); +u8 rtw_set_802_11_remove_wep(struct adapter * padapter, u32 keyindex); +u8 rtw_set_802_11_ssid(struct adapter * padapter, NDIS_802_11_SSID * ssid); +u8 rtw_set_802_11_connect(struct adapter* padapter, u8 *bssid, NDIS_802_11_SSID *ssid); +u8 rtw_set_802_11_remove_key(struct adapter * padapter, NDIS_802_11_REMOVE_KEY * key); u8 rtw_validate_bssid(u8 *bssid); u8 rtw_validate_ssid(NDIS_802_11_SSID *ssid); -u16 rtw_get_cur_max_rate(_adapter *adapter); -int rtw_set_scan_mode(_adapter *adapter, RT_SCAN_TYPE scan_mode); -int rtw_set_channel_plan(_adapter *adapter, u8 channel_plan); -int rtw_set_country(_adapter *adapter, const char *country_code); +u16 rtw_get_cur_max_rate(struct adapter *adapter); +int rtw_set_scan_mode(struct adapter *adapter, RT_SCAN_TYPE scan_mode); +int rtw_set_channel_plan(struct adapter *adapter, u8 channel_plan); +int rtw_set_country(struct adapter *adapter, const char *country_code); #endif diff --git a/include/rtw_iol.h b/include/rtw_iol.h index 0b0672a..42b2ee3 100755 --- a/include/rtw_iol.h +++ b/include/rtw_iol.h @@ -23,11 +23,11 @@ #include #include #include -struct xmit_frame *rtw_IOL_accquire_xmit_frame(ADAPTER *adapter); +struct xmit_frame *rtw_IOL_accquire_xmit_frame(struct adapter *adapter); int rtw_IOL_append_cmds(struct xmit_frame *xmit_frame, u8 *IOL_cmds, u32 cmd_len); int rtw_IOL_append_LLT_cmd(struct xmit_frame *xmit_frame, u8 page_boundary); -int rtw_IOL_exec_cmds_sync(ADAPTER *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt); -bool rtw_IOL_applied(ADAPTER *adapter); +int rtw_IOL_exec_cmds_sync(struct adapter *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt); +bool rtw_IOL_applied(struct adapter *adapter); int rtw_IOL_append_DELAY_US_cmd(struct xmit_frame *xmit_frame, u16 us); int rtw_IOL_append_DELAY_MS_cmd(struct xmit_frame *xmit_frame, u16 ms); int rtw_IOL_append_END_cmd(struct xmit_frame *xmit_frame); @@ -55,7 +55,7 @@ enum ioreg_cmd{ IOREG_CMD_DELAY_MS = 0x11, IOREG_CMD_END = 0xFF, }; -void read_efuse_from_txpktbuf(ADAPTER *adapter, int bcnhead, u8 *content, u16 *size); +void read_efuse_from_txpktbuf(struct adapter *adapter, int bcnhead, u8 *content, u16 *size); int _rtw_IOL_append_WB_cmd(struct xmit_frame *xmit_frame, u16 addr, u8 value, u8 mask); int _rtw_IOL_append_WW_cmd(struct xmit_frame *xmit_frame, u16 addr, u16 value, u16 mask); @@ -67,7 +67,7 @@ int _rtw_IOL_append_WRF_cmd(struct xmit_frame *xmit_frame, u8 rf_path, u16 addr, #define rtw_IOL_append_WRF_cmd(xmit_frame, rf_path, addr, value,mask) _rtw_IOL_append_WRF_cmd((xmit_frame),(rf_path), (addr), (value),(mask)) u8 rtw_IOL_cmd_boundary_handle(struct xmit_frame *pxmit_frame); -void rtw_IOL_cmd_buf_dump(ADAPTER *Adapter,int buf_len,u8 *pbuf); +void rtw_IOL_cmd_buf_dump(struct adapter *Adapter,int buf_len,u8 *pbuf); #ifdef CONFIG_IOL_IOREG_CFG_DBG struct cmd_cmp{ @@ -116,8 +116,8 @@ int _rtw_IOL_append_WW_cmd(struct xmit_frame *xmit_frame, u16 addr, u16 value); int _rtw_IOL_append_WD_cmd(struct xmit_frame *xmit_frame, u16 addr, u32 value); -int rtw_IOL_exec_cmd_array_sync(PADAPTER adapter, u8 *IOL_cmds, u32 cmd_num, u32 max_wating_ms); -int rtw_IOL_exec_empty_cmds_sync(ADAPTER *adapter, u32 max_wating_ms); +int rtw_IOL_exec_cmd_array_sync(struct adapter *adapter, u8 *IOL_cmds, u32 cmd_num, u32 max_wating_ms); +int rtw_IOL_exec_empty_cmds_sync(struct adapter *adapter, u32 max_wating_ms); #ifdef DBG_IO int dbg_rtw_IOL_append_WB_cmd(struct xmit_frame *xmit_frame, u16 addr, u8 value, const char *caller, const int line); diff --git a/include/rtw_led.h b/include/rtw_led.h index 3cfc571..427b94b 100755 --- a/include/rtw_led.h +++ b/include/rtw_led.h @@ -103,7 +103,7 @@ typedef enum _LED_PIN_871x{ }LED_PIN_871x; typedef struct _LED_871x{ - _adapter *padapter; + struct adapter *padapter; LED_PIN_871x LedPin; // Identify how to implement this SW led. LED_STATE_871x CurrLedState; // Current LED state. @@ -166,7 +166,7 @@ typedef enum _LED_STRATEGY_871x{ void LedControl871x( - _adapter *padapter, + struct adapter *padapter, LED_CTL_MODE LedAction ); #endif //defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI) @@ -199,7 +199,7 @@ struct led_priv{ LED_871x SwLed1; LED_STRATEGY_871x LedStrategy; u8 bRegUseLed; - void (*LedControlHandler)(_adapter *padapter, LED_CTL_MODE LedAction); + void (*LedControlHandler)(struct adapter *padapter, LED_CTL_MODE LedAction); /* add for led controll */ }; @@ -220,7 +220,7 @@ void ResetLedStatus(PLED_871x pLed); void InitLed871x( - _adapter *padapter, + struct adapter *padapter, PLED_871x pLed, LED_PIN_871x LedPin ); diff --git a/include/rtw_mlme.h b/include/rtw_mlme.h index 7bfb6d1..6d7c665 100755 --- a/include/rtw_mlme.h +++ b/include/rtw_mlme.h @@ -266,7 +266,7 @@ struct cfg80211_wifidirect_info{ #endif //CONFIG_IOCTL_CFG80211 struct wifidirect_info{ - _adapter* padapter; + struct adapter* padapter; _timer find_phase_timer; _timer restore_p2p_state_timer; @@ -607,7 +607,7 @@ struct mlme_priv { struct hostapd_priv { - _adapter *padapter; + struct adapter *padapter; #ifdef CONFIG_HOSTAPD_MLME struct net_device *pmgnt_netdev; @@ -616,33 +616,33 @@ struct hostapd_priv }; -extern int hostapd_mode_init(_adapter *padapter); -extern void hostapd_mode_unload(_adapter *padapter); +extern int hostapd_mode_init(struct adapter *padapter); +extern void hostapd_mode_unload(struct adapter *padapter); #endif -extern void rtw_joinbss_event_prehandle(_adapter *adapter, u8 *pbuf); -extern void rtw_survey_event_callback(_adapter *adapter, u8 *pbuf); -extern void rtw_surveydone_event_callback(_adapter *adapter, u8 *pbuf); -extern void rtw_joinbss_event_callback(_adapter *adapter, u8 *pbuf); -extern void rtw_stassoc_event_callback(_adapter *adapter, u8 *pbuf); -extern void rtw_stadel_event_callback(_adapter *adapter, u8 *pbuf); -extern void rtw_atimdone_event_callback(_adapter *adapter, u8 *pbuf); -extern void rtw_cpwm_event_callback(_adapter *adapter, u8 *pbuf); +extern void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf); +extern void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf); +extern void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf); +extern void rtw_joinbss_event_callback(struct adapter *adapter, u8 *pbuf); +extern void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf); +extern void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf); +extern void rtw_atimdone_event_callback(struct adapter *adapter, u8 *pbuf); +extern void rtw_cpwm_event_callback(struct adapter *adapter, u8 *pbuf); extern int event_thread(void *context); extern void rtw_join_timeout_handler(void* FunctionContext); extern void _rtw_scan_timeout_handler(void* FunctionContext); -extern void rtw_free_network_queue(_adapter *adapter,u8 isfreeall); -extern int rtw_init_mlme_priv(_adapter *adapter);// (struct mlme_priv *pmlmepriv); +extern void rtw_free_network_queue(struct adapter *adapter,u8 isfreeall); +extern int rtw_init_mlme_priv(struct adapter *adapter);// (struct mlme_priv *pmlmepriv); extern void rtw_free_mlme_priv (struct mlme_priv *pmlmepriv); extern sint rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv); -extern sint rtw_set_key(_adapter *adapter,struct security_priv *psecuritypriv,sint keyid, u8 set_tx, bool enqueue); -extern sint rtw_set_auth(_adapter *adapter,struct security_priv *psecuritypriv); +extern sint rtw_set_key(struct adapter *adapter,struct security_priv *psecuritypriv,sint keyid, u8 set_tx, bool enqueue); +extern sint rtw_set_auth(struct adapter *adapter,struct security_priv *psecuritypriv); __inline static u8 *get_bssid(struct mlme_priv *pmlmepriv) { //if sta_mode:pmlmepriv->cur_network.network.MacAddress=> bssid @@ -721,9 +721,9 @@ __inline static void up_scanned_network(struct mlme_priv *pmlmepriv) } #ifdef CONFIG_CONCURRENT_MODE -sint rtw_buddy_adapter_up(_adapter *padapter); -sint check_buddy_fwstate(_adapter *padapter, sint state); -u8 rtw_get_buddy_bBusyTraffic(_adapter *padapter); +sint rtw_buddy_adapter_up(struct adapter *padapter); +sint check_buddy_fwstate(struct adapter *padapter, sint state); +u8 rtw_get_buddy_bBusyTraffic(struct adapter *padapter); #endif //CONFIG_CONCURRENT_MODE __inline static void down_scanned_network(struct mlme_priv *pmlmepriv) @@ -745,35 +745,35 @@ __inline static void set_scanned_network_val(struct mlme_priv *pmlmepriv, sint v } extern u16 rtw_get_capability(WLAN_BSSID_EX *bss); -extern void rtw_update_scanned_network(_adapter *adapter, WLAN_BSSID_EX *target); -extern void rtw_disconnect_hdl_under_linked(_adapter* adapter, struct sta_info *psta, u8 free_assoc); +extern void rtw_update_scanned_network(struct adapter *adapter, WLAN_BSSID_EX *target); +extern void rtw_disconnect_hdl_under_linked(struct adapter* adapter, struct sta_info *psta, u8 free_assoc); extern void rtw_generate_random_ibss(u8 *pibss); extern struct wlan_network* rtw_find_network(_queue *scanned_queue, u8 *addr); extern struct wlan_network* rtw_get_oldest_wlan_network(_queue *scanned_queue); -extern void rtw_free_assoc_resources(_adapter* adapter, int lock_scanned_queue); -extern void rtw_indicate_disconnect(_adapter* adapter); -extern void rtw_indicate_connect(_adapter* adapter); -void rtw_indicate_scan_done( _adapter *padapter, bool aborted); -void rtw_scan_abort(_adapter *adapter); +extern void rtw_free_assoc_resources(struct adapter* adapter, int lock_scanned_queue); +extern void rtw_indicate_disconnect(struct adapter* adapter); +extern void rtw_indicate_connect(struct adapter* adapter); +void rtw_indicate_scan_done( struct adapter *padapter, bool aborted); +void rtw_scan_abort(struct adapter *adapter); -extern int rtw_restruct_sec_ie(_adapter *adapter,u8 *in_ie,u8 *out_ie,uint in_len); -extern int rtw_restruct_wmm_ie(_adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_len, uint initial_out_len); -extern void rtw_init_registrypriv_dev_network(_adapter *adapter); +extern int rtw_restruct_sec_ie(struct adapter *adapter,u8 *in_ie,u8 *out_ie,uint in_len); +extern int rtw_restruct_wmm_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_len, uint initial_out_len); +extern void rtw_init_registrypriv_dev_network(struct adapter *adapter); -extern void rtw_update_registrypriv_dev_network(_adapter *adapter); +extern void rtw_update_registrypriv_dev_network(struct adapter *adapter); -extern void rtw_get_encrypt_decrypt_from_registrypriv(_adapter *adapter); +extern void rtw_get_encrypt_decrypt_from_registrypriv(struct adapter *adapter); -extern void _rtw_join_timeout_handler(_adapter *adapter); -extern void rtw_scan_timeout_handler(_adapter *adapter); +extern void _rtw_join_timeout_handler(struct adapter *adapter); +extern void rtw_scan_timeout_handler(struct adapter *adapter); -extern void rtw_dynamic_check_timer_handlder(_adapter *adapter); +extern void rtw_dynamic_check_timer_handlder(struct adapter *adapter); #ifdef CONFIG_SET_SCAN_DENY_TIMER -bool rtw_is_scan_deny(_adapter *adapter); -void rtw_clear_scan_deny(_adapter *adapter); -void rtw_set_scan_deny_timer_hdl(_adapter *adapter); -void rtw_set_scan_deny(_adapter *adapter, u32 ms); +bool rtw_is_scan_deny(struct adapter *adapter); +void rtw_clear_scan_deny(struct adapter *adapter); +void rtw_set_scan_deny_timer_hdl(struct adapter *adapter); +void rtw_set_scan_deny(struct adapter *adapter, u32 ms); #else #define rtw_is_scan_deny(adapter) _FALSE #define rtw_clear_scan_deny(adapter) do {} while (0) @@ -782,10 +782,10 @@ void rtw_set_scan_deny(_adapter *adapter, u32 ms); #endif #ifdef CONFIG_DETECT_C2H_BY_POLLING -extern void rtw_event_polling_timer_hdl(_adapter *adapter); +extern void rtw_event_polling_timer_hdl(struct adapter *adapter); #endif -extern int _rtw_init_mlme_priv(_adapter *padapter); +extern int _rtw_init_mlme_priv(struct adapter *padapter); void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv); @@ -804,33 +804,33 @@ extern void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_ne extern struct wlan_network* _rtw_find_network(_queue *scanned_queue, u8 *addr); -extern void _rtw_free_network_queue(_adapter* padapter, u8 isfreeall); +extern void _rtw_free_network_queue(struct adapter* padapter, u8 isfreeall); -extern sint rtw_if_up(_adapter *padapter); +extern sint rtw_if_up(struct adapter *padapter); -sint rtw_linked_check(_adapter *padapter); +sint rtw_linked_check(struct adapter *padapter); u8 *rtw_get_capability_from_ie(u8 *ie); u8 *rtw_get_timestampe_from_ie(u8 *ie); u8 *rtw_get_beacon_interval_from_ie(u8 *ie); -void rtw_joinbss_reset(_adapter *padapter); +void rtw_joinbss_reset(struct adapter *padapter); #ifdef CONFIG_80211N_HT -unsigned int rtw_restructure_ht_ie(_adapter *padapter, u8 *in_ie, u8 *out_ie, uint in_len, uint *pout_len); -void rtw_update_ht_cap(_adapter *padapter, u8 *pie, uint ie_len); -void rtw_issue_addbareq_cmd(_adapter *padapter, struct xmit_frame *pxmitframe); +unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ie, uint in_len, uint *pout_len); +void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len); +void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitframe); #endif -int rtw_is_same_ibss(_adapter *adapter, struct wlan_network *pnetwork); +int rtw_is_same_ibss(struct adapter *adapter, struct wlan_network *pnetwork); int is_same_network(WLAN_BSSID_EX *src, WLAN_BSSID_EX *dst, u8 feature); #ifdef CONFIG_LAYER2_ROAMING -void _rtw_roaming(_adapter *adapter, struct wlan_network *tgt_network); -void rtw_roaming(_adapter *adapter, struct wlan_network *tgt_network); -void rtw_set_roaming(_adapter *adapter, u8 to_roaming); -u8 rtw_to_roaming(_adapter *adapter); +void _rtw_roaming(struct adapter *adapter, struct wlan_network *tgt_network); +void rtw_roaming(struct adapter *adapter, struct wlan_network *tgt_network); +void rtw_set_roaming(struct adapter *adapter, u8 to_roaming); +u8 rtw_to_roaming(struct adapter *adapter); #else #define _rtw_roaming(adapter, tgt_network) do {} while(0) #define rtw_roaming(adapter, tgt_network) do {} while(0) @@ -838,12 +838,12 @@ u8 rtw_to_roaming(_adapter *adapter); #define rtw_to_roaming(adapter) 0 #endif -void rtw_sta_media_status_rpt(_adapter *adapter,struct sta_info *psta, u32 mstatus); +void rtw_sta_media_status_rpt(struct adapter *adapter,struct sta_info *psta, u32 mstatus); #ifdef CONFIG_INTEL_PROXIM -void rtw_proxim_enable(_adapter *padapter); -void rtw_proxim_disable(_adapter *padapter); -void rtw_proxim_send_packet(_adapter *padapter,u8 *pbuf,u16 len,u8 hw_rate); +void rtw_proxim_enable(struct adapter *padapter); +void rtw_proxim_disable(struct adapter *padapter); +void rtw_proxim_send_packet(struct adapter *padapter,u8 *pbuf,u16 len,u8 hw_rate); #endif //CONFIG_INTEL_PROXIM #endif //__RTL871X_MLME_H_ diff --git a/include/rtw_mlme_ext.h b/include/rtw_mlme_ext.h index 79f1368..d6f6f9b 100755 --- a/include/rtw_mlme_ext.h +++ b/include/rtw_mlme_ext.h @@ -293,13 +293,13 @@ enum SCAN_STATE struct mlme_handler { unsigned int num; char* str; - unsigned int (*func)(_adapter *padapter, union recv_frame *precv_frame); + unsigned int (*func)(struct adapter *padapter, union recv_frame *precv_frame); }; struct action_handler { unsigned int num; char* str; - unsigned int (*func)(_adapter *padapter, union recv_frame *precv_frame); + unsigned int (*func)(struct adapter *padapter, union recv_frame *precv_frame); }; struct ss_res @@ -500,7 +500,7 @@ struct p2p_oper_class_map { struct mlme_ext_priv { - _adapter *padapter; + struct adapter *padapter; u8 mlmeext_init; ATOMIC_T event_seq; u16 mgnt_seq; @@ -559,205 +559,205 @@ struct mlme_ext_priv #endif }; -int init_mlme_ext_priv(_adapter* padapter); -int init_hw_mlme_ext(_adapter *padapter); +int init_mlme_ext_priv(struct adapter* padapter); +int init_hw_mlme_ext(struct adapter *padapter); void free_mlme_ext_priv (struct mlme_ext_priv *pmlmeext); -extern void init_mlme_ext_timer(_adapter *padapter); -extern void init_addba_retry_timer(_adapter *padapter, struct sta_info *psta); +extern void init_mlme_ext_timer(struct adapter *padapter); +extern void init_addba_retry_timer(struct adapter *padapter, struct sta_info *psta); extern struct xmit_frame *alloc_mgtxmitframe(struct xmit_priv *pxmitpriv); struct xmit_frame *alloc_mgtxmitframe_once(struct xmit_priv *pxmitpriv); -//void fill_fwpriv(_adapter * padapter, struct fw_priv *pfwpriv); +//void fill_fwpriv(struct adapter * padapter, struct fw_priv *pfwpriv); unsigned char networktype_to_raid(unsigned char network_type); -u8 judge_network_type(_adapter *padapter, unsigned char *rate, int ratelen); -void get_rate_set(_adapter *padapter, unsigned char *pbssrate, int *bssrate_len); -void UpdateBrateTbl(_adapter *padapter,u8 *mBratesOS); +u8 judge_network_type(struct adapter *padapter, unsigned char *rate, int ratelen); +void get_rate_set(struct adapter *padapter, unsigned char *pbssrate, int *bssrate_len); +void UpdateBrateTbl(struct adapter *padapter,u8 *mBratesOS); void UpdateBrateTblForSoftAP(u8 *bssrateset, u32 bssratelen); -void Save_DM_Func_Flag(_adapter *padapter); -void Restore_DM_Func_Flag(_adapter *padapter); -void Switch_DM_Func(_adapter *padapter, u32 mode, u8 enable); +void Save_DM_Func_Flag(struct adapter *padapter); +void Restore_DM_Func_Flag(struct adapter *padapter); +void Switch_DM_Func(struct adapter *padapter, u32 mode, u8 enable); -//void Set_NETYPE1_MSR(_adapter *padapter, u8 type); -//void Set_NETYPE0_MSR(_adapter *padapter, u8 type); -void Set_MSR(_adapter *padapter, u8 type); +//void Set_NETYPE1_MSR(struct adapter *padapter, u8 type); +//void Set_NETYPE0_MSR(struct adapter *padapter, u8 type); +void Set_MSR(struct adapter *padapter, u8 type); -u8 rtw_get_oper_ch(_adapter *adapter); -void rtw_set_oper_ch(_adapter *adapter, u8 ch); -u8 rtw_get_oper_bw(_adapter *adapter); -void rtw_set_oper_bw(_adapter *adapter, u8 bw); -u8 rtw_get_oper_choffset(_adapter *adapter); -void rtw_set_oper_choffset(_adapter *adapter, u8 offset); -u32 rtw_get_on_oper_ch_time(_adapter *adapter); -u32 rtw_get_on_cur_ch_time(_adapter *adapter); +u8 rtw_get_oper_ch(struct adapter *adapter); +void rtw_set_oper_ch(struct adapter *adapter, u8 ch); +u8 rtw_get_oper_bw(struct adapter *adapter); +void rtw_set_oper_bw(struct adapter *adapter, u8 bw); +u8 rtw_get_oper_choffset(struct adapter *adapter); +void rtw_set_oper_choffset(struct adapter *adapter, u8 offset); +u32 rtw_get_on_oper_ch_time(struct adapter *adapter); +u32 rtw_get_on_cur_ch_time(struct adapter *adapter); -void set_channel_bwmode(_adapter *padapter, unsigned char channel, unsigned char channel_offset, unsigned short bwmode); -void SelectChannel(_adapter *padapter, unsigned char channel); -void SetBWMode(_adapter *padapter, unsigned short bwmode, unsigned char channel_offset); +void set_channel_bwmode(struct adapter *padapter, unsigned char channel, unsigned char channel_offset, unsigned short bwmode); +void SelectChannel(struct adapter *padapter, unsigned char channel); +void SetBWMode(struct adapter *padapter, unsigned short bwmode, unsigned char channel_offset); unsigned int decide_wait_for_beacon_timeout(unsigned int bcn_interval); -void read_cam(_adapter *padapter ,u8 entry); -void write_cam(_adapter *padapter, u8 entry, u16 ctrl, u8 *mac, u8 *key); -void clear_cam_entry(_adapter *padapter, u8 entry); +void read_cam(struct adapter *padapter ,u8 entry); +void write_cam(struct adapter *padapter, u8 entry, u16 ctrl, u8 *mac, u8 *key); +void clear_cam_entry(struct adapter *padapter, u8 entry); -void invalidate_cam_all(_adapter *padapter); -void CAM_empty_entry(PADAPTER Adapter, u8 ucIndex); +void invalidate_cam_all(struct adapter *padapter); +void CAM_empty_entry(struct adapter *Adapter, u8 ucIndex); -int allocate_fw_sta_entry(_adapter *padapter); -void flush_all_cam_entry(_adapter *padapter); +int allocate_fw_sta_entry(struct adapter *padapter); +void flush_all_cam_entry(struct adapter *padapter); -BOOLEAN IsLegal5GChannel(PADAPTER Adapter, u8 channel); +BOOLEAN IsLegal5GChannel(struct adapter *Adapter, u8 channel); -void site_survey(_adapter *padapter); -u8 collect_bss_info(_adapter *padapter, union recv_frame *precv_frame, WLAN_BSSID_EX *bssid); -void update_network(WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src, _adapter * padapter, bool update_ie); +void site_survey(struct adapter *padapter); +u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, WLAN_BSSID_EX *bssid); +void update_network(WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src, struct adapter * padapter, bool update_ie); int get_bsstype(unsigned short capability); u8* get_my_bssid(WLAN_BSSID_EX *pnetwork); u16 get_beacon_interval(WLAN_BSSID_EX *bss); -int is_client_associated_to_ap(_adapter *padapter); -int is_client_associated_to_ibss(_adapter *padapter); -int is_IBSS_empty(_adapter *padapter); +int is_client_associated_to_ap(struct adapter *padapter); +int is_client_associated_to_ibss(struct adapter *padapter); +int is_IBSS_empty(struct adapter *padapter); unsigned char check_assoc_AP(u8 *pframe, uint len); -int WMM_param_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE); +int WMM_param_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE); #ifdef CONFIG_WFD -int WFD_info_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE); +int WFD_info_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE); #endif -void WMMOnAssocRsp(_adapter *padapter); +void WMMOnAssocRsp(struct adapter *padapter); -void HT_caps_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE); -void HT_info_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE); -void HTOnAssocRsp(_adapter *padapter); +void HT_caps_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE); +void HT_info_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE); +void HTOnAssocRsp(struct adapter *padapter); -void ERP_IE_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE); -void VCS_update(_adapter *padapter, struct sta_info *psta); +void ERP_IE_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE); +void VCS_update(struct adapter *padapter, struct sta_info *psta); -void update_beacon_info(_adapter *padapter, u8 *pframe, uint len, struct sta_info *psta); -int rtw_check_bcn_info(ADAPTER *Adapter, u8 *pframe, u32 packet_len); +void update_beacon_info(struct adapter *padapter, u8 *pframe, uint len, struct sta_info *psta); +int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len); #ifdef CONFIG_DFS -void process_csa_ie(_adapter *padapter, u8 *pframe, uint len); +void process_csa_ie(struct adapter *padapter, u8 *pframe, uint len); #endif //CONFIG_DFS -void update_IOT_info(_adapter *padapter); -void update_capinfo(PADAPTER Adapter, u16 updateCap); -void update_wireless_mode(_adapter * padapter); -void update_tx_basic_rate(_adapter *padapter, u8 modulation); -void update_bmc_sta_support_rate(_adapter *padapter, u32 mac_id); -int update_sta_support_rate(_adapter *padapter, u8* pvar_ie, uint var_ie_len, int cam_idx); +void update_IOT_info(struct adapter *padapter); +void update_capinfo(struct adapter *Adapter, u16 updateCap); +void update_wireless_mode(struct adapter * padapter); +void update_tx_basic_rate(struct adapter *padapter, u8 modulation); +void update_bmc_sta_support_rate(struct adapter *padapter, u32 mac_id); +int update_sta_support_rate(struct adapter *padapter, u8* pvar_ie, uint var_ie_len, int cam_idx); #ifdef CONFIG_WOWLAN -void rtw_get_current_ip_address(PADAPTER padapter, u8 *pcurrentip); -void rtw_get_sec_iv(PADAPTER padapter, u8*pcur_dot11txpn, u8 *StaAddr); +void rtw_get_current_ip_address(struct adapter *padapter, u8 *pcurrentip); +void rtw_get_sec_iv(struct adapter *padapter, u8*pcur_dot11txpn, u8 *StaAddr); #endif //for sta/adhoc mode -void update_sta_info(_adapter *padapter, struct sta_info *psta); +void update_sta_info(struct adapter *padapter, struct sta_info *psta); unsigned int update_basic_rate(unsigned char *ptn, unsigned int ptn_sz); unsigned int update_supported_rate(unsigned char *ptn, unsigned int ptn_sz); unsigned int update_MSC_rate(struct HT_caps_element *pHT_caps); -void Update_RA_Entry(_adapter *padapter, struct sta_info *psta); -void set_sta_rate(_adapter *padapter, struct sta_info *psta); +void Update_RA_Entry(struct adapter *padapter, struct sta_info *psta); +void set_sta_rate(struct adapter *padapter, struct sta_info *psta); -unsigned int receive_disconnect(_adapter *padapter, unsigned char *MacAddr, unsigned short reason); +unsigned int receive_disconnect(struct adapter *padapter, unsigned char *MacAddr, unsigned short reason); unsigned char get_highest_rate_idx(u32 mask); -int support_short_GI(_adapter *padapter, struct HT_caps_element *pHT_caps); -unsigned int is_ap_in_tkip(_adapter *padapter); -unsigned int is_ap_in_wep(_adapter *padapter); -unsigned int should_forbid_n_rate(_adapter * padapter); +int support_short_GI(struct adapter *padapter, struct HT_caps_element *pHT_caps); +unsigned int is_ap_in_tkip(struct adapter *padapter); +unsigned int is_ap_in_wep(struct adapter *padapter); +unsigned int should_forbid_n_rate(struct adapter * padapter); -void report_join_res(_adapter *padapter, int res); -void report_survey_event(_adapter *padapter, union recv_frame *precv_frame); -void report_surveydone_event(_adapter *padapter); -void report_del_sta_event(_adapter *padapter, unsigned char* MacAddr, unsigned short reason); -void report_add_sta_event(_adapter *padapter, unsigned char* MacAddr, int cam_idx); +void report_join_res(struct adapter *padapter, int res); +void report_survey_event(struct adapter *padapter, union recv_frame *precv_frame); +void report_surveydone_event(struct adapter *padapter); +void report_del_sta_event(struct adapter *padapter, unsigned char* MacAddr, unsigned short reason); +void report_add_sta_event(struct adapter *padapter, unsigned char* MacAddr, int cam_idx); -void beacon_timing_control(_adapter *padapter); -extern u8 set_tx_beacon_cmd(_adapter*padapter); -unsigned int setup_beacon_frame(_adapter *padapter, unsigned char *beacon_frame); -void update_mgnt_tx_rate(_adapter *padapter, u8 rate); -void update_mgntframe_attrib(_adapter *padapter, struct pkt_attrib *pattrib); -void dump_mgntframe(_adapter *padapter, struct xmit_frame *pmgntframe); -s32 dump_mgntframe_and_wait(_adapter *padapter, struct xmit_frame *pmgntframe, int timeout_ms); -s32 dump_mgntframe_and_wait_ack(_adapter *padapter, struct xmit_frame *pmgntframe); +void beacon_timing_control(struct adapter *padapter); +extern u8 set_tx_beacon_cmd(struct adapter*padapter); +unsigned int setup_beacon_frame(struct adapter *padapter, unsigned char *beacon_frame); +void update_mgnt_tx_rate(struct adapter *padapter, u8 rate); +void update_mgntframe_attrib(struct adapter *padapter, struct pkt_attrib *pattrib); +void dump_mgntframe(struct adapter *padapter, struct xmit_frame *pmgntframe); +s32 dump_mgntframe_and_wait(struct adapter *padapter, struct xmit_frame *pmgntframe, int timeout_ms); +s32 dump_mgntframe_and_wait_ack(struct adapter *padapter, struct xmit_frame *pmgntframe); #ifdef CONFIG_P2P -void issue_probersp_p2p(_adapter *padapter, unsigned char *da); -void issue_p2p_provision_request( _adapter *padapter, u8* pssid, u8 ussidlen, u8* pdev_raddr); -void issue_p2p_GO_request(_adapter *padapter, u8* raddr); -void issue_probereq_p2p(_adapter *padapter, u8 *da); -int issue_probereq_p2p_ex(_adapter *adapter, u8 *da, int try_cnt, int wait_ms); -void issue_p2p_invitation_response(_adapter *padapter, u8* raddr, u8 dialogToken, u8 success); -void issue_p2p_invitation_request(_adapter *padapter, u8* raddr ); +void issue_probersp_p2p(struct adapter *padapter, unsigned char *da); +void issue_p2p_provision_request( struct adapter *padapter, u8* pssid, u8 ussidlen, u8* pdev_raddr); +void issue_p2p_GO_request(struct adapter *padapter, u8* raddr); +void issue_probereq_p2p(struct adapter *padapter, u8 *da); +int issue_probereq_p2p_ex(struct adapter *adapter, u8 *da, int try_cnt, int wait_ms); +void issue_p2p_invitation_response(struct adapter *padapter, u8* raddr, u8 dialogToken, u8 success); +void issue_p2p_invitation_request(struct adapter *padapter, u8* raddr ); #endif //CONFIG_P2P -void issue_beacon(_adapter *padapter, int timeout_ms); -void issue_probersp(_adapter *padapter, unsigned char *da, u8 is_valid_p2p_probereq); -void issue_assocreq(_adapter *padapter); -void issue_asocrsp(_adapter *padapter, unsigned short status, struct sta_info *pstat, int pkt_type); -void issue_auth(_adapter *padapter, struct sta_info *psta, unsigned short status); -void issue_probereq(_adapter *padapter, NDIS_802_11_SSID *pssid, u8 *da); -s32 issue_probereq_ex(_adapter *padapter, NDIS_802_11_SSID *pssid, u8* da, int try_cnt, int wait_ms); -int issue_nulldata(_adapter *padapter, unsigned char *da, unsigned int power_mode, int try_cnt, int wait_ms); -int issue_qos_nulldata(_adapter *padapter, unsigned char *da, u16 tid, int try_cnt, int wait_ms); -int issue_deauth(_adapter *padapter, unsigned char *da, unsigned short reason); -int issue_deauth_ex(_adapter *padapter, u8 *da, unsigned short reason, int try_cnt, int wait_ms); -void issue_action_spct_ch_switch(_adapter *padapter, u8 *ra, u8 new_ch, u8 ch_offset); -void issue_action_BA(_adapter *padapter, unsigned char *raddr, unsigned char action, unsigned short status); +void issue_beacon(struct adapter *padapter, int timeout_ms); +void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p_probereq); +void issue_assocreq(struct adapter *padapter); +void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_info *pstat, int pkt_type); +void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned short status); +void issue_probereq(struct adapter *padapter, NDIS_802_11_SSID *pssid, u8 *da); +s32 issue_probereq_ex(struct adapter *padapter, NDIS_802_11_SSID *pssid, u8* da, int try_cnt, int wait_ms); +int issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned int power_mode, int try_cnt, int wait_ms); +int issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 tid, int try_cnt, int wait_ms); +int issue_deauth(struct adapter *padapter, unsigned char *da, unsigned short reason); +int issue_deauth_ex(struct adapter *padapter, u8 *da, unsigned short reason, int try_cnt, int wait_ms); +void issue_action_spct_ch_switch(struct adapter *padapter, u8 *ra, u8 new_ch, u8 ch_offset); +void issue_action_BA(struct adapter *padapter, unsigned char *raddr, unsigned char action, unsigned short status); #ifdef CONFIG_IEEE80211W -void issue_action_SA_Query(_adapter *padapter, unsigned char *raddr, unsigned char action, unsigned short tid); +void issue_action_SA_Query(struct adapter *padapter, unsigned char *raddr, unsigned char action, unsigned short tid); #endif //CONFIG_IEEE80211W -unsigned int send_delba(_adapter *padapter, u8 initiator, u8 *addr); -unsigned int send_beacon(_adapter *padapter); +unsigned int send_delba(struct adapter *padapter, u8 initiator, u8 *addr); +unsigned int send_beacon(struct adapter *padapter); -void start_clnt_assoc(_adapter *padapter); -void start_clnt_auth(_adapter* padapter); -void start_clnt_join(_adapter* padapter); -void start_create_ibss(_adapter* padapter); +void start_clnt_assoc(struct adapter *padapter); +void start_clnt_auth(struct adapter* padapter); +void start_clnt_join(struct adapter* padapter); +void start_create_ibss(struct adapter* padapter); -unsigned int OnAssocReq(_adapter *padapter, union recv_frame *precv_frame); -unsigned int OnAssocRsp(_adapter *padapter, union recv_frame *precv_frame); -unsigned int OnProbeReq(_adapter *padapter, union recv_frame *precv_frame); -unsigned int OnProbeRsp(_adapter *padapter, union recv_frame *precv_frame); -unsigned int DoReserved(_adapter *padapter, union recv_frame *precv_frame); -unsigned int OnBeacon(_adapter *padapter, union recv_frame *precv_frame); -unsigned int OnAtim(_adapter *padapter, union recv_frame *precv_frame); -unsigned int OnDisassoc(_adapter *padapter, union recv_frame *precv_frame); -unsigned int OnAuth(_adapter *padapter, union recv_frame *precv_frame); -unsigned int OnAuthClient(_adapter *padapter, union recv_frame *precv_frame); -unsigned int OnDeAuth(_adapter *padapter, union recv_frame *precv_frame); -unsigned int OnAction(_adapter *padapter, union recv_frame *precv_frame); +unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame); +unsigned int OnAssocRsp(struct adapter *padapter, union recv_frame *precv_frame); +unsigned int OnProbeReq(struct adapter *padapter, union recv_frame *precv_frame); +unsigned int OnProbeRsp(struct adapter *padapter, union recv_frame *precv_frame); +unsigned int DoReserved(struct adapter *padapter, union recv_frame *precv_frame); +unsigned int OnBeacon(struct adapter *padapter, union recv_frame *precv_frame); +unsigned int OnAtim(struct adapter *padapter, union recv_frame *precv_frame); +unsigned int OnDisassoc(struct adapter *padapter, union recv_frame *precv_frame); +unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame); +unsigned int OnAuthClient(struct adapter *padapter, union recv_frame *precv_frame); +unsigned int OnDeAuth(struct adapter *padapter, union recv_frame *precv_frame); +unsigned int OnAction(struct adapter *padapter, union recv_frame *precv_frame); -unsigned int on_action_spct(_adapter *padapter, union recv_frame *precv_frame); -unsigned int OnAction_qos(_adapter *padapter, union recv_frame *precv_frame); -unsigned int OnAction_dls(_adapter *padapter, union recv_frame *precv_frame); -unsigned int OnAction_back(_adapter *padapter, union recv_frame *precv_frame); -unsigned int on_action_public(_adapter *padapter, union recv_frame *precv_frame); -unsigned int OnAction_ht(_adapter *padapter, union recv_frame *precv_frame); +unsigned int on_action_spct(struct adapter *padapter, union recv_frame *precv_frame); +unsigned int OnAction_qos(struct adapter *padapter, union recv_frame *precv_frame); +unsigned int OnAction_dls(struct adapter *padapter, union recv_frame *precv_frame); +unsigned int OnAction_back(struct adapter *padapter, union recv_frame *precv_frame); +unsigned int on_action_public(struct adapter *padapter, union recv_frame *precv_frame); +unsigned int OnAction_ht(struct adapter *padapter, union recv_frame *precv_frame); #ifdef CONFIG_IEEE80211W -unsigned int OnAction_sa_query(_adapter *padapter, union recv_frame *precv_frame); +unsigned int OnAction_sa_query(struct adapter *padapter, union recv_frame *precv_frame); #endif //CONFIG_IEEE80211W -unsigned int OnAction_wmm(_adapter *padapter, union recv_frame *precv_frame); -unsigned int OnAction_p2p(_adapter *padapter, union recv_frame *precv_frame); +unsigned int OnAction_wmm(struct adapter *padapter, union recv_frame *precv_frame); +unsigned int OnAction_p2p(struct adapter *padapter, union recv_frame *precv_frame); -void mlmeext_joinbss_event_callback(_adapter *padapter, int join_res); -void mlmeext_sta_del_event_callback(_adapter *padapter); -void mlmeext_sta_add_event_callback(_adapter *padapter, struct sta_info *psta); +void mlmeext_joinbss_event_callback(struct adapter *padapter, int join_res); +void mlmeext_sta_del_event_callback(struct adapter *padapter); +void mlmeext_sta_add_event_callback(struct adapter *padapter, struct sta_info *psta); -void linked_status_chk(_adapter *padapter); +void linked_status_chk(struct adapter *padapter); -void survey_timer_hdl (_adapter *padapter); -void link_timer_hdl (_adapter *padapter); +void survey_timer_hdl (struct adapter *padapter); +void link_timer_hdl (struct adapter *padapter); void addba_timer_hdl(struct sta_info *psta); #ifdef CONFIG_IEEE80211W -void sa_query_timer_hdl(_adapter *padapter); +void sa_query_timer_hdl(struct adapter *padapter); #endif //CONFIG_IEEE80211W -//void reauth_timer_hdl(_adapter *padapter); -//void reassoc_timer_hdl(_adapter *padapter); +//void reauth_timer_hdl(struct adapter *padapter); +//void reassoc_timer_hdl(struct adapter *padapter); #define set_survey_timer(mlmeext, ms) \ do { \ @@ -780,70 +780,70 @@ void sa_query_timer_hdl(_adapter *padapter); extern int cckrates_included(unsigned char *rate, int ratelen); extern int cckratesonly_included(unsigned char *rate, int ratelen); -extern void process_addba_req(_adapter *padapter, u8 *paddba_req, u8 *addr); +extern void process_addba_req(struct adapter *padapter, u8 *paddba_req, u8 *addr); extern void update_TSF(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint len); -extern void correct_TSF(_adapter *padapter, struct mlme_ext_priv *pmlmeext); +extern void correct_TSF(struct adapter *padapter, struct mlme_ext_priv *pmlmeext); #ifdef CONFIG_CONCURRENT_MODE - sint check_buddy_mlmeinfo_state(_adapter *padapter, u32 state); -void concurrent_chk_joinbss_done(_adapter *padapter, int join_res); + sint check_buddy_mlmeinfo_state(struct adapter *padapter, u32 state); +void concurrent_chk_joinbss_done(struct adapter *padapter, int join_res); #endif //CONFIG_CONCURRENT_MODE #ifdef CONFIG_DUALMAC_CONCURRENT -void dc_SelectChannel(_adapter *padapter, unsigned char channel); -void dc_SetBWMode(_adapter *padapter, unsigned short bwmode, unsigned char channel_offset); -void dc_set_channel_bwmode_disconnect(_adapter *padapter); -u8 dc_handle_join_request(_adapter *padapter, u8 *ch, u8 *bw, u8 *offset); -void dc_handle_join_done(_adapter *padapter, u8 join_res); -sint dc_check_fwstate(_adapter *padapter, sint fw_state); -u8 dc_handle_site_survey(_adapter *padapter); -void dc_report_survey_event(_adapter *padapter, union recv_frame *precv_frame); -void dc_set_channel_bwmode_survey_done(_adapter *padapter); -void dc_set_ap_channel_bandwidth(_adapter *padapter, u8 channel, u8 channel_offset, u8 bwmode); -void dc_resume_xmit(_adapter *padapter); -u8 dc_check_xmit(_adapter *padapter); +void dc_SelectChannel(struct adapter *padapter, unsigned char channel); +void dc_SetBWMode(struct adapter *padapter, unsigned short bwmode, unsigned char channel_offset); +void dc_set_channel_bwmode_disconnect(struct adapter *padapter); +u8 dc_handle_join_request(struct adapter *padapter, u8 *ch, u8 *bw, u8 *offset); +void dc_handle_join_done(struct adapter *padapter, u8 join_res); +sint dc_check_fwstate(struct adapter *padapter, sint fw_state); +u8 dc_handle_site_survey(struct adapter *padapter); +void dc_report_survey_event(struct adapter *padapter, union recv_frame *precv_frame); +void dc_set_channel_bwmode_survey_done(struct adapter *padapter); +void dc_set_ap_channel_bandwidth(struct adapter *padapter, u8 channel, u8 channel_offset, u8 bwmode); +void dc_resume_xmit(struct adapter *padapter); +u8 dc_check_xmit(struct adapter *padapter); #endif -int rtw_chk_start_clnt_join(_adapter *padapter, u8 *ch, u8 *bw, u8 *offset); -int rtw_get_ch_setting_union(_adapter *adapter, u8 *ch, u8 *bw, u8 *offset); +int rtw_chk_start_clnt_join(struct adapter *padapter, u8 *ch, u8 *bw, u8 *offset); +int rtw_get_ch_setting_union(struct adapter *adapter, u8 *ch, u8 *bw, u8 *offset); struct cmd_hdl { uint parmsize; - u8 (*h2cfuns)(struct _ADAPTER *padapter, u8 *pbuf); + u8 (*h2cfuns)(struct adapter *padapter, u8 *pbuf); }; -u8 read_macreg_hdl(_adapter *padapter, u8 *pbuf); -u8 write_macreg_hdl(_adapter *padapter, u8 *pbuf); -u8 read_bbreg_hdl(_adapter *padapter, u8 *pbuf); -u8 write_bbreg_hdl(_adapter *padapter, u8 *pbuf); -u8 read_rfreg_hdl(_adapter *padapter, u8 *pbuf); -u8 write_rfreg_hdl(_adapter *padapter, u8 *pbuf); +u8 read_macreg_hdl(struct adapter *padapter, u8 *pbuf); +u8 write_macreg_hdl(struct adapter *padapter, u8 *pbuf); +u8 read_bbreg_hdl(struct adapter *padapter, u8 *pbuf); +u8 write_bbreg_hdl(struct adapter *padapter, u8 *pbuf); +u8 read_rfreg_hdl(struct adapter *padapter, u8 *pbuf); +u8 write_rfreg_hdl(struct adapter *padapter, u8 *pbuf); -u8 NULL_hdl(_adapter *padapter, u8 *pbuf); -u8 join_cmd_hdl(_adapter *padapter, u8 *pbuf); -u8 disconnect_hdl(_adapter *padapter, u8 *pbuf); -u8 createbss_hdl(_adapter *padapter, u8 *pbuf); -u8 setopmode_hdl(_adapter *padapter, u8 *pbuf); -u8 sitesurvey_cmd_hdl(_adapter *padapter, u8 *pbuf); -u8 setauth_hdl(_adapter *padapter, u8 *pbuf); -u8 setkey_hdl(_adapter *padapter, u8 *pbuf); -u8 set_stakey_hdl(_adapter *padapter, u8 *pbuf); -u8 set_assocsta_hdl(_adapter *padapter, u8 *pbuf); -u8 del_assocsta_hdl(_adapter *padapter, u8 *pbuf); -u8 add_ba_hdl(_adapter *padapter, unsigned char *pbuf); +u8 NULL_hdl(struct adapter *padapter, u8 *pbuf); +u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf); +u8 disconnect_hdl(struct adapter *padapter, u8 *pbuf); +u8 createbss_hdl(struct adapter *padapter, u8 *pbuf); +u8 setopmode_hdl(struct adapter *padapter, u8 *pbuf); +u8 sitesurvey_cmd_hdl(struct adapter *padapter, u8 *pbuf); +u8 setauth_hdl(struct adapter *padapter, u8 *pbuf); +u8 setkey_hdl(struct adapter *padapter, u8 *pbuf); +u8 set_stakey_hdl(struct adapter *padapter, u8 *pbuf); +u8 set_assocsta_hdl(struct adapter *padapter, u8 *pbuf); +u8 del_assocsta_hdl(struct adapter *padapter, u8 *pbuf); +u8 add_ba_hdl(struct adapter *padapter, unsigned char *pbuf); -u8 mlme_evt_hdl(_adapter *padapter, unsigned char *pbuf); -u8 h2c_msg_hdl(_adapter *padapter, unsigned char *pbuf); -u8 tx_beacon_hdl(_adapter *padapter, unsigned char *pbuf); -u8 set_ch_hdl(_adapter *padapter, u8 *pbuf); -u8 set_chplan_hdl(_adapter *padapter, unsigned char *pbuf); -u8 led_blink_hdl(_adapter *padapter, unsigned char *pbuf); -u8 set_csa_hdl(_adapter *padapter, unsigned char *pbuf); //Kurt: Handling DFS channel switch announcement ie. -u8 tdls_hdl(_adapter *padapter, unsigned char *pbuf); +u8 mlme_evt_hdl(struct adapter *padapter, unsigned char *pbuf); +u8 h2c_msg_hdl(struct adapter *padapter, unsigned char *pbuf); +u8 tx_beacon_hdl(struct adapter *padapter, unsigned char *pbuf); +u8 set_ch_hdl(struct adapter *padapter, u8 *pbuf); +u8 set_chplan_hdl(struct adapter *padapter, unsigned char *pbuf); +u8 led_blink_hdl(struct adapter *padapter, unsigned char *pbuf); +u8 set_csa_hdl(struct adapter *padapter, unsigned char *pbuf); //Kurt: Handling DFS channel switch announcement ie. +u8 tdls_hdl(struct adapter *padapter, unsigned char *pbuf); #define GEN_DRV_CMD_HANDLER(size, cmd) {size, &cmd ## _hdl}, @@ -948,8 +948,8 @@ struct C2HEvent_Header }; -void rtw_dummy_event_callback(_adapter *adapter , u8 *pbuf); -void rtw_fwdbg_event_callback(_adapter *adapter , u8 *pbuf); +void rtw_dummy_event_callback(struct adapter *adapter , u8 *pbuf); +void rtw_fwdbg_event_callback(struct adapter *adapter , u8 *pbuf); enum rtw_c2h_event { diff --git a/include/rtw_mp.h b/include/rtw_mp.h index 6197aa0..a4d16be 100755 --- a/include/rtw_mp.h +++ b/include/rtw_mp.h @@ -113,7 +113,7 @@ struct mp_xmit_frame int frame_tag; - _adapter *padapter; + struct adapter *padapter; #ifdef CONFIG_USB_HCI @@ -339,7 +339,7 @@ enum { struct mp_priv { - _adapter *papdater; + struct adapter *papdater; //Testing Flag u32 mode;//0 for normal type packet, 1 for loopback packet (16bytes TXCMD) @@ -575,102 +575,102 @@ typedef enum _ENCRY_CTRL_STATE_ { //struct mp_xmit_frame *alloc_mp_xmitframe(struct mp_priv *pmp_priv); //int free_mp_xmitframe(struct xmit_priv *pxmitpriv, struct mp_xmit_frame *pmp_xmitframe); -s32 init_mp_priv(PADAPTER padapter); +s32 init_mp_priv(struct adapter *padapter); void free_mp_priv(struct mp_priv *pmp_priv); -s32 MPT_InitializeAdapter(PADAPTER padapter, u8 Channel); -void MPT_DeInitAdapter(PADAPTER padapter); -s32 mp_start_test(PADAPTER padapter); -void mp_stop_test(PADAPTER padapter); +s32 MPT_InitializeAdapter(struct adapter *padapter, u8 Channel); +void MPT_DeInitAdapter(struct adapter *padapter); +s32 mp_start_test(struct adapter *padapter); +void mp_stop_test(struct adapter *padapter); //======================================================================= -//void IQCalibrateBcut(PADAPTER pAdapter); +//void IQCalibrateBcut(struct adapter *pAdapter); -//u32 bb_reg_read(PADAPTER Adapter, u16 offset); -//u8 bb_reg_write(PADAPTER Adapter, u16 offset, u32 value); -//u32 rf_reg_read(PADAPTER Adapter, u8 path, u8 offset); -//u8 rf_reg_write(PADAPTER Adapter, u8 path, u8 offset, u32 value); +//u32 bb_reg_read(struct adapter *Adapter, u16 offset); +//u8 bb_reg_write(struct adapter *Adapter, u16 offset, u32 value); +//u32 rf_reg_read(struct adapter *Adapter, u8 path, u8 offset); +//u8 rf_reg_write(struct adapter *Adapter, u8 path, u8 offset, u32 value); -//u32 get_bb_reg(PADAPTER Adapter, u16 offset, u32 bitmask); -//u8 set_bb_reg(PADAPTER Adapter, u16 offset, u32 bitmask, u32 value); -//u32 get_rf_reg(PADAPTER Adapter, u8 path, u8 offset, u32 bitmask); -//u8 set_rf_reg(PADAPTER Adapter, u8 path, u8 offset, u32 bitmask, u32 value); +//u32 get_bb_reg(struct adapter *Adapter, u16 offset, u32 bitmask); +//u8 set_bb_reg(struct adapter *Adapter, u16 offset, u32 bitmask, u32 value); +//u32 get_rf_reg(struct adapter *Adapter, u8 path, u8 offset, u32 bitmask); +//u8 set_rf_reg(struct adapter *Adapter, u8 path, u8 offset, u32 bitmask, u32 value); -u32 _read_rfreg(PADAPTER padapter, u8 rfpath, u32 addr, u32 bitmask); -void _write_rfreg(PADAPTER padapter, u8 rfpath, u32 addr, u32 bitmask, u32 val); +u32 _read_rfreg(struct adapter *padapter, u8 rfpath, u32 addr, u32 bitmask); +void _write_rfreg(struct adapter *padapter, u8 rfpath, u32 addr, u32 bitmask, u32 val); -u32 read_macreg(_adapter *padapter, u32 addr, u32 sz); -void write_macreg(_adapter *padapter, u32 addr, u32 val, u32 sz); -u32 read_bbreg(_adapter *padapter, u32 addr, u32 bitmask); -void write_bbreg(_adapter *padapter, u32 addr, u32 bitmask, u32 val); -u32 read_rfreg(PADAPTER padapter, u8 rfpath, u32 addr); -void write_rfreg(PADAPTER padapter, u8 rfpath, u32 addr, u32 val); +u32 read_macreg(struct adapter *padapter, u32 addr, u32 sz); +void write_macreg(struct adapter *padapter, u32 addr, u32 val, u32 sz); +u32 read_bbreg(struct adapter *padapter, u32 addr, u32 bitmask); +void write_bbreg(struct adapter *padapter, u32 addr, u32 bitmask, u32 val); +u32 read_rfreg(struct adapter *padapter, u8 rfpath, u32 addr); +void write_rfreg(struct adapter *padapter, u8 rfpath, u32 addr, u32 val); -void SetChannel(PADAPTER pAdapter); -void SetBandwidth(PADAPTER pAdapter); -void SetTxPower(PADAPTER pAdapter); -void SetAntennaPathPower(PADAPTER pAdapter); -void SetTxAGCOffset(PADAPTER pAdapter, u32 ulTxAGCOffset); -void SetDataRate(PADAPTER pAdapter); +void SetChannel(struct adapter *pAdapter); +void SetBandwidth(struct adapter *pAdapter); +void SetTxPower(struct adapter *pAdapter); +void SetAntennaPathPower(struct adapter *pAdapter); +void SetTxAGCOffset(struct adapter *pAdapter, u32 ulTxAGCOffset); +void SetDataRate(struct adapter *pAdapter); -void SetAntenna(PADAPTER pAdapter); +void SetAntenna(struct adapter *pAdapter); -//void SetCrystalCap(PADAPTER pAdapter); +//void SetCrystalCap(struct adapter *pAdapter); -s32 SetThermalMeter(PADAPTER pAdapter, u8 target_ther); -void GetThermalMeter(PADAPTER pAdapter, u8 *value); +s32 SetThermalMeter(struct adapter *pAdapter, u8 target_ther); +void GetThermalMeter(struct adapter *pAdapter, u8 *value); -void SetContinuousTx(PADAPTER pAdapter, u8 bStart); -void SetSingleCarrierTx(PADAPTER pAdapter, u8 bStart); -void SetSingleToneTx(PADAPTER pAdapter, u8 bStart); -void SetCarrierSuppressionTx(PADAPTER pAdapter, u8 bStart); -void PhySetTxPowerLevel(PADAPTER pAdapter); +void SetContinuousTx(struct adapter *pAdapter, u8 bStart); +void SetSingleCarrierTx(struct adapter *pAdapter, u8 bStart); +void SetSingleToneTx(struct adapter *pAdapter, u8 bStart); +void SetCarrierSuppressionTx(struct adapter *pAdapter, u8 bStart); +void PhySetTxPowerLevel(struct adapter *pAdapter); -void fill_txdesc_for_mp(PADAPTER padapter, struct tx_desc *ptxdesc); -void SetPacketTx(PADAPTER padapter); -void SetPacketRx(PADAPTER pAdapter, u8 bStartRx); +void fill_txdesc_for_mp(struct adapter *padapter, struct tx_desc *ptxdesc); +void SetPacketTx(struct adapter *padapter); +void SetPacketRx(struct adapter *pAdapter, u8 bStartRx); -void ResetPhyRxPktCount(PADAPTER pAdapter); -u32 GetPhyRxPktReceived(PADAPTER pAdapter); -u32 GetPhyRxPktCRC32Error(PADAPTER pAdapter); +void ResetPhyRxPktCount(struct adapter *pAdapter); +u32 GetPhyRxPktReceived(struct adapter *pAdapter); +u32 GetPhyRxPktCRC32Error(struct adapter *pAdapter); -s32 SetPowerTracking(PADAPTER padapter, u8 enable); -void GetPowerTracking(PADAPTER padapter, u8 *enable); +s32 SetPowerTracking(struct adapter *padapter, u8 enable); +void GetPowerTracking(struct adapter *padapter, u8 *enable); -u32 mp_query_psd(PADAPTER pAdapter, u8 *data); +u32 mp_query_psd(struct adapter *pAdapter, u8 *data); -void Hal_SetAntenna(PADAPTER pAdapter); -void Hal_SetBandwidth(PADAPTER pAdapter); +void Hal_SetAntenna(struct adapter *pAdapter); +void Hal_SetBandwidth(struct adapter *pAdapter); -void Hal_SetTxPower(PADAPTER pAdapter); -void Hal_SetCarrierSuppressionTx(PADAPTER pAdapter, u8 bStart); -void Hal_SetSingleToneTx ( PADAPTER pAdapter , u8 bStart ); -void Hal_SetSingleCarrierTx (PADAPTER pAdapter, u8 bStart); -void Hal_SetContinuousTx (PADAPTER pAdapter, u8 bStart); -void Hal_SetBandwidth(PADAPTER pAdapter); +void Hal_SetTxPower(struct adapter *pAdapter); +void Hal_SetCarrierSuppressionTx(struct adapter *pAdapter, u8 bStart); +void Hal_SetSingleToneTx ( struct adapter *pAdapter , u8 bStart ); +void Hal_SetSingleCarrierTx (struct adapter *pAdapter, u8 bStart); +void Hal_SetContinuousTx (struct adapter *pAdapter, u8 bStart); +void Hal_SetBandwidth(struct adapter *pAdapter); -void Hal_SetDataRate(PADAPTER pAdapter); -void Hal_SetChannel(PADAPTER pAdapter); -void Hal_SetAntennaPathPower(PADAPTER pAdapter); -s32 Hal_SetThermalMeter(PADAPTER pAdapter, u8 target_ther); -s32 Hal_SetPowerTracking(PADAPTER padapter, u8 enable); -void Hal_GetPowerTracking(PADAPTER padapter, u8 * enable); -void Hal_GetThermalMeter(PADAPTER pAdapter, u8 *value); -void Hal_mpt_SwitchRfSetting(PADAPTER pAdapter); -void Hal_MPT_CCKTxPowerAdjust(PADAPTER Adapter, BOOLEAN bInCH14); -void Hal_MPT_CCKTxPowerAdjustbyIndex(PADAPTER pAdapter, BOOLEAN beven); -void Hal_SetCCKTxPower(PADAPTER pAdapter, u8 * TxPower); -void Hal_SetOFDMTxPower(PADAPTER pAdapter, u8 * TxPower); -void Hal_TriggerRFThermalMeter(PADAPTER pAdapter); -u8 Hal_ReadRFThermalMeter(PADAPTER pAdapter); -void Hal_SetCCKContinuousTx(PADAPTER pAdapter, u8 bStart); -void SetCCKContinuousTx(PADAPTER pAdapter, u8 bStart); -void SetOFDMContinuousTx(PADAPTER pAdapter, u8 bStart); -void Hal_SetOFDMContinuousTx(PADAPTER pAdapter, u8 bStart); -void Hal_ProSetCrystalCap (PADAPTER pAdapter , u32 CrystalCapVal); +void Hal_SetDataRate(struct adapter *pAdapter); +void Hal_SetChannel(struct adapter *pAdapter); +void Hal_SetAntennaPathPower(struct adapter *pAdapter); +s32 Hal_SetThermalMeter(struct adapter *pAdapter, u8 target_ther); +s32 Hal_SetPowerTracking(struct adapter *padapter, u8 enable); +void Hal_GetPowerTracking(struct adapter *padapter, u8 * enable); +void Hal_GetThermalMeter(struct adapter *pAdapter, u8 *value); +void Hal_mpt_SwitchRfSetting(struct adapter *pAdapter); +void Hal_MPT_CCKTxPowerAdjust(struct adapter *Adapter, BOOLEAN bInCH14); +void Hal_MPT_CCKTxPowerAdjustbyIndex(struct adapter *pAdapter, BOOLEAN beven); +void Hal_SetCCKTxPower(struct adapter *pAdapter, u8 * TxPower); +void Hal_SetOFDMTxPower(struct adapter *pAdapter, u8 * TxPower); +void Hal_TriggerRFThermalMeter(struct adapter *pAdapter); +u8 Hal_ReadRFThermalMeter(struct adapter *pAdapter); +void Hal_SetCCKContinuousTx(struct adapter *pAdapter, u8 bStart); +void SetCCKContinuousTx(struct adapter *pAdapter, u8 bStart); +void SetOFDMContinuousTx(struct adapter *pAdapter, u8 bStart); +void Hal_SetOFDMContinuousTx(struct adapter *pAdapter, u8 bStart); +void Hal_ProSetCrystalCap (struct adapter *pAdapter , u32 CrystalCapVal); void _rtw_mp_xmit_priv(struct xmit_priv *pxmitpriv); -void MP_PHY_SetRFPathSwitch(PADAPTER pAdapter ,BOOLEAN bMain); -void MPT_PwrCtlDM(PADAPTER padapter, u32 bstart); +void MP_PHY_SetRFPathSwitch(struct adapter *pAdapter ,BOOLEAN bMain); +void MPT_PwrCtlDM(struct adapter *padapter, u32 bstart); #endif //_RTW_MP_H_ diff --git a/include/rtw_mp_ioctl.h b/include/rtw_mp_ioctl.h index 4b62d6f..3e0e101 100755 --- a/include/rtw_mp_ioctl.h +++ b/include/rtw_mp_ioctl.h @@ -81,7 +81,7 @@ typedef struct _DR_VARIABLE_STRUCT_ { u32 variable; }DR_VARIABLE_STRUCT; -//int mp_start_joinbss(_adapter *padapter, NDIS_802_11_SSID *pssid); +//int mp_start_joinbss(struct adapter *padapter, NDIS_802_11_SSID *pssid); //void _irqlevel_changed_(_irqL *irqlevel, /*BOOLEAN*/unsigned char bLower); #ifdef PLATFORM_OS_XP diff --git a/include/rtw_odm.h b/include/rtw_odm.h index d01acd6..a5cb544 100755 --- a/include/rtw_odm.h +++ b/include/rtw_odm.h @@ -26,16 +26,16 @@ * This file provides utilities/wrappers for rtw driver to use ODM */ -int _rtw_odm_dbg_comp_msg(_adapter *adapter, char *buf, int len); -void rtw_odm_dbg_comp_msg(_adapter *adapter); -void rtw_odm_dbg_comp_set(_adapter *adapter, u64 comps); -int _rtw_odm_dbg_level_msg(_adapter *adapter, char *buf, int len); -void rtw_odm_dbg_level_msg(_adapter *adapter); -void rtw_odm_dbg_level_set(_adapter *adapter, u32 level); +int _rtw_odm_dbg_comp_msg(struct adapter *adapter, char *buf, int len); +void rtw_odm_dbg_comp_msg(struct adapter *adapter); +void rtw_odm_dbg_comp_set(struct adapter *adapter, u64 comps); +int _rtw_odm_dbg_level_msg(struct adapter *adapter, char *buf, int len); +void rtw_odm_dbg_level_msg(struct adapter *adapter); +void rtw_odm_dbg_level_set(struct adapter *adapter, u32 level); -int _rtw_odm_adaptivity_parm_msg(_adapter *adapter, char *buf, int len); -void rtw_odm_adaptivity_parm_msg(_adapter *adapter); -void rtw_odm_adaptivity_parm_set(_adapter *adapter, s8 TH_L2H_ini, s8 TH_EDCCA_HL_diff, +int _rtw_odm_adaptivity_parm_msg(struct adapter *adapter, char *buf, int len); +void rtw_odm_adaptivity_parm_msg(struct adapter *adapter); +void rtw_odm_adaptivity_parm_set(struct adapter *adapter, s8 TH_L2H_ini, s8 TH_EDCCA_HL_diff, s8 IGI_Base, bool ForceEDCCA, u8 AdapEn_RSSI, u8 IGI_LowerBound); #endif // __RTW_ODM_H__ diff --git a/include/rtw_p2p.h b/include/rtw_p2p.h index 4249bc9..fd46e74 100755 --- a/include/rtw_p2p.h +++ b/include/rtw_p2p.h @@ -53,26 +53,26 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram u8 process_p2p_group_negotation_confirm( struct wifidirect_info *pwdinfo, u8 *pframe, uint len ); u8 process_p2p_presence_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint len); -void p2p_protocol_wk_hdl(_adapter *padapter, int intCmdType); +void p2p_protocol_wk_hdl(struct adapter *padapter, int intCmdType); #ifdef CONFIG_P2P_PS -void process_p2p_ps_ie(PADAPTER padapter, u8 *IEs, u32 IELength); -void p2p_ps_wk_hdl(_adapter *padapter, u8 p2p_ps_state); -u8 p2p_ps_wk_cmd(_adapter*padapter, u8 p2p_ps_state, u8 enqueue); +void process_p2p_ps_ie(struct adapter *padapter, u8 *IEs, u32 IELength); +void p2p_ps_wk_hdl(struct adapter *padapter, u8 p2p_ps_state); +u8 p2p_ps_wk_cmd(struct adapter*padapter, u8 p2p_ps_state, u8 enqueue); #endif // CONFIG_P2P_PS #ifdef CONFIG_IOCTL_CFG80211 -void rtw_init_cfg80211_wifidirect_info( _adapter* padapter); -int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx); -void rtw_append_wfd_ie(_adapter *padapter, u8 *buf, u32 *len); +void rtw_init_cfg80211_wifidirect_info( struct adapter* padapter); +int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx); +void rtw_append_wfd_ie(struct adapter *padapter, u8 *buf, u32 *len); #endif //CONFIG_IOCTL_CFG80211 -void reset_global_wifidirect_info( _adapter* padapter ); -int rtw_init_wifi_display_info(_adapter* padapter); -void rtw_init_wifidirect_timers(_adapter* padapter); -void rtw_init_wifidirect_addrs(_adapter* padapter, u8 *dev_addr, u8 *iface_addr); -void init_wifidirect_info( _adapter* padapter, enum P2P_ROLE role); -int rtw_p2p_enable(_adapter *padapter, enum P2P_ROLE role); +void reset_global_wifidirect_info( struct adapter* padapter ); +int rtw_init_wifi_display_info(struct adapter* padapter); +void rtw_init_wifidirect_timers(struct adapter* padapter); +void rtw_init_wifidirect_addrs(struct adapter* padapter, u8 *dev_addr, u8 *iface_addr); +void init_wifidirect_info( struct adapter* padapter, enum P2P_ROLE role); +int rtw_p2p_enable(struct adapter *padapter, enum P2P_ROLE role); static inline void _rtw_p2p_set_state(struct wifidirect_info *wdinfo, enum P2P_STATE state) { diff --git a/include/rtw_pwrctrl.h b/include/rtw_pwrctrl.h index 4b63a1e..54a108b 100755 --- a/include/rtw_pwrctrl.h +++ b/include/rtw_pwrctrl.h @@ -312,46 +312,46 @@ struct pwrctrl_priv #define rtw_set_pwr_state_check_timer(pwrctl) \ _rtw_set_pwr_state_check_timer((pwrctl), (pwrctl)->pwr_state_check_interval) -extern void rtw_init_pwrctrl_priv(_adapter *adapter); -extern void rtw_free_pwrctrl_priv(_adapter * adapter); +extern void rtw_init_pwrctrl_priv(struct adapter *adapter); +extern void rtw_free_pwrctrl_priv(struct adapter * adapter); #ifdef CONFIG_LPS_LCLK -extern s32 rtw_register_tx_alive(PADAPTER padapter); -extern void rtw_unregister_tx_alive(PADAPTER padapter); -extern s32 rtw_register_rx_alive(PADAPTER padapter); -extern void rtw_unregister_rx_alive(PADAPTER padapter); -extern s32 rtw_register_cmd_alive(PADAPTER padapter); -extern void rtw_unregister_cmd_alive(PADAPTER padapter); -extern s32 rtw_register_evt_alive(PADAPTER padapter); -extern void rtw_unregister_evt_alive(PADAPTER padapter); -extern void cpwm_int_hdl(PADAPTER padapter, struct reportpwrstate_parm *preportpwrstate); -extern void LPS_Leave_check(PADAPTER padapter); +extern s32 rtw_register_tx_alive(struct adapter *padapter); +extern void rtw_unregister_tx_alive(struct adapter *padapter); +extern s32 rtw_register_rx_alive(struct adapter *padapter); +extern void rtw_unregister_rx_alive(struct adapter *padapter); +extern s32 rtw_register_cmd_alive(struct adapter *padapter); +extern void rtw_unregister_cmd_alive(struct adapter *padapter); +extern s32 rtw_register_evt_alive(struct adapter *padapter); +extern void rtw_unregister_evt_alive(struct adapter *padapter); +extern void cpwm_int_hdl(struct adapter *padapter, struct reportpwrstate_parm *preportpwrstate); +extern void LPS_Leave_check(struct adapter *padapter); #endif -extern void rtw_set_ps_mode(PADAPTER padapter, u8 ps_mode, u8 smart_ps, u8 bcn_ant_mode); -extern void rtw_set_rpwm(_adapter * padapter, u8 val8); -extern void LeaveAllPowerSaveMode(PADAPTER Adapter); +extern void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode, u8 smart_ps, u8 bcn_ant_mode); +extern void rtw_set_rpwm(struct adapter * padapter, u8 val8); +extern void LeaveAllPowerSaveMode(struct adapter *Adapter); #ifdef CONFIG_IPS -void _ips_enter(_adapter * padapter); -void ips_enter(_adapter * padapter); -int _ips_leave(_adapter * padapter); -int ips_leave(_adapter * padapter); +void _ips_enter(struct adapter * padapter); +void ips_enter(struct adapter * padapter); +int _ips_leave(struct adapter * padapter); +int ips_leave(struct adapter * padapter); #endif -void rtw_ps_processor(_adapter*padapter); +void rtw_ps_processor(struct adapter*padapter); #ifdef CONFIG_AUTOSUSPEND -int autoresume_enter(_adapter* padapter); +int autoresume_enter(struct adapter* padapter); #endif #ifdef SUPPORT_HW_RFOFF_DETECTED -rt_rf_power_state RfOnOffDetect(IN PADAPTER pAdapter ); +rt_rf_power_state RfOnOffDetect(IN struct adapter *pAdapter ); #endif #ifdef CONFIG_LPS -s32 LPS_RF_ON_check(PADAPTER padapter, u32 delay_ms); -void LPS_Enter(PADAPTER padapter); -void LPS_Leave(PADAPTER padapter); +s32 LPS_RF_ON_check(struct adapter *padapter, u32 delay_ms); +void LPS_Enter(struct adapter *padapter); +void LPS_Leave(struct adapter *padapter); #endif #ifdef CONFIG_RESUME_IN_WORKQUEUE @@ -372,13 +372,13 @@ void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv); #define rtw_unregister_early_suspend(pwrpriv) do {} while (0) #endif /* CONFIG_HAS_EARLYSUSPEND || CONFIG_ANDROID_POWER */ -u8 rtw_interface_ps_func(_adapter *padapter,HAL_INTF_PS_FUNC efunc_id,u8* val); -void rtw_set_ips_deny(_adapter *padapter, u32 ms); -int _rtw_pwr_wakeup(_adapter *padapter, u32 ips_deffer_ms, const char *caller); +u8 rtw_interface_ps_func(struct adapter *padapter,HAL_INTF_PS_FUNC efunc_id,u8* val); +void rtw_set_ips_deny(struct adapter *padapter, u32 ms); +int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *caller); #define rtw_pwr_wakeup(adapter) _rtw_pwr_wakeup(adapter, RTW_PWR_STATE_CHK_INTERVAL, __FUNCTION__) #define rtw_pwr_wakeup_ex(adapter, ips_deffer_ms) _rtw_pwr_wakeup(adapter, ips_deffer_ms, __FUNCTION__) -int rtw_pm_set_ips(_adapter *padapter, u8 mode); -int rtw_pm_set_lps(_adapter *padapter, u8 mode); +int rtw_pm_set_ips(struct adapter *padapter, u8 mode); +int rtw_pm_set_lps(struct adapter *padapter, u8 mode); #endif //__RTL871X_PWRCTRL_H_ diff --git a/include/rtw_recv.h b/include/rtw_recv.h index 569f77f..2a6d57d 100755 --- a/include/rtw_recv.h +++ b/include/rtw_recv.h @@ -56,7 +56,7 @@ static u8 rtw_bridge_tunnel_header[] = //for Rx reordering buffer control struct recv_reorder_ctrl { - _adapter *padapter; + struct adapter *padapter; u8 enable; u16 indicate_seq;//=wstart_b, init_value=0xffff u16 wend_b; @@ -270,7 +270,7 @@ struct recv_priv uint free_recvframe_cnt; - _adapter *adapter; + struct adapter *adapter; u32 bIsAnyNonBEPkts; u64 rx_bytes; @@ -379,7 +379,7 @@ struct recv_buf u32 ref_cnt; - PADAPTER adapter; + struct adapter *adapter; u8 *pbuf; u8 *pallocated_buf; @@ -432,7 +432,7 @@ struct recv_frame_hdr _pkt *pkt_newalloc; #endif // CONFIG_BSD_RX_USE_MBUF - _adapter *adapter; + struct adapter *adapter; u8 fragcnt; @@ -489,7 +489,7 @@ extern int _rtw_enqueue_recvframe(union recv_frame *precvframe, _queue *queue); extern int rtw_enqueue_recvframe(union recv_frame *precvframe, _queue *queue); extern void rtw_free_recvframe_queue(_queue *pframequeue, _queue *pfree_recv_queue); -u32 rtw_free_uc_swdec_pending_queue(_adapter *adapter); +u32 rtw_free_uc_swdec_pending_queue(struct adapter *adapter); sint rtw_enqueue_recvbuf_to_head(struct recv_buf *precvbuf, _queue *queue); sint rtw_enqueue_recvbuf(struct recv_buf *precvbuf, _queue *queue); @@ -705,7 +705,7 @@ struct sta_info; extern void _rtw_init_sta_recv_priv(struct sta_recv_priv *psta_recvpriv); -extern void mgt_dispatcher(_adapter *padapter, union recv_frame *precv_frame); +extern void mgt_dispatcher(struct adapter *padapter, union recv_frame *precv_frame); #endif diff --git a/include/rtw_security.h b/include/rtw_security.h index f9e601e..2372f9e 100755 --- a/include/rtw_security.h +++ b/include/rtw_security.h @@ -421,18 +421,18 @@ void rtw_seccalctkipmic( u8 *Miccode, u8 priority); -u32 rtw_aes_encrypt(_adapter *padapter, u8 *pxmitframe); -u32 rtw_tkip_encrypt(_adapter *padapter, u8 *pxmitframe); -void rtw_wep_encrypt(_adapter *padapter, u8 *pxmitframe); +u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe); +u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe); +void rtw_wep_encrypt(struct adapter *padapter, u8 *pxmitframe); -u32 rtw_aes_decrypt(_adapter *padapter, u8 *precvframe); -u32 rtw_tkip_decrypt(_adapter *padapter, u8 *precvframe); -void rtw_wep_decrypt(_adapter *padapter, u8 *precvframe); +u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe); +u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe); +void rtw_wep_decrypt(struct adapter *padapter, u8 *precvframe); #ifdef CONFIG_IEEE80211W -u32 rtw_BIP_verify(_adapter *padapter, u8 *precvframe); +u32 rtw_BIP_verify(struct adapter *padapter, u8 *precvframe); #endif //CONFIG_IEEE80211W #ifdef CONFIG_TDLS -void wpa_tdls_generate_tpk(_adapter *padapter, struct sta_info *psta); +void wpa_tdls_generate_tpk(struct adapter *padapter, struct sta_info *psta); int wpa_tdls_ftie_mic(u8 *kck, u8 trans_seq, u8 *lnkid, u8 *rsnie, u8 *timeoutie, u8 *ftie, u8 *mic); @@ -442,8 +442,8 @@ int tdls_verify_mic(u8 *kck, u8 trans_seq, void rtw_use_tkipkey_handler(void* FunctionContext); -void rtw_sec_restore_wep_key(_adapter *adapter); -u8 rtw_handle_tkip_countermeasure(_adapter* adapter, const char *caller); +void rtw_sec_restore_wep_key(struct adapter *adapter); +u8 rtw_handle_tkip_countermeasure(struct adapter* adapter, const char *caller); #endif //__RTL871X_SECURITY_H_ diff --git a/include/rtw_sreset.h b/include/rtw_sreset.h index 67b85d3..d37e677 100755 --- a/include/rtw_sreset.h +++ b/include/rtw_sreset.h @@ -51,13 +51,13 @@ struct sreset_priv { #define WIFI_RX_HANG BIT5 #define WIFI_IF_NOT_EXIST BIT6 -void sreset_init_value(_adapter *padapter); -void sreset_reset_value(_adapter *padapter); -u8 sreset_get_wifi_status(_adapter *padapter); -void sreset_set_wifi_error_status(_adapter *padapter, u32 status); -void sreset_set_trigger_point(_adapter *padapter, s32 tgp); -bool sreset_inprogress(_adapter *padapter); -void sreset_reset(_adapter *padapter); +void sreset_init_value(struct adapter *padapter); +void sreset_reset_value(struct adapter *padapter); +u8 sreset_get_wifi_status(struct adapter *padapter); +void sreset_set_wifi_error_status(struct adapter *padapter, u32 status); +void sreset_set_trigger_point(struct adapter *padapter, s32 tgp); +bool sreset_inprogress(struct adapter *padapter); +void sreset_reset(struct adapter *padapter); #endif diff --git a/include/rtw_tdls.h b/include/rtw_tdls.h index bc22cfe..80adf34 100755 --- a/include/rtw_tdls.h +++ b/include/rtw_tdls.h @@ -90,53 +90,53 @@ static u8 TDLS_EXT_CAPIE[] = {0x00, 0x00, 0x00, 0x50, 0x20}; //bit(28), bit(30), // SRC: Supported Regulatory Classes static u8 TDLS_SRC[] = { 0x01, 0x01, 0x02, 0x03, 0x04, 0x0c, 0x16, 0x17, 0x18, 0x19, 0x1b, 0x1c, 0x1d, 0x1e, 0x20, 0x21 }; -void rtw_reset_tdls_info(_adapter* padapter); -int rtw_init_tdls_info(_adapter* padapter); +void rtw_reset_tdls_info(struct adapter* padapter); +int rtw_init_tdls_info(struct adapter* padapter); void rtw_free_tdls_info(struct tdls_info *ptdlsinfo); -void issue_nulldata_to_TDLS_peer_STA(_adapter *padapter, struct sta_info *ptdls_sta, unsigned int power_mode); -void init_TPK_timer(_adapter *padapter, struct sta_info *psta); -void init_ch_switch_timer(_adapter *padapter, struct sta_info *psta); -void init_base_ch_timer(_adapter *padapter, struct sta_info *psta); -void init_off_ch_timer(_adapter *padapter, struct sta_info *psta); -void init_tdls_alive_timer(_adapter *padapter, struct sta_info *psta); -void init_handshake_timer(_adapter *padapter, struct sta_info *psta); -void free_tdls_sta(_adapter *padapter, struct sta_info *ptdls_sta); +void issue_nulldata_to_TDLS_peer_STA(struct adapter *padapter, struct sta_info *ptdls_sta, unsigned int power_mode); +void init_TPK_timer(struct adapter *padapter, struct sta_info *psta); +void init_ch_switch_timer(struct adapter *padapter, struct sta_info *psta); +void init_base_ch_timer(struct adapter *padapter, struct sta_info *psta); +void init_off_ch_timer(struct adapter *padapter, struct sta_info *psta); +void init_tdls_alive_timer(struct adapter *padapter, struct sta_info *psta); +void init_handshake_timer(struct adapter *padapter, struct sta_info *psta); +void free_tdls_sta(struct adapter *padapter, struct sta_info *ptdls_sta); #ifdef CONFIG_WFD -void issue_tunneled_probe_req(_adapter *padapter); -void issue_tunneled_probe_rsp(_adapter *padapter, union recv_frame *precv_frame); +void issue_tunneled_probe_req(struct adapter *padapter); +void issue_tunneled_probe_rsp(struct adapter *padapter, union recv_frame *precv_frame); #endif //CONFIG_WFD -void issue_tdls_dis_req(_adapter *padapter, u8 *mac_addr); -void issue_tdls_setup_req(_adapter *padapter, u8 *mac_addr); -void issue_tdls_setup_rsp(_adapter *padapter, union recv_frame *precv_frame); -void issue_tdls_setup_cfm(_adapter *padapter, union recv_frame *precv_frame); -void issue_tdls_dis_rsp(_adapter * padapter, union recv_frame * precv_frame, u8 dialog); -void issue_tdls_teardown(_adapter *padapter, u8 *mac_addr); -void issue_tdls_peer_traffic_indication(_adapter *padapter, struct sta_info *psta); -void issue_tdls_ch_switch_req(_adapter *padapter, u8 *mac_addr); -void issue_tdls_ch_switch_rsp(_adapter *padapter, u8 *mac_addr); -sint On_TDLS_Dis_Rsp(_adapter *adapter, union recv_frame *precv_frame); -sint On_TDLS_Setup_Req(_adapter *adapter, union recv_frame *precv_frame); -sint On_TDLS_Setup_Rsp(_adapter *adapter, union recv_frame *precv_frame); -sint On_TDLS_Setup_Cfm(_adapter *adapter, union recv_frame *precv_frame); -sint On_TDLS_Dis_Req(_adapter *adapter, union recv_frame *precv_frame); -sint On_TDLS_Teardown(_adapter *adapter, union recv_frame *precv_frame); -sint On_TDLS_Peer_Traffic_Rsp(_adapter *adapter, union recv_frame *precv_frame); -sint On_TDLS_Ch_Switch_Req(_adapter *adapter, union recv_frame *precv_frame); -sint On_TDLS_Ch_Switch_Rsp(_adapter *adapter, union recv_frame *precv_frame); -void rtw_build_tdls_setup_req_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe); -void rtw_build_tdls_setup_rsp_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe); -void rtw_build_tdls_setup_cfm_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe); -void rtw_build_tdls_teardown_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe); -void rtw_build_tdls_dis_req_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe); -void rtw_build_tdls_dis_rsp_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe, u8 dialog); -void rtw_build_tdls_peer_traffic_indication_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe); -void rtw_build_tdls_ch_switch_req_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe); -void rtw_build_tdls_ch_switch_rsp_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe); -void rtw_build_tunneled_probe_req_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe); -void rtw_build_tunneled_probe_rsp_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe); +void issue_tdls_dis_req(struct adapter *padapter, u8 *mac_addr); +void issue_tdls_setup_req(struct adapter *padapter, u8 *mac_addr); +void issue_tdls_setup_rsp(struct adapter *padapter, union recv_frame *precv_frame); +void issue_tdls_setup_cfm(struct adapter *padapter, union recv_frame *precv_frame); +void issue_tdls_dis_rsp(struct adapter * padapter, union recv_frame * precv_frame, u8 dialog); +void issue_tdls_teardown(struct adapter *padapter, u8 *mac_addr); +void issue_tdls_peer_traffic_indication(struct adapter *padapter, struct sta_info *psta); +void issue_tdls_ch_switch_req(struct adapter *padapter, u8 *mac_addr); +void issue_tdls_ch_switch_rsp(struct adapter *padapter, u8 *mac_addr); +sint On_TDLS_Dis_Rsp(struct adapter *adapter, union recv_frame *precv_frame); +sint On_TDLS_Setup_Req(struct adapter *adapter, union recv_frame *precv_frame); +sint On_TDLS_Setup_Rsp(struct adapter *adapter, union recv_frame *precv_frame); +sint On_TDLS_Setup_Cfm(struct adapter *adapter, union recv_frame *precv_frame); +sint On_TDLS_Dis_Req(struct adapter *adapter, union recv_frame *precv_frame); +sint On_TDLS_Teardown(struct adapter *adapter, union recv_frame *precv_frame); +sint On_TDLS_Peer_Traffic_Rsp(struct adapter *adapter, union recv_frame *precv_frame); +sint On_TDLS_Ch_Switch_Req(struct adapter *adapter, union recv_frame *precv_frame); +sint On_TDLS_Ch_Switch_Rsp(struct adapter *adapter, union recv_frame *precv_frame); +void rtw_build_tdls_setup_req_ies(struct adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe); +void rtw_build_tdls_setup_rsp_ies(struct adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe); +void rtw_build_tdls_setup_cfm_ies(struct adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe); +void rtw_build_tdls_teardown_ies(struct adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe); +void rtw_build_tdls_dis_req_ies(struct adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe); +void rtw_build_tdls_dis_rsp_ies(struct adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe, u8 dialog); +void rtw_build_tdls_peer_traffic_indication_ies(struct adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe); +void rtw_build_tdls_ch_switch_req_ies(struct adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe); +void rtw_build_tdls_ch_switch_rsp_ies(struct adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe); +void rtw_build_tunneled_probe_req_ies(struct adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe); +void rtw_build_tunneled_probe_rsp_ies(struct adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe); -int update_sgi_tdls(_adapter *padapter, struct sta_info *psta); -u32 update_mask_tdls(_adapter *padapter, struct sta_info *psta); +int update_sgi_tdls(struct adapter *padapter, struct sta_info *psta); +u32 update_mask_tdls(struct adapter *padapter, struct sta_info *psta); #endif //CONFIG_TDLS #endif diff --git a/include/rtw_wapi.h b/include/rtw_wapi.h index f72c666..19efd6d 100755 --- a/include/rtw_wapi.h +++ b/include/rtw_wapi.h @@ -184,46 +184,46 @@ typedef struct _WLAN_HEADER_WAPI_EXTENSION u32 WapiComparePN(u8 *PN1, u8 *PN2); -void rtw_wapi_init(_adapter *padapter); +void rtw_wapi_init(struct adapter *padapter); -void rtw_wapi_free(_adapter *padapter); +void rtw_wapi_free(struct adapter *padapter); -void rtw_wapi_disable_tx(_adapter *padapter); +void rtw_wapi_disable_tx(struct adapter *padapter); -u8 rtw_wapi_is_wai_packet(_adapter* padapter,u8 *pkt_data); +u8 rtw_wapi_is_wai_packet(struct adapter* padapter,u8 *pkt_data); -void rtw_wapi_update_info(_adapter *padapter, union recv_frame *precv_frame); +void rtw_wapi_update_info(struct adapter *padapter, union recv_frame *precv_frame); -u8 rtw_wapi_check_for_drop(_adapter *padapter, union recv_frame *precv_frame); +u8 rtw_wapi_check_for_drop(struct adapter *padapter, union recv_frame *precv_frame); -void rtw_build_probe_resp_wapi_ie(_adapter *padapter, unsigned char *pframe, struct pkt_attrib *pattrib); +void rtw_build_probe_resp_wapi_ie(struct adapter *padapter, unsigned char *pframe, struct pkt_attrib *pattrib); -void rtw_build_beacon_wapi_ie(_adapter *padapter, unsigned char *pframe, struct pkt_attrib *pattrib); +void rtw_build_beacon_wapi_ie(struct adapter *padapter, unsigned char *pframe, struct pkt_attrib *pattrib); -void rtw_build_assoc_req_wapi_ie(_adapter *padapter, unsigned char *pframe, struct pkt_attrib *pattrib); +void rtw_build_assoc_req_wapi_ie(struct adapter *padapter, unsigned char *pframe, struct pkt_attrib *pattrib); -void rtw_wapi_on_assoc_ok(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE); +void rtw_wapi_on_assoc_ok(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE); -void rtw_wapi_return_one_sta_info(_adapter *padapter, u8 *MacAddr); +void rtw_wapi_return_one_sta_info(struct adapter *padapter, u8 *MacAddr); -void rtw_wapi_return_all_sta_info(_adapter *padapter); +void rtw_wapi_return_all_sta_info(struct adapter *padapter); -void rtw_wapi_clear_cam_entry(_adapter *padapter, u8 *pMacAddr); +void rtw_wapi_clear_cam_entry(struct adapter *padapter, u8 *pMacAddr); -void rtw_wapi_clear_all_cam_entry(_adapter *padapter); +void rtw_wapi_clear_all_cam_entry(struct adapter *padapter); -void rtw_wapi_set_key(_adapter *padapter, RT_WAPI_KEY *pWapiKey, RT_WAPI_STA_INFO *pWapiSta, u8 bGroupKey, u8 bUseDefaultKey); +void rtw_wapi_set_key(struct adapter *padapter, RT_WAPI_KEY *pWapiKey, RT_WAPI_STA_INFO *pWapiSta, u8 bGroupKey, u8 bUseDefaultKey); -int rtw_wapi_create_event_send(_adapter *padapter, u8 EventId, u8 *MacAddr, u8 *Buff, u16 BufLen); +int rtw_wapi_create_event_send(struct adapter *padapter, u8 EventId, u8 *MacAddr, u8 *Buff, u16 BufLen); -u32 rtw_sms4_encrypt(_adapter *padapter, u8 *pxmitframe); +u32 rtw_sms4_encrypt(struct adapter *padapter, u8 *pxmitframe); -u32 rtw_sms4_decrypt(_adapter *padapter, u8 *precvframe); +u32 rtw_sms4_decrypt(struct adapter *padapter, u8 *precvframe); -void rtw_wapi_get_iv(_adapter *padapter, u8*pRA, u8*IV); +void rtw_wapi_get_iv(struct adapter *padapter, u8*pRA, u8*IV); u8 WapiIncreasePN(u8 *PN, u8 AddCount); -bool rtw_wapi_drop_for_key_absent(_adapter *padapter,u8 *pRA); +bool rtw_wapi_drop_for_key_absent(struct adapter *padapter,u8 *pRA); #endif diff --git a/include/rtw_xmit.h b/include/rtw_xmit.h index 6975deb..f615bd6 100755 --- a/include/rtw_xmit.h +++ b/include/rtw_xmit.h @@ -352,7 +352,7 @@ struct xmit_buf { _list list; - _adapter *padapter; + struct adapter *padapter; u8 *pallocated_buf; @@ -413,7 +413,7 @@ struct xmit_frame int frame_tag; - _adapter *padapter; + struct adapter *padapter; u8 *buf_addr; @@ -526,7 +526,7 @@ struct xmit_priv { uint frag_len; - _adapter *adapter; + struct adapter *adapter; u8 vcs_setting; u8 vcs; @@ -616,9 +616,9 @@ extern s32 rtw_free_xmitbuf_ext(struct xmit_priv *pxmitpriv, struct xmit_buf *px extern struct xmit_buf *rtw_alloc_xmitbuf(struct xmit_priv *pxmitpriv); extern s32 rtw_free_xmitbuf(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf); -void rtw_count_tx_stats(_adapter *padapter, struct xmit_frame *pxmitframe, int sz); -extern void rtw_update_protection(_adapter *padapter, u8 *ie, uint ie_len); -extern s32 rtw_make_wlanhdr(_adapter *padapter, u8 *hdr, struct pkt_attrib *pattrib); +void rtw_count_tx_stats(struct adapter *padapter, struct xmit_frame *pxmitframe, int sz); +extern void rtw_update_protection(struct adapter *padapter, u8 *ie, uint ie_len); +extern s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattrib); extern s32 rtw_put_snap(u8 *data, u16 h_proto); extern struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv); @@ -626,44 +626,44 @@ struct xmit_frame *rtw_alloc_xmitframe_ext(struct xmit_priv *pxmitpriv); struct xmit_frame *rtw_alloc_xmitframe_once(struct xmit_priv *pxmitpriv); extern s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitframe); extern void rtw_free_xmitframe_queue(struct xmit_priv *pxmitpriv, _queue *pframequeue); -struct tx_servq *rtw_get_sta_pending(_adapter *padapter, struct sta_info *psta, sint up, u8 *ac); -extern s32 rtw_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe); +struct tx_servq *rtw_get_sta_pending(struct adapter *padapter, struct sta_info *psta, sint up, u8 *ac); +extern s32 rtw_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitframe); extern struct xmit_frame* rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmit *phwxmit_i, sint entry); -extern s32 rtw_xmit_classifier(_adapter *padapter, struct xmit_frame *pxmitframe); +extern s32 rtw_xmit_classifier(struct adapter *padapter, struct xmit_frame *pxmitframe); extern u32 rtw_calculate_wlan_pkt_size_by_attribue(struct pkt_attrib *pattrib); #define rtw_wlan_pkt_size(f) rtw_calculate_wlan_pkt_size_by_attribue(&f->attrib) -extern s32 rtw_xmitframe_coalesce(_adapter *padapter, _pkt *pkt, struct xmit_frame *pxmitframe); +extern s32 rtw_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit_frame *pxmitframe); #ifdef CONFIG_IEEE80211W -extern s32 rtw_mgmt_xmitframe_coalesce(_adapter *padapter, _pkt *pkt, struct xmit_frame *pxmitframe); +extern s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit_frame *pxmitframe); #endif //CONFIG_IEEE80211W #ifdef CONFIG_TDLS -s32 rtw_xmit_tdls_coalesce(_adapter *padapter, struct xmit_frame *pxmitframe, u8 action); +s32 rtw_xmit_tdls_coalesce(struct adapter *padapter, struct xmit_frame *pxmitframe, u8 action); #endif s32 _rtw_init_hw_txqueue(struct hw_txqueue* phw_txqueue, u8 ac_tag); void _rtw_init_sta_xmit_priv(struct sta_xmit_priv *psta_xmitpriv); -s32 rtw_txframes_pending(_adapter *padapter); -s32 rtw_txframes_sta_ac_pending(_adapter *padapter, struct pkt_attrib *pattrib); +s32 rtw_txframes_pending(struct adapter *padapter); +s32 rtw_txframes_sta_ac_pending(struct adapter *padapter, struct pkt_attrib *pattrib); void rtw_init_hwxmits(struct hw_xmit *phwxmit, sint entry); -s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, _adapter *padapter); +s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter); void _rtw_free_xmit_priv (struct xmit_priv *pxmitpriv); -void rtw_alloc_hwxmits(_adapter *padapter); -void rtw_free_hwxmits(_adapter *padapter); +void rtw_alloc_hwxmits(struct adapter *padapter); +void rtw_free_hwxmits(struct adapter *padapter); -s32 rtw_xmit(_adapter *padapter, _pkt **pkt); +s32 rtw_xmit(struct adapter *padapter, _pkt **pkt); #if defined(CONFIG_AP_MODE) || defined(CONFIG_TDLS) -sint xmitframe_enqueue_for_sleeping_sta(_adapter *padapter, struct xmit_frame *pxmitframe); -void stop_sta_xmit(_adapter *padapter, struct sta_info *psta); -void wakeup_sta_to_xmit(_adapter *padapter, struct sta_info *psta); -void xmit_delivery_enabled_frames(_adapter *padapter, struct sta_info *psta); +sint xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_frame *pxmitframe); +void stop_sta_xmit(struct adapter *padapter, struct sta_info *psta); +void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta); +void xmit_delivery_enabled_frames(struct adapter *padapter, struct sta_info *psta); #endif u8 qos_acm(u8 acm_mask, u8 priority); diff --git a/include/sdio_hal.h b/include/sdio_hal.h index a938133..23bb1c5 100755 --- a/include/sdio_hal.h +++ b/include/sdio_hal.h @@ -21,13 +21,13 @@ #define __SDIO_HAL_H__ -extern u8 sd_hal_bus_init(PADAPTER padapter); -extern u8 sd_hal_bus_deinit(PADAPTER padapter); +extern u8 sd_hal_bus_init(struct adapter *padapter); +extern u8 sd_hal_bus_deinit(struct adapter *padapter); -u8 sd_int_isr(PADAPTER padapter); -void sd_int_dpc(PADAPTER padapter); +u8 sd_int_isr(struct adapter *padapter); +void sd_int_dpc(struct adapter *padapter); -void rtl8188es_set_hal_ops(PADAPTER padapter); +void rtl8188es_set_hal_ops(struct adapter *padapter); #define hal_set_hal_ops rtl8188es_set_hal_ops #endif //__SDIO_HAL_H__ diff --git a/include/sdio_ops.h b/include/sdio_ops.h index d26d539..a08dfd8 100755 --- a/include/sdio_ops.h +++ b/include/sdio_ops.h @@ -30,30 +30,30 @@ extern void sdio_set_intf_ops(struct _io_ops *pops); //extern void sdio_func1cmd52_read(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem); //extern void sdio_func1cmd52_write(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem); -extern u8 SdioLocalCmd52Read1Byte(PADAPTER padapter, u32 addr); -extern void SdioLocalCmd52Write1Byte(PADAPTER padapter, u32 addr, u8 v); -extern s32 _sdio_local_read(PADAPTER padapter, u32 addr, u32 cnt, u8 *pbuf); -extern s32 sdio_local_read(PADAPTER padapter, u32 addr, u32 cnt, u8 *pbuf); -extern s32 _sdio_local_write(PADAPTER padapter, u32 addr, u32 cnt, u8 *pbuf); -extern s32 sdio_local_write(PADAPTER padapter, u32 addr, u32 cnt, u8 *pbuf); +extern u8 SdioLocalCmd52Read1Byte(struct adapter *padapter, u32 addr); +extern void SdioLocalCmd52Write1Byte(struct adapter *padapter, u32 addr, u8 v); +extern s32 _sdio_local_read(struct adapter *padapter, u32 addr, u32 cnt, u8 *pbuf); +extern s32 sdio_local_read(struct adapter *padapter, u32 addr, u32 cnt, u8 *pbuf); +extern s32 _sdio_local_write(struct adapter *padapter, u32 addr, u32 cnt, u8 *pbuf); +extern s32 sdio_local_write(struct adapter *padapter, u32 addr, u32 cnt, u8 *pbuf); -u32 _sdio_read32(PADAPTER padapter, u32 addr); -s32 _sdio_write32(PADAPTER padapter, u32 addr, u32 val); +u32 _sdio_read32(struct adapter *padapter, u32 addr); +s32 _sdio_write32(struct adapter *padapter, u32 addr, u32 val); -extern void InitInterrupt8723ASdio(PADAPTER padapter); -extern void InitSysInterrupt8723ASdio(PADAPTER padapter); -extern void EnableInterrupt8723ASdio(PADAPTER padapter); -extern void DisableInterrupt8723ASdio(PADAPTER padapter); -extern void sd_int_hdl(PADAPTER padapter); -extern u8 HalQueryTxBufferStatus8189ESdio(PADAPTER padapter); -extern void InitInterrupt8188ESdio(PADAPTER padapter); -extern void EnableInterrupt8188ESdio(PADAPTER padapter); -extern void DisableInterrupt8188ESdio(PADAPTER padapter); -extern void UpdateInterruptMask8188ESdio(PADAPTER padapter, u32 AddMSR, u32 RemoveMSR); +extern void InitInterrupt8723ASdio(struct adapter *padapter); +extern void InitSysInterrupt8723ASdio(struct adapter *padapter); +extern void EnableInterrupt8723ASdio(struct adapter *padapter); +extern void DisableInterrupt8723ASdio(struct adapter *padapter); +extern void sd_int_hdl(struct adapter *padapter); +extern u8 HalQueryTxBufferStatus8189ESdio(struct adapter *padapter); +extern void InitInterrupt8188ESdio(struct adapter *padapter); +extern void EnableInterrupt8188ESdio(struct adapter *padapter); +extern void DisableInterrupt8188ESdio(struct adapter *padapter); +extern void UpdateInterruptMask8188ESdio(struct adapter *padapter, u32 AddMSR, u32 RemoveMSR); #ifdef CONFIG_WOWLAN -extern u8 RecvOnePkt(PADAPTER padapter, u32 size); -extern void ClearInterrupt8189ESdio(PADAPTER padapter); +extern u8 RecvOnePkt(struct adapter *padapter, u32 size); +extern void ClearInterrupt8189ESdio(struct adapter *padapter); #endif //CONFIG_WOWLAN #endif diff --git a/include/sdio_ops_ce.h b/include/sdio_ops_ce.h deleted file mode 100755 index d2da293..0000000 --- a/include/sdio_ops_ce.h +++ /dev/null @@ -1,55 +0,0 @@ -/****************************************************************************** - * - * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA - * - * - ******************************************************************************/ -#ifndef _SDIO_OPS_WINCE_H_ -#define _SDIO_OPS_WINCE_H_ - -#include -#include -#include -#include - - -#ifdef PLATFORM_OS_CE - - -extern u8 sdbus_cmd52r_ce(struct intf_priv *pintfpriv, u32 addr); - - -extern void sdbus_cmd52w_ce(struct intf_priv *pintfpriv, u32 addr,u8 val8); - - -uint sdbus_read_blocks_to_membuf_ce(struct intf_priv *pintfpriv, u32 addr, u32 cnt, u8 *pbuf); - -extern uint sdbus_read_bytes_to_membuf_ce(struct intf_priv *pintfpriv, u32 addr, u32 cnt, u8 *pbuf); - - -extern uint sdbus_write_blocks_from_membuf_ce(struct intf_priv *pintfpriv, u32 addr, u32 cnt, u8 *pbuf,u8 async); - -extern uint sdbus_write_bytes_from_membuf_ce(struct intf_priv *pintfpriv, u32 addr, u32 cnt, u8 *pbuf); -extern u8 sdbus_func1cmd52r_ce(struct intf_priv *pintfpriv, u32 addr); -extern void sdbus_func1cmd52w_ce(struct intf_priv *pintfpriv, u32 addr, u8 val8); -extern uint sdbus_read_reg(struct intf_priv *pintfpriv, u32 addr, u32 cnt,void *pdata); -extern uint sdbus_write_reg(struct intf_priv *pintfpriv, u32 addr, u32 cnt,void *pdata); -extern void sdio_read_int(_adapter *padapter, u32 addr,u8 sz,void *pdata); - -#endif - -#endif - diff --git a/include/sdio_ops_xp.h b/include/sdio_ops_xp.h deleted file mode 100755 index 757b35d..0000000 --- a/include/sdio_ops_xp.h +++ /dev/null @@ -1,55 +0,0 @@ -/****************************************************************************** - * - * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA - * - * - ******************************************************************************/ -#ifndef _SDIO_OPS_XP_H_ -#define _SDIO_OPS_XP_H_ - -#include -#include -#include -#include - - -#ifdef PLATFORM_OS_XP - - -extern u8 sdbus_cmd52r_xp(struct intf_priv *pintfpriv, u32 addr); - - -extern void sdbus_cmd52w_xp(struct intf_priv *pintfpriv, u32 addr,u8 val8); - - -uint sdbus_read_blocks_to_membuf_xp(struct intf_priv *pintfpriv, u32 addr, u32 cnt, u8 *pbuf); - -extern uint sdbus_read_bytes_to_membuf_xp(struct intf_priv *pintfpriv, u32 addr, u32 cnt, u8 *pbuf); - - -extern uint sdbus_write_blocks_from_membuf_xp(struct intf_priv *pintfpriv, u32 addr, u32 cnt, u8 *pbuf,u8 async); - -extern uint sdbus_write_bytes_from_membuf_xp(struct intf_priv *pintfpriv, u32 addr, u32 cnt, u8 *pbuf); -extern u8 sdbus_func1cmd52r_xp(struct intf_priv *pintfpriv, u32 addr); -extern void sdbus_func1cmd52w_xp(struct intf_priv *pintfpriv, u32 addr, u8 val8); -extern uint sdbus_read_reg(struct intf_priv *pintfpriv, u32 addr, u32 cnt,void *pdata); -extern uint sdbus_write_reg(struct intf_priv *pintfpriv, u32 addr, u32 cnt,void *pdata); -extern void sdio_read_int(_adapter *padapter, u32 addr,u8 sz,void *pdata); - -#endif - -#endif - diff --git a/include/sdio_osintf.h b/include/sdio_osintf.h index 51ec5b7..626f31b 100755 --- a/include/sdio_osintf.h +++ b/include/sdio_osintf.h @@ -26,14 +26,14 @@ #include -u8 sd_hal_bus_init(PADAPTER padapter); -u8 sd_hal_bus_deinit(PADAPTER padapter); -void sd_c2h_hdl(PADAPTER padapter); +u8 sd_hal_bus_init(struct adapter *padapter); +u8 sd_hal_bus_deinit(struct adapter *padapter); +void sd_c2h_hdl(struct adapter *padapter); #ifdef PLATFORM_OS_CE -extern NDIS_STATUS ce_sd_get_dev_hdl(PADAPTER padapter); -SD_API_STATUS ce_sd_int_callback(SD_DEVICE_HANDLE hDevice, PADAPTER padapter); -extern void sd_setup_irs(PADAPTER padapter); +extern NDIS_STATUS ce_sd_get_dev_hdl(struct adapter *padapter); +SD_API_STATUS ce_sd_int_callback(SD_DEVICE_HANDLE hDevice, struct adapter *padapter); +extern void sd_setup_irs(struct adapter *padapter); #endif #endif diff --git a/include/sta_info.h b/include/sta_info.h index 3b8ed78..197232b 100755 --- a/include/sta_info.h +++ b/include/sta_info.h @@ -100,7 +100,7 @@ struct sta_info { //_list asoc_list; //20061114 //_list sleep_list;//sleep_q //_list wakeup_list;//wakeup_q - _adapter *padapter; + struct adapter *padapter; struct sta_xmit_priv sta_xmitpriv; struct sta_recv_priv sta_recvpriv; @@ -406,7 +406,7 @@ struct sta_priv { _queue sleep_q; _queue wakeup_q; - _adapter *padapter; + struct adapter *padapter; #ifdef CONFIG_AP_MODE @@ -468,12 +468,12 @@ int rtw_stainfo_offset(struct sta_priv *stapriv, struct sta_info *sta); struct sta_info *rtw_get_stainfo_by_offset(struct sta_priv *stapriv, int offset); extern struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr); -extern u32 rtw_free_stainfo(_adapter *padapter , struct sta_info *psta); -extern void rtw_free_all_stainfo(_adapter *padapter); +extern u32 rtw_free_stainfo(struct adapter *padapter , struct sta_info *psta); +extern void rtw_free_all_stainfo(struct adapter *padapter); extern struct sta_info *rtw_get_stainfo(struct sta_priv *pstapriv, u8 *hwaddr); -extern u32 rtw_init_bcmc_stainfo(_adapter* padapter); -extern struct sta_info* rtw_get_bcmc_stainfo(_adapter* padapter); -extern u8 rtw_access_ctrl(_adapter *padapter, u8 *mac_addr); +extern u32 rtw_init_bcmc_stainfo(struct adapter* padapter); +extern struct sta_info* rtw_get_bcmc_stainfo(struct adapter* padapter); +extern u8 rtw_access_ctrl(struct adapter *padapter, u8 *mac_addr); #endif //_STA_INFO_H_ diff --git a/include/usb_hal.h b/include/usb_hal.h index e00edd5..0ce9b85 100755 --- a/include/usb_hal.h +++ b/include/usb_hal.h @@ -20,11 +20,11 @@ #ifndef __USB_HAL_H__ #define __USB_HAL_H__ -void rtl8188eu_set_hal_ops(_adapter * padapter); +void rtl8188eu_set_hal_ops(struct adapter * padapter); #define hal_set_hal_ops rtl8188eu_set_hal_ops #ifdef CONFIG_INTEL_PROXIM -extern _adapter *rtw_usb_get_sw_pointer(void); +extern struct adapter *rtw_usb_get_sw_pointer(void); #endif //CONFIG_INTEL_PROXIM #endif //__USB_HAL_H__ diff --git a/include/usb_ops.h b/include/usb_ops.h index f6d7ef8..da82682 100755 --- a/include/usb_ops.h +++ b/include/usb_ops.h @@ -53,7 +53,7 @@ enum{ #endif #include -void rtl8188eu_set_hw_type(_adapter *padapter); +void rtl8188eu_set_hw_type(struct adapter *padapter); #define hal_set_hw_type rtl8188eu_set_hw_type void rtl8188eu_set_intf_ops(struct _io_ops *pops); #define usb_set_intf_ops rtl8188eu_set_intf_ops @@ -61,7 +61,7 @@ void rtl8188eu_set_intf_ops(struct _io_ops *pops); #define USB_HIGH_SPEED_BULK_SIZE 512 #define USB_FULL_SPEED_BULK_SIZE 64 -static inline u8 rtw_usb_bulk_size_boundary(_adapter * padapter,int buf_len) +static inline u8 rtw_usb_bulk_size_boundary(struct adapter * padapter,int buf_len) { u8 rst = _TRUE; struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter); diff --git a/include/usb_osintf.h b/include/usb_osintf.h index 753013d..5a28b8d 100755 --- a/include/usb_osintf.h +++ b/include/usb_osintf.h @@ -28,8 +28,8 @@ #define USBD_HALTED(Status) ((ULONG)(Status) >> 30 == 3) -//uint usb_dvobj_init(_adapter * adapter); -//void usb_dvobj_deinit(_adapter * adapter); +//uint usb_dvobj_init(struct adapter * adapter); +//void usb_dvobj_deinit(struct adapter * adapter); u8 usbvendorrequest(struct dvobj_priv *pdvobjpriv, RT_USB_BREQUEST brequest, RT_USB_WVALUE wvalue, u8 windex, void* data, u8 datalen, u8 isdirectionin); diff --git a/include/xmit_osdep.h b/include/xmit_osdep.h index 080b8bd..07a0172 100755 --- a/include/xmit_osdep.h +++ b/include/xmit_osdep.h @@ -44,10 +44,10 @@ struct xmit_buf; extern int _rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev); extern int rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev); -void rtw_os_xmit_schedule(_adapter *padapter); +void rtw_os_xmit_schedule(struct adapter *padapter); -int rtw_os_xmit_resource_alloc(_adapter *padapter, struct xmit_buf *pxmitbuf,u32 alloc_sz); -void rtw_os_xmit_resource_free(_adapter *padapter, struct xmit_buf *pxmitbuf,u32 free_sz); +int rtw_os_xmit_resource_alloc(struct adapter *padapter, struct xmit_buf *pxmitbuf,u32 alloc_sz); +void rtw_os_xmit_resource_free(struct adapter *padapter, struct xmit_buf *pxmitbuf,u32 free_sz); extern void rtw_set_tx_chksum_offload(_pkt *pkt, struct pkt_attrib *pattrib); @@ -56,8 +56,8 @@ extern void _rtw_open_pktfile(_pkt *pkt, struct pkt_file *pfile); extern uint _rtw_pktfile_read (struct pkt_file *pfile, u8 *rmem, uint rlen); extern sint rtw_endofpktfile (struct pkt_file *pfile); -extern void rtw_os_pkt_complete(_adapter *padapter, _pkt *pkt); -extern void rtw_os_xmit_complete(_adapter *padapter, struct xmit_frame *pxframe); +extern void rtw_os_pkt_complete(struct adapter *padapter, _pkt *pkt); +extern void rtw_os_xmit_complete(struct adapter *padapter, struct xmit_frame *pxframe); #endif //__XMIT_OSDEP_H_ diff --git a/os_dep/ioctl_cfg80211.c b/os_dep/ioctl_cfg80211.c index 5ddbbfe..a6998bb 100755 --- a/os_dep/ioctl_cfg80211.c +++ b/os_dep/ioctl_cfg80211.c @@ -341,7 +341,7 @@ static int rtw_ieee80211_channel_to_frequency(int chan, int band) } #define MAX_BSSINFO_LEN 1000 -struct cfg80211_bss *rtw_cfg80211_inform_bss(_adapter *padapter, struct wlan_network *pnetwork) +struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wlan_network *pnetwork) { struct ieee80211_channel *notify_channel; struct cfg80211_bss *bss = NULL; @@ -581,7 +581,7 @@ exit: return _TRUE if bss is valid, _FALSE for not found. */ -int rtw_cfg80211_check_bss(_adapter *padapter) +int rtw_cfg80211_check_bss(struct adapter *padapter) { WLAN_BSSID_EX *pnetwork = &(padapter->mlmeextpriv.mlmext_info.network); struct cfg80211_bss *bss = NULL; @@ -605,7 +605,7 @@ int rtw_cfg80211_check_bss(_adapter *padapter) return (bss!=NULL); } -void rtw_cfg80211_ibss_indicate_connect(_adapter *padapter) +void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter) { struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct wlan_network *cur_network = &(pmlmepriv->cur_network); @@ -665,7 +665,7 @@ void rtw_cfg80211_ibss_indicate_connect(_adapter *padapter) cfg80211_ibss_joined(padapter->pnetdev, cur_network->network.MacAddress, GFP_ATOMIC); } -void rtw_cfg80211_indicate_connect(_adapter *padapter) +void rtw_cfg80211_indicate_connect(struct adapter *padapter) { struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct wlan_network *cur_network = &(pmlmepriv->cur_network); @@ -774,7 +774,7 @@ check_bss: } } -void rtw_cfg80211_indicate_disconnect(_adapter *padapter) +void rtw_cfg80211_indicate_disconnect(struct adapter *padapter) { struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct wireless_dev *pwdev = padapter->rtw_wdev; @@ -825,7 +825,7 @@ void rtw_cfg80211_indicate_disconnect(_adapter *padapter) #ifdef CONFIG_AP_MODE -static u8 set_pairwise_key(_adapter *padapter, struct sta_info *psta) +static u8 set_pairwise_key(struct adapter *padapter, struct sta_info *psta) { struct cmd_obj* ph2c; struct set_stakey_parm *psetstakey_para; @@ -863,7 +863,7 @@ exit: } -static int set_group_key(_adapter *padapter, u8 *key, u8 alg, int keyid) +static int set_group_key(struct adapter *padapter, u8 *key, u8 alg, int keyid) { u8 keylen; struct cmd_obj* pcmd; @@ -931,7 +931,7 @@ exit: } -static int set_wep_key(_adapter *padapter, u8 *key, u8 keylen, int keyid) +static int set_wep_key(struct adapter *padapter, u8 *key, u8 keylen, int keyid) { u8 alg; @@ -956,7 +956,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa int ret = 0; u32 wep_key_idx, wep_key_len,wep_total_len; struct sta_info *psta = NULL, *pbcmc_sta = NULL; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct security_priv* psecuritypriv=&(padapter->securitypriv); struct sta_priv *pstapriv = &padapter->stapriv; @@ -1244,7 +1244,7 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param { int ret = 0; u32 wep_key_idx, wep_key_len,wep_total_len; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct security_priv *psecuritypriv = &padapter->securitypriv; #ifdef CONFIG_P2P @@ -1541,7 +1541,7 @@ static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev, struct ieee_param *param = NULL; int ret=0; struct wireless_dev *rtw_wdev = wiphy_to_wdev(wiphy); - _adapter *padapter = wiphy_to_adapter(wiphy); + struct adapter *padapter = wiphy_to_adapter(wiphy); struct mlme_priv *pmlmepriv = &padapter->mlmepriv; DBG_871X(FUNC_NDEV_FMT" adding key for %pM\n", FUNC_NDEV_ARG(ndev), mac_addr); @@ -1699,7 +1699,7 @@ static int cfg80211_rtw_del_key(struct wiphy *wiphy, struct net_device *ndev, u8 key_index, const u8 *mac_addr) #endif // (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) { - _adapter *padapter = (_adapter *)rtw_netdev_priv(ndev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(ndev); struct security_priv *psecuritypriv = &padapter->securitypriv; DBG_871X(FUNC_NDEV_FMT" key_index=%d\n", FUNC_NDEV_ARG(ndev), key_index); @@ -1720,7 +1720,7 @@ static int cfg80211_rtw_set_default_key(struct wiphy *wiphy, #endif ) { - _adapter *padapter = (_adapter *)rtw_netdev_priv(ndev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(ndev); struct security_priv *psecuritypriv = &padapter->securitypriv; DBG_871X(FUNC_NDEV_FMT" key_index=%d" @@ -1759,7 +1759,7 @@ static int cfg80211_rtw_get_station(struct wiphy *wiphy, u8 *mac, struct station_info *sinfo) { int ret = 0; - _adapter *padapter = wiphy_to_adapter(wiphy); + struct adapter *padapter = wiphy_to_adapter(wiphy); struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct sta_info *psta = NULL; struct sta_priv *pstapriv = &padapter->stapriv; @@ -1853,7 +1853,7 @@ static int cfg80211_rtw_change_iface(struct wiphy *wiphy, { enum nl80211_iftype old_type; NDIS_802_11_NETWORK_INFRASTRUCTURE networkType ; - _adapter *padapter = wiphy_to_adapter(wiphy); + struct adapter *padapter = wiphy_to_adapter(wiphy); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct wireless_dev *rtw_wdev = wiphy_to_wdev(wiphy); #ifdef CONFIG_P2P @@ -1999,7 +1999,7 @@ void rtw_cfg80211_indicate_scan_done(struct rtw_wdev_priv *pwdev_priv, bool abor _exit_critical_bh(&pwdev_priv->scan_req_lock, &irqL); } -void rtw_cfg80211_surveydone_event_callback(_adapter *padapter) +void rtw_cfg80211_surveydone_event_callback(struct adapter *padapter) { _irqL irqL; _list *plist, *phead; @@ -2049,7 +2049,7 @@ void rtw_cfg80211_surveydone_event_callback(_adapter *padapter) rtw_cfg80211_indicate_scan_done(wdev_to_priv(padapter->rtw_wdev), _FALSE); } -static int rtw_cfg80211_set_probe_req_wpsp2pie(_adapter *padapter, char *buf, int len) +static int rtw_cfg80211_set_probe_req_wpsp2pie(struct adapter *padapter, char *buf, int len) { int ret = 0; uint wps_ielen = 0; @@ -2177,7 +2177,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy int i; u8 _status = _FALSE; int ret = 0; - _adapter *padapter = wiphy_to_adapter(wiphy); + struct adapter *padapter = wiphy_to_adapter(wiphy); struct mlme_priv *pmlmepriv= &padapter->mlmepriv; NDIS_802_11_SSID ssid[RTW_SSID_SCAN_AMOUNT]; struct rtw_ieee80211_channel ch[RTW_CHANNEL_SCAN_AMOUNT]; @@ -2595,7 +2595,7 @@ static int rtw_cfg80211_set_key_mgt(struct security_priv *psecuritypriv, u32 key return 0; } -static int rtw_cfg80211_set_wpa_ie(_adapter *padapter, u8 *pie, size_t ielen) +static int rtw_cfg80211_set_wpa_ie(struct adapter *padapter, u8 *pie, size_t ielen) { u8 *buf=NULL, *pos=NULL; u32 left; @@ -2822,7 +2822,7 @@ exit: static int cfg80211_rtw_join_ibss(struct wiphy *wiphy, struct net_device *ndev, struct cfg80211_ibss_params *params) { - _adapter *padapter = wiphy_to_adapter(wiphy); + struct adapter *padapter = wiphy_to_adapter(wiphy); NDIS_802_11_SSID ndis_ssid; struct security_priv *psecuritypriv = &padapter->securitypriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; @@ -2912,7 +2912,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, //u8 matched_by_bssid=_FALSE; //u8 matched_by_ssid=_FALSE; u8 matched=_FALSE; - _adapter *padapter = wiphy_to_adapter(wiphy); + struct adapter *padapter = wiphy_to_adapter(wiphy); struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct security_priv *psecuritypriv = &padapter->securitypriv; _queue *queue = &pmlmepriv->scanned_queue; @@ -3151,7 +3151,7 @@ exit: static int cfg80211_rtw_disconnect(struct wiphy *wiphy, struct net_device *ndev, u16 reason_code) { - _adapter *padapter = wiphy_to_adapter(wiphy); + struct adapter *padapter = wiphy_to_adapter(wiphy); DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); @@ -3223,7 +3223,7 @@ static int cfg80211_rtw_get_txpower(struct wiphy *wiphy, #endif int *dbm) { - //_adapter *padapter = wiphy_to_adapter(wiphy); + //struct adapter *padapter = wiphy_to_adapter(wiphy); DBG_8192C("%s\n", __func__); @@ -3232,7 +3232,7 @@ static int cfg80211_rtw_get_txpower(struct wiphy *wiphy, return 0; } -inline bool rtw_cfg80211_pwr_mgmt(_adapter *adapter) +inline bool rtw_cfg80211_pwr_mgmt(struct adapter *adapter) { struct rtw_wdev_priv *rtw_wdev_priv = wdev_to_priv(adapter->rtw_wdev); return rtw_wdev_priv->power_mgmt; @@ -3242,7 +3242,7 @@ static int cfg80211_rtw_set_power_mgmt(struct wiphy *wiphy, struct net_device *ndev, bool enabled, int timeout) { - _adapter *padapter = wiphy_to_adapter(wiphy); + struct adapter *padapter = wiphy_to_adapter(wiphy); struct rtw_wdev_priv *rtw_wdev_priv = wdev_to_priv(padapter->rtw_wdev); DBG_871X(FUNC_NDEV_FMT" enabled:%u, timeout:%d\n", FUNC_NDEV_ARG(ndev), @@ -3263,7 +3263,7 @@ static int cfg80211_rtw_set_pmksa(struct wiphy *wiphy, struct cfg80211_pmksa *pmksa) { u8 index,blInserted = _FALSE; - _adapter *padapter = wiphy_to_adapter(wiphy); + struct adapter *padapter = wiphy_to_adapter(wiphy); struct security_priv *psecuritypriv = &padapter->securitypriv; u8 strZeroMacAddress[ ETH_ALEN ] = { 0x00 }; @@ -3316,7 +3316,7 @@ static int cfg80211_rtw_del_pmksa(struct wiphy *wiphy, struct cfg80211_pmksa *pmksa) { u8 index, bMatched = _FALSE; - _adapter *padapter = wiphy_to_adapter(wiphy); + struct adapter *padapter = wiphy_to_adapter(wiphy); struct security_priv *psecuritypriv = &padapter->securitypriv; DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(netdev)); @@ -3346,7 +3346,7 @@ static int cfg80211_rtw_del_pmksa(struct wiphy *wiphy, static int cfg80211_rtw_flush_pmksa(struct wiphy *wiphy, struct net_device *netdev) { - _adapter *padapter = wiphy_to_adapter(wiphy); + struct adapter *padapter = wiphy_to_adapter(wiphy); struct security_priv *psecuritypriv = &padapter->securitypriv; DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(netdev)); @@ -3358,7 +3358,7 @@ static int cfg80211_rtw_flush_pmksa(struct wiphy *wiphy, } #ifdef CONFIG_AP_MODE -void rtw_cfg80211_indicate_sta_assoc(_adapter *padapter, u8 *pmgmt_frame, uint frame_len) +void rtw_cfg80211_indicate_sta_assoc(struct adapter *padapter, u8 *pmgmt_frame, uint frame_len) { s32 freq; int channel; @@ -3411,7 +3411,7 @@ void rtw_cfg80211_indicate_sta_assoc(_adapter *padapter, u8 *pmgmt_frame, uint f } -void rtw_cfg80211_indicate_sta_disassoc(_adapter *padapter, unsigned char *da, unsigned short reason) +void rtw_cfg80211_indicate_sta_disassoc(struct adapter *padapter, unsigned char *da, unsigned short reason) { s32 freq; int channel; @@ -3499,7 +3499,7 @@ static int rtw_cfg80211_monitor_if_xmit_entry(struct sk_buff *skb, struct net_de unsigned char dst_mac_addr[6]; struct ieee80211_hdr *dot11_hdr; struct ieee80211_radiotap_header *rtap_hdr; - _adapter *padapter = (_adapter *)rtw_netdev_priv(ndev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(ndev); DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); @@ -3676,7 +3676,7 @@ static const struct net_device_ops rtw_cfg80211_monitor_if_ops = { }; #endif -static int rtw_cfg80211_add_monitor_if(_adapter *padapter, char *name, struct net_device **ndev) +static int rtw_cfg80211_add_monitor_if(struct adapter *padapter, char *name, struct net_device **ndev) { int ret = 0; struct net_device* mon_ndev = NULL; @@ -3720,7 +3720,7 @@ static int rtw_cfg80211_add_monitor_if(_adapter *padapter, char *name, struct ne pnpi = netdev_priv(mon_ndev); pnpi->priv = padapter; - pnpi->sizeof_priv = sizeof(_adapter); + pnpi->sizeof_priv = sizeof(struct adapter); /* wdev */ mon_wdev = (struct wireless_dev *)rtw_zmalloc(sizeof(struct wireless_dev)); @@ -3775,7 +3775,7 @@ static int { int ret = 0; struct net_device* ndev = NULL; - _adapter *padapter = wiphy_to_adapter(wiphy); + struct adapter *padapter = wiphy_to_adapter(wiphy); DBG_871X(FUNC_ADPT_FMT " wiphy:%s, name:%s, type:%d\n", FUNC_ADPT_ARG(padapter), wiphy_name(wiphy), name, type); @@ -3850,7 +3850,7 @@ exit: return 0; } -static int rtw_add_beacon(_adapter *adapter, const u8 *head, size_t head_len, const u8 *tail, size_t tail_len) +static int rtw_add_beacon(struct adapter *adapter, const u8 *head, size_t head_len, const u8 *tail, size_t tail_len) { int ret=0; u8 *pbuf = NULL; @@ -3956,7 +3956,7 @@ static int cfg80211_rtw_add_beacon(struct wiphy *wiphy, struct net_device *ndev, struct beacon_parameters *info) { int ret=0; - _adapter *adapter = wiphy_to_adapter(wiphy); + struct adapter *adapter = wiphy_to_adapter(wiphy); DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); ret = rtw_add_beacon(adapter, info->head, info->head_len, info->tail, info->tail_len); @@ -3967,7 +3967,7 @@ static int cfg80211_rtw_add_beacon(struct wiphy *wiphy, struct net_device *ndev, static int cfg80211_rtw_set_beacon(struct wiphy *wiphy, struct net_device *ndev, struct beacon_parameters *info) { - _adapter *padapter = wiphy_to_adapter(wiphy); + struct adapter *padapter = wiphy_to_adapter(wiphy); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); @@ -3990,7 +3990,7 @@ static int cfg80211_rtw_start_ap(struct wiphy *wiphy, struct net_device *ndev, struct cfg80211_ap_settings *settings) { int ret = 0; - _adapter *adapter = wiphy_to_adapter(wiphy); + struct adapter *adapter = wiphy_to_adapter(wiphy); DBG_871X(FUNC_NDEV_FMT" hidden_ssid:%d, auth_type:%d\n", FUNC_NDEV_ARG(ndev), settings->hidden_ssid, settings->auth_type); @@ -4027,7 +4027,7 @@ static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *nd struct cfg80211_beacon_data *info) { int ret = 0; - _adapter *adapter = wiphy_to_adapter(wiphy); + struct adapter *adapter = wiphy_to_adapter(wiphy); DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); @@ -4060,7 +4060,7 @@ static int cfg80211_rtw_del_station(struct wiphy *wiphy, struct net_device *ndev _list *phead, *plist; u8 updated; struct sta_info *psta = NULL; - _adapter *padapter = (_adapter *)rtw_netdev_priv(ndev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(ndev); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct sta_priv *pstapriv = &padapter->stapriv; @@ -4214,7 +4214,7 @@ static int cfg80211_rtw_assoc(struct wiphy *wiphy, struct net_device *ndev, } #endif //CONFIG_AP_MODE -void rtw_cfg80211_rx_action_p2p(_adapter *padapter, u8 *pmgmt_frame, uint frame_len) +void rtw_cfg80211_rx_action_p2p(struct adapter *padapter, u8 *pmgmt_frame, uint frame_len) { int type; s32 freq; @@ -4246,7 +4246,7 @@ indicate: #endif } -void rtw_cfg80211_rx_p2p_action_public(_adapter *padapter, u8 *pmgmt_frame, uint frame_len) +void rtw_cfg80211_rx_p2p_action_public(struct adapter *padapter, u8 *pmgmt_frame, uint frame_len) { int type; s32 freq; @@ -4286,7 +4286,7 @@ indicate: #endif } -void rtw_cfg80211_rx_action(_adapter *adapter, u8 *frame, uint frame_len, const char*msg) +void rtw_cfg80211_rx_action(struct adapter *adapter, u8 *frame, uint frame_len, const char*msg) { s32 freq; int channel; @@ -4318,7 +4318,7 @@ void rtw_cfg80211_rx_action(_adapter *adapter, u8 *frame, uint frame_len, const } #ifdef CONFIG_P2P -void rtw_cfg80211_issue_p2p_provision_request(_adapter *padapter, const u8 *buf, size_t len) +void rtw_cfg80211_issue_p2p_provision_request(struct adapter *padapter, const u8 *buf, size_t len) { u16 wps_devicepassword_id = 0x0000; uint wps_devicepassword_id_len = 0; @@ -4556,7 +4556,7 @@ static s32 cfg80211_rtw_remain_on_channel(struct wiphy *wiphy, unsigned int duration, u64 *cookie) { s32 err = 0; - _adapter *padapter = wiphy_to_adapter(wiphy); + struct adapter *padapter = wiphy_to_adapter(wiphy); struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(padapter->rtw_wdev); struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct wifidirect_info *pwdinfo = &padapter->wdinfo; @@ -4713,7 +4713,7 @@ static s32 cfg80211_rtw_cancel_remain_on_channel(struct wiphy *wiphy, u64 cookie) { s32 err = 0; - _adapter *padapter = wiphy_to_adapter(wiphy); + struct adapter *padapter = wiphy_to_adapter(wiphy); struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(padapter->rtw_wdev); struct wifidirect_info *pwdinfo = &padapter->wdinfo; struct cfg80211_wifidirect_info *pcfg80211_wdinfo = &padapter->cfg80211_wdinfo; @@ -4754,7 +4754,7 @@ static s32 cfg80211_rtw_cancel_remain_on_channel(struct wiphy *wiphy, #endif //CONFIG_P2P -static int _cfg80211_rtw_mgmt_tx(_adapter *padapter, u8 tx_ch, const u8 *buf, size_t len) +static int _cfg80211_rtw_mgmt_tx(struct adapter *padapter, u8 tx_ch, const u8 *buf, size_t len) { struct xmit_frame *pmgntframe; struct pkt_attrib *pattrib; @@ -4941,7 +4941,7 @@ static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy, #endif u64 *cookie) { - _adapter *padapter = (_adapter *)wiphy_to_adapter(wiphy); + struct adapter *padapter = (struct adapter *)wiphy_to_adapter(wiphy); struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(padapter->rtw_wdev); int ret = 0; int tx_ret; diff --git a/os_dep/ioctl_linux.c b/os_dep/ioctl_linux.c index 7605c6d..3114671 100755 --- a/os_dep/ioctl_linux.c +++ b/os_dep/ioctl_linux.c @@ -135,7 +135,7 @@ static int hwaddr_aton_i(const char *txt, u8 *addr) return 0; } -static void indicate_wx_custom_event(_adapter *padapter, char *msg) +static void indicate_wx_custom_event(struct adapter *padapter, char *msg) { u8 *buff, *p; union iwreq_data wrqu; @@ -164,7 +164,7 @@ static void indicate_wx_custom_event(_adapter *padapter, char *msg) } -static void request_wps_pbc_event(_adapter *padapter) +static void request_wps_pbc_event(struct adapter *padapter) { u8 *buff, *p; union iwreq_data wrqu; @@ -200,7 +200,7 @@ static void request_wps_pbc_event(_adapter *padapter) } -void indicate_wx_scan_complete_event(_adapter *padapter) +void indicate_wx_scan_complete_event(struct adapter *padapter) { union iwreq_data wrqu; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; @@ -214,7 +214,7 @@ void indicate_wx_scan_complete_event(_adapter *padapter) } -void rtw_indicate_wx_assoc_event(_adapter *padapter) +void rtw_indicate_wx_assoc_event(struct adapter *padapter) { union iwreq_data wrqu; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; @@ -237,7 +237,7 @@ void rtw_indicate_wx_assoc_event(_adapter *padapter) #endif } -void rtw_indicate_wx_disassoc_event(_adapter *padapter) +void rtw_indicate_wx_disassoc_event(struct adapter *padapter) { union iwreq_data wrqu; @@ -284,7 +284,7 @@ uint rtw_is_cckratesonly_included(u8 *rate) } */ -static char *translate_scan(_adapter *padapter, +static char *translate_scan(struct adapter *padapter, struct iw_request_info* info, struct wlan_network *pnetwork, char *start, char *stop) { @@ -719,7 +719,7 @@ static char *translate_scan(_adapter *padapter, static int wpa_set_auth_algs(struct net_device *dev, u32 value) { - _adapter *padapter = (_adapter *) rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *) rtw_netdev_priv(dev); int ret = 0; if ((value & AUTH_ALG_SHARED_KEY)&&(value & AUTH_ALG_OPEN_SYSTEM)) @@ -777,7 +777,7 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param, int ret = 0; u32 wep_key_idx, wep_key_len,wep_total_len; NDIS_802_11_WEP *pwep = NULL; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct security_priv *psecuritypriv = &padapter->securitypriv; #ifdef CONFIG_P2P @@ -1090,7 +1090,7 @@ _func_exit_; return ret; } -static int rtw_set_wpa_ie(_adapter *padapter, char *pie, unsigned short ielen) +static int rtw_set_wpa_ie(struct adapter *padapter, char *pie, unsigned short ielen) { u8 *buf=NULL, *pos=NULL; u32 left; @@ -1278,7 +1278,7 @@ static int rtw_wx_get_name(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); u16 cap; u32 ht_ielen = 0; char *p; @@ -1363,7 +1363,7 @@ static int rtw_wx_get_freq(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); WLAN_BSSID_EX *pcur_bss = &pmlmepriv->cur_network.network; @@ -1387,7 +1387,7 @@ static int rtw_wx_get_freq(struct net_device *dev, static int rtw_wx_set_mode(struct net_device *dev, struct iw_request_info *a, union iwreq_data *wrqu, char *b) { - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); NDIS_802_11_NETWORK_INFRASTRUCTURE networkType ; int ret = 0; @@ -1460,7 +1460,7 @@ exit: static int rtw_wx_get_mode(struct net_device *dev, struct iw_request_info *a, union iwreq_data *wrqu, char *b) { - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,(" rtw_wx_get_mode \n")); @@ -1497,7 +1497,7 @@ static int rtw_wx_set_pmkid(struct net_device *dev, struct iw_request_info *a, union iwreq_data *wrqu, char *extra) { - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); u8 j,blInserted = _FALSE; int intReturn = _FALSE; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; @@ -1595,7 +1595,7 @@ static int rtw_wx_get_sens(struct net_device *dev, union iwreq_data *wrqu, char *extra) { #ifdef CONFIG_PLATFORM_ROCKCHIPS - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); /* @@ -1622,7 +1622,7 @@ static int rtw_wx_get_range(struct net_device *dev, union iwreq_data *wrqu, char *extra) { struct iw_range *range = (struct iw_range *)extra; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; u16 val; @@ -1756,7 +1756,7 @@ static int rtw_wx_set_wap(struct net_device *dev, { _irqL irqL; uint ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct sockaddr *temp = (struct sockaddr *)awrq; struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); _list *phead; @@ -1884,7 +1884,7 @@ static int rtw_wx_get_wap(struct net_device *dev, union iwreq_data *wrqu, char *extra) { - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); WLAN_BSSID_EX *pcur_bss = &pmlmepriv->cur_network.network; @@ -1930,7 +1930,7 @@ struct iw_mlme int ret=0; __le16 reason; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct iw_mlme *mlme = (struct iw_mlme *) extra; @@ -1964,7 +1964,7 @@ static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a, { u8 _status = _FALSE; int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv= &padapter->mlmepriv; NDIS_802_11_SSID ssid[RTW_SSID_SCAN_AMOUNT]; _irqL irqL; @@ -2217,7 +2217,7 @@ static int rtw_wx_get_scan(struct net_device *dev, struct iw_request_info *a, { _irqL irqL; _list *plist, *phead; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); _queue *queue = &(pmlmepriv->scanned_queue); struct wlan_network *pnetwork = NULL; @@ -2227,10 +2227,6 @@ static int rtw_wx_get_scan(struct net_device *dev, struct iw_request_info *a, u32 cnt=0; u32 wait_for_surveydone; sint wait_status; -#ifdef CONFIG_CONCURRENT_MODE - //PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; - //struct mlme_priv *pbuddy_mlmepriv = &(pbuddy_adapter->mlmepriv); -#endif #ifdef CONFIG_P2P struct wifidirect_info* pwdinfo = &padapter->wdinfo; #endif //CONFIG_P2P @@ -2385,7 +2381,7 @@ static int rtw_wx_set_essid(struct net_device *dev, union iwreq_data *wrqu, char *extra) { _irqL irqL; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &padapter->mlmepriv; _queue *queue = &pmlmepriv->scanned_queue; _list *phead; @@ -2576,7 +2572,7 @@ static int rtw_wx_get_essid(struct net_device *dev, union iwreq_data *wrqu, char *extra) { u32 len,ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); WLAN_BSSID_EX *pcur_bss = &pmlmepriv->cur_network.network; @@ -2614,7 +2610,7 @@ static int rtw_wx_set_rate(struct net_device *dev, union iwreq_data *wrqu, char *extra) { int i, ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); u8 datarates[NumRates]; u32 target_rate = wrqu->bitrate.value; u32 fixed = wrqu->bitrate.fixed; @@ -2707,7 +2703,7 @@ static int rtw_wx_get_rate(struct net_device *dev, { u16 max_rate = 0; - max_rate = rtw_get_cur_max_rate((_adapter *)rtw_netdev_priv(dev)); + max_rate = rtw_get_cur_max_rate((struct adapter *)rtw_netdev_priv(dev)); if(max_rate == 0) return -EPERM; @@ -2722,7 +2718,7 @@ static int rtw_wx_set_rts(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); _func_enter_; @@ -2748,7 +2744,7 @@ static int rtw_wx_get_rts(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); _func_enter_; @@ -2767,7 +2763,7 @@ static int rtw_wx_set_frag(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); _func_enter_; @@ -2793,7 +2789,7 @@ static int rtw_wx_get_frag(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); _func_enter_; @@ -2812,7 +2808,7 @@ static int rtw_wx_get_retry(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - //_adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + //struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); wrqu->retry.value = 7; @@ -2856,7 +2852,7 @@ static int rtw_wx_set_enc(struct net_device *dev, NDIS_802_11_AUTHENTICATION_MODE authmode; struct iw_point *erq = &(wrqu->encoding); - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); DBG_871X("+rtw_wx_set_enc, flags=0x%x\n", erq->flags); @@ -2996,7 +2992,7 @@ static int rtw_wx_get_enc(struct net_device *dev, union iwreq_data *wrqu, char *keybuf) { uint key, ret =0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct iw_point *erq = &(wrqu->encoding); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); @@ -3094,7 +3090,7 @@ static int rtw_wx_get_power(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - //_adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + //struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); wrqu->power.value = 0; wrqu->power.fixed = 0; /* no auto select */ @@ -3109,7 +3105,7 @@ static int rtw_wx_set_gen_ie(struct net_device *dev, union iwreq_data *wrqu, char *extra) { int ret; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); ret = rtw_set_wpa_ie(padapter, extra, wrqu->data.length); @@ -3120,7 +3116,7 @@ static int rtw_wx_set_auth(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct iw_param *param = (struct iw_param*)&(wrqu->param); struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct security_priv *psecuritypriv = &padapter->securitypriv; @@ -3385,7 +3381,7 @@ static int rtw_wx_get_nick(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - //_adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + //struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); //struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); //struct security_priv *psecuritypriv = &padapter->securitypriv; @@ -3451,7 +3447,7 @@ static int rtw_wx_read32(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - PADAPTER padapter; + struct adapter *padapter; struct iw_point *p; u16 len; u32 addr; @@ -3460,7 +3456,7 @@ static int rtw_wx_read32(struct net_device *dev, u8 *ptmp; - padapter = (PADAPTER)rtw_netdev_priv(dev); + padapter = (struct adapter *)rtw_netdev_priv(dev); p = &wrqu->data; len = p->length; ptmp = (u8*)rtw_malloc(len); @@ -3504,7 +3500,7 @@ static int rtw_wx_write32(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - PADAPTER padapter = (PADAPTER)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); u32 addr; u32 data32; @@ -3541,7 +3537,7 @@ static int rtw_wx_read_rf(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); u32 path, addr, data32; @@ -3563,7 +3559,7 @@ static int rtw_wx_write_rf(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); u32 path, addr, data32; @@ -3585,7 +3581,7 @@ static int rtw_wx_priv_null(struct net_device *dev, struct iw_request_info *a, static int dummy(struct net_device *dev, struct iw_request_info *a, union iwreq_data *wrqu, char *b) { - //_adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + //struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); //struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); //DBG_871X("cmd_code=%x, fwstate=0x%x\n", a->cmd, get_fwstate(pmlmepriv)); @@ -3598,7 +3594,7 @@ static int rtw_wx_set_channel_plan(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct registry_priv *pregistrypriv = &padapter->registrypriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; extern int rtw_channel_plan; @@ -3623,7 +3619,7 @@ static int rtw_wx_set_mtk_wps_probe_ie(struct net_device *dev, union iwreq_data *wrqu, char *b) { #ifdef CONFIG_PLATFORM_MT53XX - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &padapter->mlmepriv; RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_notice_, @@ -3638,7 +3634,7 @@ static int rtw_wx_get_sensitivity(struct net_device *dev, union iwreq_data *wrqu, char *buf) { #ifdef CONFIG_PLATFORM_MT53XX - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); // Modified by Albert 20110914 // This is in dbm format for MTK platform. @@ -3653,7 +3649,7 @@ static int rtw_wx_set_mtk_wps_ie(struct net_device *dev, union iwreq_data *wrqu, char *extra) { #ifdef CONFIG_PLATFORM_MT53XX - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); return rtw_set_wpa_ie(padapter, wrqu->data.pointer, wrqu->data.length); #else @@ -3689,7 +3685,7 @@ struct iw_point int ret; u16 len; u8 *pparmbuf, bset; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct iw_point *p = &wrqu->data; if( (!p->length) || (!p->pointer)){ @@ -3781,7 +3777,7 @@ _rtw_drvext_hdl_exit: } -static void rtw_dbg_mode_hdl(_adapter *padapter, u32 id, u8 *pdata, u32 len) +static void rtw_dbg_mode_hdl(struct adapter *padapter, u32 id, u8 *pdata, u32 len) { pRW_Reg RegRWStruct; struct rf_reg_param *prfreg; @@ -3892,7 +3888,7 @@ static int rtw_mp_ioctl_hdl(struct net_device *dev, struct iw_request_info *info uint status=0; u16 len; u8 *pparmbuf = NULL, bset; - PADAPTER padapter = (PADAPTER)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct iw_point *p = &wrqu->data; //DBG_871X("+rtw_mp_ioctl_hdl\n"); @@ -3964,7 +3960,7 @@ static int rtw_get_ap_info(struct net_device *dev, u8 bssid[ETH_ALEN]; char data[32]; struct wlan_network *pnetwork = NULL; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); _queue *queue = &(pmlmepriv->scanned_queue); struct iw_point *pdata = &wrqu->data; @@ -4071,7 +4067,7 @@ static int rtw_set_pid(struct net_device *dev, { int ret = 0; - _adapter *padapter = rtw_netdev_priv(dev); + struct adapter *padapter = rtw_netdev_priv(dev); int *pdata = (int *)wrqu; int selector; @@ -4104,7 +4100,7 @@ static int rtw_wps_start(struct net_device *dev, { int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct iw_point *pdata = &wrqu->data; u32 u32wps_start = 0; unsigned int uintRet = 0; @@ -4154,7 +4150,7 @@ static int rtw_wext_p2p_enable(struct net_device *dev, { int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo= &(padapter->wdinfo); @@ -4193,7 +4189,7 @@ static int rtw_wext_p2p_enable(struct net_device *dev, #ifdef CONFIG_CONCURRENT_MODE else if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_IDLE)) { - _adapter *pbuddy_adapter = padapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; //struct wifidirect_info *pbuddy_wdinfo = &pbuddy_adapter->wdinfo; struct mlme_priv *pbuddy_mlmepriv = &pbuddy_adapter->mlmepriv; struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; @@ -4237,7 +4233,7 @@ static int rtw_p2p_set_go_nego_ssid(struct net_device *dev, { int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo= &(padapter->wdinfo); @@ -4256,7 +4252,7 @@ static int rtw_p2p_set_intent(struct net_device *dev, union iwreq_data *wrqu, char *extra) { int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct wifidirect_info *pwdinfo= &(padapter->wdinfo); u8 intent = pwdinfo->intent; @@ -4285,7 +4281,7 @@ static int rtw_p2p_set_listen_ch(struct net_device *dev, { int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct wifidirect_info *pwdinfo= &(padapter->wdinfo); u8 listen_ch = pwdinfo->listen_channel; // Listen channel number @@ -4316,7 +4312,7 @@ static int rtw_p2p_set_op_ch(struct net_device *dev, // This function is used to set the operating channel if the driver will become the group owner int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct wifidirect_info *pwdinfo= &(padapter->wdinfo); u8 op_ch = pwdinfo->operating_channel; // Operating channel number @@ -4345,7 +4341,7 @@ static int rtw_p2p_profilefound(struct net_device *dev, { int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct wifidirect_info *pwdinfo= &(padapter->wdinfo); // Comment by Albert 2010/10/13 @@ -4404,7 +4400,7 @@ static int rtw_p2p_setDN(struct net_device *dev, { int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct wifidirect_info *pwdinfo= &(padapter->wdinfo); @@ -4424,11 +4420,11 @@ static int rtw_p2p_get_status(struct net_device *dev, { int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); #ifdef CONFIG_CONCURRENT_MODE - _adapter *pbuddy_adapter = padapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; struct wifidirect_info *pbuddy_wdinfo = &pbuddy_adapter->wdinfo; struct mlme_priv *pbuddy_mlmepriv = &pbuddy_adapter->mlmepriv; struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; @@ -4462,7 +4458,7 @@ static int rtw_p2p_get_req_cm(struct net_device *dev, { int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); @@ -4479,7 +4475,7 @@ static int rtw_p2p_get_role(struct net_device *dev, { int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); @@ -4501,7 +4497,7 @@ static int rtw_p2p_get_peer_ifaddr(struct net_device *dev, { int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); @@ -4525,7 +4521,7 @@ static int rtw_p2p_get_peer_devaddr(struct net_device *dev, { int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); @@ -4549,7 +4545,7 @@ static int rtw_p2p_get_peer_devaddr_by_invitation(struct net_device *dev, { int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); @@ -4573,7 +4569,7 @@ static int rtw_p2p_get_groupid(struct net_device *dev, { int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); @@ -4594,7 +4590,7 @@ static int rtw_p2p_get_op_ch(struct net_device *dev, { int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); @@ -4622,7 +4618,7 @@ static int rtw_p2p_get_wps_configmethod(struct net_device *dev, { int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); u8 peerMAC[ETH_ALEN] = { 0x00 }; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; _irqL irqL; @@ -4699,7 +4695,7 @@ static int rtw_p2p_get_peer_wfd_port(struct net_device *dev, { int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); @@ -4719,7 +4715,7 @@ static int rtw_p2p_get_peer_wfd_preferred_connection(struct net_device *dev, { int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); @@ -4738,7 +4734,7 @@ static int rtw_p2p_get_peer_wfd_session_available(struct net_device *dev, { int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); @@ -4759,7 +4755,7 @@ static int rtw_p2p_get_go_device_address(struct net_device *dev, { int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); u8 peerMAC[ETH_ALEN] = { 0x00 }; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; _irqL irqL; @@ -4851,7 +4847,7 @@ static int rtw_p2p_get_device_type(struct net_device *dev, { int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); u8 peerMAC[ETH_ALEN] = { 0x00 }; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; _irqL irqL; @@ -4929,7 +4925,7 @@ static int rtw_p2p_get_device_name(struct net_device *dev, { int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); u8 peerMAC[ETH_ALEN] = { 0x00 }; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; _irqL irqL; @@ -5003,7 +4999,7 @@ static int rtw_p2p_get_invitation_procedure(struct net_device *dev, { int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); u8 peerMAC[ETH_ALEN] = { 0x00 }; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; _irqL irqL; @@ -5092,7 +5088,7 @@ static int rtw_p2p_connect(struct net_device *dev, { int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); u8 peerMAC[ ETH_ALEN ] = { 0x00 }; int jj,kk; @@ -5104,7 +5100,7 @@ static int rtw_p2p_connect(struct net_device *dev, struct wlan_network *pnetwork = NULL; uint uintPeerChannel = 0; #ifdef CONFIG_CONCURRENT_MODE - _adapter *pbuddy_adapter = padapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; struct mlme_priv *pbuddy_mlmepriv = &pbuddy_adapter->mlmepriv; struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; #endif // CONFIG_CONCURRENT_MODE @@ -5224,7 +5220,7 @@ static int rtw_p2p_invite_req(struct net_device *dev, { int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); int jj,kk; @@ -5240,7 +5236,7 @@ static int rtw_p2p_invite_req(struct net_device *dev, _irqL irqL; struct tx_invite_req_info* pinvite_req_info = &pwdinfo->invitereq_info; #ifdef CONFIG_CONCURRENT_MODE - _adapter *pbuddy_adapter = padapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; struct mlme_priv *pbuddy_mlmepriv = &pbuddy_adapter->mlmepriv; struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; #endif // CONFIG_CONCURRENT_MODE @@ -5446,7 +5442,7 @@ static int rtw_p2p_set_persistent(struct net_device *dev, { int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); int jj,kk; @@ -5462,7 +5458,7 @@ static int rtw_p2p_set_persistent(struct net_device *dev, _irqL irqL; struct tx_invite_req_info* pinvite_req_info = &pwdinfo->invitereq_info; #ifdef CONFIG_CONCURRENT_MODE - _adapter *pbuddy_adapter = padapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; struct mlme_priv *pbuddy_mlmepriv = &pbuddy_adapter->mlmepriv; struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; #endif // CONFIG_CONCURRENT_MODE @@ -5563,7 +5559,7 @@ static int rtw_p2p_set_wps_uuid(struct net_device *dev, { int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct wifidirect_info *pwdinfo = &(padapter->wdinfo); DBG_871X("[%s] data = %s\n", __FUNCTION__, extra); @@ -5586,7 +5582,7 @@ static int rtw_p2p_set_pc(struct net_device *dev, { int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); u8 peerMAC[ ETH_ALEN ] = { 0x00 }; @@ -5602,7 +5598,7 @@ static int rtw_p2p_set_pc(struct net_device *dev, _irqL irqL; uint uintPeerChannel = 0; #ifdef CONFIG_CONCURRENT_MODE - _adapter *pbuddy_adapter = padapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; #endif // CONFIG_CONCURRENT_MODE struct wifi_display_info* pwfd_info = pwdinfo->wfd_info; @@ -5722,7 +5718,7 @@ static int rtw_p2p_set_wfd_device_type(struct net_device *dev, { int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); struct wifi_display_info* pwfd_info = pwdinfo->wfd_info; @@ -5755,7 +5751,7 @@ static int rtw_p2p_set_scan_result_type(struct net_device *dev, { int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); struct wifi_display_info *pwfd_info = pwdinfo->wfd_info; @@ -5801,7 +5797,7 @@ static int rtw_p2p_set_wfd_enable(struct net_device *dev, // This function is used to set wfd enabled int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct wifidirect_info *pwdinfo= &(padapter->wdinfo); if(*extra == '0' ) @@ -5822,7 +5818,7 @@ static int rtw_p2p_set_driver_iface(struct net_device *dev, // Commented by Kurt 20121206 // This function is used to set driver iface is WEXT or CFG80211 int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct wifidirect_info *pwdinfo= &(padapter->wdinfo); if(*extra == '1' ) @@ -5847,7 +5843,7 @@ static int rtw_p2p_set_sa(struct net_device *dev, { int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); struct wifi_display_info *pwfd_info = pwdinfo->wfd_info; @@ -5888,7 +5884,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev, union iwreq_data *wrqu, char *extra) { int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); u8 peerMAC[ ETH_ALEN ] = { 0x00 }; int jj,kk; @@ -5904,7 +5900,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev, _irqL irqL; u8 ie_offset; #ifdef CONFIG_CONCURRENT_MODE - _adapter *pbuddy_adapter = padapter->pbuddy_adapter; + struct adapter *pbuddy_adapter = padapter->pbuddy_adapter; struct mlme_priv *pbuddy_mlmepriv = &pbuddy_adapter->mlmepriv; struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; #endif // CONFIG_CONCURRENT_MODE @@ -6173,7 +6169,7 @@ static int rtw_p2p_got_wpsinfo(struct net_device *dev, { int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); @@ -6219,7 +6215,7 @@ static int rtw_p2p_set(struct net_device *dev, int ret = 0; #ifdef CONFIG_P2P - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo= &(padapter->wdinfo); @@ -6350,7 +6346,7 @@ static int rtw_p2p_get(struct net_device *dev, #ifdef CONFIG_P2P - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo= &(padapter->wdinfo); @@ -6480,7 +6476,7 @@ static int rtw_cta_test_start(struct net_device *dev, union iwreq_data *wrqu, char *extra) { int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); DBG_871X("%s %s\n", __func__, extra); if (!strcmp(extra, "1")) padapter->in_cta_test = 1; @@ -6505,13 +6501,13 @@ static int rtw_cta_test_start(struct net_device *dev, } -extern int rtw_change_ifname(_adapter *padapter, const char *ifname); +extern int rtw_change_ifname(struct adapter *padapter, const char *ifname); static int rtw_rereg_nd_name(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { int ret = 0; - _adapter *padapter = rtw_netdev_priv(dev); + struct adapter *padapter = rtw_netdev_priv(dev); struct rereg_nd_name_data *rereg_priv = &padapter->rereg_nd_name_priv; char new_ifname[IFNAMSIZ]; @@ -6578,7 +6574,7 @@ exit: } #if 0 -void mac_reg_dump(_adapter *padapter) +void mac_reg_dump(struct adapter *padapter) { int i,j=1; DBG_871X("\n======= MAC REG =======\n"); @@ -6595,7 +6591,7 @@ void mac_reg_dump(_adapter *padapter) if((j++)%4 == 0) DBG_871X("\n"); } } -void bb_reg_dump(_adapter *padapter) +void bb_reg_dump(struct adapter *padapter) { int i,j=1; DBG_871X("\n======= BB REG =======\n"); @@ -6607,7 +6603,7 @@ void bb_reg_dump(_adapter *padapter) if((j++)%4 == 0) DBG_871X("\n"); } } -void rf_reg_dump(_adapter *padapter) +void rf_reg_dump(struct adapter *padapter) { int i,j=1,path; u32 value; @@ -6627,7 +6623,7 @@ void rf_reg_dump(_adapter *padapter) #endif -static void mac_reg_dump(_adapter *padapter) +static void mac_reg_dump(struct adapter *padapter) { int i,j=1; printk("\n======= MAC REG =======\n"); @@ -6644,7 +6640,7 @@ static void mac_reg_dump(_adapter *padapter) if((j++)%4 == 0) printk("\n"); } } -void bb_reg_dump(_adapter *padapter) +void bb_reg_dump(struct adapter *padapter) { int i,j=1; printk("\n======= BB REG =======\n"); @@ -6656,7 +6652,7 @@ void bb_reg_dump(_adapter *padapter) if((j++)%4 == 0) printk("\n"); } } -void rf_reg_dump(_adapter *padapter) +void rf_reg_dump(struct adapter *padapter) { int i,j=1,path; u32 value; @@ -6696,7 +6692,7 @@ static int rtw_dbg_port(struct net_device *dev, u16 arg; u32 extra_arg, *pdata, val32; struct sta_info *psta; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); @@ -7408,7 +7404,7 @@ static int wpa_set_param(struct net_device *dev, u8 name, u32 value) { uint ret=0; u32 flags; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); switch (name){ case IEEE_PARAM_WPA_ENABLED: @@ -7523,7 +7519,7 @@ static int wpa_set_param(struct net_device *dev, u8 name, u32 value) static int wpa_mlme(struct net_device *dev, u32 command, u32 reason) { int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); switch (command) { @@ -7584,7 +7580,7 @@ static int wpa_supplicant_ioctl(struct net_device *dev, struct iw_point *p) case IEEE_CMD_SET_WPA_IE: //ret = wpa_set_wpa_ie(dev, param, p->length); - ret = rtw_set_wpa_ie((_adapter *)rtw_netdev_priv(dev), (char*)param->u.wpa_ie.data, (u16)param->u.wpa_ie.len); + ret = rtw_set_wpa_ie((struct adapter *)rtw_netdev_priv(dev), (char*)param->u.wpa_ie.data, (u16)param->u.wpa_ie.len); break; case IEEE_CMD_SET_ENCRYPTION: @@ -7616,7 +7612,7 @@ out: } #ifdef CONFIG_AP_MODE -static u8 set_pairwise_key(_adapter *padapter, struct sta_info *psta) +static u8 set_pairwise_key(struct adapter *padapter, struct sta_info *psta) { struct cmd_obj* ph2c; struct set_stakey_parm *psetstakey_para; @@ -7654,7 +7650,7 @@ exit: } -static int set_group_key(_adapter *padapter, u8 *key, u8 alg, int keyid) +static int set_group_key(struct adapter *padapter, u8 *key, u8 alg, int keyid) { u8 keylen; struct cmd_obj* pcmd; @@ -7721,7 +7717,7 @@ exit: } -static int set_wep_key(_adapter *padapter, u8 *key, u8 keylen, int keyid) +static int set_wep_key(struct adapter *padapter, u8 *key, u8 keylen, int keyid) { u8 alg; @@ -7748,7 +7744,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, u32 wep_key_idx, wep_key_len,wep_total_len; NDIS_802_11_WEP *pwep = NULL; struct sta_info *psta = NULL, *pbcmc_sta = NULL; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct security_priv* psecuritypriv=&(padapter->securitypriv); struct sta_priv *pstapriv = &padapter->stapriv; @@ -8071,7 +8067,7 @@ exit: static int rtw_set_beacon(struct net_device *dev, struct ieee_param *param, int len) { int ret=0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct sta_priv *pstapriv = &padapter->stapriv; unsigned char *pbuf = param->u.bcn_ie.buf; @@ -8104,7 +8100,7 @@ static int rtw_hostapd_sta_flush(struct net_device *dev) //_list *phead, *plist; int ret=0; //struct sta_info *psta = NULL; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); //struct sta_priv *pstapriv = &padapter->stapriv; DBG_871X("%s\n", __FUNCTION__); @@ -8122,7 +8118,7 @@ static int rtw_add_sta(struct net_device *dev, struct ieee_param *param) _irqL irqL; int ret=0; struct sta_info *psta = NULL; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct sta_priv *pstapriv = &padapter->stapriv; @@ -8211,7 +8207,7 @@ static int rtw_del_sta(struct net_device *dev, struct ieee_param *param) _irqL irqL; int ret=0; struct sta_info *psta = NULL; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct sta_priv *pstapriv = &padapter->stapriv; @@ -8267,7 +8263,7 @@ static int rtw_ioctl_get_sta_data(struct net_device *dev, struct ieee_param *par { int ret=0; struct sta_info *psta = NULL; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct sta_priv *pstapriv = &padapter->stapriv; struct ieee_param_ex *param_ex = (struct ieee_param_ex *)param; @@ -8355,7 +8351,7 @@ static int rtw_get_sta_wpaie(struct net_device *dev, struct ieee_param *param) { int ret=0; struct sta_info *psta = NULL; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct sta_priv *pstapriv = &padapter->stapriv; @@ -8408,7 +8404,7 @@ static int rtw_set_wps_beacon(struct net_device *dev, struct ieee_param *param, { int ret=0; unsigned char wps_oui[4]={0x0,0x50,0xf2,0x04}; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); @@ -8453,7 +8449,7 @@ static int rtw_set_wps_beacon(struct net_device *dev, struct ieee_param *param, static int rtw_set_wps_probe_resp(struct net_device *dev, struct ieee_param *param, int len) { int ret=0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); int ie_len; @@ -8490,7 +8486,7 @@ static int rtw_set_wps_probe_resp(struct net_device *dev, struct ieee_param *par static int rtw_set_wps_assoc_resp(struct net_device *dev, struct ieee_param *param, int len) { int ret=0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); int ie_len; @@ -8528,7 +8524,7 @@ static int rtw_set_wps_assoc_resp(struct net_device *dev, struct ieee_param *par static int rtw_set_hidden_ssid(struct net_device *dev, struct ieee_param *param, int len) { int ret=0; - _adapter *adapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *adapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *mlmepriv = &(adapter->mlmepriv); struct mlme_ext_priv *mlmeext = &(adapter->mlmeextpriv); struct mlme_ext_info *mlmeinfo = &(mlmeext->mlmext_info); @@ -8582,7 +8578,7 @@ static int rtw_set_hidden_ssid(struct net_device *dev, struct ieee_param *param, static int rtw_ioctl_acl_remove_sta(struct net_device *dev, struct ieee_param *param, int len) { int ret=0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); if(check_fwstate(pmlmepriv, WIFI_AP_STATE) != _TRUE) @@ -8604,7 +8600,7 @@ static int rtw_ioctl_acl_remove_sta(struct net_device *dev, struct ieee_param *p static int rtw_ioctl_acl_add_sta(struct net_device *dev, struct ieee_param *param, int len) { int ret=0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); if(check_fwstate(pmlmepriv, WIFI_AP_STATE) != _TRUE) @@ -8626,7 +8622,7 @@ static int rtw_ioctl_acl_add_sta(struct net_device *dev, struct ieee_param *para static int rtw_ioctl_set_macaddr_acl(struct net_device *dev, struct ieee_param *param, int len) { int ret=0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); if(check_fwstate(pmlmepriv, WIFI_AP_STATE) != _TRUE) @@ -8641,7 +8637,7 @@ static int rtw_hostapd_ioctl(struct net_device *dev, struct iw_point *p) { struct ieee_param *param; int ret=0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); //DBG_871X("%s\n", __FUNCTION__); @@ -8800,7 +8796,7 @@ static int rtw_wx_set_priv(struct net_device *dev, char *ext; int i; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct iw_point *dwrq = (struct iw_point*)awrq; //RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_notice_, ("+rtw_wx_set_priv\n")); @@ -8972,7 +8968,7 @@ static int rtw_wowlan_ctrl(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct wowlan_ioctl_param poidparam; struct pwrctrl_priv *pwrctrlpriv = adapter_to_pwrctl(padapter); struct mlme_priv *pmlmepriv = &padapter->mlmepriv; @@ -9068,7 +9064,7 @@ static int rtw_pm_set(struct net_device *dev, { int ret = 0; unsigned mode = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); DBG_871X( "[%s] extra = %s\n", __FUNCTION__, extra ); @@ -9094,7 +9090,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, union iwreq_data *wdata, char *extra) { - PADAPTER padapter = rtw_netdev_priv(dev); + struct adapter *padapter = rtw_netdev_priv(dev); EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter); PHAL_DATA_TYPE pHalData = GET_HAL_DATA(padapter); PEFUSE_HAL pEfuseHal; @@ -9650,7 +9646,7 @@ static int rtw_mp_efuse_set(struct net_device *dev, union iwreq_data *wdata, char *extra) { struct iw_point *wrqu; - PADAPTER padapter; + struct adapter *padapter; struct pwrctrl_priv *pwrctrlpriv ; PHAL_DATA_TYPE pHalData; PEFUSE_HAL pEfuseHal; @@ -10117,7 +10113,7 @@ static int rtw_wfd_tdls_enable(struct net_device *dev, #ifdef CONFIG_TDLS #ifdef CONFIG_WFD - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); printk( "[%s] %s %d\n", __FUNCTION__, extra, wrqu->data.length -1 ); @@ -10145,7 +10141,7 @@ static int rtw_tdls_weaksec(struct net_device *dev, #ifdef CONFIG_TDLS u8 i, j; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); DBG_871X( "[%s] %s %d\n", __FUNCTION__, extra, wrqu->data.length -1 ); @@ -10171,7 +10167,7 @@ static int rtw_tdls_enable(struct net_device *dev, #ifdef CONFIG_TDLS - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; _irqL irqL; _list *plist, *phead; @@ -10241,7 +10237,7 @@ static int rtw_tdls_setup(struct net_device *dev, #ifdef CONFIG_TDLS u8 i, j; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); u8 mac_addr[ETH_ALEN]; #ifdef CONFIG_WFD @@ -10287,7 +10283,7 @@ static int rtw_tdls_teardown(struct net_device *dev, #ifdef CONFIG_TDLS u8 i,j; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct sta_info *ptdls_sta = NULL; u8 mac_addr[ETH_ALEN]; @@ -10318,7 +10314,7 @@ static int rtw_tdls_discovery(struct net_device *dev, #ifdef CONFIG_TDLS - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); @@ -10339,7 +10335,7 @@ static int rtw_tdls_ch_switch(struct net_device *dev, #ifdef CONFIG_TDLS - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; u8 i, j, mac_addr[ETH_ALEN]; struct sta_info *ptdls_sta = NULL; @@ -10370,7 +10366,7 @@ static int rtw_tdls_pson(struct net_device *dev, #ifdef CONFIG_TDLS - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); u8 i, j, mac_addr[ETH_ALEN]; @@ -10399,7 +10395,7 @@ static int rtw_tdls_psoff(struct net_device *dev, #ifdef CONFIG_TDLS - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); u8 i, j, mac_addr[ETH_ALEN]; @@ -10429,7 +10425,7 @@ static int rtw_tdls_setip(struct net_device *dev, #ifdef CONFIG_TDLS #ifdef CONFIG_WFD - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; struct wifi_display_info *pwfd_info = ptdlsinfo->wfd_info; u8 i=0, j=0, k=0, tag=0, ip[3] = { 0xff }, *ptr = extra; @@ -10477,7 +10473,7 @@ static int rtw_tdls_getip(struct net_device *dev, #ifdef CONFIG_TDLS #ifdef CONFIG_WFD - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; struct wifi_display_info *pwfd_info = ptdlsinfo->wfd_info; @@ -10511,7 +10507,7 @@ static int rtw_tdls_getport(struct net_device *dev, #ifdef CONFIG_TDLS #ifdef CONFIG_WFD - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; struct wifi_display_info *pwfd_info = ptdlsinfo->wfd_info; @@ -10540,7 +10536,7 @@ static int rtw_tdls_dis_result(struct net_device *dev, #ifdef CONFIG_TDLS #ifdef CONFIG_WFD - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; struct wifi_display_info *pwfd_info = ptdlsinfo->wfd_info; @@ -10572,7 +10568,7 @@ static int rtw_wfd_tdls_status(struct net_device *dev, #ifdef CONFIG_TDLS #ifdef CONFIG_WFD - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; struct wifi_display_info *pwfd_info = ptdlsinfo->wfd_info; @@ -10604,7 +10600,7 @@ static int rtw_tdls_ch_switch_off(struct net_device *dev, #ifdef CONFIG_TDLS - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); u8 i, j, mac_addr[ETH_ALEN]; struct sta_info *ptdls_sta = NULL; @@ -10637,7 +10633,7 @@ static int rtw_tdls(struct net_device *dev, int ret = 0; #ifdef CONFIG_TDLS - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); DBG_871X( "[%s] extra = %s\n", __FUNCTION__, extra ); // WFD Sigma will use the tdls enable command to let the driver know we want to test the tdls now! @@ -10709,7 +10705,7 @@ static int rtw_tdls(struct net_device *dev, } else if (_rtw_memcmp( extra, "tprobe=", 6 ) ) { - issue_tunneled_probe_req((_adapter *)rtw_netdev_priv(dev)); + issue_tunneled_probe_req((struct adapter *)rtw_netdev_priv(dev)); } #endif //CONFIG_WFD @@ -10762,7 +10758,7 @@ static int rtw_widi_set(struct net_device *dev, union iwreq_data *wrqu, char *extra) { int ret = 0; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); process_intel_widi_cmd(padapter, extra); @@ -10775,7 +10771,7 @@ static int rtw_widi_set_probe_request(struct net_device *dev, { int ret = 0; u8 *pbuf = NULL; - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); pbuf = rtw_malloc(sizeof(l2_msg_t)); if(pbuf) @@ -10802,7 +10798,7 @@ extern void rtl8188es_fill_default_txdesc(struct xmit_frame *pxmitframe, u8 *pbu #define fill_default_txdesc rtl8188es_fill_default_txdesc #endif // CONFIG_SDIO_HCI -static s32 initLoopback(PADAPTER padapter) +static s32 initLoopback(struct adapter *padapter) { PLOOPBACKDATA ploopback; @@ -10823,7 +10819,7 @@ static s32 initLoopback(PADAPTER padapter) return 0; } -static void freeLoopback(PADAPTER padapter) +static void freeLoopback(struct adapter *padapter) { PLOOPBACKDATA ploopback; @@ -10835,7 +10831,7 @@ static void freeLoopback(PADAPTER padapter) } } -static s32 initpseudoadhoc(PADAPTER padapter) +static s32 initpseudoadhoc(struct adapter *padapter) { NDIS_802_11_NETWORK_INFRASTRUCTURE networkType; s32 err; @@ -10850,7 +10846,7 @@ static s32 initpseudoadhoc(PADAPTER padapter) return _SUCCESS; } -static s32 createpseudoadhoc(PADAPTER padapter) +static s32 createpseudoadhoc(struct adapter *padapter) { NDIS_802_11_AUTHENTICATION_MODE authmode; struct mlme_priv *pmlmepriv; @@ -10926,7 +10922,7 @@ static s32 createpseudoadhoc(PADAPTER padapter) return _SUCCESS; } -static struct xmit_frame* createloopbackpkt(PADAPTER padapter, u32 size) +static struct xmit_frame* createloopbackpkt(struct adapter *padapter, u32 size) { struct xmit_priv *pxmitpriv; struct xmit_frame *pframe; @@ -11055,7 +11051,7 @@ static struct xmit_frame* createloopbackpkt(PADAPTER padapter, u32 size) return pframe; } -static void freeloopbackpkt(PADAPTER padapter, struct xmit_frame *pframe) +static void freeloopbackpkt(struct adapter *padapter, struct xmit_frame *pframe) { struct xmit_priv *pxmitpriv; struct xmit_buf *pxmitbuf; @@ -11104,7 +11100,7 @@ static void printdata(u8 *pbuf, u32 len) printk("\n"); } -static u8 pktcmp(PADAPTER padapter, u8 *txbuf, u32 txsz, u8 *rxbuf, u32 rxsz) +static u8 pktcmp(struct adapter *padapter, u8 *txbuf, u32 txsz, u8 *rxbuf, u32 rxsz) { PHAL_DATA_TYPE phal; struct recv_stat *prxstat; @@ -11175,7 +11171,7 @@ static u8 pktcmp(PADAPTER padapter, u8 *txbuf, u32 txsz, u8 *rxbuf, u32 rxsz) thread_return lbk_thread(thread_context context) { s32 err; - PADAPTER padapter; + struct adapter *padapter; PLOOPBACKDATA ploopback; struct xmit_frame *pxmitframe; u32 cnt, ok, fail, headerlen; @@ -11183,7 +11179,7 @@ thread_return lbk_thread(thread_context context) u32 ff_hwaddr; - padapter = (PADAPTER)context; + padapter = (struct adapter *)context; ploopback = padapter->ploopback; if (ploopback == NULL) return -1; cnt = 0; @@ -11254,7 +11250,7 @@ thread_return lbk_thread(thread_context context) thread_exit(); } -static void loopbackTest(PADAPTER padapter, u32 cnt, u32 size, u8* pmsg) +static void loopbackTest(struct adapter *padapter, u32 cnt, u32 size, u8* pmsg) { PLOOPBACKDATA ploopback; u32 len; @@ -11332,7 +11328,7 @@ static int rtw_test( u8 *pbuf, *pch; char *ptmp; u8 *delim = ","; - PADAPTER padapter = rtw_netdev_priv(dev); + struct adapter *padapter = rtw_netdev_priv(dev); DBG_871X("+%s\n", __func__); @@ -11624,7 +11620,7 @@ static iw_handler rtw_private_handler[] = #if WIRELESS_EXT >= 17 static struct iw_statistics *rtw_get_wireless_stats(struct net_device *dev) { - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct iw_statistics *piwstats=&padapter->iwstats; int tmp_level = 0; int tmp_qual = 0; diff --git a/os_dep/mlme_linux.c b/os_dep/mlme_linux.c index 58c466b..0baf624 100755 --- a/os_dep/mlme_linux.c +++ b/os_dep/mlme_linux.c @@ -31,7 +31,7 @@ void Linkup_workitem_callback(struct work_struct *work) { struct mlme_priv *pmlmepriv = container_of(work, struct mlme_priv, Linkup_workitem); - _adapter *padapter = container_of(pmlmepriv, _adapter, mlmepriv); + struct adapter *padapter = container_of(pmlmepriv, struct adapter, mlmepriv); _func_enter_; @@ -49,7 +49,7 @@ _func_exit_; void Linkdown_workitem_callback(struct work_struct *work) { struct mlme_priv *pmlmepriv = container_of(work, struct mlme_priv, Linkdown_workitem); - _adapter *padapter = container_of(pmlmepriv, _adapter, mlmepriv); + struct adapter *padapter = container_of(pmlmepriv, struct adapter, mlmepriv); _func_enter_; @@ -69,7 +69,7 @@ _func_exit_; /* void sitesurvey_ctrl_handler(void *FunctionContext) { - _adapter *adapter = (_adapter *)FunctionContext; + struct adapter *adapter = (struct adapter *)FunctionContext; _sitesurvey_ctrl_handler(adapter); @@ -79,21 +79,21 @@ void sitesurvey_ctrl_handler(void *FunctionContext) void rtw_join_timeout_handler (void *FunctionContext) { - _adapter *adapter = (_adapter *)FunctionContext; + struct adapter *adapter = (struct adapter *)FunctionContext; _rtw_join_timeout_handler(adapter); } void _rtw_scan_timeout_handler (void *FunctionContext) { - _adapter *adapter = (_adapter *)FunctionContext; + struct adapter *adapter = (struct adapter *)FunctionContext; rtw_scan_timeout_handler(adapter); } void _dynamic_check_timer_handlder (void *FunctionContext) { - _adapter *adapter = (_adapter *)FunctionContext; + struct adapter *adapter = (struct adapter *)FunctionContext; /* remove for MP power tracking DM. #if (MP_DRIVER == 1) if (adapter->registrypriv.mp_mode == 1) @@ -108,7 +108,7 @@ if (adapter->registrypriv.mp_mode == 1) #ifdef CONFIG_SET_SCAN_DENY_TIMER void _rtw_set_scan_deny_timer_hdl(void *FunctionContext) { - _adapter *adapter = (_adapter *)FunctionContext; + struct adapter *adapter = (struct adapter *)FunctionContext; rtw_set_scan_deny_timer_hdl(adapter); } #endif @@ -116,7 +116,7 @@ void _rtw_set_scan_deny_timer_hdl(void *FunctionContext) #ifdef CONFIG_DETECT_C2H_BY_POLLING void _rtw_event_polling_timer_hdl(void *FunctionContext) { - _adapter *adapter = (_adapter *)FunctionContext; + struct adapter *adapter = (struct adapter *)FunctionContext; rtw_event_polling_timer_hdl(adapter); @@ -124,7 +124,7 @@ void _rtw_event_polling_timer_hdl(void *FunctionContext) } #endif -void rtw_init_mlme_timer(_adapter *padapter) +void rtw_init_mlme_timer(struct adapter *padapter) { struct mlme_priv *pmlmepriv = &padapter->mlmepriv; @@ -152,10 +152,10 @@ void rtw_init_mlme_timer(_adapter *padapter) #endif } -extern void rtw_indicate_wx_assoc_event(_adapter *padapter); -extern void rtw_indicate_wx_disassoc_event(_adapter *padapter); +extern void rtw_indicate_wx_assoc_event(struct adapter *padapter); +extern void rtw_indicate_wx_disassoc_event(struct adapter *padapter); -void rtw_os_indicate_connect(_adapter *adapter) +void rtw_os_indicate_connect(struct adapter *adapter) { struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); _func_enter_; @@ -184,8 +184,8 @@ _func_exit_; } -extern void indicate_wx_scan_complete_event(_adapter *padapter); -void rtw_os_indicate_scan_done( _adapter *padapter, bool aborted) +extern void indicate_wx_scan_complete_event(struct adapter *padapter); +void rtw_os_indicate_scan_done( struct adapter *padapter, bool aborted) { #ifdef CONFIG_IOCTL_CFG80211 rtw_cfg80211_indicate_scan_done(wdev_to_priv(padapter->rtw_wdev), aborted); @@ -194,7 +194,7 @@ void rtw_os_indicate_scan_done( _adapter *padapter, bool aborted) } static RT_PMKID_LIST backupPMKIDList[ NUM_PMKID_CACHE ]; -void rtw_reset_securitypriv( _adapter *adapter ) +void rtw_reset_securitypriv( struct adapter *adapter ) { u8 backupPMKIDIndex = 0; u8 backupTKIPCountermeasure = 0x00; @@ -258,7 +258,7 @@ void rtw_reset_securitypriv( _adapter *adapter ) _exit_critical_bh(&adapter->security_key_mutex, &irqL); } -void rtw_os_indicate_disconnect( _adapter *adapter ) +void rtw_os_indicate_disconnect( struct adapter *adapter ) { //RT_PMKID_LIST backupPMKIDList[ NUM_PMKID_CACHE ]; @@ -282,7 +282,7 @@ _func_exit_; } -void rtw_report_sec_ie(_adapter *adapter,u8 authmode,u8 *sec_ie) +void rtw_report_sec_ie(struct adapter *adapter,u8 authmode,u8 *sec_ie) { uint len; u8 *buff,*p,i; @@ -335,14 +335,14 @@ _func_exit_; void _survey_timer_hdl (void *FunctionContext) { - _adapter *padapter = (_adapter *)FunctionContext; + struct adapter *padapter = (struct adapter *)FunctionContext; survey_timer_hdl(padapter); } void _link_timer_hdl (void *FunctionContext) { - _adapter *padapter = (_adapter *)FunctionContext; + struct adapter *padapter = (struct adapter *)FunctionContext; link_timer_hdl(padapter); } @@ -355,12 +355,12 @@ void _addba_timer_hdl(void *FunctionContext) #ifdef CONFIG_IEEE80211W void _sa_query_timer_hdl (void *FunctionContext) { - _adapter *padapter = (_adapter *)FunctionContext; + struct adapter *padapter = (struct adapter *)FunctionContext; sa_query_timer_hdl(padapter); } #endif //CONFIG_IEEE80211W -void init_addba_retry_timer(_adapter *padapter, struct sta_info *psta) +void init_addba_retry_timer(struct adapter *padapter, struct sta_info *psta) { _init_timer(&psta->addba_retry_timer, padapter->pnetdev, _addba_timer_hdl, psta); @@ -369,18 +369,18 @@ void init_addba_retry_timer(_adapter *padapter, struct sta_info *psta) /* void _reauth_timer_hdl(void *FunctionContext) { - _adapter *padapter = (_adapter *)FunctionContext; + struct adapter *padapter = (struct adapter *)FunctionContext; reauth_timer_hdl(padapter); } void _reassoc_timer_hdl(void *FunctionContext) { - _adapter *padapter = (_adapter *)FunctionContext; + struct adapter *padapter = (struct adapter *)FunctionContext; reassoc_timer_hdl(padapter); } */ -void init_mlme_ext_timer(_adapter *padapter) +void init_mlme_ext_timer(struct adapter *padapter) { struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; @@ -397,7 +397,7 @@ void init_mlme_ext_timer(_adapter *padapter) #ifdef CONFIG_AP_MODE -void rtw_indicate_sta_assoc_event(_adapter *padapter, struct sta_info *psta) +void rtw_indicate_sta_assoc_event(struct adapter *padapter, struct sta_info *psta) { union iwreq_data wrqu; struct sta_priv *pstapriv = &padapter->stapriv; @@ -424,7 +424,7 @@ void rtw_indicate_sta_assoc_event(_adapter *padapter, struct sta_info *psta) } -void rtw_indicate_sta_disassoc_event(_adapter *padapter, struct sta_info *psta) +void rtw_indicate_sta_disassoc_event(struct adapter *padapter, struct sta_info *psta) { union iwreq_data wrqu; struct sta_priv *pstapriv = &padapter->stapriv; @@ -457,7 +457,7 @@ void rtw_indicate_sta_disassoc_event(_adapter *padapter, struct sta_info *psta) static int mgnt_xmit_entry(struct sk_buff *skb, struct net_device *pnetdev) { struct hostapd_priv *phostapdpriv = rtw_netdev_priv(pnetdev); - _adapter *padapter = (_adapter *)phostapdpriv->padapter; + struct adapter *padapter = (struct adapter *)phostapdpriv->padapter; //DBG_871X("%s\n", __FUNCTION__); @@ -514,7 +514,7 @@ static const struct net_device_ops rtl871x_mgnt_netdev_ops = { }; #endif -int hostapd_mode_init(_adapter *padapter) +int hostapd_mode_init(struct adapter *padapter) { unsigned char mac[ETH_ALEN]; struct hostapd_priv *phostapdpriv; @@ -605,7 +605,7 @@ int hostapd_mode_init(_adapter *padapter) } -void hostapd_mode_unload(_adapter *padapter) +void hostapd_mode_unload(struct adapter *padapter) { struct hostapd_priv *phostapdpriv = padapter->phostapdpriv; struct net_device *pnetdev = phostapdpriv->pmgnt_netdev; diff --git a/os_dep/os_intfs.c b/os_dep/os_intfs.c index 1653798..29def83 100755 --- a/os_dep/os_intfs.c +++ b/os_dep/os_intfs.c @@ -300,7 +300,7 @@ MODULE_PARM_DESC(rtw_notch_filter, "0:Disable, 1:Enable, 2:Enable only for P2P") module_param_named(debug, rtw_debug, int, 0444); MODULE_PARM_DESC(debug, "Set debug level (1-9) (default 1)"); -static uint loadparam(PADAPTER padapter, _nic_hdl pnetdev); +static uint loadparam(struct adapter *padapter, _nic_hdl pnetdev); int _netdev_open(struct net_device *pnetdev); int netdev_open (struct net_device *pnetdev); static int netdev_close (struct net_device *pnetdev); @@ -315,523 +315,16 @@ static int rtw_proc_cnt = 0; #define RTW_PROC_NAME DRV_NAME -#if 1 void rtw_proc_init_one(struct net_device *dev) { } -void rtw_proc_remove_one(struct net_device *dev) -{ -} -#else -void rtw_proc_init_one(struct net_device *dev) -{ - struct proc_dir_entry *dir_dev = NULL; - struct proc_dir_entry *entry=NULL; - _adapter *padapter = rtw_netdev_priv(dev); - u8 rf_type; - - if(rtw_proc == NULL) - { - if(padapter->chip_type == RTL8188C_8192C) - { - _rtw_memcpy(rtw_proc_name, RTL8192C_PROC_NAME, sizeof(RTL8192C_PROC_NAME)); - } - else if(padapter->chip_type == RTL8192D) - { - _rtw_memcpy(rtw_proc_name, RTL8192D_PROC_NAME, sizeof(RTL8192D_PROC_NAME)); - } - else if(padapter->chip_type == RTL8723A) - { - _rtw_memcpy(rtw_proc_name, RTW_PROC_NAME, sizeof(RTW_PROC_NAME)); - } - else if(padapter->chip_type == RTL8188E) - { - _rtw_memcpy(rtw_proc_name, RTW_PROC_NAME, sizeof(RTW_PROC_NAME)); - } - else - { - _rtw_memcpy(rtw_proc_name, RTW_PROC_NAME, sizeof(RTW_PROC_NAME)); - } - -#if(LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - rtw_proc=create_proc_entry(rtw_proc_name, S_IFDIR, proc_net); -#else - rtw_proc=create_proc_entry(rtw_proc_name, S_IFDIR, init_net.proc_net); -#endif - if (rtw_proc == NULL) { - DBG_871X(KERN_ERR "Unable to create rtw_proc directory\n"); - return; - } - - entry = create_proc_read_entry("ver_info", S_IFREG | S_IRUGO, rtw_proc, proc_get_drv_version, dev); - if (!entry) { - DBG_871X("Unable to create_proc_read_entry!\n"); - return; - } - -#ifdef DBG_MEM_ALLOC - entry = create_proc_read_entry("mstat", S_IFREG | S_IRUGO, - rtw_proc, proc_get_mstat, dev); - if (!entry) { - DBG_871X("Unable to create_proc_read_entry!\n"); - return; - } -#endif /* DBG_MEM_ALLOC */ - } - - - - if(padapter->dir_dev == NULL) - { - padapter->dir_dev = create_proc_entry(dev->name, - S_IFDIR | S_IRUGO | S_IXUGO, - rtw_proc); - - dir_dev = padapter->dir_dev; - - if(dir_dev==NULL) - { - if(rtw_proc_cnt == 0) - { - if(rtw_proc){ -#if(LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - remove_proc_entry(rtw_proc_name, proc_net); -#else - remove_proc_entry(rtw_proc_name, init_net.proc_net); -#endif - rtw_proc = NULL; - } - } - - DBG_871X("Unable to create dir_dev directory\n"); - return; - } - } - else - { - return; - } - - rtw_proc_cnt++; - - entry = create_proc_read_entry("write_reg", S_IFREG | S_IRUGO, - dir_dev, proc_get_write_reg, dev); - if (!entry) { - DBG_871X("Unable to create_proc_read_entry!\n"); - return; - } - entry->write_proc = proc_set_write_reg; - - entry = create_proc_read_entry("read_reg", S_IFREG | S_IRUGO, - dir_dev, proc_get_read_reg, dev); - if (!entry) { - DBG_871X("Unable to create_proc_read_entry!\n"); - return; - } - entry->write_proc = proc_set_read_reg; - - - entry = create_proc_read_entry("fwstate", S_IFREG | S_IRUGO, - dir_dev, proc_get_fwstate, dev); - if (!entry) { - DBG_871X("Unable to create_proc_read_entry!\n"); - return; - } - - - entry = create_proc_read_entry("sec_info", S_IFREG | S_IRUGO, - dir_dev, proc_get_sec_info, dev); - if (!entry) { - DBG_871X("Unable to create_proc_read_entry!\n"); - return; - } - - - entry = create_proc_read_entry("mlmext_state", S_IFREG | S_IRUGO, - dir_dev, proc_get_mlmext_state, dev); - if (!entry) { - DBG_871X("Unable to create_proc_read_entry!\n"); - return; - } - - - entry = create_proc_read_entry("qos_option", S_IFREG | S_IRUGO, - dir_dev, proc_get_qos_option, dev); - if (!entry) { - DBG_871X("Unable to create_proc_read_entry!\n"); - return; - } - - entry = create_proc_read_entry("ht_option", S_IFREG | S_IRUGO, - dir_dev, proc_get_ht_option, dev); - if (!entry) { - DBG_871X("Unable to create_proc_read_entry!\n"); - return; - } - - entry = create_proc_read_entry("rf_info", S_IFREG | S_IRUGO, - dir_dev, proc_get_rf_info, dev); - if (!entry) { - DBG_871X("Unable to create_proc_read_entry!\n"); - return; - } - - entry = create_proc_read_entry("ap_info", S_IFREG | S_IRUGO, - dir_dev, proc_get_ap_info, dev); - if (!entry) { - DBG_871X("Unable to create_proc_read_entry!\n"); - return; - } - - entry = create_proc_read_entry("adapter_state", S_IFREG | S_IRUGO, - dir_dev, proc_get_adapter_state, dev); - if (!entry) { - DBG_871X("Unable to create_proc_read_entry!\n"); - return; - } - - entry = create_proc_read_entry("trx_info", S_IFREG | S_IRUGO, - dir_dev, proc_get_trx_info, dev); - if (!entry) { - DBG_871X("Unable to create_proc_read_entry!\n"); - return; - } - - entry = create_proc_read_entry("mac_reg_dump1", S_IFREG | S_IRUGO, - dir_dev, proc_get_mac_reg_dump1, dev); - if (!entry) { - DBG_871X("Unable to create_proc_read_entry!\n"); - return; - } - - entry = create_proc_read_entry("mac_reg_dump2", S_IFREG | S_IRUGO, - dir_dev, proc_get_mac_reg_dump2, dev); - if (!entry) { - DBG_871X("Unable to create_proc_read_entry!\n"); - return; - } - - entry = create_proc_read_entry("mac_reg_dump3", S_IFREG | S_IRUGO, - dir_dev, proc_get_mac_reg_dump3, dev); - if (!entry) { - DBG_871X("Unable to create_proc_read_entry!\n"); - return; - } - - entry = create_proc_read_entry("bb_reg_dump1", S_IFREG | S_IRUGO, - dir_dev, proc_get_bb_reg_dump1, dev); - if (!entry) { - DBG_871X("Unable to create_proc_read_entry!\n"); - return; - } - - entry = create_proc_read_entry("bb_reg_dump2", S_IFREG | S_IRUGO, - dir_dev, proc_get_bb_reg_dump2, dev); - if (!entry) { - DBG_871X("Unable to create_proc_read_entry!\n"); - return; - } - - entry = create_proc_read_entry("bb_reg_dump3", S_IFREG | S_IRUGO, - dir_dev, proc_get_bb_reg_dump3, dev); - if (!entry) { - DBG_871X("Unable to create_proc_read_entry!\n"); - return; - } - - entry = create_proc_read_entry("rf_reg_dump1", S_IFREG | S_IRUGO, - dir_dev, proc_get_rf_reg_dump1, dev); - if (!entry) { - DBG_871X("Unable to create_proc_read_entry!\n"); - return; - } - - entry = create_proc_read_entry("rf_reg_dump2", S_IFREG | S_IRUGO, - dir_dev, proc_get_rf_reg_dump2, dev); - if (!entry) { - DBG_871X("Unable to create_proc_read_entry!\n"); - return; - } - - rtw_hal_get_hwreg(padapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type)); - if((RF_1T2R == rf_type) ||(RF_1T1R ==rf_type )) { - entry = create_proc_read_entry("rf_reg_dump3", S_IFREG | S_IRUGO, - dir_dev, proc_get_rf_reg_dump3, dev); - if (!entry) { - DBG_871X("Unable to create_proc_read_entry!\n"); - return; - } - - entry = create_proc_read_entry("rf_reg_dump4", S_IFREG | S_IRUGO, - dir_dev, proc_get_rf_reg_dump4, dev); - if (!entry) { - DBG_871X("Unable to create_proc_read_entry!\n"); - return; - } - } - -#ifdef CONFIG_AP_MODE - - entry = create_proc_read_entry("all_sta_info", S_IFREG | S_IRUGO, - dir_dev, proc_get_all_sta_info, dev); - if (!entry) { - DBG_871X("Unable to create_proc_read_entry!\n"); - return; - } -#endif - -#ifdef DBG_MEMORY_LEAK - entry = create_proc_read_entry("_malloc_cnt", S_IFREG | S_IRUGO, - dir_dev, proc_get_malloc_cnt, dev); - if (!entry) { - DBG_871X("Unable to create_proc_read_entry!\n"); - return; - } -#endif - -#ifdef CONFIG_FIND_BEST_CHANNEL - entry = create_proc_read_entry("best_channel", S_IFREG | S_IRUGO, - dir_dev, proc_get_best_channel, dev); - if (!entry) { - DBG_871X("Unable to create_proc_read_entry!\n"); - return; - } - entry->write_proc = proc_set_best_channel; -#endif - - entry = create_proc_read_entry("rx_signal", S_IFREG | S_IRUGO, - dir_dev, proc_get_rx_signal, dev); - if (!entry) { - DBG_871X("Unable to create_proc_read_entry!\n"); - return; - } - entry->write_proc = proc_set_rx_signal; -#ifdef CONFIG_80211N_HT - entry = create_proc_read_entry("ht_enable", S_IFREG | S_IRUGO, - dir_dev, proc_get_ht_enable, dev); - if (!entry) { - DBG_871X("Unable to create_proc_read_entry!\n"); - return; - } - entry->write_proc = proc_set_ht_enable; - - entry = create_proc_read_entry("cbw40_enable", S_IFREG | S_IRUGO, - dir_dev, proc_get_cbw40_enable, dev); - if (!entry) { - DBG_871X("Unable to create_proc_read_entry!\n"); - return; - } - entry->write_proc = proc_set_cbw40_enable; - - entry = create_proc_read_entry("ampdu_enable", S_IFREG | S_IRUGO, - dir_dev, proc_get_ampdu_enable, dev); - if (!entry) { - DBG_871X("Unable to create_proc_read_entry!\n"); - return; - } - entry->write_proc = proc_set_ampdu_enable; - - entry = create_proc_read_entry("rx_stbc", S_IFREG | S_IRUGO, - dir_dev, proc_get_rx_stbc, dev); - if (!entry) { - DBG_871X("Unable to create_proc_read_entry!\n"); - return; - } - entry->write_proc = proc_set_rx_stbc; -#endif //CONFIG_80211N_HT - - entry = create_proc_read_entry("path_rssi", S_IFREG | S_IRUGO, - dir_dev, proc_get_two_path_rssi, dev); - - - entry = create_proc_read_entry("rssi_disp", S_IFREG | S_IRUGO, - dir_dev, proc_get_rssi_disp, dev); - if (!entry) { - DBG_871X("Unable to create_proc_read_entry!\n"); - return; - } - entry->write_proc = proc_set_rssi_disp; -#ifdef CONFIG_BT_COEXIST - entry = create_proc_read_entry("btcoex_dbg", S_IFREG | S_IRUGO, - dir_dev, proc_get_btcoex_dbg, dev); - if (!entry) { - DBG_871X("Unable to create_proc_read_entry!\n"); - return; - } - entry->write_proc = proc_set_btcoex_dbg; -#endif /*CONFIG_BT_COEXIST*/ - -#if defined(DBG_CONFIG_ERROR_DETECT) - entry = create_proc_read_entry("sreset", S_IFREG | S_IRUGO, - dir_dev, proc_get_sreset, dev); - if (!entry) { - DBG_871X("Unable to create_proc_read_entry!\n"); - return; - } - entry->write_proc = proc_set_sreset; -#endif /* DBG_CONFIG_ERROR_DETECT */ - - /* for odm */ - { - struct proc_dir_entry *dir_odm = NULL; - - if (padapter->dir_odm == NULL) { - padapter->dir_odm = create_proc_entry( - "odm", S_IFDIR | S_IRUGO | S_IXUGO, dir_dev); - - dir_odm = padapter->dir_odm; - - if(dir_odm==NULL) { - DBG_871X("Unable to create dir_odm directory\n"); - return; - } - } - else - { - return; - } - - entry = create_proc_read_entry("dbg_comp", S_IFREG | S_IRUGO, - dir_odm, proc_get_odm_dbg_comp, dev); - if (!entry) { - rtw_warn_on(1); - return; - } - entry->write_proc = proc_set_odm_dbg_comp; - - entry = create_proc_read_entry("dbg_level", S_IFREG | S_IRUGO, - dir_odm, proc_get_odm_dbg_level, dev); - if (!entry) { - rtw_warn_on(1); - return; - } - entry->write_proc = proc_set_odm_dbg_level; - - entry = create_proc_read_entry("adaptivity", S_IFREG | S_IRUGO, - dir_odm, proc_get_odm_adaptivity, dev); - if (!entry) { - rtw_warn_on(1); - return; - } - entry->write_proc = proc_set_odm_adaptivity; - } -} void rtw_proc_remove_one(struct net_device *dev) { - struct proc_dir_entry *dir_dev = NULL; - _adapter *padapter = rtw_netdev_priv(dev); - u8 rf_type; - - dir_dev = padapter->dir_dev; - padapter->dir_dev = NULL; - - if (dir_dev) { - - remove_proc_entry("write_reg", dir_dev); - remove_proc_entry("read_reg", dir_dev); - remove_proc_entry("fwstate", dir_dev); - remove_proc_entry("sec_info", dir_dev); - remove_proc_entry("mlmext_state", dir_dev); - remove_proc_entry("qos_option", dir_dev); - remove_proc_entry("ht_option", dir_dev); - remove_proc_entry("rf_info", dir_dev); - remove_proc_entry("ap_info", dir_dev); - remove_proc_entry("adapter_state", dir_dev); - remove_proc_entry("trx_info", dir_dev); - - remove_proc_entry("mac_reg_dump1", dir_dev); - remove_proc_entry("mac_reg_dump2", dir_dev); - remove_proc_entry("mac_reg_dump3", dir_dev); - remove_proc_entry("bb_reg_dump1", dir_dev); - remove_proc_entry("bb_reg_dump2", dir_dev); - remove_proc_entry("bb_reg_dump3", dir_dev); - remove_proc_entry("rf_reg_dump1", dir_dev); - remove_proc_entry("rf_reg_dump2", dir_dev); - rtw_hal_get_hwreg(padapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type)); - if((RF_1T2R == rf_type) ||(RF_1T1R ==rf_type )) { - remove_proc_entry("rf_reg_dump3", dir_dev); - remove_proc_entry("rf_reg_dump4", dir_dev); - } -#ifdef CONFIG_AP_MODE - remove_proc_entry("all_sta_info", dir_dev); -#endif - -#ifdef DBG_MEMORY_LEAK - remove_proc_entry("_malloc_cnt", dir_dev); -#endif - -#ifdef CONFIG_FIND_BEST_CHANNEL - remove_proc_entry("best_channel", dir_dev); -#endif - remove_proc_entry("rx_signal", dir_dev); -#ifdef CONFIG_80211N_HT - remove_proc_entry("cbw40_enable", dir_dev); - - remove_proc_entry("ht_enable", dir_dev); - - remove_proc_entry("ampdu_enable", dir_dev); - - remove_proc_entry("rx_stbc", dir_dev); -#endif //CONFIG_80211N_HT - remove_proc_entry("path_rssi", dir_dev); - - remove_proc_entry("rssi_disp", dir_dev); - -#ifdef CONFIG_BT_COEXIST - remove_proc_entry("btcoex_dbg", dir_dev); -#endif //CONFIG_BT_COEXIST - -#if defined(DBG_CONFIG_ERROR_DETECT) - remove_proc_entry("sreset", dir_dev); -#endif /* DBG_CONFIG_ERROR_DETECT */ - - /* for odm */ - { - struct proc_dir_entry *dir_odm = NULL; - dir_odm = padapter->dir_odm; - padapter->dir_odm = NULL; - - if (dir_odm) { - remove_proc_entry("dbg_comp", dir_odm); - remove_proc_entry("dbg_level", dir_odm); - remove_proc_entry("adaptivity", dir_odm); - - remove_proc_entry("odm", dir_dev); - } - } - - remove_proc_entry(dev->name, rtw_proc); - dir_dev = NULL; - - } - else - { - return; - } - - rtw_proc_cnt--; - - if(rtw_proc_cnt == 0) - { - if(rtw_proc){ - remove_proc_entry("ver_info", rtw_proc); - #ifdef DBG_MEM_ALLOC - remove_proc_entry("mstat", rtw_proc); - #endif /* DBG_MEM_ALLOC */ -#if(LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) - remove_proc_entry(rtw_proc_name, proc_net); -#else - remove_proc_entry(rtw_proc_name, init_net.proc_net); -#endif - rtw_proc = NULL; - } - } } #endif -#endif -uint loadparam( _adapter *padapter, _nic_hdl pnetdev) +uint loadparam( struct adapter *padapter, _nic_hdl pnetdev) { uint status = _SUCCESS; @@ -968,7 +461,7 @@ _func_exit_; static int rtw_net_set_mac_address(struct net_device *pnetdev, void *p) { - _adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev); struct sockaddr *addr = p; if(padapter->bup == _FALSE) @@ -985,7 +478,7 @@ static int rtw_net_set_mac_address(struct net_device *pnetdev, void *p) static struct net_device_stats *rtw_net_get_stats(struct net_device *pnetdev) { - _adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev); struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct recv_priv *precvpriv = &(padapter->recvpriv); @@ -1036,7 +529,7 @@ unsigned int rtw_classify8021d(struct sk_buff *skb) static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb) { - _adapter *padapter = rtw_netdev_priv(dev); + struct adapter *padapter = rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &padapter->mlmepriv; skb->priority = rtw_classify8021d(skb); @@ -1095,11 +588,11 @@ static const struct net_device_ops rtw_netdev_ops = { int rtw_init_netdev_name(struct net_device *pnetdev, const char *ifname) { - _adapter *padapter = rtw_netdev_priv(pnetdev); + struct adapter *padapter = rtw_netdev_priv(pnetdev); #ifdef CONFIG_EASY_REPLACEMENT struct net_device *TargetNetdev = NULL; - _adapter *TargetAdapter = NULL; + struct adapter *TargetAdapter = NULL; struct net *devnet = NULL; if(padapter->bDongle == 1) @@ -1145,17 +638,17 @@ int rtw_init_netdev_name(struct net_device *pnetdev, const char *ifname) return 0; } -struct net_device *rtw_init_netdev(_adapter *old_padapter) +struct net_device *rtw_init_netdev(struct adapter *old_padapter) { - _adapter *padapter; + struct adapter *padapter; struct net_device *pnetdev; RT_TRACE(_module_os_intfs_c_,_drv_info_,("+init_net_dev\n")); if(old_padapter != NULL) - pnetdev = rtw_alloc_etherdev_with_old_priv(sizeof(_adapter), (void *)old_padapter); + pnetdev = rtw_alloc_etherdev_with_old_priv(sizeof(struct adapter), (void *)old_padapter); else - pnetdev = rtw_alloc_etherdev(sizeof(_adapter)); + pnetdev = rtw_alloc_etherdev(sizeof(struct adapter)); if (!pnetdev) return NULL; @@ -1203,7 +696,7 @@ struct net_device *rtw_init_netdev(_adapter *old_padapter) } -u32 rtw_start_drv_threads(_adapter *padapter) +u32 rtw_start_drv_threads(struct adapter *padapter) { u32 _status = _SUCCESS; @@ -1253,7 +746,7 @@ u32 rtw_start_drv_threads(_adapter *padapter) void rtw_unregister_netdevs(struct dvobj_priv *dvobj) { int i; - _adapter *padapter = NULL; + struct adapter *padapter = NULL; for(i=0;iiface_nums;i++) { @@ -1281,7 +774,7 @@ void rtw_unregister_netdevs(struct dvobj_priv *dvobj) } -void rtw_stop_drv_threads (_adapter *padapter) +void rtw_stop_drv_threads (struct adapter *padapter) { RT_TRACE(_module_os_intfs_c_,_drv_info_,("+rtw_stop_drv_threads\n")); @@ -1322,8 +815,8 @@ void rtw_stop_drv_threads (_adapter *padapter) rtw_hal_stop_thread(padapter); } -u8 rtw_init_default_value(_adapter *padapter); -u8 rtw_init_default_value(_adapter *padapter) +u8 rtw_init_default_value(struct adapter *padapter); +u8 rtw_init_default_value(struct adapter *padapter) { u8 ret = _SUCCESS; struct registry_priv* pregistrypriv = &padapter->registrypriv; @@ -1396,7 +889,7 @@ u8 rtw_init_default_value(_adapter *padapter) return ret; } -u8 rtw_reset_drv_sw(_adapter *padapter) +u8 rtw_reset_drv_sw(struct adapter *padapter) { u8 ret8=_SUCCESS; struct mlme_priv *pmlmepriv= &padapter->mlmepriv; @@ -1438,7 +931,7 @@ u8 rtw_reset_drv_sw(_adapter *padapter) } -u8 rtw_init_drv_sw(_adapter *padapter) +u8 rtw_init_drv_sw(struct adapter *padapter) { u8 ret8=_SUCCESS; @@ -1573,14 +1066,14 @@ exit: } #ifdef CONFIG_WOWLAN -void rtw_cancel_dynamic_chk_timer(_adapter *padapter) +void rtw_cancel_dynamic_chk_timer(struct adapter *padapter) { _cancel_timer_ex(&padapter->mlmepriv.dynamic_chk_timer); RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel dynamic_chk_timer! \n")); } #endif -void rtw_cancel_all_timer(_adapter *padapter) +void rtw_cancel_all_timer(struct adapter *padapter) { RT_TRACE(_module_os_intfs_c_,_drv_info_,("+rtw_cancel_all_timer\n")); @@ -1631,7 +1124,7 @@ void rtw_cancel_all_timer(_adapter *padapter) } -u8 rtw_free_drv_sw(_adapter *padapter) +u8 rtw_free_drv_sw(struct adapter *padapter) { struct net_device *pnetdev = (struct net_device*)padapter->pnetdev; @@ -1725,8 +1218,8 @@ u8 rtw_free_drv_sw(_adapter *padapter) #ifdef CONFIG_CONCURRENT_MODE int _netdev_if2_open(struct net_device *pnetdev) { - _adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev); - _adapter *primary_padapter = padapter->pbuddy_adapter; + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev); + struct adapter *primary_padapter = padapter->pbuddy_adapter; DBG_871X("+871x_drv - if2_open, bup=%d\n", padapter->bup); @@ -1798,7 +1291,7 @@ netdev_if2_open_error: int netdev_if2_open(struct net_device *pnetdev) { int ret; - _adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev); _enter_critical_mutex(&(adapter_to_dvobj(padapter)->hw_init_mutex), NULL); ret = _netdev_if2_open(pnetdev); @@ -1808,7 +1301,7 @@ int netdev_if2_open(struct net_device *pnetdev) static int netdev_if2_close(struct net_device *pnetdev) { - _adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev); padapter->net_closed = _TRUE; @@ -1847,11 +1340,11 @@ static const struct net_device_ops rtw_netdev_if2_ops = { #ifdef CONFIG_SDIO_HCI #include #endif -_adapter *rtw_drv_if2_init(_adapter *primary_padapter, void (*set_intf_ops)(struct _io_ops *pops)) +struct adapter *rtw_drv_if2_init(struct adapter *primary_padapter, void (*set_intf_ops)(struct _io_ops *pops)) { int res = _FAIL; struct net_device *pnetdev = NULL; - _adapter *padapter = NULL; + struct adapter *padapter = NULL; struct dvobj_priv *pdvobjpriv; u8 mac[ETH_ALEN]; @@ -1874,7 +1367,7 @@ _adapter *rtw_drv_if2_init(_adapter *primary_padapter, void (*set_intf_ops)(stru /****** init adapter ******/ padapter = rtw_netdev_priv(pnetdev); - _rtw_memcpy(padapter, primary_padapter, sizeof(_adapter)); + _rtw_memcpy(padapter, primary_padapter, sizeof(struct adapter)); // padapter->bup = _FALSE; @@ -1982,9 +1475,9 @@ error_rtw_drv_if2_init: } -void rtw_drv_if2_free(_adapter *if2) +void rtw_drv_if2_free(struct adapter *if2) { - _adapter *padapter = if2; + struct adapter *padapter = if2; struct net_device *pnetdev = NULL; if (padapter == NULL) @@ -2003,9 +1496,9 @@ void rtw_drv_if2_free(_adapter *if2) } -void rtw_drv_if2_stop(_adapter *if2) +void rtw_drv_if2_stop(struct adapter *if2) { - _adapter *padapter = if2; + struct adapter *padapter = if2; //struct net_device *pnetdev = NULL; if (padapter == NULL) @@ -2047,7 +1540,7 @@ void rtw_drv_if2_stop(_adapter *if2) #ifdef CONFIG_BR_EXT void netdev_br_init(struct net_device *netdev) { - _adapter *adapter = (_adapter *)rtw_netdev_priv(netdev); + struct adapter *adapter = (struct adapter *)rtw_netdev_priv(netdev); #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)) rcu_read_lock(); @@ -2093,7 +1586,7 @@ void netdev_br_init(struct net_device *netdev) } #endif //CONFIG_BR_EXT -static int _rtw_drv_register_netdev(_adapter *padapter, char *name) +static int _rtw_drv_register_netdev(struct adapter *padapter, char *name) { int ret = _SUCCESS; struct net_device *pnetdev = padapter->pnetdev; @@ -2126,7 +1619,7 @@ error_register_netdev: return ret; } -int rtw_drv_register_netdev(_adapter *if1) +int rtw_drv_register_netdev(struct adapter *if1) { int i, status = _SUCCESS; struct dvobj_priv *dvobj = if1->dvobj; @@ -2135,7 +1628,7 @@ int rtw_drv_register_netdev(_adapter *if1) { for(i=0; iiface_nums; i++) { - _adapter *padapter = dvobj->padapters[i]; + struct adapter *padapter = dvobj->padapters[i]; if(padapter) { @@ -2161,7 +1654,7 @@ int rtw_drv_register_netdev(_adapter *if1) int _netdev_open(struct net_device *pnetdev) { uint status; - _adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev); struct pwrctrl_priv *pwrctrlpriv = adapter_to_pwrctl(padapter); RT_TRACE(_module_os_intfs_c_,_drv_info_,("+871x_drv - dev_open\n")); @@ -2245,7 +1738,7 @@ netdev_open_normal_process: #ifdef CONFIG_CONCURRENT_MODE { - _adapter *sec_adapter = padapter->pbuddy_adapter; + struct adapter *sec_adapter = padapter->pbuddy_adapter; if(sec_adapter && (sec_adapter->bup == _FALSE)) _netdev_if2_open(sec_adapter->pnetdev); } @@ -2273,7 +1766,7 @@ netdev_open_error: int netdev_open(struct net_device *pnetdev) { int ret; - _adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev); _enter_critical_mutex(&(adapter_to_dvobj(padapter)->hw_init_mutex), NULL); ret = _netdev_open(pnetdev); @@ -2283,7 +1776,7 @@ int netdev_open(struct net_device *pnetdev) } #ifdef CONFIG_IPS -int ips_netdrv_open(_adapter *padapter) +int ips_netdrv_open(struct adapter *padapter) { int status = _SUCCESS; padapter->net_closed = _FALSE; @@ -2323,7 +1816,7 @@ netdev_open_error: } -int rtw_ips_pwr_up(_adapter *padapter) +int rtw_ips_pwr_up(struct adapter *padapter) { int result; u32 start_time = rtw_get_current_time(); @@ -2339,7 +1832,7 @@ int rtw_ips_pwr_up(_adapter *padapter) } -void rtw_ips_pwr_down(_adapter *padapter) +void rtw_ips_pwr_down(struct adapter *padapter) { u32 start_time = rtw_get_current_time(); DBG_871X("===> rtw_ips_pwr_down...................\n"); @@ -2354,7 +1847,7 @@ void rtw_ips_pwr_down(_adapter *padapter) DBG_871X("<=== rtw_ips_pwr_down..................... in %dms\n", rtw_get_passing_time_ms(start_time)); } #endif -void rtw_ips_dev_unload(_adapter *padapter) +void rtw_ips_dev_unload(struct adapter *padapter) { struct net_device *pnetdev= (struct net_device*)padapter->pnetdev; struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); @@ -2376,7 +1869,7 @@ void rtw_ips_dev_unload(_adapter *padapter) } #ifdef CONFIG_RF_GAIN_OFFSET -void rtw_bb_rf_gain_offset(_adapter *padapter) +void rtw_bb_rf_gain_offset(struct adapter *padapter) { u8 value = padapter->eeprompriv.EEPROMRFGainOffset; u8 tmp = 0x3e; @@ -2415,7 +1908,7 @@ int pm_netdev_open(struct net_device *pnetdev,u8 bnormal) status = netdev_open(pnetdev); #ifdef CONFIG_IPS else - status = (_SUCCESS == ips_netdrv_open((_adapter *)rtw_netdev_priv(pnetdev)))?(0):(-1); + status = (_SUCCESS == ips_netdrv_open((struct adapter *)rtw_netdev_priv(pnetdev)))?(0):(-1); #endif return status; @@ -2423,7 +1916,7 @@ int pm_netdev_open(struct net_device *pnetdev,u8 bnormal) static int netdev_close(struct net_device *pnetdev) { - _adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev); RT_TRACE(_module_os_intfs_c_,_drv_info_,("+871x_drv - drv_close\n")); @@ -2472,7 +1965,7 @@ static int netdev_close(struct net_device *pnetdev) #ifdef CONFIG_BR_EXT //if (OPMODE & (WIFI_STATION_STATE | WIFI_ADHOC_STATE)) { - //void nat25_db_cleanup(_adapter *priv); + //void nat25_db_cleanup(struct adapter *priv); nat25_db_cleanup(padapter); } #endif // CONFIG_BR_EXT @@ -2758,7 +2251,7 @@ static int get_defaultgw(u32 *ip_addr ,char mac[]) return 0; } -int rtw_gw_addr_query(_adapter *padapter) +int rtw_gw_addr_query(struct adapter *padapter) { struct mlme_priv *pmlmepriv = &padapter->mlmepriv; u32 gw_addr = 0; // default gw address @@ -2786,7 +2279,7 @@ int rtw_gw_addr_query(_adapter *padapter) } #endif -int rtw_suspend_free_assoc_resource(_adapter *padapter) +int rtw_suspend_free_assoc_resource(struct adapter *padapter) { struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct net_device *pnetdev = padapter->pnetdev; @@ -2842,8 +2335,8 @@ int rtw_suspend_free_assoc_resource(_adapter *padapter) DBG_871X("==> "FUNC_ADPT_FMT" exit....\n", FUNC_ADPT_ARG(padapter)); return 0; } -extern void rtw_dev_unload(_adapter *padapter); -int rtw_suspend_common(_adapter *padapter) +extern void rtw_dev_unload(struct adapter *padapter); +int rtw_suspend_common(struct adapter *padapter) { struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); struct mlme_priv *pmlmepriv = &padapter->mlmepriv; @@ -2874,7 +2367,7 @@ exit: return ret; } -int rtw_resume_common(_adapter *padapter) +int rtw_resume_common(struct adapter *padapter) { int ret = 0; struct net_device *pnetdev= padapter->pnetdev; diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c index d852670..455ee31 100755 --- a/os_dep/osdep_service.c +++ b/os_dep/osdep_service.c @@ -1270,7 +1270,7 @@ RETURN: * Jeff: this function should be called under ioctl (rtnl_lock is accquired) while * LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) */ -int rtw_change_ifname(_adapter *padapter, const char *ifname) +int rtw_change_ifname(struct adapter *padapter, const char *ifname) { struct net_device *pnetdev; struct net_device *cur_pnetdev = padapter->pnetdev; diff --git a/os_dep/recv_linux.c b/os_dep/recv_linux.c index bb6de8a..1b39e8d 100755 --- a/os_dep/recv_linux.c +++ b/os_dep/recv_linux.c @@ -34,7 +34,7 @@ #endif //init os related resource in struct recv_priv -int rtw_os_recv_resource_init(struct recv_priv *precvpriv, _adapter *padapter) +int rtw_os_recv_resource_init(struct recv_priv *precvpriv, struct adapter *padapter) { int res=_SUCCESS; @@ -42,7 +42,7 @@ int rtw_os_recv_resource_init(struct recv_priv *precvpriv, _adapter *padapter) } //alloc os related resource in union recv_frame -int rtw_os_recv_resource_alloc(_adapter *padapter, union recv_frame *precvframe) +int rtw_os_recv_resource_alloc(struct adapter *padapter, union recv_frame *precvframe) { int res=_SUCCESS; @@ -73,7 +73,7 @@ void rtw_os_recv_resource_free(struct recv_priv *precvpriv) //alloc os related resource in struct recv_buf -int rtw_os_recvbuf_resource_alloc(_adapter *padapter, struct recv_buf *precvbuf) +int rtw_os_recvbuf_resource_alloc(struct adapter *padapter, struct recv_buf *precvbuf) { int res=_SUCCESS; @@ -112,7 +112,7 @@ int rtw_os_recvbuf_resource_alloc(_adapter *padapter, struct recv_buf *precvbuf) } //free os related resource in struct recv_buf -int rtw_os_recvbuf_resource_free(_adapter *padapter, struct recv_buf *precvbuf) +int rtw_os_recvbuf_resource_free(struct adapter *padapter, struct recv_buf *precvbuf) { int ret = _SUCCESS; @@ -146,7 +146,7 @@ int rtw_os_recvbuf_resource_free(_adapter *padapter, struct recv_buf *precvbuf) } -void rtw_handle_tkip_mic_err(_adapter *padapter,u8 bgroup) +void rtw_handle_tkip_mic_err(struct adapter *padapter,u8 bgroup) { #ifdef CONFIG_IOCTL_CFG80211 enum nl80211_key_type key_type; @@ -212,7 +212,7 @@ void rtw_handle_tkip_mic_err(_adapter *padapter,u8 bgroup) #endif } -void rtw_hostapd_mlme_rx(_adapter *padapter, union recv_frame *precv_frame) +void rtw_hostapd_mlme_rx(struct adapter *padapter, union recv_frame *precv_frame) { #ifdef CONFIG_HOSTAPD_MLME _pkt *skb; @@ -253,7 +253,7 @@ void rtw_hostapd_mlme_rx(_adapter *padapter, union recv_frame *precv_frame) #endif } -int rtw_recv_indicatepkt(_adapter *padapter, union recv_frame *precv_frame) +int rtw_recv_indicatepkt(struct adapter *padapter, union recv_frame *precv_frame) { struct recv_priv *precvpriv; _queue *pfree_recv_queue; @@ -369,7 +369,7 @@ _func_enter_; if( br_port && (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == _TRUE) ) { - int nat25_handle_frame(_adapter *priv, struct sk_buff *skb); + int nat25_handle_frame(struct adapter *priv, struct sk_buff *skb); if (nat25_handle_frame(padapter, skb) == -1) { //priv->ext_stats.rx_data_drops++; //DEBUG_ERR("RX DROP: nat25_handle_frame fail!\n"); @@ -469,7 +469,7 @@ _func_exit_; } -void rtw_os_read_port(_adapter *padapter, struct recv_buf *precvbuf) +void rtw_os_read_port(struct adapter *padapter, struct recv_buf *precvbuf) { struct recv_priv *precvpriv = &padapter->recvpriv; @@ -504,7 +504,7 @@ void _rtw_reordering_ctrl_timeout_handler (void *FunctionContext) void rtw_init_recv_timer(struct recv_reorder_ctrl *preorder_ctrl) { - _adapter *padapter = preorder_ctrl->padapter; + struct adapter *padapter = preorder_ctrl->padapter; _init_timer(&(preorder_ctrl->reordering_ctrl_timer), padapter->pnetdev, _rtw_reordering_ctrl_timeout_handler, preorder_ctrl); diff --git a/os_dep/rtw_android.c b/os_dep/rtw_android.c index 06d05a8..dbb430a 100755 --- a/os_dep/rtw_android.c +++ b/os_dep/rtw_android.c @@ -244,7 +244,7 @@ int rtw_android_cmdstr_to_num(char *cmdstr) static int rtw_android_get_rssi(struct net_device *net, char *command, int total_len) { - _adapter *padapter = (_adapter *)rtw_netdev_priv(net); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(net); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct wlan_network *pcur_network = &pmlmepriv->cur_network; int bytes_written = 0; @@ -259,7 +259,7 @@ static int rtw_android_get_rssi(struct net_device *net, char *command, int total static int rtw_android_get_link_speed(struct net_device *net, char *command, int total_len) { - _adapter *padapter = (_adapter *)rtw_netdev_priv(net); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(net); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct wlan_network *pcur_network = &pmlmepriv->cur_network; int bytes_written = 0; @@ -273,7 +273,7 @@ static int rtw_android_get_link_speed(struct net_device *net, char *command, int static int rtw_android_get_macaddr(struct net_device *net, char *command, int total_len) { - _adapter *adapter = (_adapter *)rtw_netdev_priv(net); + struct adapter *adapter = (struct adapter *)rtw_netdev_priv(net); int bytes_written = 0; bytes_written = snprintf(command, total_len, "Macaddr = "MAC_FMT, MAC_ARG(net->dev_addr)); @@ -282,7 +282,7 @@ static int rtw_android_get_macaddr(struct net_device *net, char *command, int to static int rtw_android_set_country(struct net_device *net, char *command, int total_len) { - _adapter *adapter = (_adapter *)rtw_netdev_priv(net); + struct adapter *adapter = (struct adapter *)rtw_netdev_priv(net); char *country_code = command + strlen(android_wifi_cmd_str[ANDROID_WIFI_CMD_COUNTRY]) + 1; int ret = _FAIL; @@ -304,7 +304,7 @@ static int rtw_android_get_p2p_dev_addr(struct net_device *net, char *command, i static int rtw_android_set_block(struct net_device *net, char *command, int total_len) { - _adapter *adapter = (_adapter *)rtw_netdev_priv(net); + struct adapter *adapter = (struct adapter *)rtw_netdev_priv(net); char *block_value = command + strlen(android_wifi_cmd_str[ANDROID_WIFI_CMD_BLOCK]) + 1; #ifdef CONFIG_IOCTL_CFG80211 @@ -337,7 +337,7 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd) int cmd_num; int bytes_written = 0; android_wifi_priv_cmd priv_cmd; - _adapter* padapter = ( _adapter * ) rtw_netdev_priv(net); + struct adapter* padapter = ( struct adapter * ) rtw_netdev_priv(net); #ifdef CONFIG_WFD struct wifi_display_info *pwfd_info; #endif @@ -399,7 +399,7 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd) break; case ANDROID_WIFI_CMD_SCAN_ACTIVE: - //rtw_set_scan_mode((_adapter *)rtw_netdev_priv(net), SCAN_ACTIVE); + //rtw_set_scan_mode((struct adapter *)rtw_netdev_priv(net), SCAN_ACTIVE); #ifdef CONFIG_PLATFORM_MSTAR #ifdef CONFIG_IOCTL_CFG80211 (wdev_to_priv(net->ieee80211_ptr))->bandroid_scan = _TRUE; @@ -407,7 +407,7 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd) #endif //CONFIG_PLATFORM_MSTAR break; case ANDROID_WIFI_CMD_SCAN_PASSIVE: - //rtw_set_scan_mode((_adapter *)rtw_netdev_priv(net), SCAN_PASSIVE); + //rtw_set_scan_mode((struct adapter *)rtw_netdev_priv(net), SCAN_PASSIVE); break; case ANDROID_WIFI_CMD_RSSI: @@ -466,7 +466,7 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd) case ANDROID_WIFI_CMD_SETBAND: { uint band = *(command + strlen("SETBAND") + 1) - '0'; - _adapter* padapter = ( _adapter * ) rtw_netdev_priv(net); + struct adapter* padapter = ( struct adapter * ) rtw_netdev_priv(net); if (padapter->chip_type == RTL8192D) padapter->setband = band; @@ -554,7 +554,7 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd) // Specify the WFD device type ( WFD source/primary sink ) struct wifi_display_info *pwfd_info; - _adapter* padapter = ( _adapter * ) rtw_netdev_priv(net); + struct adapter* padapter = ( struct adapter * ) rtw_netdev_priv(net); pwfd_info = &padapter->wfd_info; if (padapter->wdinfo.driver_interface == DRIVER_CFG80211) { diff --git a/os_dep/usb_intf.c b/os_dep/usb_intf.c index ad8c2a9..185ce48 100755 --- a/os_dep/usb_intf.c +++ b/os_dep/usb_intf.c @@ -54,7 +54,7 @@ int ui_pid[3] = {0, 0, 0}; extern int pm_netdev_open(struct net_device *pnetdev,u8 bnormal); static int rtw_suspend(struct usb_interface *intf, pm_message_t message); static int rtw_resume(struct usb_interface *intf); -int rtw_resume_process(_adapter *padapter); +int rtw_resume_process(struct adapter *padapter); static int rtw_drv_init(struct usb_interface *pusb_intf,const struct usb_device_id *pdid); @@ -64,7 +64,7 @@ static void rtw_dev_shutdown(struct device *dev) { struct usb_interface *usb_intf = container_of(dev, struct usb_interface, dev); struct dvobj_priv *dvobj = usb_get_intfdata(usb_intf); - _adapter *adapter = dvobj->if1; + struct adapter *adapter = dvobj->if1; int i; DBG_871X("%s\n", __func__); @@ -481,13 +481,13 @@ _func_enter_; _func_exit_; } -static void decide_chip_type_by_usb_device_id(_adapter *padapter, const struct usb_device_id *pdid) +static void decide_chip_type_by_usb_device_id(struct adapter *padapter, const struct usb_device_id *pdid) { padapter->chip_type = NULL_CHIP_TYPE; hal_set_hw_type(padapter); } -static void usb_intf_start(_adapter *padapter) +static void usb_intf_start(struct adapter *padapter) { RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+usb_intf_start\n")); @@ -498,7 +498,7 @@ static void usb_intf_start(_adapter *padapter) } -static void usb_intf_stop(_adapter *padapter) +static void usb_intf_stop(struct adapter *padapter) { RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+usb_intf_stop\n")); @@ -523,7 +523,7 @@ static void usb_intf_stop(_adapter *padapter) } -void rtw_dev_unload(_adapter *padapter) +void rtw_dev_unload(struct adapter *padapter) { struct net_device *pnetdev= (struct net_device*)padapter->pnetdev; u8 val8; @@ -619,7 +619,7 @@ static void process_spec_devid(const struct usb_device_id *pdid) } #ifdef SUPPORT_HW_RFOFF_DETECTED -int rtw_hw_suspend(_adapter *padapter ) +int rtw_hw_suspend(struct adapter *padapter ) { struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); struct usb_interface *pusb_intf = adapter_to_dvobj(padapter)->pusbintf; @@ -697,7 +697,7 @@ error_exit: } -int rtw_hw_resume(_adapter *padapter) +int rtw_hw_resume(struct adapter *padapter) { struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); struct usb_interface *pusb_intf = adapter_to_dvobj(padapter)->pusbintf; @@ -750,7 +750,7 @@ error_exit: #if 1 #ifdef CONFIG_WOWLAN -static void rtw_suspend_wow(_adapter *padapter) +static void rtw_suspend_wow(struct adapter *padapter) { struct net_device *pnetdev = padapter->pnetdev; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; @@ -825,7 +825,7 @@ static void rtw_suspend_wow(_adapter *padapter) static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message) { struct dvobj_priv *dvobj = usb_get_intfdata(pusb_intf); - _adapter *padapter = dvobj->if1; + struct adapter *padapter = dvobj->if1; struct net_device *pnetdev = padapter->pnetdev; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct pwrctrl_priv *pwrpriv = dvobj_to_pwrctl(dvobj); @@ -898,7 +898,7 @@ exit: static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message) { struct dvobj_priv *dvobj = usb_get_intfdata(pusb_intf); - _adapter *padapter = dvobj->if1; + struct adapter *padapter = dvobj->if1; struct net_device *pnetdev = padapter->pnetdev; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct pwrctrl_priv *pwrpriv = dvobj_to_pwrctl(dvobj); @@ -1019,7 +1019,7 @@ exit: static int rtw_resume(struct usb_interface *pusb_intf) { struct dvobj_priv *dvobj = usb_get_intfdata(pusb_intf); - _adapter *padapter = dvobj->if1; + struct adapter *padapter = dvobj->if1; struct net_device *pnetdev = padapter->pnetdev; struct pwrctrl_priv *pwrpriv = dvobj_to_pwrctl(dvobj); int ret = 0; @@ -1047,7 +1047,7 @@ static int rtw_resume(struct usb_interface *pusb_intf) } -int rtw_resume_process(_adapter *padapter) +int rtw_resume_process(struct adapter *padapter) { struct net_device *pnetdev; struct pwrctrl_priv *pwrpriv; @@ -1146,7 +1146,7 @@ exit: } #ifdef CONFIG_AUTOSUSPEND -void autosuspend_enter(_adapter* padapter) +void autosuspend_enter(struct adapter* padapter) { struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); struct dvobj_priv *dvobj = adapter_to_dvobj(padapter); @@ -1201,7 +1201,7 @@ void autosuspend_enter(_adapter* padapter) #endif } -int autoresume_enter(_adapter* padapter) +int autoresume_enter(struct adapter* padapter) { int result = _SUCCESS; struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); @@ -1293,16 +1293,16 @@ static script_item_u item; * We accept the new device by returning 0. */ -_adapter *rtw_sw_export = NULL; +struct adapter *rtw_sw_export = NULL; -_adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj, +struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj, struct usb_interface *pusb_intf, const struct usb_device_id *pdid) { - _adapter *padapter = NULL; + struct adapter *padapter = NULL; struct net_device *pnetdev = NULL; int status = _FAIL; - if ((padapter = (_adapter *)rtw_zvmalloc(sizeof(*padapter))) == NULL) { + if ((padapter = (struct adapter *)rtw_zvmalloc(sizeof(*padapter))) == NULL) { goto exit; } padapter->dvobj = dvobj; @@ -1459,7 +1459,7 @@ exit: return padapter; } -static void rtw_usb_if1_deinit(_adapter *if1) +static void rtw_usb_if1_deinit(struct adapter *if1) { struct net_device *pnetdev = if1->pnetdev; struct mlme_priv *pmlmepriv= &if1->mlmepriv; @@ -1649,7 +1649,7 @@ static void dump_usb_interface(struct usb_interface *usb_intf) static int rtw_drv_init(struct usb_interface *pusb_intf, const struct usb_device_id *pdid) { int i; - _adapter *if1 = NULL, *if2 = NULL; + struct adapter *if1 = NULL, *if2 = NULL; int status; struct dvobj_priv *dvobj; @@ -1738,7 +1738,7 @@ extern void rtw_unregister_netdevs(struct dvobj_priv *dvobj); static void rtw_dev_remove(struct usb_interface *pusb_intf) { struct dvobj_priv *dvobj = usb_get_intfdata(pusb_intf); - _adapter *padapter = dvobj->if1; + struct adapter *padapter = dvobj->if1; struct net_device *pnetdev = padapter->pnetdev; struct mlme_priv *pmlmepriv= &padapter->mlmepriv; @@ -1879,7 +1879,7 @@ module_init(rtw_drv_entry); module_exit(rtw_drv_halt); #ifdef CONFIG_INTEL_PROXIM -_adapter *rtw_usb_get_sw_pointer(void) +struct adapter *rtw_usb_get_sw_pointer(void) { return rtw_sw_export; } diff --git a/os_dep/usb_ops_linux.c b/os_dep/usb_ops_linux.c index db75464..7de0d2f 100755 --- a/os_dep/usb_ops_linux.c +++ b/os_dep/usb_ops_linux.c @@ -216,7 +216,7 @@ static u32 usb_bulkout_zero(struct intf_hdl *pintfhdl, u32 addr) unsigned char *pbuf; struct zero_bulkout_context *pcontext; PURB purb = NULL; - _adapter *padapter = (_adapter *)pintfhdl->padapter; + struct adapter *padapter = (struct adapter *)pintfhdl->padapter; struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter); struct usb_device *pusbd = pdvobj->pusbdev; @@ -281,7 +281,7 @@ void usb_read_port_cancel(struct intf_hdl *pintfhdl) { int i; struct recv_buf *precvbuf; - _adapter *padapter = pintfhdl->padapter; + struct adapter *padapter = pintfhdl->padapter; precvbuf = (struct recv_buf *)padapter->recvpriv.precv_buf; DBG_871X("%s\n", __func__); @@ -309,8 +309,8 @@ static void usb_write_port_complete(struct urb *purb, struct pt_regs *regs) int i; struct xmit_buf *pxmitbuf = (struct xmit_buf *)purb->context; //struct xmit_frame *pxmitframe = (struct xmit_frame *)pxmitbuf->priv_data; - //_adapter *padapter = pxmitframe->padapter; - _adapter *padapter = pxmitbuf->padapter; + //struct adapter *padapter = pxmitframe->padapter; + struct adapter *padapter = pxmitbuf->padapter; struct xmit_priv *pxmitpriv = &padapter->xmitpriv; //struct pkt_attrib *pattrib = &pxmitframe->attrib; @@ -463,7 +463,7 @@ u32 usb_write_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem) int status; u32 ret = _FAIL, bwritezero = _FALSE; PURB purb = NULL; - _adapter *padapter = (_adapter *)pintfhdl->padapter; + struct adapter *padapter = (struct adapter *)pintfhdl->padapter; struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter); struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_buf *pxmitbuf = (struct xmit_buf *)wmem; @@ -669,7 +669,7 @@ _func_exit_; void usb_write_port_cancel(struct intf_hdl *pintfhdl) { int i, j; - _adapter *padapter = pintfhdl->padapter; + struct adapter *padapter = pintfhdl->padapter; struct xmit_buf *pxmitbuf = (struct xmit_buf *)padapter->xmitpriv.pxmitbuf; DBG_871X("%s \n", __func__); diff --git a/os_dep/xmit_linux.c b/os_dep/xmit_linux.c index c7e40b8..2c72730 100755 --- a/os_dep/xmit_linux.c +++ b/os_dep/xmit_linux.c @@ -123,7 +123,7 @@ void rtw_set_tx_chksum_offload(_pkt *pkt, struct pkt_attrib *pattrib) } -int rtw_os_xmit_resource_alloc(_adapter *padapter, struct xmit_buf *pxmitbuf,u32 alloc_sz) +int rtw_os_xmit_resource_alloc(struct adapter *padapter, struct xmit_buf *pxmitbuf,u32 alloc_sz) { #ifdef CONFIG_USB_HCI int i; @@ -172,7 +172,7 @@ int rtw_os_xmit_resource_alloc(_adapter *padapter, struct xmit_buf *pxmitbuf,u32 return _SUCCESS; } -void rtw_os_xmit_resource_free(_adapter *padapter, struct xmit_buf *pxmitbuf,u32 free_sz) +void rtw_os_xmit_resource_free(struct adapter *padapter, struct xmit_buf *pxmitbuf,u32 free_sz) { #ifdef CONFIG_USB_HCI int i; @@ -207,7 +207,7 @@ void rtw_os_xmit_resource_free(_adapter *padapter, struct xmit_buf *pxmitbuf,u32 #define WMM_XMIT_THRESHOLD (NR_XMITFRAME*2/5) -void rtw_os_pkt_complete(_adapter *padapter, _pkt *pkt) +void rtw_os_pkt_complete(struct adapter *padapter, _pkt *pkt) { #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) u16 queue; @@ -232,7 +232,7 @@ void rtw_os_pkt_complete(_adapter *padapter, _pkt *pkt) rtw_skb_free(pkt); } -void rtw_os_xmit_complete(_adapter *padapter, struct xmit_frame *pxframe) +void rtw_os_xmit_complete(struct adapter *padapter, struct xmit_frame *pxframe) { if(pxframe->pkt) rtw_os_pkt_complete(padapter, pxframe->pkt); @@ -240,9 +240,9 @@ void rtw_os_xmit_complete(_adapter *padapter, struct xmit_frame *pxframe) pxframe->pkt = NULL; } -void rtw_os_xmit_schedule(_adapter *padapter) +void rtw_os_xmit_schedule(struct adapter *padapter) { - _adapter *pri_adapter = padapter; + struct adapter *pri_adapter = padapter; #if defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI) if(!padapter) @@ -277,7 +277,7 @@ void rtw_os_xmit_schedule(_adapter *padapter) #endif } -static void rtw_check_xmit_resource(_adapter *padapter, _pkt *pkt) +static void rtw_check_xmit_resource(struct adapter *padapter, _pkt *pkt) { struct xmit_priv *pxmitpriv = &padapter->xmitpriv; #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,35)) @@ -306,7 +306,7 @@ static void rtw_check_xmit_resource(_adapter *padapter, _pkt *pkt) } #ifdef CONFIG_TX_MCAST2UNI -static int rtw_mlcst2unicst(_adapter *padapter, struct sk_buff *skb) +static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb) { struct sta_priv *pstapriv = &padapter->stapriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv; @@ -378,7 +378,7 @@ static int rtw_mlcst2unicst(_adapter *padapter, struct sk_buff *skb) int _rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev) { - _adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev); + struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev); struct xmit_priv *pxmitpriv = &padapter->xmitpriv; #ifdef CONFIG_TX_MCAST2UNI struct mlme_priv *pmlmepriv = &padapter->mlmepriv;