skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2024-11-24 21:43:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Convert typedef for _adapter, etc.

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-26 20:08:39 -05:00
parent e8012b9521
commit 2bd2f4b4c8
99 changed files with 2239 additions and 2251 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
core/rtw_ap.c
View file

@ -32,7 +32,7 @@ extern unsigned char WPS_OUI[];
extern unsigned char P2P_OUI[]; extern unsigned char P2P_OUI[];
extern unsigned char WFD_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_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@ -48,7 +48,7 @@ void init_mlme_ap_info(_adapter *padapter)
start_ap_mode(padapter); start_ap_mode(padapter);
} }
void free_mlme_ap_info(_adapter *padapter) void free_mlme_ap_info(struct adapter *padapter)
{ {
unsigned long irqL; unsigned long irqL;
struct sta_info *psta=NULL; struct sta_info *psta=NULL;
@ -76,7 +76,7 @@ void free_mlme_ap_info(_adapter *padapter)
_rtw_spinlock_free(&pmlmepriv->bcn_update_lock); _rtw_spinlock_free(&pmlmepriv->bcn_update_lock);
} }
static void update_BCNTIM(_adapter *padapter) static void update_BCNTIM(struct adapter *padapter)
{ {
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
@ -165,7 +165,7 @@ static void update_BCNTIM(_adapter *padapter)
set_tx_beacon_cmd(padapter); set_tx_beacon_cmd(padapter);
} }
void rtw_add_bcn_ie(_adapter *padapter, struct wlan_bssid_ex *pnetwork, u8 index, u8 *data, u8 len) void rtw_add_bcn_ie(struct adapter *padapter, struct wlan_bssid_ex *pnetwork, u8 index, u8 *data, u8 len)
{ {
struct ndis_802_11_var_ie * pIE; struct ndis_802_11_var_ie * pIE;
u8 bmatch = false; u8 bmatch = false;
@ -227,7 +227,7 @@ void rtw_add_bcn_ie(_adapter *padapter, struct wlan_bssid_ex *pnetwork, u8 index
pnetwork->IELength = offset + remainder_ielen; pnetwork->IELength = offset + remainder_ielen;
} }
void rtw_remove_bcn_ie(_adapter *padapter, struct wlan_bssid_ex *pnetwork, u8 index) void rtw_remove_bcn_ie(struct adapter *padapter, struct wlan_bssid_ex *pnetwork, u8 index)
{ {
u8 *p, *dst_ie, *premainder_ie=NULL, *pbackup_remainder_ie=NULL; u8 *p, *dst_ie, *premainder_ie=NULL, *pbackup_remainder_ie=NULL;
uint offset, ielen, ie_offset, remainder_ielen = 0; uint offset, ielen, ie_offset, remainder_ielen = 0;
@ -278,7 +278,7 @@ static u8 chk_sta_is_alive(struct sta_info *psta)
return ret; return ret;
} }
void expire_timeout_chk(_adapter *padapter) void expire_timeout_chk(struct adapter *padapter)
{ {
unsigned long irqL; unsigned long irqL;
struct list_head *phead, *plist; struct list_head *phead, *plist;
@ -444,7 +444,7 @@ void expire_timeout_chk(_adapter *padapter)
associated_clients_update(padapter, updated); 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; int i;
u8 rf_type; u8 rf_type;
@ -543,7 +543,7 @@ void add_RATid(_adapter *padapter, struct sta_info *psta, u8 rssi_level)
} }
} }
static void update_bmc_sta(_adapter *padapter) static void update_bmc_sta(struct adapter *padapter)
{ {
unsigned long irqL; unsigned long irqL;
u32 init_rate=0; u32 init_rate=0;
@ -632,7 +632,7 @@ static void update_bmc_sta(_adapter *padapter)
/* MAC_ID = 0 for bssid for sta/ap/adhoc */ /* MAC_ID = 0 for bssid for sta/ap/adhoc */
/* CAM_ID = 0~3 for default key, cmd_id=macid + 3, macid=aid+1; */ /* 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)
{ {
unsigned long irqL; unsigned long irqL;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@ -699,7 +699,7 @@ void update_sta_info_apmode(_adapter *padapter, struct sta_info *psta)
_exit_critical_bh(&psta->lock, &irqL); _exit_critical_bh(&psta->lock, &irqL);
} }
static void update_hw_ht_param(_adapter *padapter) static void update_hw_ht_param(struct adapter *padapter)
{ {
unsigned char max_AMPDU_len; unsigned char max_AMPDU_len;
unsigned char min_MPDU_spacing; unsigned char min_MPDU_spacing;
@ -730,7 +730,7 @@ static void update_hw_ht_param(_adapter *padapter)
DBG_88E("%s(): WLAN_HT_CAP_SM_PS_STATIC\n",__func__); DBG_88E("%s(): WLAN_HT_CAP_SM_PS_STATIC\n",__func__);
} }
static void start_bss_network(_adapter *padapter, u8 *pbuf) static void start_bss_network(struct adapter *padapter, u8 *pbuf)
{ {
u8 *p; u8 *p;
u8 val8, cur_channel, cur_bwmode, cur_ch_offset; u8 val8, cur_channel, cur_bwmode, cur_ch_offset;
@ -873,7 +873,7 @@ static void start_bss_network(_adapter *padapter, u8 *pbuf)
update_bmc_sta(padapter); update_bmc_sta(padapter);
} }
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; int ret=_SUCCESS;
u8 *p; u8 *p;
@ -1193,7 +1193,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 sta_priv *pstapriv = &padapter->stapriv;
struct wlan_acl_pool *pacl_list = &pstapriv->acl_list; struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;
@ -1203,7 +1203,7 @@ void rtw_set_macaddr_acl(_adapter *padapter, int mode)
pacl_list->mode = mode; pacl_list->mode = mode;
} }
int rtw_acl_add_sta(_adapter *padapter, u8 *addr) int rtw_acl_add_sta(struct adapter *padapter, u8 *addr)
{ {
unsigned long irqL; unsigned long irqL;
struct list_head *plist, *phead; struct list_head *plist, *phead;
@ -1277,7 +1277,7 @@ int rtw_acl_add_sta(_adapter *padapter, u8 *addr)
return ret; return ret;
} }
int rtw_acl_remove_sta(_adapter *padapter, u8 *addr) int rtw_acl_remove_sta(struct adapter *padapter, u8 *addr)
{ {
unsigned long irqL; unsigned long irqL;
struct list_head *plist, *phead; struct list_head *plist, *phead;
@ -1320,13 +1320,13 @@ int rtw_acl_remove_sta(_adapter *padapter, u8 *addr)
} }
static void update_bcn_fixed_ie(_adapter *padapter) static void update_bcn_fixed_ie(struct adapter *padapter)
{ {
DBG_88E("%s\n", __func__); DBG_88E("%s\n", __func__);
} }
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_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
@ -1361,37 +1361,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_88E("%s\n", __func__); DBG_88E("%s\n", __func__);
} }
static void update_bcn_htinfo_ie(_adapter *padapter) static void update_bcn_htinfo_ie(struct adapter *padapter)
{ {
DBG_88E("%s\n", __func__); DBG_88E("%s\n", __func__);
} }
static void update_bcn_rsn_ie(_adapter *padapter) static void update_bcn_rsn_ie(struct adapter *padapter)
{ {
DBG_88E("%s\n", __func__); DBG_88E("%s\n", __func__);
} }
static void update_bcn_wpa_ie(_adapter *padapter) static void update_bcn_wpa_ie(struct adapter *padapter)
{ {
DBG_88E("%s\n", __func__); DBG_88E("%s\n", __func__);
} }
static void update_bcn_wmm_ie(_adapter *padapter) static void update_bcn_wmm_ie(struct adapter *padapter)
{ {
DBG_88E("%s\n", __func__); DBG_88E("%s\n", __func__);
} }
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; u8 *pwps_ie=NULL, *pwps_ie_src, *premainder_ie, *pbackup_remainder_ie=NULL;
uint wps_ielen=0, wps_offset, remainder_ielen; uint wps_ielen=0, wps_offset, remainder_ielen;
@ -1447,12 +1447,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_88E("%s\n", __func__); DBG_88E("%s\n", __func__);
@ -1480,7 +1480,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)
{ {
unsigned long irqL; unsigned long irqL;
struct mlme_priv *pmlmepriv; struct mlme_priv *pmlmepriv;
@ -1567,7 +1567,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 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) (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; u16 cur_op_mode, new_op_mode;
int op_mode_changes = 0; int op_mode_changes = 0;
@ -1638,7 +1638,7 @@ static int rtw_ht_operation_update(_adapter *padapter)
#endif /* CONFIG_80211N_HT */ #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. */ /* update associcated stations cap. */
if (updated == true) if (updated == true)
@ -1670,7 +1670,7 @@ void associated_clients_update(_adapter *padapter, u8 updated)
} }
/* called > TSR LEVEL for USB or SDIO Interface*/ /* 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; u8 beacon_updated = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@ -1843,7 +1843,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; u8 beacon_updated = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@ -1917,7 +1917,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)
{ {
unsigned long irqL; unsigned long irqL;
u8 beacon_updated = false; u8 beacon_updated = false;
@ -1962,7 +1962,7 @@ u8 ap_free_sta(_adapter *padapter, struct sta_info *psta, bool active, u16 reaso
return beacon_updated; return beacon_updated;
} }
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)
{ {
unsigned long irqL; unsigned long irqL;
struct list_head *phead, *plist; struct list_head *phead, *plist;
@ -1999,7 +1999,7 @@ int rtw_ap_inform_ch_switch (_adapter *padapter, u8 new_ch, u8 ch_offset)
return ret; return ret;
} }
int rtw_sta_flush(_adapter *padapter) int rtw_sta_flush(struct adapter *padapter)
{ {
unsigned long irqL; unsigned long irqL;
struct list_head *phead, *plist; struct list_head *phead, *plist;
@ -2044,7 +2044,7 @@ int rtw_sta_flush(_adapter *padapter)
} }
/* called > TSR LEVEL for USB or SDIO Interface*/ /* 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; int flags = psta->flags;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@ -2083,7 +2083,7 @@ void sta_info_update(_adapter *padapter, struct sta_info *psta)
} }
/* called >= TSR LEVEL for USB or SDIO Interface*/ /* 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) if (psta->state & _FW_LINKED)
{ {
@ -2092,7 +2092,7 @@ void ap_sta_info_defer_update(_adapter *padapter, struct sta_info *psta)
} }
} }
void start_ap_mode(_adapter *padapter) void start_ap_mode(struct adapter *padapter)
{ {
int i; int i;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@ -2147,7 +2147,7 @@ void start_ap_mode(_adapter *padapter)
} }
void stop_ap_mode(_adapter *padapter) void stop_ap_mode(struct adapter *padapter)
{ {
unsigned long irqL; unsigned long irqL;
struct list_head *phead, *plist; struct list_head *phead, *plist;

24
core/rtw_br_ext.c
View file

@ -128,7 +128,7 @@ static int skb_pull_and_merge(struct sk_buff *skb, unsigned char *src, int len)
return 0; return 0;
} }
static __inline__ unsigned long __nat25_timeout(_adapter *priv) static __inline__ unsigned long __nat25_timeout(struct adapter *priv)
{ {
unsigned long timeout; unsigned long timeout;
@ -138,7 +138,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) struct nat25_network_db_entry *fdb)
{ {
if (time_before_eq(fdb->ageing_timer, __nat25_timeout(priv))) if (time_before_eq(fdb->ageing_timer, __nat25_timeout(priv)))
@ -355,7 +355,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) struct nat25_network_db_entry *ent, int hash)
{ {
/* Caller must _enter_critical_bh already! */ /* Caller must _enter_critical_bh already! */
@ -388,7 +388,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 sk_buff *skb, unsigned char *networkAddr)
{ {
struct nat25_network_db_entry *db; struct nat25_network_db_entry *db;
@ -443,7 +443,7 @@ static int __nat25_db_network_lookup_and_replace(_adapter *priv,
return 0; return 0;
} }
static void __nat25_db_network_insert(_adapter *priv, static void __nat25_db_network_insert(struct adapter *priv,
unsigned char *macAddr, unsigned char *networkAddr) unsigned char *macAddr, unsigned char *networkAddr)
{ {
struct nat25_network_db_entry *db; struct nat25_network_db_entry *db;
@ -483,7 +483,7 @@ static void __nat25_db_network_insert(_adapter *priv,
} }
static void __nat25_db_print(_adapter *priv) static void __nat25_db_print(struct adapter *priv)
{ {
} }
@ -491,7 +491,7 @@ static void __nat25_db_print(_adapter *priv)
* NAT2.5 interface * NAT2.5 interface
*/ */
void nat25_db_cleanup(_adapter *priv) void nat25_db_cleanup(struct adapter *priv)
{ {
int i; int i;
unsigned long irqL; unsigned long irqL;
@ -522,7 +522,7 @@ void nat25_db_cleanup(_adapter *priv)
} }
void nat25_db_expire(_adapter *priv) void nat25_db_expire(struct adapter *priv)
{ {
int i; int i;
unsigned long irqL; unsigned long irqL;
@ -559,7 +559,7 @@ void nat25_db_expire(_adapter *priv)
_exit_critical_bh(&priv->br_ext_lock, &irqL); _exit_critical_bh(&priv->br_ext_lock, &irqL);
} }
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 short protocol;
unsigned char networkAddr[MAX_NETWORK_ADDR_LEN]; unsigned char networkAddr[MAX_NETWORK_ADDR_LEN];
@ -1247,7 +1247,7 @@ int nat25_db_handle(_adapter *priv, struct sk_buff *skb, int method)
return -1; return -1;
} }
int nat25_handle_frame(_adapter *priv, struct sk_buff *skb) int nat25_handle_frame(struct adapter *priv, struct sk_buff *skb)
{ {
if (!(skb->data[0] & 1)) { if (!(skb->data[0] & 1)) {
int is_vlan_tag=0, i, retval=0; int is_vlan_tag=0, i, retval=0;
@ -1334,7 +1334,7 @@ struct dhcpMessage {
u_int8_t options[308]; /* 312 - cookie */ 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) if (skb == NULL)
return; return;
@ -1380,7 +1380,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 *ipAddr)
{ {
unsigned char networkAddr[MAX_NETWORK_ADDR_LEN]; unsigned char networkAddr[MAX_NETWORK_ADDR_LEN];

118
core/rtw_cmd.c
View file

@ -264,7 +264,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) u32 rtw_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)
{ {
int res = _FAIL; int res = _FAIL;
PADAPTER padapter = pcmdpriv->padapter; struct adapter * padapter = pcmdpriv->padapter;
_func_enter_; _func_enter_;
@ -341,9 +341,9 @@ int rtw_cmd_thread(void *context)
u8 ret; u8 ret;
struct cmd_obj *pcmd; struct cmd_obj *pcmd;
u8 *pcmdbuf; u8 *pcmdbuf;
u8 (*cmd_hdl)(_adapter *padapter, u8* pbuf); u8 (*cmd_hdl)(struct adapter *padapter, u8* pbuf);
void (*pcmd_callback)(_adapter *dev, struct cmd_obj *pcmd); void (*pcmd_callback)(struct adapter *dev, struct cmd_obj *pcmd);
PADAPTER padapter = (PADAPTER)context; struct adapter * padapter = (struct adapter *)context;
struct cmd_priv *pcmdpriv = &(padapter->cmdpriv); struct cmd_priv *pcmdpriv = &(padapter->cmdpriv);
_func_enter_; _func_enter_;
@ -460,7 +460,7 @@ _func_exit_;
} }
u8 rtw_setstandby_cmd(_adapter *padapter, uint action) u8 rtw_setstandby_cmd(struct adapter *padapter, uint action)
{ {
struct cmd_obj* ph2c; struct cmd_obj* ph2c;
struct usb_suspend_parm* psetusbsuspend; struct usb_suspend_parm* psetusbsuspend;
@ -501,7 +501,7 @@ rtw_sitesurvey_cmd(~)
### NOTE:#### (!!!!) ### NOTE:#### (!!!!)
MUST TAKE CARE THAT BEFORE CALLING THIS FUNC, YOU SHOULD HAVE LOCKED pmlmepriv->lock MUST TAKE CARE THAT BEFORE CALLING THIS FUNC, YOU SHOULD HAVE LOCKED pmlmepriv->lock
*/ */
u8 rtw_sitesurvey_cmd(_adapter *padapter, struct ndis_802_11_ssid *ssid, int ssid_num, u8 rtw_sitesurvey_cmd(struct adapter *padapter, struct ndis_802_11_ssid *ssid, int ssid_num,
struct rtw_ieee80211_channel *ch, int ch_num) struct rtw_ieee80211_channel *ch, int ch_num)
{ {
u8 res = _FAIL; u8 res = _FAIL;
@ -592,7 +592,7 @@ _func_exit_;
return res; return res;
} }
u8 rtw_setdatarate_cmd(_adapter *padapter, u8 *rateset) u8 rtw_setdatarate_cmd(struct adapter *padapter, u8 *rateset)
{ {
struct cmd_obj* ph2c; struct cmd_obj* ph2c;
struct setdatarate_parm* pbsetdataratepara; struct setdatarate_parm* pbsetdataratepara;
@ -625,7 +625,7 @@ _func_exit_;
return res; return res;
} }
u8 rtw_setbasicrate_cmd(_adapter *padapter, u8 *rateset) u8 rtw_setbasicrate_cmd(struct adapter *padapter, u8 *rateset)
{ {
struct cmd_obj* ph2c; struct cmd_obj* ph2c;
struct setbasicrate_parm* pssetbasicratepara; struct setbasicrate_parm* pssetbasicratepara;
@ -667,7 +667,7 @@ unsigned char rtw_setphy_cmd(unsigned char *adapter)
2. for AdHoc/Ap mode or mp mode? 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 cmd_obj* ph2c;
struct setphy_parm* psetphypara; struct setphy_parm* psetphypara;
@ -704,7 +704,7 @@ _func_exit_;
return res; 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 cmd_obj* ph2c;
struct writeBB_parm* pwritebbparm; struct writeBB_parm* pwritebbparm;
@ -735,7 +735,7 @@ _func_exit_;
return res; 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 cmd_obj* ph2c;
struct readBB_parm* prdbbparm; struct readBB_parm* prdbbparm;
@ -770,7 +770,7 @@ _func_exit_;
return res; 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 cmd_obj* ph2c;
struct writeRF_parm* pwriterfparm; struct writeRF_parm* pwriterfparm;
@ -801,7 +801,7 @@ _func_exit_;
return res; 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 cmd_obj* ph2c;
struct readRF_parm* prdrfparm; struct readRF_parm* prdrfparm;
@ -841,7 +841,7 @@ _func_exit_;
return res; 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_; _func_enter_;
@ -853,7 +853,7 @@ void rtw_getbbrfreg_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd)
_func_exit_; _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_; _func_enter_;
@ -865,7 +865,7 @@ void rtw_readtssi_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd)
_func_exit_; _func_exit_;
} }
u8 rtw_createbss_cmd(_adapter *padapter) u8 rtw_createbss_cmd(struct adapter *padapter)
{ {
struct cmd_obj* pcmd; struct cmd_obj* pcmd;
struct cmd_priv *pcmdpriv=&padapter->cmdpriv; struct cmd_priv *pcmdpriv=&padapter->cmdpriv;
@ -904,7 +904,7 @@ _func_exit_;
return res; 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_obj* pcmd;
struct cmd_priv *pcmdpriv=&padapter->cmdpriv; struct cmd_priv *pcmdpriv=&padapter->cmdpriv;
@ -934,7 +934,7 @@ _func_exit_;
return res; return res;
} }
u8 rtw_joinbss_cmd(_adapter *padapter, struct wlan_network* pnetwork) u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network* pnetwork)
{ {
u8 res = _SUCCESS; u8 res = _SUCCESS;
uint t_len = 0; uint t_len = 0;
@ -1096,7 +1096,7 @@ _func_exit_;
return res; 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 cmd_obj *cmdobj = NULL;
struct disconnect_parm *param = NULL; struct disconnect_parm *param = NULL;
@ -1139,7 +1139,7 @@ _func_exit_;
return res; return res;
} }
u8 rtw_setopmode_cmd(_adapter *padapter, enum ndis_802_11_network_infra networktype) u8 rtw_setopmode_cmd(struct adapter *padapter, enum ndis_802_11_network_infra networktype)
{ {
struct cmd_obj* ph2c; struct cmd_obj* ph2c;
struct setopmode_parm* psetop; struct setopmode_parm* psetop;
@ -1174,7 +1174,7 @@ _func_exit_;
return res; return res;
} }
u8 rtw_setstakey_cmd(_adapter *padapter, u8 *psta, u8 unicast_key) u8 rtw_setstakey_cmd(struct adapter *padapter, u8 *psta, u8 unicast_key)
{ {
struct cmd_obj* ph2c; struct cmd_obj* ph2c;
struct set_stakey_parm *psetstakey_para; struct set_stakey_parm *psetstakey_para;
@ -1239,7 +1239,7 @@ _func_exit_;
return res; 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 cmd_obj* ph2c;
struct set_stakey_parm *psetstakey_para; struct set_stakey_parm *psetstakey_para;
@ -1300,7 +1300,7 @@ _func_exit_;
return res; 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 cmd_obj* ph2c;
struct setratable_parm * psetrttblparm; struct setratable_parm * psetrttblparm;
@ -1332,7 +1332,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 cmd_obj* ph2c;
struct getratable_parm * pgetrttblparm; struct getratable_parm * pgetrttblparm;
@ -1371,7 +1371,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_priv *pcmdpriv = &padapter->cmdpriv;
struct cmd_obj* ph2c; struct cmd_obj* ph2c;
@ -1417,7 +1417,7 @@ _func_exit_;
return res; 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_priv *pcmdpriv = &padapter->cmdpriv;
struct cmd_obj* ph2c; struct cmd_obj* ph2c;
@ -1457,7 +1457,7 @@ _func_exit_;
return res; return res;
} }
u8 rtw_dynamic_chk_wk_cmd(_adapter*padapter) u8 rtw_dynamic_chk_wk_cmd(struct adapter*padapter)
{ {
struct cmd_obj* ph2c; struct cmd_obj* ph2c;
struct drvextra_cmd_parm *pdrvextra_cmd_parm; struct drvextra_cmd_parm *pdrvextra_cmd_parm;
@ -1497,7 +1497,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 cmd_obj *pcmdobj;
struct set_ch_parm *set_ch_parm; struct set_ch_parm *set_ch_parm;
@ -1552,7 +1552,7 @@ _func_exit_;
return res; 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 cmd_obj* pcmdobj;
struct SetChannelPlan_param *setChannelPlan_param; struct SetChannelPlan_param *setChannelPlan_param;
@ -1611,7 +1611,7 @@ _func_exit_;
return res; return res;
} }
u8 rtw_led_blink_cmd(_adapter*padapter, struct LED_871x * pLed) u8 rtw_led_blink_cmd(struct adapter*padapter, struct LED_871x * pLed)
{ {
struct cmd_obj* pcmdobj; struct cmd_obj* pcmdobj;
struct LedBlink_param *ledBlink_param; struct LedBlink_param *ledBlink_param;
@ -1648,7 +1648,7 @@ _func_exit_;
return res; 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 cmd_obj* pcmdobj;
struct SetChannelSwitch_param*setChannelSwitch_param; struct SetChannelSwitch_param*setChannelSwitch_param;
@ -1686,12 +1686,12 @@ _func_exit_;
return res; return res;
} }
u8 rtw_tdls_cmd(_adapter *padapter, u8 *addr, u8 option) u8 rtw_tdls_cmd(struct adapter *padapter, u8 *addr, u8 option)
{ {
return _SUCCESS; return _SUCCESS;
} }
static void traffic_status_watchdog(_adapter *padapter) static void traffic_status_watchdog(struct adapter *padapter)
{ {
u8 bEnterPS; u8 bEnterPS;
u8 bBusyTraffic = false, bTxBusyTraffic = false, bRxBusyTraffic = false; u8 bBusyTraffic = false, bTxBusyTraffic = false, bRxBusyTraffic = false;
@ -1776,12 +1776,12 @@ static void traffic_status_watchdog(_adapter *padapter)
pmlmepriv->LinkDetectInfo.bHigherBusyTxTraffic = bHigherBusyTxTraffic; pmlmepriv->LinkDetectInfo.bHigherBusyTxTraffic = bHigherBusyTxTraffic;
} }
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(_adapter *padapter, u8 *pbuf, int sz) void dynamic_chk_wk_hdl(struct adapter *padapter, u8 *pbuf, int sz)
{ {
struct mlme_priv *pmlmepriv; struct mlme_priv *pmlmepriv;
padapter = (_adapter *)pbuf; padapter = (struct adapter *)pbuf;
pmlmepriv = &(padapter->mlmepriv); pmlmepriv = &(padapter->mlmepriv);
#ifdef CONFIG_AP_MODE #ifdef CONFIG_AP_MODE
@ -1802,7 +1802,7 @@ void dynamic_chk_wk_hdl(_adapter *padapter, u8 *pbuf, int sz)
#endif #endif
} }
void lps_ctrl_wk_hdl(_adapter *padapter, u8 lps_ctrl_type) void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type)
{ {
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@ -1886,7 +1886,7 @@ _func_enter_;
_func_exit_; _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 cmd_obj *ph2c;
struct drvextra_cmd_parm *pdrvextra_cmd_parm; struct drvextra_cmd_parm *pdrvextra_cmd_parm;
@ -1936,12 +1936,12 @@ _func_exit_;
} }
#if (RATE_ADAPTIVE_SUPPORT==1) #if (RATE_ADAPTIVE_SUPPORT==1)
static void rpt_timer_setting_wk_hdl(_adapter *padapter, u16 minRptTime) static void rpt_timer_setting_wk_hdl(struct adapter *padapter, u16 minRptTime)
{ {
rtw_hal_set_hwreg(padapter, HW_VAR_RPT_TIMER_SETTING, (u8 *)(&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 cmd_obj *ph2c;
struct drvextra_cmd_parm *pdrvextra_cmd_parm; struct drvextra_cmd_parm *pdrvextra_cmd_parm;
@ -1978,12 +1978,12 @@ _func_exit_;
#endif #endif
static void antenna_select_wk_hdl(_adapter *padapter, u8 antenna) static void antenna_select_wk_hdl(struct adapter *padapter, u8 antenna)
{ {
rtw_hal_set_hwreg(padapter, HW_VAR_ANTENNA_DIVERSITY_SELECT, (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 cmd_obj *ph2c;
struct drvextra_cmd_parm *pdrvextra_cmd_parm; struct drvextra_cmd_parm *pdrvextra_cmd_parm;
@ -2028,13 +2028,13 @@ _func_exit_;
} }
void power_saving_wk_hdl(_adapter *padapter, u8 *pbuf, int sz) void power_saving_wk_hdl(struct adapter *padapter, u8 *pbuf, int sz)
{ {
rtw_ps_processor(padapter); rtw_ps_processor(padapter);
} }
#ifdef CONFIG_P2P #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 cmd_obj *ph2c;
struct drvextra_cmd_parm *pdrvextra_cmd_parm; struct drvextra_cmd_parm *pdrvextra_cmd_parm;
@ -2079,7 +2079,7 @@ _func_exit_;
} }
#endif /* CONFIG_P2P */ #endif /* CONFIG_P2P */
u8 rtw_ps_cmd(_adapter*padapter) u8 rtw_ps_cmd(struct adapter*padapter)
{ {
struct cmd_obj *ppscmd; struct cmd_obj *ppscmd;
struct drvextra_cmd_parm *pdrvextra_cmd_parm; struct drvextra_cmd_parm *pdrvextra_cmd_parm;
@ -2117,7 +2117,7 @@ _func_exit_;
#ifdef CONFIG_AP_MODE #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; int cnt=0;
struct sta_info *psta_bmc; struct sta_info *psta_bmc;
@ -2164,7 +2164,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 cmd_obj *ph2c;
struct drvextra_cmd_parm *pdrvextra_cmd_parm; struct drvextra_cmd_parm *pdrvextra_cmd_parm;
@ -2199,7 +2199,7 @@ exit:
} }
#endif #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 cmd_obj *ph2c;
struct drvextra_cmd_parm *pdrvextra_cmd_parm; struct drvextra_cmd_parm *pdrvextra_cmd_parm;
@ -2232,7 +2232,7 @@ exit:
return res; return res;
} }
static s32 c2h_evt_hdl(_adapter *adapter, struct c2h_evt_hdr *c2h_evt, c2h_id_filter filter) static s32 c2h_evt_hdl(struct adapter *adapter, struct c2h_evt_hdr *c2h_evt, c2h_id_filter filter)
{ {
s32 ret = _FAIL; s32 ret = _FAIL;
u8 buf[16]; u8 buf[16];
@ -2261,7 +2261,7 @@ exit:
static void c2h_wk_callback(struct work_struct *work) static void c2h_wk_callback(struct work_struct *work)
{ {
struct evt_priv *evtpriv = container_of(work, struct evt_priv, c2h_wk); 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; struct c2h_evt_hdr *c2h_evt;
c2h_id_filter ccx_id_filter = rtw_hal_c2h_id_filter_ccx(adapter); c2h_id_filter ccx_id_filter = rtw_hal_c2h_id_filter_ccx(adapter);
@ -2299,7 +2299,7 @@ static void c2h_wk_callback(struct work_struct *work)
evtpriv->c2h_wk_alive = false; evtpriv->c2h_wk_alive = false;
} }
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; struct drvextra_cmd_parm *pdrvextra_cmd;
@ -2356,7 +2356,7 @@ u8 rtw_drvextra_cmd_hdl(_adapter *padapter, unsigned char *pbuf)
return H2C_SUCCESS; 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; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -2378,7 +2378,7 @@ _func_enter_;
_func_exit_; _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)
{ {
unsigned long irqL; unsigned long irqL;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -2405,7 +2405,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; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -2428,7 +2428,7 @@ _func_enter_;
_func_exit_; _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)
{ {
unsigned long irqL; unsigned long irqL;
u8 timer_cancelled; u8 timer_cancelled;
@ -2505,7 +2505,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; struct sta_priv * pstapriv = &padapter->stapriv;
@ -2524,7 +2524,7 @@ exit:
_func_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)
{ {
unsigned long irqL; unsigned long irqL;
struct sta_priv * pstapriv = &padapter->stapriv; struct sta_priv * pstapriv = &padapter->stapriv;
@ -2557,8 +2557,8 @@ exit:
_func_exit_; _func_exit_;
} }
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(_adapter* padapter, struct cmd_obj *pcmd) void rtw_getrttbl_cmd_cmdrsp_callback(struct adapter* padapter, struct cmd_obj *pcmd)
{ {
_func_enter_; _func_enter_;

74
core/rtw_debug.c
View file

@ -48,7 +48,7 @@ int proc_set_write_reg(struct file *file, const char __user *buffer,
unsigned long count, void *data) unsigned long count, void *data)
{ {
struct net_device *dev = (struct net_device *)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]; char tmp[32];
u32 addr, val, len; u32 addr, val, len;
@ -97,7 +97,7 @@ int proc_get_read_reg(char *page, char **start,
int *eof, void *data) int *eof, void *data)
{ {
struct net_device *dev = 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 len = 0;
@ -163,7 +163,7 @@ int proc_get_fwstate(char *page, char **start,
int *eof, void *data) int *eof, void *data)
{ {
struct net_device *dev = 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); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
int len = 0; int len = 0;
@ -179,7 +179,7 @@ int proc_get_sec_info(char *page, char **start,
int *eof, void *data) int *eof, void *data)
{ {
struct net_device *dev = 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; struct security_priv *psecuritypriv = &padapter->securitypriv;
int len = 0; int len = 0;
@ -197,7 +197,7 @@ int proc_get_mlmext_state(char *page, char **start,
int *eof, void *data) int *eof, void *data)
{ {
struct net_device *dev = 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_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -214,7 +214,7 @@ int proc_get_qos_option(char *page, char **start,
int *eof, void *data) int *eof, void *data)
{ {
struct net_device *dev = 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); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
int len = 0; int len = 0;
@ -231,7 +231,7 @@ int proc_get_ht_option(char *page, char **start,
int *eof, void *data) int *eof, void *data)
{ {
struct net_device *dev = 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); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
int len = 0; int len = 0;
@ -247,7 +247,7 @@ int proc_get_rf_info(char *page, char **start,
int *eof, void *data) int *eof, void *data)
{ {
struct net_device *dev = 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_priv *pmlmeext = &padapter->mlmeextpriv;
int len = 0; int len = 0;
@ -266,7 +266,7 @@ int proc_get_ap_info(char *page, char **start,
{ {
struct sta_info *psta; struct sta_info *psta;
struct net_device *dev = 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); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct wlan_network *cur_network = &(pmlmepriv->cur_network); struct wlan_network *cur_network = &(pmlmepriv->cur_network);
@ -316,7 +316,7 @@ int proc_get_adapter_state(char *page, char **start,
int *eof, void *data) int *eof, void *data)
{ {
struct net_device *dev = 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 len = 0;
len += snprintf(page + len, count - len, "bSurpriseRemoved=%d, bDriverStopped=%d\n", len += snprintf(page + len, count - len, "bSurpriseRemoved=%d, bDriverStopped=%d\n",
@ -332,7 +332,7 @@ int proc_get_trx_info(char *page, char **start,
int *eof, void *data) int *eof, void *data)
{ {
struct net_device *dev = data; 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 xmit_priv *pxmitpriv = &padapter->xmitpriv;
struct recv_priv *precvpriv = &padapter->recvpriv; struct recv_priv *precvpriv = &padapter->recvpriv;
int len = 0; int len = 0;
@ -351,7 +351,7 @@ int proc_get_mac_reg_dump1(char *page, char **start,
int *eof, void *data) int *eof, void *data)
{ {
struct net_device *dev = 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 len = 0;
int i,j=1; int i,j=1;
@ -374,7 +374,7 @@ int proc_get_mac_reg_dump2(char *page, char **start,
int *eof, void *data) int *eof, void *data)
{ {
struct net_device *dev = 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 len = 0;
int i,j=1; int i,j=1;
@ -397,7 +397,7 @@ int proc_get_mac_reg_dump3(char *page, char **start,
int *eof, void *data) int *eof, void *data)
{ {
struct net_device *dev = 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 len = 0;
int i,j=1; int i,j=1;
@ -420,7 +420,7 @@ int proc_get_bb_reg_dump1(char *page, char **start,
int *eof, void *data) int *eof, void *data)
{ {
struct net_device *dev = 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 len = 0;
int i,j=1; int i,j=1;
@ -440,7 +440,7 @@ int proc_get_bb_reg_dump2(char *page, char **start,
int *eof, void *data) int *eof, void *data)
{ {
struct net_device *dev = 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 len = 0;
int i,j=1; int i,j=1;
@ -460,7 +460,7 @@ int proc_get_bb_reg_dump3(char *page, char **start,
int *eof, void *data) int *eof, void *data)
{ {
struct net_device *dev = 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 len = 0;
int i,j=1; int i,j=1;
@ -480,7 +480,7 @@ int proc_get_rf_reg_dump1(char *page, char **start,
int *eof, void *data) int *eof, void *data)
{ {
struct net_device *dev = 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 len = 0;
int i,j=1,path; int i,j=1,path;
u32 value; u32 value;
@ -506,7 +506,7 @@ int proc_get_rf_reg_dump2(char *page, char **start,
int *eof, void *data) int *eof, void *data)
{ {
struct net_device *dev = 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 len = 0;
int i,j=1,path; int i,j=1,path;
u32 value; u32 value;
@ -531,7 +531,7 @@ int proc_get_rf_reg_dump3(char *page, char **start,
int *eof, void *data) int *eof, void *data)
{ {
struct net_device *dev = 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 len = 0;
int i,j=1,path; int i,j=1,path;
u32 value; u32 value;
@ -557,7 +557,7 @@ int proc_get_rf_reg_dump4(char *page, char **start,
int *eof, void *data) int *eof, void *data)
{ {
struct net_device *dev = 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 len = 0;
int i,j=1,path; int i,j=1,path;
u32 value; u32 value;
@ -583,7 +583,7 @@ int proc_get_rx_signal(char *page, char **start,
int *eof, void *data) int *eof, void *data)
{ {
struct net_device *dev = 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); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
int len = 0; int len = 0;
@ -609,7 +609,7 @@ int proc_set_rx_signal(struct file *file, const char __user *buffer,
unsigned long count, void *data) unsigned long count, void *data)
{ {
struct net_device *dev = (struct net_device *)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]; char tmp[32];
u32 is_signal_dbg; u32 is_signal_dbg;
s32 signal_strength; s32 signal_strength;
@ -643,7 +643,7 @@ int proc_get_ht_enable(char *page, char **start,
int *eof, void *data) int *eof, void *data)
{ {
struct net_device *dev = 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; struct registry_priv *pregpriv = &padapter->registrypriv;
int len = 0; int len = 0;
@ -660,7 +660,7 @@ int proc_set_ht_enable(struct file *file, const char __user *buffer,
unsigned long count, void *data) unsigned long count, void *data)
{ {
struct net_device *dev = (struct net_device *)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; struct registry_priv *pregpriv = &padapter->registrypriv;
char tmp[32]; char tmp[32];
s32 mode; s32 mode;
@ -688,7 +688,7 @@ int proc_get_cbw40_enable(char *page, char **start,
int *eof, void *data) int *eof, void *data)
{ {
struct net_device *dev = 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; struct registry_priv *pregpriv = &padapter->registrypriv;
int len = 0; int len = 0;
@ -707,7 +707,7 @@ int proc_set_cbw40_enable(struct file *file, const char __user *buffer,
unsigned long count, void *data) unsigned long count, void *data)
{ {
struct net_device *dev = (struct net_device *)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; struct registry_priv *pregpriv = &padapter->registrypriv;
char tmp[32]; char tmp[32];
s32 mode; s32 mode;
@ -737,7 +737,7 @@ int proc_get_ampdu_enable(char *page, char **start,
int *eof, void *data) int *eof, void *data)
{ {
struct net_device *dev = 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; struct registry_priv *pregpriv = &padapter->registrypriv;
int len = 0; int len = 0;
@ -756,7 +756,7 @@ int proc_set_ampdu_enable(struct file *file, const char __user *buffer,
unsigned long count, void *data) unsigned long count, void *data)
{ {
struct net_device *dev = (struct net_device *)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; struct registry_priv *pregpriv = &padapter->registrypriv;
char tmp[32]; char tmp[32];
s32 mode; s32 mode;
@ -786,7 +786,7 @@ int proc_get_two_path_rssi(char *page, char **start,
int *eof, void *data) int *eof, void *data)
{ {
struct net_device *dev = 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 len = 0;
@ -806,7 +806,7 @@ int proc_get_rx_stbc(char *page, char **start,
int *eof, void *data) int *eof, void *data)
{ {
struct net_device *dev = 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; struct registry_priv *pregpriv = &padapter->registrypriv;
int len = 0; int len = 0;
@ -825,7 +825,7 @@ int proc_set_rx_stbc(struct file *file, const char __user *buffer,
unsigned long count, void *data) unsigned long count, void *data)
{ {
struct net_device *dev = (struct net_device *)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; struct registry_priv *pregpriv = &padapter->registrypriv;
char tmp[32]; char tmp[32];
u32 mode; u32 mode;
@ -862,7 +862,7 @@ int proc_set_rssi_disp(struct file *file, const char __user *buffer,
unsigned long count, void *data) unsigned long count, void *data)
{ {
struct net_device *dev = (struct net_device *)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]; char tmp[32];
u32 enable=0; u32 enable=0;
@ -908,7 +908,7 @@ int proc_get_all_sta_info(char *page, char **start,
unsigned long irqL; unsigned long irqL;
struct sta_info *psta; struct sta_info *psta;
struct net_device *dev = data; 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; struct sta_priv *pstapriv = &padapter->stapriv;
int i, j; int i, j;
struct list_head *plist, *phead; struct list_head *plist, *phead;
@ -971,7 +971,7 @@ int proc_get_best_channel(char *page, char **start,
int *eof, void *data) int *eof, void *data)
{ {
struct net_device *dev = 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_priv *pmlmeext = &padapter->mlmeextpriv;
int len = 0; int len = 0;
u32 i, best_channel_24G = 1, best_channel_5G = 36, index_24G = 0, index_5G = 0; u32 i, best_channel_24G = 1, best_channel_5G = 36, index_24G = 0, index_5G = 0;
@ -1035,7 +1035,7 @@ int proc_get_btcoex_dbg(char *page, char **start,
int *eof, void *data) int *eof, void *data)
{ {
struct net_device *dev = 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; struct registry_priv *pregpriv = &padapter->registrypriv;
int len = 0; int len = 0;
@ -1054,7 +1054,7 @@ int proc_set_btcoex_dbg(struct file *file, const char __user *buffer,
unsigned long count, void *data) unsigned long count, void *data)
{ {
struct net_device *dev = (struct net_device *)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; struct registry_priv *pregpriv = &padapter->registrypriv;
char tmp[32]; char tmp[32];
u32 mode; u32 mode;

86
core/rtw_efuse.c
View file

@ -50,12 +50,12 @@ u8 fakeBTEfuseModifiedMap[EFUSE_BT_MAX_MAP_LEN]={0};
bool bool
Efuse_Read1ByteFromFakeContent( Efuse_Read1ByteFromFakeContent(
PADAPTER pAdapter, struct adapter * pAdapter,
u16 Offset, u16 Offset,
u8 *Value ); u8 *Value );
bool bool
Efuse_Read1ByteFromFakeContent( Efuse_Read1ByteFromFakeContent(
PADAPTER pAdapter, struct adapter * pAdapter,
u16 Offset, u16 Offset,
u8 *Value ) u8 *Value )
{ {
@ -72,12 +72,12 @@ Efuse_Read1ByteFromFakeContent(
bool bool
Efuse_Write1ByteToFakeContent( Efuse_Write1ByteToFakeContent(
PADAPTER pAdapter, struct adapter * pAdapter,
u16 Offset, u16 Offset,
u8 Value ); u8 Value );
bool bool
Efuse_Write1ByteToFakeContent( Efuse_Write1ByteToFakeContent(
PADAPTER pAdapter, struct adapter * pAdapter,
u16 Offset, u16 Offset,
u8 Value ) u8 Value )
{ {
@ -114,7 +114,7 @@ Efuse_Write1ByteToFakeContent(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
void void
Efuse_PowerSwitch( Efuse_PowerSwitch(
PADAPTER pAdapter, struct adapter * pAdapter,
u8 bWrite, u8 bWrite,
u8 PwrState) u8 PwrState)
{ {
@ -139,7 +139,7 @@ Efuse_PowerSwitch(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
u16 u16
Efuse_GetCurrentSize( Efuse_GetCurrentSize(
PADAPTER pAdapter, struct adapter * pAdapter,
u8 efuseType, u8 efuseType,
bool bPseudoTest) bool bPseudoTest)
{ {
@ -175,7 +175,7 @@ Efuse_CalculateWordCnts(u8 word_en)
/* */ /* */
void void
ReadEFuseByte( ReadEFuseByte(
PADAPTER Adapter, struct adapter * Adapter,
u16 _offset, u16 _offset,
u8 *pbuf, u8 *pbuf,
bool bPseudoTest) bool bPseudoTest)
@ -240,7 +240,7 @@ ReadEFuseByte(
void void
efuse_ReadEFuse( efuse_ReadEFuse(
PADAPTER Adapter, struct adapter * Adapter,
u8 efuseType, u8 efuseType,
u16 _offset, u16 _offset,
u16 _size_byte, u16 _size_byte,
@ -249,7 +249,7 @@ efuse_ReadEFuse(
); );
void void
efuse_ReadEFuse( efuse_ReadEFuse(
PADAPTER Adapter, struct adapter * Adapter,
u8 efuseType, u8 efuseType,
u16 _offset, u16 _offset,
u16 _size_byte, u16 _size_byte,
@ -262,7 +262,7 @@ efuse_ReadEFuse(
void void
EFUSE_GetEfuseDefinition( EFUSE_GetEfuseDefinition(
PADAPTER pAdapter, struct adapter * pAdapter,
u8 efuseType, u8 efuseType,
u8 type, u8 type,
void *pOut, void *pOut,
@ -290,7 +290,7 @@ EFUSE_GetEfuseDefinition(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
u8 u8
EFUSE_Read1Byte( EFUSE_Read1Byte(
PADAPTER Adapter, struct adapter * Adapter,
u16 Address) u16 Address)
{ {
u8 data; u8 data;
@ -355,12 +355,12 @@ EFUSE_Read1Byte(
void void
EFUSE_Write1Byte( EFUSE_Write1Byte(
PADAPTER Adapter, struct adapter * Adapter,
u16 Address, u16 Address,
u8 Value); u8 Value);
void void
EFUSE_Write1Byte( EFUSE_Write1Byte(
PADAPTER Adapter, struct adapter * Adapter,
u16 Address, u16 Address,
u8 Value) u8 Value)
{ {
@ -408,7 +408,7 @@ EFUSE_Write1Byte(
/* 11/16/2008 MH Read one byte from real Efuse. */ /* 11/16/2008 MH Read one byte from real Efuse. */
u8 u8
efuse_OneByteRead( efuse_OneByteRead(
PADAPTER pAdapter, struct adapter * pAdapter,
u16 addr, u16 addr,
u8 *data, u8 *data,
bool bPseudoTest) bool bPseudoTest)
@ -449,7 +449,7 @@ efuse_OneByteRead(
/* 11/16/2008 MH Write one byte to reald Efuse. */ /* 11/16/2008 MH Write one byte to reald Efuse. */
u8 u8
efuse_OneByteWrite( efuse_OneByteWrite(
PADAPTER pAdapter, struct adapter * pAdapter,
u16 addr, u16 addr,
u8 data, u8 data,
bool bPseudoTest) bool bPseudoTest)
@ -492,7 +492,7 @@ efuse_OneByteWrite(
} }
int int
Efuse_PgPacketRead( PADAPTER pAdapter, Efuse_PgPacketRead( struct adapter * pAdapter,
u8 offset, u8 offset,
u8 *data, u8 *data,
bool bPseudoTest) bool bPseudoTest)
@ -505,7 +505,7 @@ Efuse_PgPacketRead( PADAPTER pAdapter,
} }
int int
Efuse_PgPacketWrite( PADAPTER pAdapter, Efuse_PgPacketWrite( struct adapter * pAdapter,
u8 offset, u8 offset,
u8 word_en, u8 word_en,
u8 *data, u8 *data,
@ -520,7 +520,7 @@ Efuse_PgPacketWrite( PADAPTER pAdapter,
static int static int
Efuse_PgPacketWrite_BT( PADAPTER pAdapter, Efuse_PgPacketWrite_BT( struct adapter * pAdapter,
u8 offset, u8 offset,
u8 word_en, u8 word_en,
u8 *data, u8 *data,
@ -579,7 +579,7 @@ efuse_WordEnableDataRead( u8 word_en,
u8 u8
Efuse_WordEnableDataWrite( PADAPTER pAdapter, Efuse_WordEnableDataWrite( struct adapter * pAdapter,
u16 efuse_addr, u16 efuse_addr,
u8 word_en, u8 word_en,
u8 *data, u8 *data,
@ -592,12 +592,12 @@ Efuse_WordEnableDataWrite( PADAPTER pAdapter,
return ret; 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); 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); return efuse_OneByteWrite(padapter,address, *value, false);
} }
@ -605,12 +605,12 @@ static u8 efuse_write8(PADAPTER padapter, u16 address, u8 *value)
/* /*
* read/wirte raw efuse data * 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; int i = 0;
u16 real_content_len = 0, max_available_size = 0; u16 real_content_len = 0, max_available_size = 0;
u8 res = _FAIL ; u8 res = _FAIL ;
u8 (*rw8)(PADAPTER, u16, u8*); u8 (*rw8)(struct adapter *, u16, u8*);
EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_REAL_CONTENT_LEN, (void *)&real_content_len, false); EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_REAL_CONTENT_LEN, (void *)&real_content_len, false);
EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false); EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_available_size, false);
@ -643,14 +643,14 @@ u8 rtw_efuse_access(PADAPTER padapter, u8 bWrite, u16 start_addr, u16 cnts, u8 *
return res; return res;
} }
/* */ /* */
u16 efuse_GetMaxSize(PADAPTER padapter) u16 efuse_GetMaxSize(struct adapter * padapter)
{ {
u16 max_size; u16 max_size;
EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI , TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_size, false); EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI , TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (void *)&max_size, false);
return max_size; return max_size;
} }
/* */ /* */
u8 efuse_GetCurrentSize(PADAPTER padapter, u16 *size) u8 efuse_GetCurrentSize(struct adapter * padapter, u16 *size)
{ {
Efuse_PowerSwitch(padapter, false, true); Efuse_PowerSwitch(padapter, false, true);
*size = Efuse_GetCurrentSize(padapter, EFUSE_WIFI, false); *size = Efuse_GetCurrentSize(padapter, EFUSE_WIFI, false);
@ -659,7 +659,7 @@ u8 efuse_GetCurrentSize(PADAPTER padapter, u16 *size)
return _SUCCESS; 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; u16 mapLen=0;
@ -677,7 +677,7 @@ u8 rtw_efuse_map_read(PADAPTER padapter, u16 addr, u16 cnts, u8 *data)
return _SUCCESS; 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; u16 mapLen=0;
@ -695,7 +695,7 @@ u8 rtw_BT_efuse_map_read(PADAPTER padapter, u16 addr, u16 cnts, u8 *data)
return _SUCCESS; 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 offset, word_en;
u8 *map; u8 *map;
@ -787,7 +787,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 offset, word_en;
u8 *map; u8 *map;
@ -900,13 +900,13 @@ exit:
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
void void
Efuse_ReadAllMap( Efuse_ReadAllMap(
PADAPTER pAdapter, struct adapter * pAdapter,
u8 efuseType, u8 efuseType,
u8 *Efuse, u8 *Efuse,
bool bPseudoTest); bool bPseudoTest);
void void
Efuse_ReadAllMap( Efuse_ReadAllMap(
PADAPTER pAdapter, struct adapter * pAdapter,
u8 efuseType, u8 efuseType,
u8 *Efuse, u8 *Efuse,
bool bPseudoTest) bool bPseudoTest)
@ -942,7 +942,7 @@ Efuse_ReadAllMap(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
static void static void
efuse_ShadowRead1Byte( efuse_ShadowRead1Byte(
PADAPTER pAdapter, struct adapter * pAdapter,
u16 Offset, u16 Offset,
u8 *Value) u8 *Value)
{ {
@ -955,7 +955,7 @@ efuse_ShadowRead1Byte(
/* Read Two Bytes */ /* Read Two Bytes */
static void static void
efuse_ShadowRead2Byte( efuse_ShadowRead2Byte(
PADAPTER pAdapter, struct adapter * pAdapter,
u16 Offset, u16 Offset,
u16 *Value) u16 *Value)
{ {
@ -969,7 +969,7 @@ efuse_ShadowRead2Byte(
/* Read Four Bytes */ /* Read Four Bytes */
static void static void
efuse_ShadowRead4Byte( efuse_ShadowRead4Byte(
PADAPTER pAdapter, struct adapter * pAdapter,
u16 Offset, u16 Offset,
u32 *Value) u32 *Value)
{ {
@ -1003,7 +1003,7 @@ efuse_ShadowRead4Byte(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
static void static void
efuse_ShadowWrite1Byte( efuse_ShadowWrite1Byte(
PADAPTER pAdapter, struct adapter * pAdapter,
u16 Offset, u16 Offset,
u8 Value) u8 Value)
{ {
@ -1016,7 +1016,7 @@ efuse_ShadowWrite1Byte(
/* Write Two Bytes */ /* Write Two Bytes */
static void static void
efuse_ShadowWrite2Byte( efuse_ShadowWrite2Byte(
PADAPTER pAdapter, struct adapter * pAdapter,
u16 Offset, u16 Offset,
u16 Value) u16 Value)
{ {
@ -1030,7 +1030,7 @@ efuse_ShadowWrite2Byte(
/* Write Four Bytes */ /* Write Four Bytes */
static void static void
efuse_ShadowWrite4Byte( efuse_ShadowWrite4Byte(
PADAPTER pAdapter, struct adapter * pAdapter,
u16 Offset, u16 Offset,
u32 Value) u32 Value)
{ {
@ -1060,7 +1060,7 @@ efuse_ShadowWrite4Byte(
* *
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
void EFUSE_ShadowMapUpdate( void EFUSE_ShadowMapUpdate(
PADAPTER pAdapter, struct adapter * pAdapter,
u8 efuseType, u8 efuseType,
bool bPseudoTest) bool bPseudoTest)
{ {
@ -1093,7 +1093,7 @@ void EFUSE_ShadowMapUpdate(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
void void
EFUSE_ShadowRead( EFUSE_ShadowRead(
PADAPTER pAdapter, struct adapter * pAdapter,
u8 Type, u8 Type,
u16 Offset, u16 Offset,
u32 *Value ) u32 *Value )
@ -1125,13 +1125,13 @@ EFUSE_ShadowRead(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
void void
EFUSE_ShadowWrite( EFUSE_ShadowWrite(
PADAPTER pAdapter, struct adapter * pAdapter,
u8 Type, u8 Type,
u16 Offset, u16 Offset,
u32 Value); u32 Value);
void void
EFUSE_ShadowWrite( EFUSE_ShadowWrite(
PADAPTER pAdapter, struct adapter * pAdapter,
u8 Type, u8 Type,
u16 Offset, u16 Offset,
u32 Value) u32 Value)
@ -1154,11 +1154,11 @@ EFUSE_ShadowWrite(
void void
Efuse_InitSomeVar( Efuse_InitSomeVar(
PADAPTER pAdapter struct adapter * pAdapter
); );
void void
Efuse_InitSomeVar( Efuse_InitSomeVar(
PADAPTER pAdapter struct adapter * pAdapter
) )
{ {
u8 i; u8 i;

36
core/rtw_io.c
View file

@ -52,7 +52,7 @@ jackson@realtek.com.tw
#define rtw_cpu_to_le32(val) cpu_to_le32(val) #define rtw_cpu_to_le32(val) cpu_to_le32(val)
u8 _rtw_read8(_adapter *adapter, u32 addr) u8 _rtw_read8(struct adapter *adapter, u32 addr)
{ {
u8 r_val; u8 r_val;
/* struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; */ /* struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; */
@ -67,7 +67,7 @@ u8 _rtw_read8(_adapter *adapter, u32 addr)
return r_val; return r_val;
} }
u16 _rtw_read16(_adapter *adapter, u32 addr) u16 _rtw_read16(struct adapter *adapter, u32 addr)
{ {
u16 r_val; u16 r_val;
struct io_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
@ -81,7 +81,7 @@ _func_exit_;
return r_val; return r_val;
} }
u32 _rtw_read32(_adapter *adapter, u32 addr) u32 _rtw_read32(struct adapter *adapter, u32 addr)
{ {
u32 r_val; u32 r_val;
struct io_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
@ -95,7 +95,7 @@ _func_exit_;
return r_val; return r_val;
} }
int _rtw_write8(_adapter *adapter, u32 addr, u8 val) int _rtw_write8(struct adapter *adapter, u32 addr, u8 val)
{ {
struct io_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
struct intf_hdl *pintfhdl = &(pio_priv->intf); struct intf_hdl *pintfhdl = &(pio_priv->intf);
@ -110,7 +110,7 @@ int _rtw_write8(_adapter *adapter, u32 addr, u8 val)
return RTW_STATUS_CODE(ret); 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_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
struct intf_hdl *pintfhdl = &(pio_priv->intf); struct intf_hdl *pintfhdl = &(pio_priv->intf);
@ -124,7 +124,7 @@ int _rtw_write16(_adapter *adapter, u32 addr, u16 val)
return RTW_STATUS_CODE(ret); 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_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
struct intf_hdl *pintfhdl = &(pio_priv->intf); struct intf_hdl *pintfhdl = &(pio_priv->intf);
@ -139,7 +139,7 @@ int _rtw_write32(_adapter *adapter, u32 addr, u32 val)
return RTW_STATUS_CODE(ret); 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_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
struct intf_hdl *pintfhdl = (struct intf_hdl*)(&(pio_priv->intf)); struct intf_hdl *pintfhdl = (struct intf_hdl*)(&(pio_priv->intf));
@ -153,7 +153,7 @@ int _rtw_writeN(_adapter *adapter, u32 addr ,u32 length , u8 *pdata)
return RTW_STATUS_CODE(ret); 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_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
struct intf_hdl *pintfhdl = &(pio_priv->intf); struct intf_hdl *pintfhdl = &(pio_priv->intf);
@ -168,7 +168,7 @@ int _rtw_write8_async(_adapter *adapter, u32 addr, u8 val)
return RTW_STATUS_CODE(ret); 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_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
struct intf_hdl *pintfhdl = &(pio_priv->intf); struct intf_hdl *pintfhdl = &(pio_priv->intf);
@ -183,7 +183,7 @@ _func_exit_;
return RTW_STATUS_CODE(ret); 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_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
struct intf_hdl *pintfhdl = &(pio_priv->intf); struct intf_hdl *pintfhdl = &(pio_priv->intf);
@ -198,7 +198,7 @@ _func_exit_;
return RTW_STATUS_CODE(ret); 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); void (*_read_mem)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem);
struct io_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
@ -220,7 +220,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); void (*_write_mem)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem);
struct io_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
@ -236,7 +236,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); u32 (*_read_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem);
struct io_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
@ -258,7 +258,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); void (*_read_port_cancel)(struct intf_hdl *pintfhdl);
struct io_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
@ -271,7 +271,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); u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem);
struct io_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
@ -289,7 +289,7 @@ u32 _rtw_write_port(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
return ret; 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; int ret = _SUCCESS;
struct xmit_buf *pxmitbuf = (struct xmit_buf *)pmem; struct xmit_buf *pxmitbuf = (struct xmit_buf *)pmem;
@ -306,7 +306,7 @@ u32 _rtw_write_port_and_wait(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem, int
return ret; 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); void (*_write_port_cancel)(struct intf_hdl *pintfhdl);
struct io_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
@ -319,7 +319,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 io_priv *piopriv = &padapter->iopriv;
struct intf_hdl *pintf = &piopriv->intf; struct intf_hdl *pintf = &piopriv->intf;

42
core/rtw_ioctl_set.c
View file

@ -28,7 +28,7 @@
#include <usb_osintf.h> #include <usb_osintf.h>
#include <usb_ops.h> #include <usb_ops.h>
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) \ #define IS_MAC_ADDRESS_BROADCAST(addr) \
( \ ( \
@ -67,8 +67,8 @@ _func_exit_;
return ret; return ret;
} }
u8 rtw_do_join(_adapter * padapter); u8 rtw_do_join(struct adapter * padapter);
u8 rtw_do_join(_adapter * padapter) u8 rtw_do_join(struct adapter * padapter)
{ {
unsigned long irqL; unsigned long irqL;
struct list_head *plist, *phead; struct list_head *plist, *phead;
@ -181,7 +181,7 @@ _func_exit_;
return ret; return ret;
} }
u8 rtw_set_802_11_bssid(_adapter* padapter, u8 *bssid) u8 rtw_set_802_11_bssid(struct adapter* padapter, u8 *bssid)
{ {
unsigned long irqL; unsigned long irqL;
u8 status=_SUCCESS; u8 status=_SUCCESS;
@ -277,7 +277,7 @@ _func_exit_;
return status; return status;
} }
u8 rtw_set_802_11_ssid(_adapter* padapter, struct ndis_802_11_ssid *ssid) u8 rtw_set_802_11_ssid(struct adapter* padapter, struct ndis_802_11_ssid *ssid)
{ {
unsigned long irqL; unsigned long irqL;
u8 status = _SUCCESS; u8 status = _SUCCESS;
@ -400,7 +400,7 @@ _func_exit_;
} }
u8 rtw_set_802_11_infrastructure_mode(_adapter* padapter, u8 rtw_set_802_11_infrastructure_mode(struct adapter* padapter,
enum ndis_802_11_network_infra networktype) enum ndis_802_11_network_infra networktype)
{ {
unsigned long irqL; unsigned long irqL;
@ -481,7 +481,7 @@ _func_exit_;
} }
u8 rtw_set_802_11_disassociate(_adapter *padapter) u8 rtw_set_802_11_disassociate(struct adapter *padapter)
{ {
unsigned long irqL; unsigned long irqL;
struct mlme_priv * pmlmepriv = &padapter->mlmepriv; struct mlme_priv * pmlmepriv = &padapter->mlmepriv;
@ -507,7 +507,7 @@ _func_exit_;
return true; return true;
} }
u8 rtw_set_802_11_bssid_list_scan(_adapter* padapter, struct ndis_802_11_ssid *pssid, int ssid_max_num) u8 rtw_set_802_11_bssid_list_scan(struct adapter* padapter, struct ndis_802_11_ssid *pssid, int ssid_max_num)
{ {
unsigned long irqL; unsigned long irqL;
struct mlme_priv *pmlmepriv= &padapter->mlmepriv; struct mlme_priv *pmlmepriv= &padapter->mlmepriv;
@ -559,7 +559,7 @@ _func_exit_;
return res; return res;
} }
u8 rtw_set_802_11_authentication_mode(_adapter* padapter, enum ndis_802_11_auth_mode authmode) u8 rtw_set_802_11_authentication_mode(struct adapter* padapter, enum ndis_802_11_auth_mode authmode)
{ {
struct security_priv *psecuritypriv = &padapter->securitypriv; struct security_priv *psecuritypriv = &padapter->securitypriv;
int res; int res;
@ -588,7 +588,7 @@ _func_exit_;
return ret; return ret;
} }
u8 rtw_set_802_11_add_wep(_adapter* padapter, struct ndis_802_11_wep *wep){ u8 rtw_set_802_11_add_wep(struct adapter* padapter, struct ndis_802_11_wep *wep){
int keyid,res; int keyid,res;
struct security_priv* psecuritypriv=&(padapter->securitypriv); struct security_priv* psecuritypriv=&(padapter->securitypriv);
@ -647,7 +647,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; u8 ret=_SUCCESS;
@ -690,7 +690,7 @@ _func_exit_;
} }
u8 rtw_set_802_11_add_key(_adapter* padapter, struct ndis_802_11_key *key){ u8 rtw_set_802_11_add_key(struct adapter* padapter, struct ndis_802_11_key *key){
uint encryptionalgo; uint encryptionalgo;
u8 * pbssid; u8 * pbssid;
@ -1053,7 +1053,7 @@ _func_exit_;
return ret; return ret;
} }
u8 rtw_set_802_11_remove_key(_adapter* padapter, struct ndis_802_11_remove_key *key){ u8 rtw_set_802_11_remove_key(struct adapter* padapter, struct ndis_802_11_remove_key *key){
u8 *pbssid; u8 *pbssid;
struct sta_info *stainfo; struct sta_info *stainfo;
@ -1095,11 +1095,11 @@ _func_exit_;
/* /*
* rtw_get_cur_max_rate - * rtw_get_cur_max_rate -
* @adapter: pointer to _adapter structure * @adapter: pointer to struct adapter structure
* *
* Return 0 or 100Kbps * Return 0 or 100Kbps
*/ */
u16 rtw_get_cur_max_rate(_adapter *adapter) u16 rtw_get_cur_max_rate(struct adapter *adapter)
{ {
int i = 0; int i = 0;
u8 *p; u8 *p;
@ -1171,12 +1171,12 @@ u16 rtw_get_cur_max_rate(_adapter *adapter)
/* /*
* rtw_set_scan_mode - * rtw_set_scan_mode -
* @adapter: pointer to _adapter structure * @adapter: pointer to struct adapter structure
* @scan_mode: * @scan_mode:
* *
* Return _SUCCESS or _FAIL * Return _SUCCESS or _FAIL
*/ */
int rtw_set_scan_mode(_adapter *adapter, enum rt_scan_type scan_mode) int rtw_set_scan_mode(struct adapter *adapter, enum rt_scan_type scan_mode)
{ {
if (scan_mode != SCAN_ACTIVE && scan_mode != SCAN_PASSIVE) if (scan_mode != SCAN_ACTIVE && scan_mode != SCAN_PASSIVE)
return _FAIL; return _FAIL;
@ -1188,12 +1188,12 @@ int rtw_set_scan_mode(_adapter *adapter, enum rt_scan_type scan_mode)
/* /*
* rtw_set_channel_plan - * rtw_set_channel_plan -
* @adapter: pointer to _adapter structure * @adapter: pointer to struct adapter structure
* @channel_plan: * @channel_plan:
* *
* Return _SUCCESS or _FAIL * 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 registry_priv *pregistrypriv = &adapter->registrypriv;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv; struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
@ -1204,12 +1204,12 @@ int rtw_set_channel_plan(_adapter *adapter, u8 channel_plan)
/* /*
* rtw_set_country - * rtw_set_country -
* @adapter: pointer to _adapter structure * @adapter: pointer to struct adapter structure
* @country_code: string of country code * @country_code: string of country code
* *
* Return _SUCCESS or _FAIL * 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; int channel_plan = RT_CHANNEL_DOMAIN_WORLD_WIDE_5G;

8
core/rtw_iol.c
View file

@ -20,7 +20,7 @@
#include<rtw_iol.h> #include<rtw_iol.h>
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_frame *xmit_frame;
struct xmit_buf *xmitbuf; struct xmit_buf *xmitbuf;
@ -94,7 +94,7 @@ int rtw_IOL_append_cmds(struct xmit_frame *xmit_frame, u8 *IOL_cmds, u32 cmd_len
return _SUCCESS; return _SUCCESS;
} }
bool rtw_IOL_applied(ADAPTER *adapter) bool rtw_IOL_applied(struct adapter *adapter)
{ {
if (1 == adapter->registrypriv.fw_iol) if (1 == adapter->registrypriv.fw_iol)
return true; return true;
@ -104,7 +104,7 @@ bool rtw_IOL_applied(ADAPTER *adapter)
return false; return false;
} }
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); return rtw_hal_iol_cmd(adapter, xmit_frame, max_wating_ms,bndy_cnt);
} }
@ -216,7 +216,7 @@ u8 rtw_IOL_cmd_boundary_handle(struct xmit_frame *pxmit_frame)
return is_cmd_bndy; 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 i;
int j=1; int j=1;

40
core/rtw_led.c
View file

@ -29,7 +29,7 @@
void BlinkTimerCallback(void *data) void BlinkTimerCallback(void *data)
{ {
struct LED_871x * pLed = (struct LED_871x *)data; struct LED_871x * pLed = (struct LED_871x *)data;
_adapter *padapter = pLed->padapter; struct adapter *padapter = pLed->padapter;
if ( (padapter->bSurpriseRemoved == true) || ( padapter->bDriverStopped == true)) if ( (padapter->bSurpriseRemoved == true) || ( padapter->bDriverStopped == true))
{ {
@ -75,7 +75,7 @@ void ResetLedStatus(struct LED_871x * pLed) {
/* Initialize an LED_871x object. */ /* Initialize an LED_871x object. */
void void
InitLed871x( InitLed871x(
_adapter *padapter, struct adapter *padapter,
struct LED_871x *pLed, struct LED_871x *pLed,
enum LED_PIN_871x LedPin enum LED_PIN_871x LedPin
) )
@ -112,15 +112,15 @@ DeInitLed871x(
/* It toggle off LED and schedule corresponding timer if necessary. */ /* It toggle off LED and schedule corresponding timer if necessary. */
/* */ /* */
void SwLedOn(_adapter *padapter, struct LED_871x * pLed); void SwLedOn(struct adapter *padapter, struct LED_871x * pLed);
void SwLedOff(_adapter *padapter, struct LED_871x *pLed); void SwLedOff(struct adapter *padapter, struct LED_871x *pLed);
static void static void
SwLedBlink( SwLedBlink(
struct LED_871x * pLed struct LED_871x * pLed
) )
{ {
_adapter *padapter = pLed->padapter; struct adapter *padapter = pLed->padapter;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
u8 bStopBlinking = false; u8 bStopBlinking = false;
@ -238,7 +238,7 @@ SwLedBlink1(
struct LED_871x * pLed struct LED_871x * pLed
) )
{ {
_adapter *padapter = pLed->padapter; struct adapter *padapter = pLed->padapter;
struct led_priv *ledpriv = &(padapter->ledpriv); struct led_priv *ledpriv = &(padapter->ledpriv);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct LED_871x * pLed1 = &(ledpriv->SwLed1); struct LED_871x * pLed1 = &(ledpriv->SwLed1);
@ -413,7 +413,7 @@ SwLedBlink2(
struct LED_871x * pLed struct LED_871x * pLed
) )
{ {
_adapter *padapter = pLed->padapter; struct adapter *padapter = pLed->padapter;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
u8 bStopBlinking = false; u8 bStopBlinking = false;
@ -535,7 +535,7 @@ SwLedBlink3(
struct LED_871x * pLed struct LED_871x * pLed
) )
{ {
_adapter *padapter = pLed->padapter; struct adapter *padapter = pLed->padapter;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
u8 bStopBlinking = false; u8 bStopBlinking = false;
@ -706,7 +706,7 @@ SwLedBlink4(
struct LED_871x * pLed struct LED_871x * pLed
) )
{ {
_adapter *padapter = pLed->padapter; struct adapter *padapter = pLed->padapter;
struct led_priv *ledpriv = &(padapter->ledpriv); struct led_priv *ledpriv = &(padapter->ledpriv);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct LED_871x *pLed1 = &(ledpriv->SwLed1); struct LED_871x *pLed1 = &(ledpriv->SwLed1);
@ -905,7 +905,7 @@ SwLedBlink5(
struct LED_871x * pLed struct LED_871x * pLed
) )
{ {
_adapter *padapter = pLed->padapter; struct adapter *padapter = pLed->padapter;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
u8 bStopBlinking = false; u8 bStopBlinking = false;
@ -1023,7 +1023,7 @@ SwLedBlink6(
struct LED_871x * pLed struct LED_871x * pLed
) )
{ {
_adapter *padapter = pLed->padapter; struct adapter *padapter = pLed->padapter;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
u8 bStopBlinking = false; u8 bStopBlinking = false;
@ -1044,7 +1044,7 @@ SwLedBlink6(
static void static void
SwLedControlMode0( SwLedControlMode0(
_adapter *padapter, struct adapter *padapter,
enum LED_CTL_MODE LedAction enum LED_CTL_MODE LedAction
) )
{ {
@ -1159,7 +1159,7 @@ SwLedControlMode0(
/* ALPHA, added by chiyoko, 20090106 */ /* ALPHA, added by chiyoko, 20090106 */
static void static void
SwLedControlMode1( SwLedControlMode1(
_adapter *padapter, struct adapter *padapter,
enum LED_CTL_MODE LedAction enum LED_CTL_MODE LedAction
) )
{ {
@ -1425,7 +1425,7 @@ SwLedControlMode1(
/* Arcadyan/Sitecom , added by chiyoko, 20090216 */ /* Arcadyan/Sitecom , added by chiyoko, 20090216 */
static void static void
SwLedControlMode2( SwLedControlMode2(
_adapter *padapter, struct adapter *padapter,
enum LED_CTL_MODE LedAction enum LED_CTL_MODE LedAction
) )
{ {
@ -1590,7 +1590,7 @@ SwLedControlMode2(
/* COREGA, added by chiyoko, 20090316 */ /* COREGA, added by chiyoko, 20090316 */
static void static void
SwLedControlMode3( SwLedControlMode3(
_adapter *padapter, struct adapter *padapter,
enum LED_CTL_MODE LedAction enum LED_CTL_MODE LedAction
) )
{ {
@ -1769,7 +1769,7 @@ SwLedControlMode2(
/* Edimax-Belkin, added by chiyoko, 20090413 */ /* Edimax-Belkin, added by chiyoko, 20090413 */
static void static void
SwLedControlMode4( SwLedControlMode4(
_adapter *padapter, struct adapter *padapter,
enum LED_CTL_MODE LedAction enum LED_CTL_MODE LedAction
) )
{ {
@ -2101,7 +2101,7 @@ SwLedControlMode4(
/* Sercomm-Belkin, added by chiyoko, 20090415 */ /* Sercomm-Belkin, added by chiyoko, 20090415 */
static void static void
SwLedControlMode5( SwLedControlMode5(
_adapter *padapter, struct adapter *padapter,
enum LED_CTL_MODE LedAction enum LED_CTL_MODE LedAction
) )
{ {
@ -2183,7 +2183,7 @@ SwLedControlMode5(
/* WNC-Corega, added by chiyoko, 20090902 */ /* WNC-Corega, added by chiyoko, 20090902 */
static void static void
SwLedControlMode6( SwLedControlMode6(
_adapter *padapter, struct adapter *padapter,
enum LED_CTL_MODE LedAction enum LED_CTL_MODE LedAction
) )
{ {
@ -2220,7 +2220,7 @@ SwLedControlMode6(
/* */ /* */
void BlinkHandler(struct LED_871x * pLed) void BlinkHandler(struct LED_871x * pLed)
{ {
_adapter *padapter = pLed->padapter; struct adapter *padapter = pLed->padapter;
struct led_priv *ledpriv = &(padapter->ledpriv); struct led_priv *ledpriv = &(padapter->ledpriv);
if ( (padapter->bSurpriseRemoved == true) || ( padapter->bDriverStopped == true)) if ( (padapter->bSurpriseRemoved == true) || ( padapter->bDriverStopped == true))
@ -2263,7 +2263,7 @@ void BlinkHandler(struct LED_871x * pLed)
void void
LedControl871x( LedControl871x(
_adapter *padapter, struct adapter *padapter,
enum LED_CTL_MODE LedAction enum LED_CTL_MODE LedAction
) )
{ {

114
core/rtw_mlme.c
View file

@ -32,13 +32,13 @@
#include <rtw_ioctl_set.h> #include <rtw_ioctl_set.h>
#include <usb_osintf.h> #include <usb_osintf.h>
extern void indicate_wx_scan_complete_event(_adapter *padapter); extern void indicate_wx_scan_complete_event(struct adapter *padapter);
extern u8 rtw_do_join(_adapter * padapter); extern u8 rtw_do_join(struct adapter * padapter);
extern unsigned char MCS_rate_2R[16]; extern unsigned char MCS_rate_2R[16];
extern unsigned char MCS_rate_1R[16]; extern unsigned char MCS_rate_1R[16];
int _rtw_init_mlme_priv (_adapter* padapter) int _rtw_init_mlme_priv (struct adapter* padapter)
{ {
int i; int i;
u8 *pbuf; u8 *pbuf;
@ -353,7 +353,7 @@ _func_exit_;
} }
void _rtw_free_network_queue(_adapter *padapter, u8 isfreeall) void _rtw_free_network_queue(struct adapter *padapter, u8 isfreeall)
{ {
unsigned long irqL; unsigned long irqL;
struct list_head *phead, *plist; struct list_head *phead, *plist;
@ -389,7 +389,7 @@ _func_exit_;
int rtw_if_up(_adapter *padapter) { int rtw_if_up(struct adapter *padapter) {
int res; int res;
_func_enter_; _func_enter_;
@ -450,7 +450,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; int res;
_func_enter_; _func_enter_;
@ -515,7 +515,7 @@ _func_exit_;
} }
void rtw_free_network_queue(_adapter* dev, u8 isfreeall) void rtw_free_network_queue(struct adapter* dev, u8 isfreeall)
{ {
_func_enter_; _func_enter_;
_rtw_free_network_queue(dev, isfreeall); _rtw_free_network_queue(dev, isfreeall);
@ -534,7 +534,7 @@ struct wlan_network *rtw_find_network(struct __queue *scanned_queue, u8 *addr)
return pnetwork; 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; int ret=true;
struct security_priv *psecuritypriv = &adapter->securitypriv; struct security_priv *psecuritypriv = &adapter->securitypriv;
@ -623,7 +623,7 @@ _func_exit_;
} }
void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src, void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src,
_adapter * padapter, bool update_ie) struct adapter * padapter, bool update_ie)
{ {
u8 ss_ori = dst->PhyInfo.SignalStrength; u8 ss_ori = dst->PhyInfo.SignalStrength;
u8 sq_ori = dst->PhyInfo.SignalQuality; u8 sq_ori = dst->PhyInfo.SignalQuality;
@ -696,7 +696,7 @@ _func_enter_;
_func_exit_; _func_exit_;
} }
static void update_current_network(_adapter *adapter, struct wlan_bssid_ex *pnetwork) static void update_current_network(struct adapter *adapter, struct wlan_bssid_ex *pnetwork)
{ {
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
@ -714,7 +714,7 @@ _func_exit_;
/* /*
Caller must hold pmlmepriv->lock first. Caller must hold pmlmepriv->lock first.
*/ */
void rtw_update_scanned_network(_adapter *adapter, struct wlan_bssid_ex *target) void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *target)
{ {
unsigned long irqL; unsigned long irqL;
struct list_head *plist, *phead; struct list_head *plist, *phead;
@ -822,10 +822,10 @@ exit:
_func_exit_; _func_exit_;
} }
void rtw_add_network(_adapter *adapter, struct wlan_bssid_ex *pnetwork) void rtw_add_network(struct adapter *adapter, struct wlan_bssid_ex *pnetwork)
{ {
unsigned long irqL; unsigned long irqL;
struct mlme_priv *pmlmepriv = &(((_adapter *)adapter)->mlmepriv); struct mlme_priv *pmlmepriv = &(((struct adapter *)adapter)->mlmepriv);
_func_enter_; _func_enter_;
@ -847,7 +847,7 @@ _func_exit_;
/* (3) WMM */ /* (3) WMM */
/* (4) HT */ /* (4) HT */
/* (5) others */ /* (5) others */
static int rtw_is_desired_network(_adapter *adapter, struct wlan_network *pnetwork) static int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *pnetwork)
{ {
struct security_priv *psecuritypriv = &adapter->securitypriv; struct security_priv *psecuritypriv = &adapter->securitypriv;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv; struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
@ -896,7 +896,7 @@ static int rtw_is_desired_network(_adapter *adapter, struct wlan_network *pnetwo
} }
/* TODO: Perry : For Power Management */ /* 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_; _func_enter_;
@ -906,7 +906,7 @@ _func_exit_;
} }
void rtw_survey_event_callback(_adapter *adapter, u8 *pbuf) void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf)
{ {
unsigned long irqL; unsigned long irqL;
u32 len; u32 len;
@ -970,7 +970,7 @@ _func_exit_;
void rtw_surveydone_event_callback(_adapter *adapter, u8 *pbuf) void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)
{ {
unsigned long irqL; unsigned long irqL;
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
@ -1089,12 +1089,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)
{ {
} }
@ -1133,7 +1133,7 @@ _func_exit_;
/* /*
*rtw_free_assoc_resources: the caller has to lock pmlmepriv->lock *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)
{ {
unsigned long irqL; unsigned long irqL;
struct wlan_network* pwlan = NULL; struct wlan_network* pwlan = NULL;
@ -1191,7 +1191,7 @@ _func_exit_;
/* /*
*rtw_indicate_connect: the caller has to lock pmlmepriv->lock *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 mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@ -1223,7 +1223,7 @@ _func_exit_;
/* /*
*rtw_indicate_disconnect: the caller has to lock pmlmepriv->lock *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_priv *pmlmepriv = &padapter->mlmepriv;
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
@ -1264,12 +1264,12 @@ _func_enter_;
_func_exit_; _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); rtw_os_indicate_scan_done(padapter, aborted);
} }
void rtw_scan_abort(_adapter *adapter) void rtw_scan_abort(struct adapter *adapter)
{ {
u32 cnt=0; u32 cnt=0;
u32 start; u32 start;
@ -1296,7 +1296,7 @@ void rtw_scan_abort(_adapter *adapter)
pmlmeext->scan_abort = false; 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; int i;
struct sta_info *bmc_sta, *psta=NULL; struct sta_info *bmc_sta, *psta=NULL;
@ -1387,7 +1387,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(_adapter *padapter, struct wl
/* pnetwork : returns from rtw_joinbss_event_callback */ /* pnetwork : returns from rtw_joinbss_event_callback */
/* ptarget_wlan: found from scanned_queue */ /* 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 mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct wlan_network *cur_network = &(pmlmepriv->cur_network); struct wlan_network *cur_network = &(pmlmepriv->cur_network);
@ -1460,7 +1460,7 @@ static void rtw_joinbss_update_network(_adapter *padapter, struct wlan_network *
/* if join_res > 0, for (fw_state==WIFI_ADHOC_STATE), we only check if "ptarget_wlan" exist. */ /* if join_res > 0, for (fw_state==WIFI_ADHOC_STATE), we only check if "ptarget_wlan" exist. */
/* if join_res > 0, update "cur_network->network" from "pnetwork->network" if (ptarget_wlan !=NULL). */ /* if join_res > 0, update "cur_network->network" from "pnetwork->network" if (ptarget_wlan !=NULL). */
void rtw_joinbss_event_prehandle(_adapter *adapter, u8 *pbuf) void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)
{ {
unsigned long irqL,irqL2; unsigned long irqL,irqL2;
u8 timer_cancelled; u8 timer_cancelled;
@ -1590,7 +1590,7 @@ ignore_nolock:
_func_exit_; _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; struct wlan_network *pnetwork = (struct wlan_network *)pbuf;
@ -1603,7 +1603,7 @@ _func_enter_;
_func_exit_; _func_exit_;
} }
static u8 search_max_mac_id(_adapter *padapter) static u8 search_max_mac_id(struct adapter *padapter)
{ {
u8 mac_id, aid; u8 mac_id, aid;
#if (RATE_ADAPTIVE_SUPPORT==1) /* for 88E RA */ #if (RATE_ADAPTIVE_SUPPORT==1) /* for 88E RA */
@ -1639,7 +1639,7 @@ static u8 search_max_mac_id(_adapter *padapter)
} }
/* FOR AP ,AD-HOC mode */ /* FOR AP ,AD-HOC mode */
void rtw_stassoc_hw_rpt(_adapter *adapter,struct sta_info *psta) void rtw_stassoc_hw_rpt(struct adapter *adapter,struct sta_info *psta)
{ {
u16 media_status; u16 media_status;
@ -1655,7 +1655,7 @@ void rtw_stassoc_hw_rpt(_adapter *adapter,struct sta_info *psta)
rtw_hal_set_hwreg(adapter,HW_VAR_H2C_MEDIA_STATUS_RPT,(u8 *)&media_status); rtw_hal_set_hwreg(adapter,HW_VAR_H2C_MEDIA_STATUS_RPT,(u8 *)&media_status);
} }
void rtw_stassoc_event_callback(_adapter *adapter, u8 *pbuf) void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)
{ {
unsigned long irqL; unsigned long irqL;
struct sta_info *psta; struct sta_info *psta;
@ -1746,7 +1746,7 @@ _func_exit_;
} }
void rtw_stadel_event_callback(_adapter *adapter, u8 *pbuf) void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)
{ {
unsigned long irqL,irqL2; unsigned long irqL,irqL2;
int mac_id=-1; int mac_id=-1;
@ -1867,7 +1867,7 @@ _func_exit_;
} }
void rtw_cpwm_event_callback(PADAPTER padapter, u8 *pbuf) void rtw_cpwm_event_callback(struct adapter * padapter, u8 *pbuf)
{ {
_func_enter_; _func_enter_;
RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("+rtw_cpwm_event_callback !!!\n")); RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("+rtw_cpwm_event_callback !!!\n"));
@ -1876,9 +1876,9 @@ _func_exit_;
/* /*
* _rtw_join_timeout_handler - Timeout/faliure handler for CMD JoinBss * _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)
{ {
unsigned long irqL; unsigned long irqL;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv; struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
@ -1922,9 +1922,9 @@ _func_exit_;
/* /*
* rtw_scan_timeout_handler - Timeout/Faliure handler for CMD SiteSurvey * 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)
{ {
unsigned long irqL; unsigned long irqL;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv; struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
@ -1941,7 +1941,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 mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv;
@ -1964,7 +1964,7 @@ 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 #ifdef CONFIG_AP_MODE
struct mlme_priv *pmlmepriv = &adapter->mlmepriv; struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
@ -2046,7 +2046,7 @@ static int rtw_check_join_candidate(struct mlme_priv *pmlmepriv
, struct wlan_network **candidate, struct wlan_network *competitor) , struct wlan_network **candidate, struct wlan_network *competitor)
{ {
int updated = false; int updated = false;
_adapter *adapter = container_of(pmlmepriv, _adapter, mlmepriv); struct adapter *adapter = container_of(pmlmepriv, struct adapter, mlmepriv);
/* check bssid, if needed */ /* check bssid, if needed */
@ -2105,7 +2105,7 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv )
unsigned long irqL; unsigned long irqL;
int ret; int ret;
struct list_head *phead; struct list_head *phead;
_adapter *adapter; struct adapter *adapter;
struct __queue *queue = &(pmlmepriv->scanned_queue); struct __queue *queue = &(pmlmepriv->scanned_queue);
struct wlan_network *pnetwork = NULL; struct wlan_network *pnetwork = NULL;
struct wlan_network *candidate = NULL; struct wlan_network *candidate = NULL;
@ -2115,7 +2115,7 @@ _func_enter_;
_enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); _enter_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
phead = get_list_head(queue); phead = get_list_head(queue);
adapter = (_adapter *)pmlmepriv->nic_hdl; adapter = (struct adapter *)pmlmepriv->nic_hdl;
pmlmepriv->pscanned = get_next( phead ); pmlmepriv->pscanned = get_next( phead );
@ -2178,7 +2178,7 @@ _func_exit_;
return ret; return ret;
} }
int rtw_set_auth(_adapter * adapter,struct security_priv *psecuritypriv) int rtw_set_auth(struct adapter * adapter,struct security_priv *psecuritypriv)
{ {
struct cmd_obj* pcmd; struct cmd_obj* pcmd;
struct setauth_parm *psetauthparm; struct setauth_parm *psetauthparm;
@ -2225,7 +2225,7 @@ _func_exit_;
} }
int rtw_set_key(_adapter * adapter, struct security_priv *psecuritypriv, int keyid, u8 set_tx) int rtw_set_key(struct adapter * adapter, struct security_priv *psecuritypriv, int keyid, u8 set_tx)
{ {
u8 keylen; u8 keylen;
struct cmd_obj *pcmd; struct cmd_obj *pcmd;
@ -2313,7 +2313,7 @@ _func_exit_;
/* adjust IEs for rtw_joinbss_cmd in WMM */ /* 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 ielength=0;
unsigned int i, j; unsigned int i, j;
@ -2358,7 +2358,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; struct security_priv *psecuritypriv=&Adapter->securitypriv;
int i=0; int i=0;
@ -2399,7 +2399,7 @@ static int SecIsInPMKIDList(_adapter *Adapter, u8 *bssid)
/* 13th element in the array is the IE length */ /* 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; struct security_priv *psecuritypriv=&Adapter->securitypriv;
@ -2419,7 +2419,7 @@ static int rtw_append_pmkid(_adapter *Adapter,int iEntry, u8 *ie, uint ie_len)
} }
int rtw_restruct_sec_ie(_adapter *adapter,u8 *in_ie, u8 *out_ie, uint in_len) int rtw_restruct_sec_ie(struct adapter *adapter,u8 *in_ie, u8 *out_ie, uint in_len)
{ {
u8 authmode, securitytype, match; u8 authmode, securitytype, match;
u8 sec_ie[255], uncst_oui[4], bkup_ie[255]; u8 sec_ie[255], uncst_oui[4], bkup_ie[255];
@ -2478,7 +2478,7 @@ _func_exit_;
return ielength; 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 registry_priv* pregistrypriv = &adapter->registrypriv;
struct eeprom_priv* peepriv = &adapter->eeprompriv; struct eeprom_priv* peepriv = &adapter->eeprompriv;
@ -2503,7 +2503,7 @@ _func_exit_;
} }
void rtw_update_registrypriv_dev_network(_adapter* adapter) void rtw_update_registrypriv_dev_network(struct adapter* adapter)
{ {
int sz=0; int sz=0;
struct registry_priv* pregistrypriv = &adapter->registrypriv; struct registry_priv* pregistrypriv = &adapter->registrypriv;
@ -2569,7 +2569,7 @@ _func_exit_;
} }
void rtw_get_encrypt_decrypt_from_registrypriv(_adapter* adapter) void rtw_get_encrypt_decrypt_from_registrypriv(struct adapter* adapter)
{ {
_func_enter_; _func_enter_;
@ -2579,7 +2579,7 @@ _func_exit_;
} }
/* the fucntion is at passive_level */ /* the fucntion is at passive_level */
void rtw_joinbss_reset(_adapter *padapter) void rtw_joinbss_reset(struct adapter *padapter)
{ {
u8 threshold; u8 threshold;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -2622,7 +2622,7 @@ void rtw_joinbss_reset(_adapter *padapter)
#ifdef CONFIG_80211N_HT #ifdef CONFIG_80211N_HT
/* the fucntion is >= passive_level */ /* 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; u32 ielen, out_len;
HT_CAP_AMPDU_FACTOR max_rx_ampdu_factor; HT_CAP_AMPDU_FACTOR max_rx_ampdu_factor;
@ -2700,7 +2700,7 @@ unsigned int rtw_restructure_ht_ie(_adapter *padapter, u8 *in_ie, u8 *out_ie, ui
} }
/* the fucntion is > passive_level (in critical_section) */ /* 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; u8 *p, max_ampdu_sz;
int len; int len;
@ -2808,7 +2808,7 @@ void rtw_update_ht_cap(_adapter *padapter, u8 *pie, uint ie_len)
pmlmeinfo->HT_protection = pmlmeinfo->HT_info.infos[1] & 0x3; pmlmeinfo->HT_protection = pmlmeinfo->HT_info.infos[1] & 0x3;
} }
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; u8 issued;
int priority; int priority;
@ -2849,7 +2849,7 @@ void rtw_issue_addbareq_cmd(_adapter *padapter, struct xmit_frame *pxmitframe)
#endif #endif
void rtw_roaming(_adapter *padapter, struct wlan_network *tgt_network) void rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_network)
{ {
unsigned long irqL; unsigned long irqL;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -2858,7 +2858,7 @@ void rtw_roaming(_adapter *padapter, struct wlan_network *tgt_network)
_rtw_roaming(padapter, tgt_network); _rtw_roaming(padapter, tgt_network);
_exit_critical_bh(&pmlmepriv->lock, &irqL); _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; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
int do_join_r; int do_join_r;

228
core/rtw_mlme_ext.c
View file

@ -203,7 +203,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; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -211,7 +211,7 @@ int init_hw_mlme_ext(_adapter *padapter)
return _SUCCESS; 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_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -290,7 +290,7 @@ static int has_channel(struct rt_channel_info *channel_set,
return 0; return 0;
} }
static void init_channel_list(_adapter *padapter, struct rt_channel_info *channel_set, static void init_channel_list(struct adapter *padapter, struct rt_channel_info *channel_set,
u8 chanset_size, u8 chanset_size,
struct p2p_channels *channel_list) { struct p2p_channels *channel_list) {
@ -342,7 +342,7 @@ static void init_channel_list(_adapter *padapter, struct rt_channel_info *channe
} }
static u8 init_channel_set(_adapter* padapter, u8 ChannelPlan, struct rt_channel_info *channel_set) static u8 init_channel_set(struct adapter* padapter, u8 ChannelPlan, struct rt_channel_info *channel_set)
{ {
u8 index,chanset_size = 0; u8 index,chanset_size = 0;
u8 b5GBand = false, b2_4GBand = false; u8 b5GBand = false, b2_4GBand = false;
@ -397,7 +397,7 @@ static u8 init_channel_set(_adapter* padapter, u8 ChannelPlan, struct rt_channel
return chanset_size; return chanset_size;
} }
int init_mlme_ext_priv(_adapter* padapter) int init_mlme_ext_priv(struct adapter* padapter)
{ {
int res = _SUCCESS; int res = _SUCCESS;
struct registry_priv* pregistrypriv = &padapter->registrypriv; struct registry_priv* pregistrypriv = &padapter->registrypriv;
@ -435,7 +435,7 @@ int init_mlme_ext_priv(_adapter* padapter)
void free_mlme_ext_priv (struct mlme_ext_priv *pmlmeext) void free_mlme_ext_priv (struct mlme_ext_priv *pmlmeext)
{ {
_adapter *padapter = pmlmeext->padapter; struct adapter *padapter = pmlmeext->padapter;
if (!padapter) if (!padapter)
return; return;
@ -448,7 +448,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 */ { /* if the channel is same, return 0. else return channel differential */
uint len; uint len;
u8 channel; u8 channel;
@ -472,7 +472,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 bc_addr[ETH_ALEN] = {0xff,0xff,0xff,0xff,0xff,0xff};
u8 *pframe = precv_frame->u.hdr.rx_data; u8 *pframe = precv_frame->u.hdr.rx_data;
@ -491,7 +491,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; int index;
struct mlme_handler *ptable; struct mlme_handler *ptable;
@ -582,7 +582,7 @@ void mgt_dispatcher(_adapter *padapter, union recv_frame *precv_frame)
} }
#ifdef CONFIG_P2P #ifdef CONFIG_P2P
static u32 p2p_listen_state_process(_adapter *padapter, unsigned char *da) static u32 p2p_listen_state_process(struct adapter *padapter, unsigned char *da)
{ {
bool response = true; bool response = true;
@ -606,7 +606,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 int ielen;
unsigned char *p; unsigned char *p;
@ -695,7 +695,7 @@ _issue_probersp:
return _SUCCESS; return _SUCCESS;
} }
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 sta_info *psta;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -769,7 +769,7 @@ unsigned int OnProbeRsp(_adapter *padapter, union recv_frame *precv_frame)
return _SUCCESS; return _SUCCESS;
} }
unsigned int OnBeacon(_adapter *padapter, union recv_frame *precv_frame) unsigned int OnBeacon(struct adapter *padapter, union recv_frame *precv_frame)
{ {
int cam_idx; int cam_idx;
struct sta_info *psta; struct sta_info *psta;
@ -861,7 +861,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 #ifdef CONFIG_AP_MODE
unsigned long irqL; unsigned long irqL;
@ -1046,7 +1046,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, offset; unsigned int seq, len, status, offset;
unsigned char *p; unsigned char *p;
@ -1145,7 +1145,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 #ifdef CONFIG_AP_MODE
unsigned long irqL; unsigned long irqL;
@ -1685,7 +1685,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; uint i;
int res; int res;
@ -1775,7 +1775,7 @@ report_assoc_result:
return _SUCCESS; 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; unsigned short reason;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -1850,7 +1850,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)
{ {
u16 reason; u16 reason;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -1924,13 +1924,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_88E("%s\n", __func__); DBG_88E("%s\n", __func__);
return _SUCCESS; return _SUCCESS;
} }
static unsigned int on_action_spct_ch_switch (_adapter *padapter, struct sta_info *psta, u8 *ies, uint ies_len) static unsigned int on_action_spct_ch_switch (struct adapter *padapter, struct sta_info *psta, u8 *ies, uint ies_len)
{ {
unsigned int ret = _FAIL; unsigned int ret = _FAIL;
struct mlme_ext_priv *mlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *mlmeext = &padapter->mlmeextpriv;
@ -1988,7 +1988,7 @@ exit:
return ret; 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; unsigned int ret = _FAIL;
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
@ -2027,17 +2027,17 @@ exit:
return ret; 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; 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; 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; u8 *addr;
struct sta_info *psta=NULL; struct sta_info *psta=NULL;
@ -2184,7 +2184,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; unsigned char category = RTW_WLAN_CATEGORY_PUBLIC;
@ -2556,7 +2556,7 @@ void issue_p2p_GO_request(_adapter *padapter, u8* raddr)
return; return;
} }
static void issue_p2p_GO_response(_adapter *padapter, u8* raddr, u8* frame_body,uint len, u8 result) static void issue_p2p_GO_response(struct adapter *padapter, u8* raddr, u8* frame_body,uint len, u8 result)
{ {
unsigned char category = RTW_WLAN_CATEGORY_PUBLIC; unsigned char category = RTW_WLAN_CATEGORY_PUBLIC;
@ -2965,7 +2965,7 @@ static void issue_p2p_GO_response(_adapter *padapter, u8* raddr, u8* frame_body,
return; return;
} }
static void issue_p2p_GO_confirm(_adapter *padapter, u8* raddr, u8 result) static void issue_p2p_GO_confirm(struct adapter *padapter, u8* raddr, u8 result)
{ {
unsigned char category = RTW_WLAN_CATEGORY_PUBLIC; unsigned char category = RTW_WLAN_CATEGORY_PUBLIC;
@ -3176,7 +3176,7 @@ static 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; unsigned char category = RTW_WLAN_CATEGORY_PUBLIC;
@ -3441,7 +3441,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; unsigned char category = RTW_WLAN_CATEGORY_PUBLIC;
@ -3642,7 +3642,7 @@ void issue_p2p_invitation_response(_adapter *padapter, u8* raddr, u8 dialogToken
return; return;
} }
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; unsigned char category = RTW_WLAN_CATEGORY_PUBLIC;
u8 action = P2P_PUB_ACTION_ACTION; u8 action = P2P_PUB_ACTION_ACTION;
@ -3764,7 +3764,7 @@ static u8 is_matched_in_profilelist( u8* peermacaddr, struct profile_info* profi
return (match_result ); 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 xmit_frame *pmgntframe;
struct pkt_attrib *pattrib; struct pkt_attrib *pattrib;
@ -4019,7 +4019,7 @@ void issue_probersp_p2p(_adapter *padapter, unsigned char *da)
return; return;
} }
static int _issue_probereq_p2p(_adapter *padapter, u8 *da, int wait_ack) static int _issue_probereq_p2p(struct adapter *padapter, u8 *da, int wait_ack)
{ {
int ret = _FAIL; int ret = _FAIL;
struct xmit_frame *pmgntframe; struct xmit_frame *pmgntframe;
@ -4323,12 +4323,12 @@ exit:
return ret; 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); _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 ret;
int i = 0; int i = 0;
@ -4373,7 +4373,7 @@ exit:
static s32 rtw_action_public_decache(union recv_frame *recv_frame, s32 token) static 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); struct mlme_ext_priv *mlmeext = &(adapter->mlmeextpriv);
u8 *frame = recv_frame->u.hdr.rx_data; u8 *frame = recv_frame->u.hdr.rx_data;
u16 seq_ctrl = ( (recv_frame->u.hdr.attrib.seq_num&0xffff) << 4) | u16 seq_ctrl = ( (recv_frame->u.hdr.attrib.seq_num&0xffff) << 4) |
@ -4407,7 +4407,7 @@ static s32 rtw_action_public_decache(union recv_frame *recv_frame, s32 token)
static unsigned int on_action_public_p2p(union recv_frame *precv_frame) static 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; u8 *pframe = precv_frame->u.hdr.rx_data;
uint len = precv_frame->u.hdr.len; uint len = precv_frame->u.hdr.len;
u8 *frame_body; u8 *frame_body;
@ -4791,7 +4791,7 @@ static unsigned int on_action_public_default(union recv_frame *precv_frame, u8 a
uint frame_len = precv_frame->u.hdr.len; uint frame_len = precv_frame->u.hdr.len;
u8 *frame_body = pframe + sizeof(struct rtw_ieee80211_hdr_3addr); u8 *frame_body = pframe + sizeof(struct rtw_ieee80211_hdr_3addr);
u8 token; u8 token;
_adapter *adapter = precv_frame->u.hdr.adapter; struct adapter *adapter = precv_frame->u.hdr.adapter;
int cnt = 0; int cnt = 0;
char msg[64]; char msg[64];
@ -4806,7 +4806,7 @@ exit:
return ret; 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; unsigned int ret = _FAIL;
u8 *pframe = precv_frame->u.hdr.rx_data; u8 *pframe = precv_frame->u.hdr.rx_data;
@ -4836,17 +4836,17 @@ exit:
return ret; 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; return _SUCCESS;
} }
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; 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 #ifdef CONFIG_P2P
u8 *frame_body; u8 *frame_body;
@ -4891,7 +4891,7 @@ unsigned int OnAction_p2p(_adapter *padapter, union recv_frame *precv_frame)
return _SUCCESS; return _SUCCESS;
} }
unsigned int OnAction(_adapter *padapter, union recv_frame *precv_frame) unsigned int OnAction(struct adapter *padapter, union recv_frame *precv_frame)
{ {
int i; int i;
unsigned char category; unsigned char category;
@ -4916,7 +4916,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_88E("rcvd mgt frame(%x, %x)\n", (GetFrameSubType(pframe) >> 4), *(unsigned int *)GetAddr1Ptr(pframe)); */ /* DBG_88E("rcvd mgt frame(%x, %x)\n", (GetFrameSubType(pframe) >> 4), *(unsigned int *)GetAddr1Ptr(pframe)); */
@ -4960,7 +4960,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); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
@ -4968,7 +4968,7 @@ void update_mgnt_tx_rate(_adapter *padapter, u8 rate)
DBG_88E("%s(): rate = %x\n",__func__, rate); DBG_88E("%s(): rate = %x\n",__func__, 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); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
@ -5002,7 +5002,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 || if (padapter->bSurpriseRemoved == true ||
padapter->bDriverStopped == true) padapter->bDriverStopped == true)
@ -5011,7 +5011,7 @@ void dump_mgntframe(_adapter *padapter, struct xmit_frame *pmgntframe)
rtw_hal_mgnt_xmit(padapter, 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; s32 ret = _FAIL;
struct xmit_buf *pxmitbuf = pmgntframe->pxmitbuf; struct xmit_buf *pxmitbuf = pmgntframe->pxmitbuf;
@ -5032,7 +5032,7 @@ s32 dump_mgntframe_and_wait(_adapter *padapter, struct xmit_frame *pmgntframe, i
return ret; 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)
{ {
s32 ret = _FAIL; s32 ret = _FAIL;
u32 timeout_ms = 500;/* 500ms */ u32 timeout_ms = 500;/* 500ms */
@ -5094,7 +5094,7 @@ static int update_hidden_ssid(u8 *ies, u32 ies_len, u8 hidden_ssid_mode)
return len_diff; 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 xmit_frame *pmgntframe;
struct pkt_attrib *pattrib; struct pkt_attrib *pattrib;
@ -5348,7 +5348,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 xmit_frame *pmgntframe;
struct pkt_attrib *pattrib; struct pkt_attrib *pattrib;
@ -5531,7 +5531,7 @@ void issue_probersp(_adapter *padapter, unsigned char *da, u8 is_valid_p2p_probe
return; return;
} }
static int _issue_probereq(_adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da, int wait_ack) static int _issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da, int wait_ack)
{ {
int ret = _FAIL; int ret = _FAIL;
struct xmit_frame *pmgntframe; struct xmit_frame *pmgntframe;
@ -5632,12 +5632,12 @@ exit:
return ret; return ret;
} }
inline void issue_probereq(_adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da) inline void issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da)
{ {
_issue_probereq(padapter, pssid, da, false); _issue_probereq(padapter, pssid, da, false);
} }
int issue_probereq_ex(_adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da, int issue_probereq_ex(struct adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da,
int try_cnt, int wait_ms) int try_cnt, int wait_ms)
{ {
int ret; int ret;
@ -5680,7 +5680,7 @@ exit:
} }
/* if psta == NULL, indiate we are station(client) now... */ /* 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 xmit_frame *pmgntframe;
struct pkt_attrib *pattrib; struct pkt_attrib *pattrib;
@ -5822,7 +5822,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 #ifdef CONFIG_AP_MODE
struct xmit_frame *pmgntframe; struct xmit_frame *pmgntframe;
@ -5965,7 +5965,7 @@ void issue_asocrsp(_adapter *padapter, unsigned short status, struct sta_info *p
#endif #endif
} }
void issue_assocreq(_adapter *padapter) void issue_assocreq(struct adapter *padapter)
{ {
int ret = _FAIL; int ret = _FAIL;
struct xmit_frame *pmgntframe; struct xmit_frame *pmgntframe;
@ -6325,7 +6325,7 @@ exit:
} }
/* when wait_ack is ture, this function shoule be called at process context */ /* 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; int ret = _FAIL;
struct xmit_frame *pmgntframe; struct xmit_frame *pmgntframe;
@ -6408,7 +6408,7 @@ exit:
/* when wait_ms >0 , this function shoule be called at process context */ /* when wait_ms >0 , this function shoule be called at process context */
/* da == NULL for station mode */ /* 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 ret;
int i = 0; int i = 0;
@ -6456,7 +6456,7 @@ exit:
} }
/* when wait_ack is ture, this function shoule be called at process context */ /* 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; int ret = _FAIL;
struct xmit_frame *pmgntframe; struct xmit_frame *pmgntframe;
@ -6542,7 +6542,7 @@ exit:
/* when wait_ms >0 , this function shoule be called at process context */ /* when wait_ms >0 , this function shoule be called at process context */
/* da == NULL for station mode */ /* 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 ret;
int i = 0; int i = 0;
@ -6589,7 +6589,7 @@ exit:
return ret; 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 xmit_frame *pmgntframe;
struct pkt_attrib *pattrib; struct pkt_attrib *pattrib;
@ -6657,13 +6657,13 @@ exit:
return ret; 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_88E("%s to %pM\n", __func__, da); DBG_88E("%s to %pM\n", __func__, da);
return _issue_deauth(padapter, da, reason, false); 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 wait_ms)
{ {
int ret; int ret;
@ -6705,7 +6705,7 @@ exit:
return ret; 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)
{ {
unsigned long irqL; unsigned long irqL;
struct list_head *plist, *phead; struct list_head *plist, *phead;
@ -6769,7 +6769,7 @@ void issue_action_spct_ch_switch (_adapter *padapter, u8 *ra, u8 new_ch, u8 ch_o
} }
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; u8 category = RTW_WLAN_CATEGORY_BACK;
u16 start_seq; u16 start_seq;
@ -6929,7 +6929,7 @@ void issue_action_BA(_adapter *padapter, unsigned char *raddr, unsigned char act
#endif /* CONFIG_80211N_HT */ #endif /* CONFIG_80211N_HT */
} }
static void issue_action_BSSCoexistPacket(_adapter *padapter) static void issue_action_BSSCoexistPacket(struct adapter *padapter)
{ {
unsigned long irqL; unsigned long irqL;
struct list_head *plist, *phead; struct list_head *plist, *phead;
@ -7087,7 +7087,7 @@ static void issue_action_BSSCoexistPacket(_adapter *padapter)
#endif /* CONFIG_80211N_HT */ #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_priv *pstapriv = &padapter->stapriv;
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
@ -7141,7 +7141,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; u8 bxmitok = false;
int issue=0; int issue=0;
@ -7181,7 +7181,7 @@ Following are some utitity fuctions for WiFi MLME
*****************************************************************************/ *****************************************************************************/
bool IsLegal5GChannel(PADAPTER Adapter, u8 channel) bool IsLegal5GChannel(struct adapter * Adapter, u8 channel)
{ {
int i=0; int i=0;
u8 Channel_5G[45] = {36,38,40,42,44,46,48,50,52,54,56,58, u8 Channel_5G[45] = {36,38,40,42,44,46,48,50,52,54,56,58,
@ -7194,7 +7194,7 @@ bool IsLegal5GChannel(PADAPTER Adapter, u8 channel)
return false; return false;
} }
void site_survey(_adapter *padapter) void site_survey(struct adapter *padapter)
{ {
unsigned char survey_channel = 0, val8; unsigned char survey_channel = 0, val8;
enum rt_scan_type ScanType = SCAN_PASSIVE; enum rt_scan_type ScanType = SCAN_PASSIVE;
@ -7397,7 +7397,7 @@ void site_survey(_adapter *padapter)
} }
/* collect bss info from Beacon and Probe request/response frames. */ /* collect bss info from Beacon and Probe request/response frames. */
u8 collect_bss_info(_adapter *padapter, union recv_frame *precv_frame, struct wlan_bssid_ex *bssid) u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, struct wlan_bssid_ex *bssid)
{ {
int i; int i;
u32 len; u32 len;
@ -7591,7 +7591,7 @@ u8 collect_bss_info(_adapter *padapter, union recv_frame *precv_frame, struct wl
return _SUCCESS; return _SUCCESS;
} }
void start_create_ibss(_adapter* padapter) void start_create_ibss(struct adapter* padapter)
{ {
unsigned short caps; unsigned short caps;
u8 val8; u8 val8;
@ -7649,7 +7649,7 @@ void start_create_ibss(_adapter* padapter)
} }
void start_clnt_join(_adapter* padapter) void start_clnt_join(struct adapter* padapter)
{ {
unsigned short caps; unsigned short caps;
u8 val8; u8 val8;
@ -7711,7 +7711,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_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -7743,7 +7743,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_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -7758,7 +7758,7 @@ void start_clnt_assoc(_adapter* padapter)
set_link_timer(pmlmeext, REASSOC_TO); 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_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -7786,7 +7786,7 @@ unsigned int receive_disconnect(_adapter *padapter, unsigned char *MacAddr, unsi
return _SUCCESS; return _SUCCESS;
} }
static void process_80211d(PADAPTER padapter, struct wlan_bssid_ex *bssid) static void process_80211d(struct adapter * padapter, struct wlan_bssid_ex *bssid)
{ {
struct registry_priv *pregistrypriv; struct registry_priv *pregistrypriv;
struct mlme_ext_priv *pmlmeext; struct mlme_ext_priv *pmlmeext;
@ -8025,7 +8025,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; struct cmd_obj *pcmd_obj;
u8 *pevtcmd; u8 *pevtcmd;
@ -8088,7 +8088,7 @@ void report_survey_event(_adapter *padapter, union recv_frame *precv_frame)
return; return;
} }
void report_surveydone_event(_adapter *padapter) void report_surveydone_event(struct adapter *padapter)
{ {
struct cmd_obj *pcmd_obj; struct cmd_obj *pcmd_obj;
u8 *pevtcmd; u8 *pevtcmd;
@ -8132,7 +8132,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; struct cmd_obj *pcmd_obj;
u8 *pevtcmd; u8 *pevtcmd;
@ -8185,7 +8185,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; struct cmd_obj *pcmd_obj;
u8 *pevtcmd; u8 *pevtcmd;
@ -8243,7 +8243,7 @@ void report_del_sta_event(_adapter *padapter, unsigned char* MacAddr, unsigned s
return; 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; struct cmd_obj *pcmd_obj;
u8 *pevtcmd; u8 *pevtcmd;
@ -8298,7 +8298,7 @@ Following are the event callback functions
*****************************************************************************/ *****************************************************************************/
/* for sta/adhoc mode */ /* 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_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -8351,7 +8351,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 sta_info *psta, *psta_bmc;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -8443,7 +8443,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_priv *pmlmeext = &(padapter->mlmeextpriv);
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -8493,7 +8493,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_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -8534,8 +8534,8 @@ void mlmeext_sta_del_event_callback(_adapter *padapter)
Following are the functions for the timer handlers Following are the functions for the timer handlers
*****************************************************************************/ *****************************************************************************/
void _linked_rx_signal_strehgth_display(_adapter *padapter); void _linked_rx_signal_strehgth_display(struct adapter *padapter);
void _linked_rx_signal_strehgth_display(_adapter *padapter) void _linked_rx_signal_strehgth_display(struct adapter *padapter)
{ {
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -8557,7 +8557,7 @@ void _linked_rx_signal_strehgth_display(_adapter *padapter)
} }
static u8 chk_ap_is_alive(_adapter *padapter, struct sta_info *psta) static u8 chk_ap_is_alive(struct adapter *padapter, struct sta_info *psta)
{ {
u8 ret = false; u8 ret = false;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -8576,7 +8576,7 @@ static u8 chk_ap_is_alive(_adapter *padapter, struct sta_info *psta)
return ret; return ret;
} }
void linked_status_chk(_adapter *padapter) void linked_status_chk(struct adapter *padapter)
{ {
u32 i; u32 i;
struct sta_info *psta; struct sta_info *psta;
@ -8710,7 +8710,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 cmd_obj *ph2c;
struct sitesurvey_parm *psurveyPara; struct sitesurvey_parm *psurveyPara;
@ -8770,7 +8770,7 @@ exit_survey_timer_hdl:
return; return;
} }
void link_timer_hdl(_adapter *padapter) void link_timer_hdl(struct adapter *padapter)
{ {
/* static unsigned int rx_pkt = 0; */ /* static unsigned int rx_pkt = 0; */
/* static u64 tx_cnt = 0; */ /* static u64 tx_cnt = 0; */
@ -8844,12 +8844,12 @@ void addba_timer_hdl(struct sta_info *psta)
#endif /* CONFIG_80211N_HT */ #endif /* CONFIG_80211N_HT */
} }
u8 NULL_hdl(_adapter *padapter, u8 *pbuf) u8 NULL_hdl(struct adapter *padapter, u8 *pbuf)
{ {
return H2C_SUCCESS; return H2C_SUCCESS;
} }
u8 setopmode_hdl(_adapter *padapter, u8 *pbuf) u8 setopmode_hdl(struct adapter *padapter, u8 *pbuf)
{ {
u8 type; u8 type;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -8883,7 +8883,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_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -8949,7 +8949,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; u8 join_type;
struct ndis_802_11_var_ie * pIE; struct ndis_802_11_var_ie * pIE;
@ -9079,7 +9079,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 disconnect_parm *param = (struct disconnect_parm *)pbuf;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -9126,7 +9126,7 @@ u8 disconnect_hdl(_adapter *padapter, unsigned char *pbuf)
return H2C_SUCCESS; return H2C_SUCCESS;
} }
static int rtw_scan_ch_decision(_adapter *padapter, struct rtw_ieee80211_channel *out, static int rtw_scan_ch_decision(struct adapter *padapter, struct rtw_ieee80211_channel *out,
u32 out_num, struct rtw_ieee80211_channel *in, u32 in_num) u32 out_num, struct rtw_ieee80211_channel *in, u32 in_num)
{ {
int i, j; int i, j;
@ -9171,7 +9171,7 @@ static int rtw_scan_ch_decision(_adapter *padapter, struct rtw_ieee80211_channel
return j; 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 mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct sitesurvey_parm *pparm = (struct sitesurvey_parm *)pbuf; struct sitesurvey_parm *pparm = (struct sitesurvey_parm *)pbuf;
@ -9259,7 +9259,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 setauth_parm *pparm = (struct setauth_parm *)pbuf;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -9273,7 +9273,7 @@ u8 setauth_hdl(_adapter *padapter, unsigned char *pbuf)
return H2C_SUCCESS; return H2C_SUCCESS;
} }
u8 setkey_hdl(_adapter *padapter, u8 *pbuf) u8 setkey_hdl(struct adapter *padapter, u8 *pbuf)
{ {
unsigned short ctrl; unsigned short ctrl;
struct setkey_parm *pparm = (struct setkey_parm *)pbuf; struct setkey_parm *pparm = (struct setkey_parm *)pbuf;
@ -9295,7 +9295,7 @@ u8 setkey_hdl(_adapter *padapter, u8 *pbuf)
return H2C_SUCCESS; return H2C_SUCCESS;
} }
u8 set_stakey_hdl(_adapter *padapter, u8 *pbuf) u8 set_stakey_hdl(struct adapter *padapter, u8 *pbuf)
{ {
u16 ctrl=0; u16 ctrl=0;
u8 cam_id;/* cam_entry */ u8 cam_id;/* cam_entry */
@ -9381,7 +9381,7 @@ u8 set_stakey_hdl(_adapter *padapter, u8 *pbuf)
return H2C_SUCCESS; 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 addBaReq_parm *pparm = (struct addBaReq_parm *)pbuf;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -9409,7 +9409,7 @@ u8 add_ba_hdl(_adapter *padapter, unsigned char *pbuf)
return H2C_SUCCESS; return H2C_SUCCESS;
} }
u8 set_tx_beacon_cmd(_adapter* padapter) u8 set_tx_beacon_cmd(struct adapter* padapter)
{ {
struct cmd_obj *ph2c; struct cmd_obj *ph2c;
struct Tx_Beacon_param *ptxBeacon_parm; struct Tx_Beacon_param *ptxBeacon_parm;
@ -9455,12 +9455,12 @@ _func_exit_;
return res; return res;
} }
u8 mlme_evt_hdl(_adapter *padapter, unsigned char *pbuf) u8 mlme_evt_hdl(struct adapter *padapter, unsigned char *pbuf)
{ {
u8 evt_code; u8 evt_code;
u16 evt_sz; u16 evt_sz;
uint *peventbuf; uint *peventbuf;
void (*event_callback)(_adapter *dev, u8 *pbuf); void (*event_callback)(struct adapter *dev, u8 *pbuf);
struct evt_priv *pevt_priv = &(padapter->evtpriv); struct evt_priv *pevt_priv = &(padapter->evtpriv);
peventbuf = (uint*)pbuf; peventbuf = (uint*)pbuf;
@ -9505,7 +9505,7 @@ _abort_event_:
} }
u8 h2c_msg_hdl(_adapter *padapter, unsigned char *pbuf) u8 h2c_msg_hdl(struct adapter *padapter, unsigned char *pbuf)
{ {
if (!pbuf) if (!pbuf)
return H2C_PARAMETERS_ERROR; return H2C_PARAMETERS_ERROR;
@ -9513,7 +9513,7 @@ u8 h2c_msg_hdl(_adapter *padapter, unsigned char *pbuf)
return H2C_SUCCESS; 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) if (send_beacon(padapter)==_FAIL)
{ {
@ -9577,7 +9577,7 @@ u8 tx_beacon_hdl(_adapter *padapter, unsigned char *pbuf)
return H2C_SUCCESS; return H2C_SUCCESS;
} }
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 set_ch_parm *set_ch_parm;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -9601,7 +9601,7 @@ u8 set_ch_hdl(_adapter *padapter, u8 *pbuf)
return H2C_SUCCESS; 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 SetChannelPlan_param *setChannelPlan_param;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -9618,14 +9618,14 @@ u8 set_chplan_hdl(_adapter *padapter, unsigned char *pbuf)
return H2C_SUCCESS; return H2C_SUCCESS;
} }
u8 led_blink_hdl(_adapter *padapter, unsigned char *pbuf) u8 led_blink_hdl(struct adapter *padapter, unsigned char *pbuf)
{ {
if (!pbuf) if (!pbuf)
return H2C_PARAMETERS_ERROR; return H2C_PARAMETERS_ERROR;
return H2C_SUCCESS; return H2C_SUCCESS;
} }
u8 set_csa_hdl(_adapter *padapter, unsigned char *pbuf) u8 set_csa_hdl(struct adapter *padapter, unsigned char *pbuf)
{ {
return H2C_REJECTED; return H2C_REJECTED;
@ -9644,7 +9644,7 @@ u8 set_csa_hdl(_adapter *padapter, unsigned char *pbuf)
/* TDLS_CKALV_PH1 : check alive timer phase1 */ /* TDLS_CKALV_PH1 : check alive timer phase1 */
/* TDLS_CKALV_PH2 : check alive timer phase2 */ /* TDLS_CKALV_PH2 : check alive timer phase2 */
/* TDLS_FREE_STA : free tdls sta */ /* TDLS_FREE_STA : free tdls sta */
u8 tdls_hdl(_adapter *padapter, unsigned char *pbuf) u8 tdls_hdl(struct adapter *padapter, unsigned char *pbuf)
{ {
return H2C_REJECTED; return H2C_REJECTED;
} }

112
core/rtw_mp.c
View file

@ -24,7 +24,7 @@
#include "odm_precomp.h" #include "odm_precomp.h"
#include "rtl8188e_hal.h" #include "rtl8188e_hal.h"
u32 read_macreg(_adapter *padapter, u32 addr, u32 sz) u32 read_macreg(struct adapter *padapter, u32 addr, u32 sz)
{ {
u32 val = 0; u32 val = 0;
@ -46,7 +46,7 @@ u32 read_macreg(_adapter *padapter, u32 addr, u32 sz)
return val; return val;
} }
void write_macreg(_adapter *padapter, u32 addr, u32 val, u32 sz) void write_macreg(struct adapter *padapter, u32 addr, u32 val, u32 sz)
{ {
switch (sz) { switch (sz) {
case 1: case 1:
@ -64,32 +64,32 @@ void write_macreg(_adapter *padapter, u32 addr, u32 val, u32 sz)
} }
u32 read_bbreg(_adapter *padapter, u32 addr, u32 bitmask) u32 read_bbreg(struct adapter *padapter, u32 addr, u32 bitmask)
{ {
return rtw_hal_read_bbreg(padapter, addr, bitmask); return rtw_hal_read_bbreg(padapter, addr, bitmask);
} }
void write_bbreg(_adapter *padapter, u32 addr, u32 bitmask, u32 val) void write_bbreg(struct adapter *padapter, u32 addr, u32 bitmask, u32 val)
{ {
rtw_hal_write_bbreg(padapter, addr, bitmask, val); rtw_hal_write_bbreg(padapter, addr, bitmask, val);
} }
u32 _read_rfreg(PADAPTER padapter, u8 rfpath, u32 addr, u32 bitmask) u32 _read_rfreg(struct adapter * padapter, u8 rfpath, u32 addr, u32 bitmask)
{ {
return rtw_hal_read_rfreg(padapter, (enum rf_radio_path)rfpath, addr, bitmask); return rtw_hal_read_rfreg(padapter, (enum rf_radio_path)rfpath, addr, bitmask);
} }
void _write_rfreg(PADAPTER padapter, u8 rfpath, u32 addr, u32 bitmask, u32 val) void _write_rfreg(struct adapter * padapter, u8 rfpath, u32 addr, u32 bitmask, u32 val)
{ {
rtw_hal_write_rfreg(padapter, (enum rf_radio_path)rfpath, addr, bitmask, val); rtw_hal_write_rfreg(padapter, (enum rf_radio_path)rfpath, addr, bitmask, val);
} }
u32 read_rfreg(PADAPTER padapter, u8 rfpath, u32 addr) u32 read_rfreg(struct adapter * padapter, u8 rfpath, u32 addr)
{ {
return _read_rfreg(padapter, (enum rf_radio_path)rfpath, addr, bRFRegOffsetMask); return _read_rfreg(padapter, (enum rf_radio_path)rfpath, addr, bRFRegOffsetMask);
} }
void write_rfreg(PADAPTER padapter, u8 rfpath, u32 addr, u32 val) void write_rfreg(struct adapter * padapter, u8 rfpath, u32 addr, u32 val)
{ {
_write_rfreg(padapter, (enum rf_radio_path)rfpath, addr, bRFRegOffsetMask, val); _write_rfreg(padapter, (enum rf_radio_path)rfpath, addr, bRFRegOffsetMask, val);
} }
@ -173,7 +173,7 @@ _exit_init_mp_priv:
return res; return res;
} }
static void mp_init_xmit_attrib(struct mp_tx *pmptx, PADAPTER padapter) static void mp_init_xmit_attrib(struct mp_tx *pmptx, struct adapter * padapter)
{ {
struct pkt_attrib *pattrib; struct pkt_attrib *pattrib;
struct tx_desc *desc; struct tx_desc *desc;
@ -197,7 +197,7 @@ static void mp_init_xmit_attrib(struct mp_tx *pmptx, PADAPTER padapter)
pattrib->qos_en = false; pattrib->qos_en = false;
} }
s32 init_mp_priv(PADAPTER padapter) s32 init_mp_priv(struct adapter * padapter)
{ {
struct mp_priv *pmppriv = &padapter->mppriv; struct mp_priv *pmppriv = &padapter->mppriv;
@ -246,7 +246,7 @@ void free_mp_priv(struct mp_priv *pmp_priv)
s32 s32
MPT_InitializeAdapter( MPT_InitializeAdapter(
PADAPTER pAdapter, struct adapter * pAdapter,
u8 Channel u8 Channel
) )
{ {
@ -300,7 +300,7 @@ MPT_InitializeAdapter(
* *
* Overview: Extra DeInitialization for Mass Production Test. * Overview: Extra DeInitialization for Mass Production Test.
* *
* Input: PADAPTER pAdapter * Input: struct adapter * pAdapter
* *
* Output: NONE * Output: NONE
* *
@ -314,7 +314,7 @@ MPT_InitializeAdapter(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
void void
MPT_DeInitAdapter( MPT_DeInitAdapter(
PADAPTER pAdapter struct adapter * pAdapter
) )
{ {
struct mpt_context * pMptCtx = &pAdapter->mppriv.MptCtx; struct mpt_context * pMptCtx = &pAdapter->mppriv.MptCtx;
@ -322,7 +322,7 @@ MPT_DeInitAdapter(
pMptCtx->bMptDrvUnload = true; pMptCtx->bMptDrvUnload = true;
} }
static u8 mpt_ProStartTest(PADAPTER padapter) static u8 mpt_ProStartTest(struct adapter * padapter)
{ {
struct mpt_context * pMptCtx = &padapter->mppriv.MptCtx; struct mpt_context * pMptCtx = &padapter->mppriv.MptCtx;
@ -340,19 +340,19 @@ static u8 mpt_ProStartTest(PADAPTER padapter)
/* /*
* General use * General use
*/ */
s32 SetPowerTracking(PADAPTER padapter, u8 enable) s32 SetPowerTracking(struct adapter * padapter, u8 enable)
{ {
Hal_SetPowerTracking( padapter, enable ); Hal_SetPowerTracking( padapter, enable );
return 0; return 0;
} }
void GetPowerTracking(PADAPTER padapter, u8 *enable) void GetPowerTracking(struct adapter * padapter, u8 *enable)
{ {
Hal_GetPowerTracking( padapter, enable ); Hal_GetPowerTracking( padapter, enable );
} }
static void disable_dm(PADAPTER padapter) static void disable_dm(struct adapter * padapter)
{ {
u8 v8; u8 v8;
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
@ -376,7 +376,7 @@ static void disable_dm(PADAPTER padapter)
} }
/* This function initializes the DUT to the MP test mode */ /* This function initializes the DUT to the MP test mode */
s32 mp_start_test(PADAPTER padapter) s32 mp_start_test(struct adapter * padapter)
{ {
struct wlan_bssid_ex bssid; struct wlan_bssid_ex bssid;
struct sta_info *psta; struct sta_info *psta;
@ -491,7 +491,7 @@ end_of_mp_start_test:
} }
/* */ /* */
/* This function change the DUT from the MP test mode into normal mode */ /* This function change the DUT from the MP test mode into normal mode */
void mp_stop_test(PADAPTER padapter) void mp_stop_test(struct adapter * padapter)
{ {
struct mp_priv *pmppriv = &padapter->mppriv; struct mp_priv *pmppriv = &padapter->mppriv;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -534,7 +534,7 @@ end_of_mp_stop_test:
* *
* Overview: Change RF Setting when we siwthc channel/rate/BW for MP. * Overview: Change RF Setting when we siwthc channel/rate/BW for MP.
* *
* Input: PADAPTER pAdapter * Input: struct adapter * pAdapter
* *
* Output: NONE * Output: NONE
* *
@ -546,19 +546,19 @@ end_of_mp_stop_test:
* 01/09/2009 MHC Add CCK modification for 40MHZ. Suggestion from SD3. * 01/09/2009 MHC Add CCK modification for 40MHZ. Suggestion from SD3.
* *
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
static void mpt_SwitchRfSetting(PADAPTER pAdapter) static void mpt_SwitchRfSetting(struct adapter * pAdapter)
{ {
Hal_mpt_SwitchRfSetting(pAdapter); Hal_mpt_SwitchRfSetting(pAdapter);
} }
/*---------------------------hal\rtl8192c\MPT_Phy.c---------------------------*/ /*---------------------------hal\rtl8192c\MPT_Phy.c---------------------------*/
/*---------------------------hal\rtl8192c\MPT_HelperFunc.c---------------------------*/ /*---------------------------hal\rtl8192c\MPT_HelperFunc.c---------------------------*/
static void MPT_CCKTxPowerAdjust(PADAPTER Adapter, bool bInCH14) static void MPT_CCKTxPowerAdjust(struct adapter * Adapter, bool bInCH14)
{ {
Hal_MPT_CCKTxPowerAdjust(Adapter,bInCH14); Hal_MPT_CCKTxPowerAdjust(Adapter,bInCH14);
} }
static void MPT_CCKTxPowerAdjustbyIndex(PADAPTER pAdapter, bool beven) static void MPT_CCKTxPowerAdjustbyIndex(struct adapter * pAdapter, bool beven)
{ {
Hal_MPT_CCKTxPowerAdjustbyIndex(pAdapter,beven); Hal_MPT_CCKTxPowerAdjustbyIndex(pAdapter,beven);
} }
@ -571,7 +571,7 @@ static void MPT_CCKTxPowerAdjustbyIndex(PADAPTER pAdapter, bool beven)
* Use H2C command to change channel, * Use H2C command to change channel,
* not only modify rf register, but also other setting need to be done. * not only modify rf register, but also other setting need to be done.
*/ */
void SetChannel(PADAPTER pAdapter) void SetChannel(struct adapter * pAdapter)
{ {
Hal_SetChannel(pAdapter); Hal_SetChannel(pAdapter);
@ -581,39 +581,39 @@ void SetChannel(PADAPTER pAdapter)
* Notice * Notice
* Switch bandwitdth may change center frequency(channel) * Switch bandwitdth may change center frequency(channel)
*/ */
void SetBandwidth(PADAPTER pAdapter) void SetBandwidth(struct adapter * pAdapter)
{ {
Hal_SetBandwidth(pAdapter); Hal_SetBandwidth(pAdapter);
} }
static void SetCCKTxPower(PADAPTER pAdapter, u8 *TxPower) static void SetCCKTxPower(struct adapter * pAdapter, u8 *TxPower)
{ {
Hal_SetCCKTxPower(pAdapter,TxPower); Hal_SetCCKTxPower(pAdapter,TxPower);
} }
static void SetOFDMTxPower(PADAPTER pAdapter, u8 *TxPower) static void SetOFDMTxPower(struct adapter * pAdapter, u8 *TxPower)
{ {
Hal_SetOFDMTxPower(pAdapter,TxPower); Hal_SetOFDMTxPower(pAdapter,TxPower);
} }
void SetAntenna(PADAPTER pAdapter) void SetAntenna(struct adapter * pAdapter)
{ {
Hal_SetAntenna(pAdapter); Hal_SetAntenna(pAdapter);
} }
void SetAntennaPathPower(PADAPTER pAdapter) void SetAntennaPathPower(struct adapter * pAdapter)
{ {
Hal_SetAntennaPathPower(pAdapter); Hal_SetAntennaPathPower(pAdapter);
} }
void SetTxPower(PADAPTER pAdapter) void SetTxPower(struct adapter * pAdapter)
{ {
Hal_SetTxPower(pAdapter); Hal_SetTxPower(pAdapter);
} }
static void SetTxAGCOffset(PADAPTER pAdapter, u32 ulTxAGCOffset) static void SetTxAGCOffset(struct adapter * pAdapter, u32 ulTxAGCOffset)
{ {
u32 TxAGCOffset_B, TxAGCOffset_C, TxAGCOffset_D,tmpAGC; u32 TxAGCOffset_B, TxAGCOffset_C, TxAGCOffset_D,tmpAGC;
@ -626,76 +626,76 @@ static void SetTxAGCOffset(PADAPTER pAdapter, u32 ulTxAGCOffset)
(bXBTxAGC|bXCTxAGC|bXDTxAGC), tmpAGC); (bXBTxAGC|bXCTxAGC|bXDTxAGC), tmpAGC);
} }
void SetDataRate(PADAPTER pAdapter) void SetDataRate(struct adapter * pAdapter)
{ {
Hal_SetDataRate(pAdapter); Hal_SetDataRate(pAdapter);
} }
void MP_PHY_SetRFPathSwitch(PADAPTER pAdapter ,bool bMain) void MP_PHY_SetRFPathSwitch(struct adapter * pAdapter ,bool bMain)
{ {
PHY_SetRFPathSwitch(pAdapter,bMain); PHY_SetRFPathSwitch(pAdapter,bMain);
} }
s32 SetThermalMeter(PADAPTER pAdapter, u8 target_ther) s32 SetThermalMeter(struct adapter * pAdapter, u8 target_ther)
{ {
return Hal_SetThermalMeter( pAdapter, target_ther); return Hal_SetThermalMeter( pAdapter, target_ther);
} }
static void TriggerRFThermalMeter(PADAPTER pAdapter) static void TriggerRFThermalMeter(struct adapter * pAdapter)
{ {
Hal_TriggerRFThermalMeter(pAdapter); Hal_TriggerRFThermalMeter(pAdapter);
} }
static u8 ReadRFThermalMeter(PADAPTER pAdapter) static u8 ReadRFThermalMeter(struct adapter * pAdapter)
{ {
return Hal_ReadRFThermalMeter(pAdapter); return Hal_ReadRFThermalMeter(pAdapter);
} }
void GetThermalMeter(PADAPTER pAdapter, u8 *value) void GetThermalMeter(struct adapter * pAdapter, u8 *value)
{ {
Hal_GetThermalMeter(pAdapter,value); Hal_GetThermalMeter(pAdapter,value);
} }
void SetSingleCarrierTx(PADAPTER pAdapter, u8 bStart) void SetSingleCarrierTx(struct adapter * pAdapter, u8 bStart)
{ {
PhySetTxPowerLevel(pAdapter); PhySetTxPowerLevel(pAdapter);
Hal_SetSingleCarrierTx(pAdapter,bStart); Hal_SetSingleCarrierTx(pAdapter,bStart);
} }
void SetSingleToneTx(PADAPTER pAdapter, u8 bStart) void SetSingleToneTx(struct adapter * pAdapter, u8 bStart)
{ {
PhySetTxPowerLevel(pAdapter); PhySetTxPowerLevel(pAdapter);
Hal_SetSingleToneTx(pAdapter,bStart); Hal_SetSingleToneTx(pAdapter,bStart);
} }
void SetCarrierSuppressionTx(PADAPTER pAdapter, u8 bStart) void SetCarrierSuppressionTx(struct adapter * pAdapter, u8 bStart)
{ {
PhySetTxPowerLevel(pAdapter); PhySetTxPowerLevel(pAdapter);
Hal_SetCarrierSuppressionTx(pAdapter, bStart); Hal_SetCarrierSuppressionTx(pAdapter, bStart);
} }
static void SetCCKContinuousTx(PADAPTER pAdapter, u8 bStart) static void SetCCKContinuousTx(struct adapter * pAdapter, u8 bStart)
{ {
PhySetTxPowerLevel(pAdapter); PhySetTxPowerLevel(pAdapter);
Hal_SetCCKContinuousTx(pAdapter,bStart); Hal_SetCCKContinuousTx(pAdapter,bStart);
} }
static void SetOFDMContinuousTx(PADAPTER pAdapter, u8 bStart) static void SetOFDMContinuousTx(struct adapter * pAdapter, u8 bStart)
{ {
PhySetTxPowerLevel(pAdapter); PhySetTxPowerLevel(pAdapter);
Hal_SetOFDMContinuousTx( pAdapter, bStart); Hal_SetOFDMContinuousTx( pAdapter, bStart);
}/* mpt_StartOfdmContTx */ }/* mpt_StartOfdmContTx */
void SetContinuousTx(PADAPTER pAdapter, u8 bStart) void SetContinuousTx(struct adapter * pAdapter, u8 bStart)
{ {
PhySetTxPowerLevel(pAdapter); PhySetTxPowerLevel(pAdapter);
Hal_SetContinuousTx(pAdapter,bStart); Hal_SetContinuousTx(pAdapter,bStart);
} }
void PhySetTxPowerLevel(PADAPTER pAdapter) void PhySetTxPowerLevel(struct adapter * pAdapter)
{ {
struct mp_priv *pmp_priv = &pAdapter->mppriv; struct mp_priv *pmp_priv = &pAdapter->mppriv;
@ -704,7 +704,7 @@ void PhySetTxPowerLevel(PADAPTER pAdapter)
} }
/* */ /* */
static void dump_mpframe(PADAPTER padapter, struct xmit_frame *pmpframe) static void dump_mpframe(struct adapter * padapter, struct xmit_frame *pmpframe)
{ {
rtw_hal_mgnt_xmit(padapter, pmpframe); rtw_hal_mgnt_xmit(padapter, pmpframe);
} }
@ -743,7 +743,7 @@ static int mp_xmit_packet_thread(void *context)
struct mp_tx *pmptx; struct mp_tx *pmptx;
struct mp_priv *pmp_priv; struct mp_priv *pmp_priv;
struct xmit_priv *pxmitpriv; struct xmit_priv *pxmitpriv;
PADAPTER padapter; struct adapter * padapter;
pmp_priv = (struct mp_priv *)context; pmp_priv = (struct mp_priv *)context;
pmptx = &pmp_priv->tx; pmptx = &pmp_priv->tx;
@ -795,13 +795,13 @@ exit:
thread_exit(); thread_exit();
} }
void fill_txdesc_for_mp(PADAPTER padapter, struct tx_desc *ptxdesc) void fill_txdesc_for_mp(struct adapter * padapter, struct tx_desc *ptxdesc)
{ {
struct mp_priv *pmp_priv = &padapter->mppriv; struct mp_priv *pmp_priv = &padapter->mppriv;
_rtw_memcpy(ptxdesc, &(pmp_priv->tx.desc), TXDESC_SIZE); _rtw_memcpy(ptxdesc, &(pmp_priv->tx.desc), TXDESC_SIZE);
} }
void SetPacketTx(PADAPTER padapter) void SetPacketTx(struct adapter * padapter)
{ {
u8 *ptr, *pkt_start, *pkt_end; u8 *ptr, *pkt_start, *pkt_end;
u32 pkt_size,offset; u32 pkt_size,offset;
@ -931,7 +931,7 @@ void SetPacketTx(PADAPTER padapter)
DBG_88E("Create PktTx Thread Fail !!!!!\n"); DBG_88E("Create PktTx Thread Fail !!!!!\n");
} }
void SetPacketRx(PADAPTER pAdapter, u8 bStartRx) void SetPacketRx(struct adapter * pAdapter, u8 bStartRx)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
@ -950,7 +950,7 @@ void SetPacketRx(PADAPTER pAdapter, u8 bStartRx)
} }
} }
void ResetPhyRxPktCount(PADAPTER pAdapter) void ResetPhyRxPktCount(struct adapter * pAdapter)
{ {
u32 i, phyrx_set = 0; u32 i, phyrx_set = 0;
@ -962,7 +962,7 @@ void ResetPhyRxPktCount(PADAPTER pAdapter)
} }
} }
static u32 GetPhyRxPktCounts(PADAPTER pAdapter, u32 selbit) static u32 GetPhyRxPktCounts(struct adapter * pAdapter, u32 selbit)
{ {
/* selection */ /* selection */
u32 phyrx_set = 0, count = 0; u32 phyrx_set = 0, count = 0;
@ -976,7 +976,7 @@ static u32 GetPhyRxPktCounts(PADAPTER pAdapter, u32 selbit)
return count; return count;
} }
u32 GetPhyRxPktReceived(PADAPTER pAdapter) u32 GetPhyRxPktReceived(struct adapter * pAdapter)
{ {
u32 OFDM_cnt = 0, CCK_cnt = 0, HT_cnt = 0; u32 OFDM_cnt = 0, CCK_cnt = 0, HT_cnt = 0;
@ -987,7 +987,7 @@ u32 GetPhyRxPktReceived(PADAPTER pAdapter)
return OFDM_cnt + CCK_cnt + HT_cnt; return OFDM_cnt + CCK_cnt + HT_cnt;
} }
u32 GetPhyRxPktCRC32Error(PADAPTER pAdapter) u32 GetPhyRxPktCRC32Error(struct adapter * pAdapter)
{ {
u32 OFDM_cnt = 0, CCK_cnt = 0, HT_cnt = 0; u32 OFDM_cnt = 0, CCK_cnt = 0, HT_cnt = 0;
@ -1001,7 +1001,7 @@ u32 GetPhyRxPktCRC32Error(PADAPTER pAdapter)
/* reg 0x808[9:0]: FFT data x */ /* reg 0x808[9:0]: FFT data x */
/* reg 0x808[22]: 0 --> 1 to get 1 FFT data y */ /* reg 0x808[22]: 0 --> 1 to get 1 FFT data y */
/* reg 0x8B4[15:0]: FFT data y report */ /* reg 0x8B4[15:0]: FFT data y report */
static u32 rtw_GetPSDData(PADAPTER pAdapter, u32 point) static u32 rtw_GetPSDData(struct adapter * pAdapter, u32 point)
{ {
int psd_val; int psd_val;
@ -1031,7 +1031,7 @@ static u32 rtw_GetPSDData(PADAPTER pAdapter, u32 point)
* 1024 512 512 + 1024 = 1536 * 1024 512 512 + 1024 = 1536
* *
*/ */
u32 mp_query_psd(PADAPTER pAdapter, u8 *data) u32 mp_query_psd(struct adapter * pAdapter, u8 *data)
{ {
u32 i, psd_pts=0, psd_start=0, psd_stop=0; u32 i, psd_pts=0, psd_start=0, psd_stop=0;
u32 psd_data=0; u32 psd_data=0;
@ -1078,7 +1078,7 @@ u32 mp_query_psd(PADAPTER pAdapter, u8 *data)
void _rtw_mp_xmit_priv (struct xmit_priv *pxmitpriv) void _rtw_mp_xmit_priv (struct xmit_priv *pxmitpriv)
{ {
int i,res; int i,res;
_adapter *padapter = pxmitpriv->adapter; struct adapter *padapter = pxmitpriv->adapter;
struct xmit_frame *pxmitframe = (struct xmit_frame*) pxmitpriv->pxmit_frame_buf; struct xmit_frame *pxmitframe = (struct xmit_frame*) pxmitpriv->pxmit_frame_buf;
struct xmit_buf *pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmitbuf; struct xmit_buf *pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmitbuf;

76
core/rtw_mp_ioctl.c
View file

@ -31,7 +31,7 @@
NDIS_STATUS oid_rt_wireless_mode_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_wireless_mode_hdl(struct oid_par_priv *poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_; _func_enter_;
@ -59,7 +59,7 @@ NDIS_STATUS oid_rt_pro_write_bb_reg_hdl(struct oid_par_priv *poid_par_priv)
u16 offset; u16 offset;
u32 value; u32 value;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_; _func_enter_;
@ -97,7 +97,7 @@ NDIS_STATUS oid_rt_pro_read_bb_reg_hdl(struct oid_par_priv *poid_par_priv)
u16 offset; u16 offset;
u32 value; u32 value;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_; _func_enter_;
@ -136,7 +136,7 @@ NDIS_STATUS oid_rt_pro_write_rf_reg_hdl(struct oid_par_priv *poid_par_priv)
u8 offset; u8 offset;
u32 value; u32 value;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_; _func_enter_;
@ -180,7 +180,7 @@ NDIS_STATUS oid_rt_pro_read_rf_reg_hdl(struct oid_par_priv *poid_par_priv)
u8 path; u8 path;
u8 offset; u8 offset;
u32 value; u32 value;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
_func_enter_; _func_enter_;
@ -228,7 +228,7 @@ NDIS_STATUS oid_rt_pro_set_data_rate_hdl(struct oid_par_priv *poid_par_priv)
{ {
u32 ratevalue;/* 4 */ u32 ratevalue;/* 4 */
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_; _func_enter_;
@ -262,7 +262,7 @@ NDIS_STATUS oid_rt_pro_start_test_hdl(struct oid_par_priv *poid_par_priv)
{ {
u32 mode; u32 mode;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_; _func_enter_;
@ -299,7 +299,7 @@ _func_exit_;
NDIS_STATUS oid_rt_pro_stop_test_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_pro_stop_test_hdl(struct oid_par_priv *poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_; _func_enter_;
@ -323,7 +323,7 @@ NDIS_STATUS oid_rt_pro_set_channel_direct_call_hdl(struct oid_par_priv *poid_par
{ {
u32 Channel; u32 Channel;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_; _func_enter_;
@ -360,7 +360,7 @@ NDIS_STATUS oid_rt_set_bandwidth_hdl(struct oid_par_priv *poid_par_priv)
u16 bandwidth; u16 bandwidth;
u16 channel_offset; u16 channel_offset;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); struct adapter * padapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_; _func_enter_;
@ -398,7 +398,7 @@ NDIS_STATUS oid_rt_pro_set_antenna_bb_hdl(struct oid_par_priv *poid_par_priv)
{ {
u32 antenna; u32 antenna;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_; _func_enter_;
@ -434,7 +434,7 @@ NDIS_STATUS oid_rt_pro_set_tx_power_control_hdl(struct oid_par_priv *poid_par_pr
{ {
u32 tx_pwr_idx; u32 tx_pwr_idx;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_; _func_enter_;
@ -471,7 +471,7 @@ _func_exit_;
NDIS_STATUS oid_rt_pro_query_tx_packet_sent_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_pro_query_tx_packet_sent_hdl(struct oid_par_priv *poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_; _func_enter_;
@ -495,7 +495,7 @@ _func_exit_;
NDIS_STATUS oid_rt_pro_query_rx_packet_received_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_pro_query_rx_packet_received_hdl(struct oid_par_priv *poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_; _func_enter_;
@ -520,7 +520,7 @@ _func_exit_;
NDIS_STATUS oid_rt_pro_query_rx_packet_crc32_error_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_pro_query_rx_packet_crc32_error_hdl(struct oid_par_priv *poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_; _func_enter_;
@ -546,7 +546,7 @@ _func_exit_;
NDIS_STATUS oid_rt_pro_reset_tx_packet_sent_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_pro_reset_tx_packet_sent_hdl(struct oid_par_priv *poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_; _func_enter_;
@ -566,7 +566,7 @@ _func_exit_;
NDIS_STATUS oid_rt_pro_reset_rx_packet_received_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_pro_reset_rx_packet_received_hdl(struct oid_par_priv *poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_; _func_enter_;
@ -591,7 +591,7 @@ _func_exit_;
NDIS_STATUS oid_rt_reset_phy_rx_packet_count_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_reset_phy_rx_packet_count_hdl(struct oid_par_priv *poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_; _func_enter_;
@ -612,7 +612,7 @@ _func_exit_;
NDIS_STATUS oid_rt_get_phy_rx_packet_received_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_get_phy_rx_packet_received_hdl(struct oid_par_priv *poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_; _func_enter_;
@ -640,7 +640,7 @@ _func_exit_;
NDIS_STATUS oid_rt_get_phy_rx_packet_crc32_error_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_get_phy_rx_packet_crc32_error_hdl(struct oid_par_priv *poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_; _func_enter_;
@ -670,7 +670,7 @@ NDIS_STATUS oid_rt_pro_set_continuous_tx_hdl(struct oid_par_priv *poid_par_priv)
{ {
u32 bStartTest; u32 bStartTest;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_; _func_enter_;
@ -705,7 +705,7 @@ NDIS_STATUS oid_rt_pro_set_single_carrier_tx_hdl(struct oid_par_priv *poid_par_p
{ {
u32 bStartTest; u32 bStartTest;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_; _func_enter_;
@ -740,7 +740,7 @@ NDIS_STATUS oid_rt_pro_set_carrier_suppression_tx_hdl(struct oid_par_priv *poid_
{ {
u32 bStartTest; u32 bStartTest;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_; _func_enter_;
@ -775,7 +775,7 @@ NDIS_STATUS oid_rt_pro_set_single_tone_tx_hdl(struct oid_par_priv *poid_par_priv
{ {
u32 bStartTest; u32 bStartTest;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_; _func_enter_;
@ -802,7 +802,7 @@ NDIS_STATUS oid_rt_pro_set_modulation_hdl(struct oid_par_priv* poid_par_priv)
NDIS_STATUS oid_rt_pro_trigger_gpio_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_pro_trigger_gpio_hdl(struct oid_par_priv *poid_par_priv)
{ {
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
_func_enter_; _func_enter_;
@ -829,7 +829,7 @@ NDIS_STATUS oid_rt_pro_read_register_hdl(struct oid_par_priv *poid_par_priv)
struct mp_rw_reg * RegRWStruct; struct mp_rw_reg * RegRWStruct;
u32 offset, width; u32 offset, width;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_; _func_enter_;
@ -878,7 +878,7 @@ NDIS_STATUS oid_rt_pro_write_register_hdl(struct oid_par_priv *poid_par_priv)
struct mp_rw_reg *RegRWStruct; struct mp_rw_reg *RegRWStruct;
u32 offset, width, value; u32 offset, width, value;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); struct adapter * padapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_; _func_enter_;
@ -997,7 +997,7 @@ NDIS_STATUS oid_rt_pro_cfg_debug_message_hdl(struct oid_par_priv *poid_par_priv)
/* */ /* */
NDIS_STATUS oid_rt_pro_set_data_rate_ex_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_pro_set_data_rate_ex_hdl(struct oid_par_priv *poid_par_priv)
{ {
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
@ -1024,7 +1024,7 @@ NDIS_STATUS oid_rt_get_thermal_meter_hdl(struct oid_par_priv *poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
u8 thermal = 0; u8 thermal = 0;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_; _func_enter_;
@ -1056,7 +1056,7 @@ NDIS_STATUS oid_rt_pro_read_tssi_hdl(struct oid_par_priv *poid_par_priv)
NDIS_STATUS oid_rt_pro_set_power_tracking_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_pro_set_power_tracking_hdl(struct oid_par_priv *poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_; _func_enter_;
@ -1136,7 +1136,7 @@ NDIS_STATUS oid_rt_pro_read_efuse_hdl(struct oid_par_priv *poid_par_priv)
u8 *data; u8 *data;
u16 addr = 0, cnts = 0, max_available_size = 0; u16 addr = 0, cnts = 0, max_available_size = 0;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_; _func_enter_;
@ -1181,7 +1181,7 @@ NDIS_STATUS oid_rt_pro_write_efuse_hdl(struct oid_par_priv *poid_par_priv)
u8 *data; u8 *data;
u16 addr = 0, cnts = 0, max_available_size = 0; u16 addr = 0, cnts = 0, max_available_size = 0;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_; _func_enter_;
@ -1219,7 +1219,7 @@ NDIS_STATUS oid_rt_pro_rw_efuse_pgpkt_hdl(struct oid_par_priv *poid_par_priv)
{ {
struct pgpkt *ppgpkt; struct pgpkt *ppgpkt;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_; _func_enter_;
@ -1272,7 +1272,7 @@ NDIS_STATUS oid_rt_get_efuse_current_size_hdl(struct oid_par_priv *poid_par_priv
u16 size; u16 size;
u8 ret; u8 ret;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_; _func_enter_;
@ -1299,7 +1299,7 @@ _func_exit_;
NDIS_STATUS oid_rt_get_efuse_max_size_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_get_efuse_max_size_hdl(struct oid_par_priv *poid_par_priv)
{ {
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
_func_enter_; _func_enter_;
@ -1345,7 +1345,7 @@ NDIS_STATUS oid_rt_pro_efuse_map_hdl(struct oid_par_priv *poid_par_priv)
{ {
u8 *data; u8 *data;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); struct adapter * Adapter = (struct adapter *)(poid_par_priv->adapter_context);
u16 mapLen=0; u16 mapLen=0;
_func_enter_; _func_enter_;
@ -1441,14 +1441,14 @@ NDIS_STATUS oid_rt_pro_set_pkt_test_mode_hdl(struct oid_par_priv *poid_par_priv)
unsigned int mp_ioctl_xmit_packet_hdl(struct oid_par_priv *poid_par_priv) unsigned int mp_ioctl_xmit_packet_hdl(struct oid_par_priv *poid_par_priv)
{ {
struct mp_xmit_parm * pparm; struct mp_xmit_parm * pparm;
PADAPTER padapter; struct adapter * padapter;
struct mp_priv *pmp_priv; struct mp_priv *pmp_priv;
struct pkt_attrib *pattrib; struct pkt_attrib *pattrib;
RT_TRACE(_module_mp_, _drv_notice_, ("+%s\n", __func__)); RT_TRACE(_module_mp_, _drv_notice_, ("+%s\n", __func__));
pparm = (struct mp_xmit_parm *)poid_par_priv->information_buf; pparm = (struct mp_xmit_parm *)poid_par_priv->information_buf;
padapter = (PADAPTER)poid_par_priv->adapter_context; padapter = (struct adapter *)poid_par_priv->adapter_context;
pmp_priv = &padapter->mppriv; pmp_priv = &padapter->mppriv;
if (poid_par_priv->type_of_oid == QUERY_OID) { if (poid_par_priv->type_of_oid == QUERY_OID) {

58
core/rtw_p2p.c
View file

@ -40,7 +40,7 @@ static int rtw_p2p_is_channel_list_ok( u8 desired_ch, u8* ch_list, u8 ch_cnt )
return( found ); return( found );
} }
static int is_any_client_associated( _adapter *padapter) static int is_any_client_associated( struct adapter *padapter)
{ {
unsigned long irqL; unsigned long irqL;
struct list_head *phead, *plist; struct list_head *phead, *plist;
@ -81,7 +81,7 @@ static u32 go_add_group_info_attr(struct wifidirect_info *pwdinfo, u8 *pbuf)
u16 attr_len = 0; u16 attr_len = 0;
u8 tmplen, *pdata_attr, *pstart, *pcur; u8 tmplen, *pdata_attr, *pstart, *pcur;
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
_adapter *padapter = pwdinfo->padapter; struct adapter *padapter = pwdinfo->padapter;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
DBG_88E("%s\n", __func__); DBG_88E("%s\n", __func__);
@ -181,7 +181,7 @@ static void issue_group_disc_req(struct wifidirect_info *pwdinfo, u8 *da)
unsigned char *pframe; unsigned char *pframe;
struct rtw_ieee80211_hdr *pwlanhdr; struct rtw_ieee80211_hdr *pwlanhdr;
unsigned short *fctrl; unsigned short *fctrl;
_adapter *padapter = pwdinfo->padapter; struct adapter *padapter = pwdinfo->padapter;
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
unsigned char category = RTW_WLAN_CATEGORY_P2P;/* P2P action frame */ unsigned char category = RTW_WLAN_CATEGORY_P2P;/* P2P action frame */
@ -240,7 +240,7 @@ static void issue_p2p_devdisc_resp(struct wifidirect_info *pwdinfo, u8 *da, u8 s
unsigned char *pframe; unsigned char *pframe;
struct rtw_ieee80211_hdr *pwlanhdr; struct rtw_ieee80211_hdr *pwlanhdr;
unsigned short *fctrl; unsigned short *fctrl;
_adapter *padapter = pwdinfo->padapter; struct adapter *padapter = pwdinfo->padapter;
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
unsigned char category = RTW_WLAN_CATEGORY_PUBLIC; unsigned char category = RTW_WLAN_CATEGORY_PUBLIC;
@ -309,7 +309,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) 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; unsigned char category = RTW_WLAN_CATEGORY_PUBLIC;
u8 action = P2P_PUB_ACTION_ACTION; u8 action = P2P_PUB_ACTION_ACTION;
u8 dialogToken = frame_body[7]; /* The Dialog Token of provisioning discovery request frame. */ u8 dialogToken = frame_body[7]; /* The Dialog Token of provisioning discovery request frame. */
@ -392,7 +392,7 @@ static void issue_p2p_presence_resp(struct wifidirect_info *pwdinfo, u8 *da, u8
unsigned char *pframe; unsigned char *pframe;
struct rtw_ieee80211_hdr *pwlanhdr; struct rtw_ieee80211_hdr *pwlanhdr;
unsigned short *fctrl; unsigned short *fctrl;
_adapter *padapter = pwdinfo->padapter; struct adapter *padapter = pwdinfo->padapter;
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
unsigned char category = RTW_WLAN_CATEGORY_P2P;/* P2P action frame */ unsigned char category = RTW_WLAN_CATEGORY_P2P;/* P2P action frame */
@ -1049,7 +1049,7 @@ u32 process_p2p_devdisc_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint le
u8 *frame_body; u8 *frame_body;
u8 status, dialogToken; u8 status, dialogToken;
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
_adapter *padapter = pwdinfo->padapter; struct adapter *padapter = pwdinfo->padapter;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
u8 *p2p_ie; u8 *p2p_ie;
u32 p2p_ielen = 0; u32 p2p_ielen = 0;
@ -1220,7 +1220,7 @@ static u8 rtw_p2p_ch_inclusion(struct mlme_ext_priv *pmlmeext, u8 *peer_ch_list,
u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe, uint len ) 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; u8 result = P2P_STATUS_SUCCESS;
u32 p2p_ielen = 0, wps_ielen = 0; u32 p2p_ielen = 0, wps_ielen = 0;
u8 * ies; u8 * ies;
@ -1386,7 +1386,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 ) 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; u8 result = P2P_STATUS_SUCCESS;
u32 p2p_ielen, wps_ielen; u32 p2p_ielen, wps_ielen;
u8 * ies; u8 * ies;
@ -1697,7 +1697,7 @@ u8 process_p2p_presence_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint le
return true; return true;
} }
static void find_phase_handler( _adapter* padapter ) static void find_phase_handler( struct adapter* padapter )
{ {
struct wifidirect_info *pwdinfo = &padapter->wdinfo; struct wifidirect_info *pwdinfo = &padapter->wdinfo;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -1719,9 +1719,9 @@ _func_enter_;
_func_exit_; _func_exit_;
} }
void p2p_concurrent_handler( _adapter* padapter ); void p2p_concurrent_handler( struct adapter* padapter );
static void restore_p2p_state_handler( _adapter* padapter ) static void restore_p2p_state_handler( struct adapter* padapter )
{ {
struct wifidirect_info *pwdinfo = &padapter->wdinfo; struct wifidirect_info *pwdinfo = &padapter->wdinfo;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -1743,7 +1743,7 @@ _func_enter_;
_func_exit_; _func_exit_;
} }
static void pre_tx_invitereq_handler( _adapter* padapter ) static void pre_tx_invitereq_handler( struct adapter* padapter )
{ {
struct wifidirect_info *pwdinfo = &padapter->wdinfo; struct wifidirect_info *pwdinfo = &padapter->wdinfo;
u8 val8 = 1; u8 val8 = 1;
@ -1757,7 +1757,7 @@ _func_enter_;
_func_exit_; _func_exit_;
} }
static void pre_tx_provdisc_handler( _adapter* padapter ) static void pre_tx_provdisc_handler( struct adapter* padapter )
{ {
struct wifidirect_info *pwdinfo = &padapter->wdinfo; struct wifidirect_info *pwdinfo = &padapter->wdinfo;
u8 val8 = 1; u8 val8 = 1;
@ -1771,7 +1771,7 @@ _func_enter_;
_func_exit_; _func_exit_;
} }
static void pre_tx_negoreq_handler( _adapter* padapter ) static void pre_tx_negoreq_handler( struct adapter* padapter )
{ {
struct wifidirect_info *pwdinfo = &padapter->wdinfo; struct wifidirect_info *pwdinfo = &padapter->wdinfo;
u8 val8 = 1; u8 val8 = 1;
@ -1785,7 +1785,7 @@ _func_enter_;
_func_exit_; _func_exit_;
} }
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); struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
@ -1812,7 +1812,7 @@ _func_enter_;
_func_exit_; _func_exit_;
} }
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; u8 * ies;
u32 ies_len; u32 ies_len;
@ -1919,7 +1919,7 @@ _func_enter_;
_func_exit_; _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 = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
struct wifidirect_info *pwdinfo= &(padapter->wdinfo); struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
@ -1979,7 +1979,7 @@ _func_enter_;
_func_exit_; _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 cmd_obj *ph2c;
struct drvextra_cmd_parm *pdrvextra_cmd_parm; struct drvextra_cmd_parm *pdrvextra_cmd_parm;
@ -2029,7 +2029,7 @@ _func_exit_;
static void reset_ch_sitesurvey_timer_process (void *FunctionContext) 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; struct wifidirect_info *pwdinfo = &adapter->wdinfo;
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
@ -2043,7 +2043,7 @@ static void reset_ch_sitesurvey_timer_process (void *FunctionContext)
static void reset_ch_sitesurvey_timer_process2 (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; struct wifidirect_info *pwdinfo = &adapter->wdinfo;
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
@ -2057,7 +2057,7 @@ static void reset_ch_sitesurvey_timer_process2 (void *FunctionContext)
static void restore_p2p_state_timer_process (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; struct wifidirect_info *pwdinfo = &adapter->wdinfo;
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
@ -2068,7 +2068,7 @@ static void restore_p2p_state_timer_process (void *FunctionContext)
static void pre_tx_scan_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; struct wifidirect_info *pwdinfo = &adapter->wdinfo;
unsigned long irqL; unsigned long irqL;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv; struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
@ -2113,7 +2113,7 @@ static void pre_tx_scan_timer_process (void *FunctionContext)
static void find_phase_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; struct wifidirect_info *pwdinfo = &adapter->wdinfo;
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
@ -2124,7 +2124,7 @@ static void find_phase_timer_process (void *FunctionContext)
p2p_protocol_wk_cmd( adapter, P2P_FIND_PHASE_WK ); p2p_protocol_wk_cmd( adapter, P2P_FIND_PHASE_WK );
} }
void reset_global_wifidirect_info( _adapter* padapter ) void reset_global_wifidirect_info( struct adapter* padapter )
{ {
struct wifidirect_info *pwdinfo; struct wifidirect_info *pwdinfo;
@ -2135,7 +2135,7 @@ void reset_global_wifidirect_info( _adapter* padapter )
pwdinfo->wfd_tdls_weaksec = 0; pwdinfo->wfd_tdls_weaksec = 0;
} }
void rtw_init_wifidirect_timers(_adapter* padapter) void rtw_init_wifidirect_timers(struct adapter* padapter)
{ {
struct wifidirect_info *pwdinfo = &padapter->wdinfo; struct wifidirect_info *pwdinfo = &padapter->wdinfo;
@ -2146,7 +2146,7 @@ void rtw_init_wifidirect_timers(_adapter* padapter)
_init_timer( &pwdinfo->reset_ch_sitesurvey2, padapter->pnetdev, reset_ch_sitesurvey_timer_process2, padapter ); _init_timer( &pwdinfo->reset_ch_sitesurvey2, padapter->pnetdev, reset_ch_sitesurvey_timer_process2, padapter );
} }
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 #ifdef CONFIG_P2P
struct wifidirect_info *pwdinfo = &padapter->wdinfo; struct wifidirect_info *pwdinfo = &padapter->wdinfo;
@ -2161,7 +2161,7 @@ void rtw_init_wifidirect_addrs(_adapter* padapter, u8 *dev_addr, u8 *iface_addr)
#endif #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; struct wifidirect_info *pwdinfo;
@ -2258,7 +2258,7 @@ void init_wifidirect_info( _adapter* padapter, enum P2P_ROLE role)
pwdinfo->p2p_info.scan_op_ch_only = 0; pwdinfo->p2p_info.scan_op_ch_only = 0;
} }
int rtw_p2p_enable(_adapter *padapter, enum P2P_ROLE role) int rtw_p2p_enable(struct adapter *padapter, enum P2P_ROLE role)
{ {
int ret = _SUCCESS; int ret = _SUCCESS;
struct wifidirect_info *pwdinfo= &(padapter->wdinfo); struct wifidirect_info *pwdinfo= &(padapter->wdinfo);

46
core/rtw_pwrctrl.c
View file

@ -28,7 +28,7 @@
#include <rtl8723a_hal.h> #include <rtl8723a_hal.h>
#endif #endif
void ips_enter(_adapter * padapter) void ips_enter(struct adapter * padapter)
{ {
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@ -76,7 +76,7 @@ void ips_enter(_adapter * padapter)
} }
int ips_leave(_adapter * padapter) int ips_leave(struct adapter * padapter)
{ {
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
struct security_priv* psecuritypriv=&(padapter->securitypriv); struct security_priv* psecuritypriv=&(padapter->securitypriv);
@ -125,9 +125,9 @@ int ips_leave(_adapter * padapter)
return result; return result;
} }
static bool rtw_pwr_unassociated_idle(_adapter *adapter) static 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 mlme_priv *pmlmepriv = &(adapter->mlmepriv);
#ifdef CONFIG_P2P #ifdef CONFIG_P2P
struct wifidirect_info *pwdinfo = &(adapter->wdinfo); struct wifidirect_info *pwdinfo = &(adapter->wdinfo);
@ -175,7 +175,7 @@ exit:
return ret; return ret;
} }
void rtw_ps_processor(_adapter*padapter) void rtw_ps_processor(struct adapter*padapter)
{ {
#ifdef CONFIG_P2P #ifdef CONFIG_P2P
struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); struct wifidirect_info *pwdinfo = &( padapter->wdinfo );
@ -235,7 +235,7 @@ exit:
void pwr_state_check_handler(void *FunctionContext) void pwr_state_check_handler(void *FunctionContext)
{ {
_adapter *padapter = (_adapter *)FunctionContext; struct adapter *padapter = (struct adapter *)FunctionContext;
rtw_ps_cmd(padapter); rtw_ps_cmd(padapter);
} }
@ -246,7 +246,7 @@ void pwr_state_check_handler(void *FunctionContext)
* pslv power state level, only could be PS_STATE_S0 ~ PS_STATE_S4 * 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; u8 rpwm;
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
@ -306,8 +306,8 @@ _func_enter_;
_func_exit_; _func_exit_;
} }
u8 PS_RDY_CHECK(_adapter * padapter); u8 PS_RDY_CHECK(struct adapter * padapter);
u8 PS_RDY_CHECK(_adapter * padapter) u8 PS_RDY_CHECK(struct adapter * padapter)
{ {
u32 curr_time, delta_time; u32 curr_time, delta_time;
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
@ -345,7 +345,7 @@ u8 PS_RDY_CHECK(_adapter * padapter)
return true; 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 = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
#ifdef CONFIG_P2P #ifdef CONFIG_P2P
@ -416,7 +416,7 @@ _func_exit_;
* -1: Timeout * -1: Timeout
* -2: Other error * -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; u32 start_time;
u8 bAwake = false; u8 bAwake = false;
@ -453,11 +453,11 @@ s32 LPS_RF_ON_check(PADAPTER padapter, u32 delay_ms)
/* Description: */ /* Description: */
/* Enter the leisure power save mode. */ /* Enter the leisure power save mode. */
/* */ /* */
void LPS_Enter(PADAPTER padapter) void LPS_Enter(struct adapter * padapter)
{ {
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
_adapter *buddy = padapter->pbuddy_adapter; struct adapter *buddy = padapter->pbuddy_adapter;
_func_enter_; _func_enter_;
@ -490,7 +490,7 @@ _func_exit_;
/* Description: */ /* Description: */
/* Leave the leisure power save mode. */ /* Leave the leisure power save mode. */
/* */ /* */
void LPS_Leave(PADAPTER padapter) void LPS_Leave(struct adapter * padapter)
{ {
#define LPS_LEAVE_TIMEOUT_MS 100 #define LPS_LEAVE_TIMEOUT_MS 100
@ -522,7 +522,7 @@ _func_exit_;
/* Description: Leave all power save mode: LPS, FwLPS, IPS if needed. */ /* Description: Leave all power save mode: LPS, FwLPS, IPS if needed. */
/* Move code to function by tynli. 2010.03.26. */ /* Move code to function by tynli. 2010.03.26. */
/* */ /* */
void LeaveAllPowerSaveMode(PADAPTER Adapter) void LeaveAllPowerSaveMode(struct adapter * Adapter)
{ {
struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv); struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv);
u8 enqueue = 0; u8 enqueue = 0;
@ -539,7 +539,7 @@ _func_enter_;
_func_exit_; _func_exit_;
} }
void rtw_init_pwrctrl_priv(PADAPTER padapter) void rtw_init_pwrctrl_priv(struct adapter * padapter)
{ {
struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv;
@ -585,7 +585,7 @@ _func_enter_;
_func_exit_; _func_exit_;
} }
void rtw_free_pwrctrl_priv(PADAPTER adapter) void rtw_free_pwrctrl_priv(struct adapter * adapter)
{ {
struct pwrctrl_priv *pwrctrlpriv = &adapter->pwrctrlpriv; struct pwrctrl_priv *pwrctrlpriv = &adapter->pwrctrlpriv;
@ -596,7 +596,7 @@ _func_enter_;
_func_exit_; _func_exit_;
} }
u8 rtw_interface_ps_func(_adapter *padapter,enum hal_intf_ps_func efunc_id,u8* val) u8 rtw_interface_ps_func(struct adapter *padapter,enum hal_intf_ps_func efunc_id,u8* val)
{ {
u8 bResult = true; u8 bResult = true;
rtw_hal_intf_ps_func(padapter,efunc_id,val); rtw_hal_intf_ps_func(padapter,efunc_id,val);
@ -605,7 +605,7 @@ u8 rtw_interface_ps_func(_adapter *padapter,enum hal_intf_ps_func efunc_id,u8* v
} }
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 = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
pwrpriv->ips_deny_time = rtw_get_current_time() + rtw_ms_to_systime(ms); pwrpriv->ips_deny_time = rtw_get_current_time() + rtw_ms_to_systime(ms);
@ -613,12 +613,12 @@ inline void rtw_set_ips_deny(_adapter *padapter, u32 ms)
/* /*
* rtw_pwr_wakeup - Wake the NIC up from: 1)IPS. 2)USB autosuspend * 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 * @ips_deffer_ms: the ms wiil prevent from falling into IPS after wakeup
* Return _SUCCESS or _FAIL * 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 = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -690,7 +690,7 @@ exit:
} }
int rtw_pm_set_lps(_adapter *padapter, u8 mode) int rtw_pm_set_lps(struct adapter *padapter, u8 mode)
{ {
int ret = 0; int ret = 0;
struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv;
@ -719,7 +719,7 @@ int rtw_pm_set_lps(_adapter *padapter, u8 mode)
return ret; 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 = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv;

78
core/rtw_recv.c
View file

@ -48,7 +48,7 @@ _func_exit_;
} }
int _rtw_init_recv_priv(struct recv_priv *precvpriv, _adapter *padapter) int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter)
{ {
int i; int i;
@ -124,7 +124,7 @@ void rtw_mfree_recv_priv_lock(struct recv_priv *precvpriv)
void _rtw_free_recv_priv (struct recv_priv *precvpriv) void _rtw_free_recv_priv (struct recv_priv *precvpriv)
{ {
_adapter *padapter = precvpriv->adapter; struct adapter *padapter = precvpriv->adapter;
_func_enter_; _func_enter_;
@ -149,7 +149,7 @@ union recv_frame *_rtw_alloc_recvframe (struct __queue *pfree_recv_queue)
union recv_frame *precvframe; union recv_frame *precvframe;
struct list_head *plist, *phead; struct list_head *plist, *phead;
_adapter *padapter; struct adapter *padapter;
struct recv_priv *precvpriv; struct recv_priv *precvpriv;
_func_enter_; _func_enter_;
@ -205,7 +205,7 @@ void rtw_init_recvframe(union recv_frame *precvframe, struct recv_priv *precvpri
int rtw_free_recvframe(union recv_frame *precvframe, struct __queue *pfree_recv_queue) int rtw_free_recvframe(union recv_frame *precvframe, struct __queue *pfree_recv_queue)
{ {
unsigned long irqL; unsigned long irqL;
_adapter *padapter=precvframe->u.hdr.adapter; struct adapter *padapter=precvframe->u.hdr.adapter;
struct recv_priv *precvpriv = &padapter->recvpriv; struct recv_priv *precvpriv = &padapter->recvpriv;
_func_enter_; _func_enter_;
@ -242,7 +242,7 @@ _func_exit_;
int _rtw_enqueue_recvframe(union recv_frame *precvframe, struct __queue *queue) int _rtw_enqueue_recvframe(union recv_frame *precvframe, struct __queue *queue)
{ {
_adapter *padapter=precvframe->u.hdr.adapter; struct adapter *padapter=precvframe->u.hdr.adapter;
struct recv_priv *precvpriv = &padapter->recvpriv; struct recv_priv *precvpriv = &padapter->recvpriv;
_func_enter_; _func_enter_;
@ -306,7 +306,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; u32 cnt = 0;
union recv_frame *pending_frame; union recv_frame *pending_frame;
@ -376,7 +376,7 @@ struct recv_buf *rtw_dequeue_recvbuf (struct __queue *queue)
} }
int recvframe_chkmic(_adapter *adapter, union recv_frame *precvframe){ int recvframe_chkmic(struct adapter *adapter, union recv_frame *precvframe){
int i,res=_SUCCESS; int i,res=_SUCCESS;
u32 datalen; u32 datalen;
@ -513,8 +513,8 @@ _func_exit_;
} }
/* decrypt and set the ivlen,icvlen of the recv_frame */ /* 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(struct 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)
{ {
struct rx_pkt_attrib *prxattrib = &precv_frame->u.hdr.attrib; struct rx_pkt_attrib *prxattrib = &precv_frame->u.hdr.attrib;
@ -582,7 +582,7 @@ _func_exit_;
} }
/* set the security information in the recv_frame */ /* set the security information in the recv_frame */
union recv_frame *portctrl(_adapter *adapter, union recv_frame *precv_frame) union recv_frame *portctrl(struct adapter *adapter, union recv_frame *precv_frame)
{ {
u8 *psta_addr, *ptr; u8 *psta_addr, *ptr;
uint auth_alg; uint auth_alg;
@ -706,8 +706,8 @@ _func_exit_;
} }
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(_adapter *padapter, union recv_frame *precv_frame) void process_pwrbit_data(struct adapter *padapter, union recv_frame *precv_frame)
{ {
#ifdef CONFIG_AP_MODE #ifdef CONFIG_AP_MODE
unsigned char pwrbit; unsigned char pwrbit;
@ -752,8 +752,8 @@ void process_pwrbit_data(_adapter *padapter, union recv_frame *precv_frame)
#endif #endif
} }
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(_adapter *padapter, union recv_frame *precv_frame) void process_wmmps_data(struct adapter *padapter, union recv_frame *precv_frame)
{ {
#ifdef CONFIG_AP_MODE #ifdef CONFIG_AP_MODE
struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib; struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib;
@ -815,7 +815,7 @@ void process_wmmps_data(_adapter *padapter, union recv_frame *precv_frame)
} }
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)
{ {
int sz; int sz;
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
@ -848,12 +848,12 @@ void count_rx_stats(_adapter *padapter, union recv_frame *prframe, struct sta_in
} }
int sta2sta_data_frame( int sta2sta_data_frame(
_adapter *adapter, struct adapter *adapter,
union recv_frame *precv_frame, union recv_frame *precv_frame,
struct sta_info**psta struct sta_info**psta
); );
int sta2sta_data_frame( int sta2sta_data_frame(
_adapter *adapter, struct adapter *adapter,
union recv_frame *precv_frame, union recv_frame *precv_frame,
struct sta_info**psta struct sta_info**psta
) )
@ -970,7 +970,7 @@ _func_exit_;
} }
int ap2sta_data_frame( int ap2sta_data_frame(
_adapter *adapter, struct adapter *adapter,
union recv_frame *precv_frame, union recv_frame *precv_frame,
struct sta_info**psta ) struct sta_info**psta )
{ {
@ -1102,7 +1102,7 @@ _func_exit_;
} }
int sta2ap_data_frame( int sta2ap_data_frame(
_adapter *adapter, struct adapter *adapter,
union recv_frame *precv_frame, union recv_frame *precv_frame,
struct sta_info**psta ) struct sta_info**psta )
{ {
@ -1169,7 +1169,7 @@ _func_exit_;
} }
int validate_recv_ctrl_frame(_adapter *padapter, union recv_frame *precv_frame) int validate_recv_ctrl_frame(struct adapter *padapter, union recv_frame *precv_frame)
{ {
#ifdef CONFIG_AP_MODE #ifdef CONFIG_AP_MODE
struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib; struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib;
@ -1327,9 +1327,9 @@ int validate_recv_ctrl_frame(_adapter *padapter, union recv_frame *precv_frame)
} }
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);
int validate_recv_mgnt_frame(PADAPTER padapter, union recv_frame *precv_frame) int validate_recv_mgnt_frame(struct adapter * padapter, union recv_frame *precv_frame)
{ {
/* struct mlme_priv *pmlmepriv = &adapter->mlmepriv; */ /* struct mlme_priv *pmlmepriv = &adapter->mlmepriv; */
@ -1367,7 +1367,7 @@ int validate_recv_mgnt_frame(PADAPTER padapter, union recv_frame *precv_frame)
return _SUCCESS; return _SUCCESS;
} }
int validate_recv_data_frame(_adapter *adapter, union recv_frame *precv_frame) int validate_recv_data_frame(struct adapter *adapter, union recv_frame *precv_frame)
{ {
u8 bretry; u8 bretry;
u8 *psa, *pda, *pbssid; u8 *psa, *pda, *pbssid;
@ -1507,7 +1507,7 @@ _func_exit_;
return ret; return ret;
} }
int validate_recv_frame(_adapter *adapter, union recv_frame *precv_frame) int validate_recv_frame(struct adapter *adapter, union recv_frame *precv_frame)
{ {
/* shall check frame subtype, to / from ds, da, bssid */ /* shall check frame subtype, to / from ds, da, bssid */
@ -1642,7 +1642,7 @@ int wlanhdr_to_ethhdr ( union recv_frame *precvframe)
struct ieee80211_snap_hdr *psnap; struct ieee80211_snap_hdr *psnap;
int ret=_SUCCESS; int ret=_SUCCESS;
_adapter *adapter =precvframe->u.hdr.adapter; struct adapter *adapter =precvframe->u.hdr.adapter;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv; struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
u8 *ptr = get_recvframe_data(precvframe) ; /* point to frame_ctrl field */ u8 *ptr = get_recvframe_data(precvframe) ; /* point to frame_ctrl field */
@ -1708,7 +1708,7 @@ _func_exit_;
} }
/* perform defrag */ /* perform defrag */
union recv_frame *recvframe_defrag(_adapter *adapter, struct __queue *defrag_q) union recv_frame *recvframe_defrag(struct adapter *adapter, struct __queue *defrag_q)
{ {
struct list_head *plist, *phead; struct list_head *plist, *phead;
u8 wlanhdr_offset; u8 wlanhdr_offset;
@ -1795,7 +1795,7 @@ _func_exit_;
} }
/* check if need to defrag, if needed queue the frame to defrag_q */ /* 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 ismfrag;
u8 fragnum; u8 fragnum;
@ -1918,7 +1918,7 @@ _func_exit_;
} }
static int amsdu_to_msdu(_adapter *padapter, union recv_frame *prframe) static int amsdu_to_msdu(struct adapter *padapter, union recv_frame *prframe)
{ {
int a_len, padding_len; int a_len, padding_len;
u16 eth_type, nSubframe_Length; u16 eth_type, nSubframe_Length;
@ -2110,7 +2110,7 @@ int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, union rec
return true; return true;
} }
static int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ctrl *preorder_ctrl, int bforced) static int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reorder_ctrl *preorder_ctrl, int bforced)
{ {
struct list_head *phead, *plist; struct list_head *phead, *plist;
union recv_frame *prframe; union recv_frame *prframe;
@ -2188,7 +2188,7 @@ static int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ct
return bPktInBuf; return bPktInBuf;
} }
static int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe) static int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *prframe)
{ {
unsigned long irql; unsigned long irql;
int retval = _SUCCESS; int retval = _SUCCESS;
@ -2304,7 +2304,7 @@ void rtw_reordering_ctrl_timeout_handler(void *pcontext)
{ {
unsigned long irql; unsigned long irql;
struct recv_reorder_ctrl *preorder_ctrl = (struct recv_reorder_ctrl *)pcontext; struct recv_reorder_ctrl *preorder_ctrl = (struct recv_reorder_ctrl *)pcontext;
_adapter *padapter = preorder_ctrl->padapter; struct adapter *padapter = preorder_ctrl->padapter;
struct __queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue; struct __queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue;
@ -2326,8 +2326,8 @@ void rtw_reordering_ctrl_timeout_handler(void *pcontext)
} }
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(_adapter *padapter, union recv_frame *prframe) int process_recv_indicatepkts(struct adapter *padapter, union recv_frame *prframe)
{ {
int retval = _SUCCESS; int retval = _SUCCESS;
/* struct recv_priv *precvpriv = &padapter->recvpriv; */ /* struct recv_priv *precvpriv = &padapter->recvpriv; */
@ -2385,7 +2385,7 @@ int process_recv_indicatepkts(_adapter *padapter, union recv_frame *prframe)
} }
static int recv_func_prehandle(_adapter *padapter, union recv_frame *rframe) static int recv_func_prehandle(struct adapter *padapter, union recv_frame *rframe)
{ {
int ret = _SUCCESS; int ret = _SUCCESS;
struct rx_pkt_attrib *pattrib = &rframe->u.hdr.attrib; struct rx_pkt_attrib *pattrib = &rframe->u.hdr.attrib;
@ -2424,7 +2424,7 @@ exit:
return ret; return ret;
} }
static int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe) static int recv_func_posthandle(struct adapter *padapter, union recv_frame *prframe)
{ {
int ret = _SUCCESS; int ret = _SUCCESS;
union recv_frame *orig_prframe = prframe; union recv_frame *orig_prframe = prframe;
@ -2520,8 +2520,8 @@ _recv_data_drop:
} }
int recv_func(_adapter *padapter, union recv_frame *rframe); int recv_func(struct 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 ret; int ret;
struct rx_pkt_attrib *prxattrib = &rframe->u.hdr.attrib; struct rx_pkt_attrib *prxattrib = &rframe->u.hdr.attrib;
@ -2566,7 +2566,7 @@ exit:
s32 rtw_recv_entry(union recv_frame *precvframe) s32 rtw_recv_entry(union recv_frame *precvframe)
{ {
_adapter *padapter; struct adapter *padapter;
struct recv_priv *precvpriv; struct recv_priv *precvpriv;
s32 ret=_SUCCESS; s32 ret=_SUCCESS;
@ -2603,7 +2603,7 @@ _func_exit_;
} }
void rtw_signal_stat_timer_hdl(RTW_TIMER_HDL_ARGS){ 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; struct recv_priv *recvpriv = &adapter->recvpriv;
u32 tmp_s, tmp_q; u32 tmp_s, tmp_q;

14
core/rtw_security.c
View file

@ -158,7 +158,7 @@ _func_exit_;
/* /*
Need to consider the fragment situation 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 */ { /* exclude ICV */
unsigned char crc[4]; unsigned char crc[4];
@ -230,7 +230,7 @@ _func_exit_;
} }
void rtw_wep_decrypt(_adapter *padapter, u8 *precvframe) void rtw_wep_decrypt(struct adapter *padapter, u8 *precvframe)
{ {
/* exclude ICV */ /* exclude ICV */
u8 crc[4]; u8 crc[4];
@ -634,7 +634,7 @@ _func_exit_;
/* The hlen isn't include the IV */ /* 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 */ { /* exclude ICV */
u16 pnl; u16 pnl;
u32 pnh; u32 pnh;
@ -737,7 +737,7 @@ _func_exit_;
/* The hlen isn't include the IV */ /* 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 */ { /* exclude ICV */
u16 pnl; u16 pnl;
u32 pnh; u32 pnh;
@ -1462,7 +1462,7 @@ _func_exit_;
u32 rtw_aes_encrypt(_adapter *padapter, u8 *pxmitframe) u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe)
{ /* exclude ICV */ { /* exclude ICV */
@ -1812,7 +1812,7 @@ _func_exit_;
return res; return res;
} }
u32 rtw_aes_decrypt(_adapter *padapter, u8 *precvframe) u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe)
{ /* exclude ICV */ { /* exclude ICV */
@ -2570,7 +2570,7 @@ static int omac1_aes_128(u8 *key, u8 *data, size_t data_len, u8 *mac)
void rtw_use_tkipkey_handler(void *FunctionContext) void rtw_use_tkipkey_handler(void *FunctionContext)
{ {
_adapter *padapter = (_adapter *)FunctionContext; struct adapter *padapter = (struct adapter *)FunctionContext;
_func_enter_; _func_enter_;

8
core/rtw_sreset.c
View file

@ -20,7 +20,7 @@
#include <rtw_sreset.h> #include <rtw_sreset.h>
void sreset_init_value(_adapter *padapter) void sreset_init_value(struct adapter *padapter)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
struct sreset_priv *psrtpriv = &pHalData->srestpriv; struct sreset_priv *psrtpriv = &pHalData->srestpriv;
@ -31,7 +31,7 @@ void sreset_init_value(_adapter *padapter)
psrtpriv->last_tx_time =0; psrtpriv->last_tx_time =0;
psrtpriv->last_tx_complete_time =0; psrtpriv->last_tx_complete_time =0;
} }
void sreset_reset_value(_adapter *padapter) void sreset_reset_value(struct adapter *padapter)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
struct sreset_priv *psrtpriv = &pHalData->srestpriv; struct sreset_priv *psrtpriv = &pHalData->srestpriv;
@ -42,7 +42,7 @@ void sreset_reset_value(_adapter *padapter)
psrtpriv->last_tx_complete_time =0; psrtpriv->last_tx_complete_time =0;
} }
u8 sreset_get_wifi_status(_adapter *padapter) u8 sreset_get_wifi_status(struct adapter *padapter)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
struct sreset_priv *psrtpriv = &pHalData->srestpriv; struct sreset_priv *psrtpriv = &pHalData->srestpriv;
@ -76,7 +76,7 @@ u8 sreset_get_wifi_status(_adapter *padapter)
return status; return status;
} }
void sreset_set_wifi_error_status(_adapter *padapter, u32 status) void sreset_set_wifi_error_status(struct adapter *padapter, u32 status)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
pHalData->srestpriv.Wifi_Error_Status = status; pHalData->srestpriv.Wifi_Error_Status = status;

10
core/rtw_sta_mgt.c
View file

@ -388,7 +388,7 @@ _func_exit_;
/* using pstapriv->sta_hash_lock to protect */ /* 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; int i;
unsigned long irqL0; unsigned long irqL0;
@ -530,7 +530,7 @@ _func_exit_;
} }
/* free all stainfo which in sta_hash[all] */ /* free all stainfo which in sta_hash[all] */
void rtw_free_all_stainfo(_adapter *padapter) void rtw_free_all_stainfo(struct adapter *padapter)
{ {
unsigned long irqL; unsigned long irqL;
struct list_head *plist, *phead; struct list_head *plist, *phead;
@ -618,7 +618,7 @@ _func_exit_;
} }
u32 rtw_init_bcmc_stainfo(_adapter* padapter) u32 rtw_init_bcmc_stainfo(struct adapter* padapter)
{ {
struct sta_info *psta; struct sta_info *psta;
u32 res=_SUCCESS; u32 res=_SUCCESS;
@ -643,7 +643,7 @@ _func_exit_;
return res; return res;
} }
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_info *psta;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
@ -655,7 +655,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; u8 res = true;
#ifdef CONFIG_AP_MODE #ifdef CONFIG_AP_MODE

120
core/rtw_wlan_util.c
View file

@ -136,7 +136,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; u8 network_type = 0;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -237,8 +237,8 @@ unsigned char ratetbl_val_2wifirate(unsigned char rate)
} }
int is_basicrate(_adapter *padapter, unsigned char rate); int is_basicrate(struct adapter *padapter, unsigned char rate);
int is_basicrate(_adapter *padapter, unsigned char rate) int is_basicrate(struct adapter *padapter, unsigned char rate)
{ {
int i; int i;
unsigned char val; unsigned char val;
@ -260,8 +260,8 @@ int is_basicrate(_adapter *padapter, unsigned char rate)
return false; return false;
} }
unsigned int ratetbl2rateset(_adapter *padapter, unsigned char *rateset); unsigned int ratetbl2rateset(struct adapter *padapter, unsigned char *rateset);
unsigned int ratetbl2rateset(_adapter *padapter, unsigned char *rateset) unsigned int ratetbl2rateset(struct adapter *padapter, unsigned char *rateset)
{ {
int i; int i;
unsigned char rate; unsigned char rate;
@ -296,7 +296,7 @@ unsigned int ratetbl2rateset(_adapter *padapter, unsigned char *rateset)
return len; 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]; unsigned char supportedrates[NumRates];
@ -305,7 +305,7 @@ void get_rate_set(_adapter *padapter, unsigned char *pbssrate, int *bssrate_len)
_rtw_memcpy(pbssrate, supportedrates, *bssrate_len); _rtw_memcpy(pbssrate, supportedrates, *bssrate_len);
} }
void UpdateBrateTbl(PADAPTER Adapter, u8 *mBratesOS) void UpdateBrateTbl(struct adapter * Adapter, u8 *mBratesOS)
{ {
u8 i; u8 i;
u8 rate; u8 rate;
@ -348,21 +348,21 @@ void UpdateBrateTblForSoftAP(u8 *bssrateset, u32 bssratelen)
} }
void Save_DM_Func_Flag(_adapter *padapter) void Save_DM_Func_Flag(struct adapter *padapter)
{ {
u8 bSaveFlag = true; u8 bSaveFlag = true;
rtw_hal_set_hwreg(padapter, HW_VAR_DM_FUNC_OP, (u8 *)(&bSaveFlag)); 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; u8 bSaveFlag = false;
rtw_hal_set_hwreg(padapter, HW_VAR_DM_FUNC_OP, (u8 *)(&bSaveFlag)); 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) if (enable == true)
rtw_hal_set_hwreg(padapter, HW_VAR_DM_FUNC_SET, (u8 *)(&mode)); rtw_hal_set_hwreg(padapter, HW_VAR_DM_FUNC_SET, (u8 *)(&mode));
@ -370,52 +370,52 @@ void Switch_DM_Func(_adapter *padapter, u32 mode, u8 enable)
rtw_hal_set_hwreg(padapter, HW_VAR_DM_FUNC_CLR, (u8 *)(&mode)); 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)); 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)); 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)
{ {
Set_NETYPE0_MSR(padapter, type); Set_NETYPE0_MSR(padapter, type);
} }
inline u8 rtw_get_oper_ch(_adapter *adapter) inline u8 rtw_get_oper_ch(struct adapter *adapter)
{ {
return adapter->mlmeextpriv.oper_channel; return adapter->mlmeextpriv.oper_channel;
} }
inline void rtw_set_oper_ch(_adapter *adapter, u8 ch) inline void rtw_set_oper_ch(struct adapter *adapter, u8 ch)
{ {
adapter->mlmeextpriv.oper_channel = ch; adapter->mlmeextpriv.oper_channel = ch;
} }
inline u8 rtw_get_oper_bw(_adapter *adapter) inline u8 rtw_get_oper_bw(struct adapter *adapter)
{ {
return adapter->mlmeextpriv.oper_bwmode; return adapter->mlmeextpriv.oper_bwmode;
} }
inline void rtw_set_oper_bw(_adapter *adapter, u8 bw) inline void rtw_set_oper_bw(struct adapter *adapter, u8 bw)
{ {
adapter->mlmeextpriv.oper_bwmode = bw; adapter->mlmeextpriv.oper_bwmode = bw;
} }
inline u8 rtw_get_oper_choffset(_adapter *adapter) inline u8 rtw_get_oper_choffset(struct adapter *adapter)
{ {
return adapter->mlmeextpriv.oper_ch_offset; return adapter->mlmeextpriv.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->mlmeextpriv.oper_ch_offset = offset; adapter->mlmeextpriv.oper_ch_offset = offset;
} }
void SelectChannel(_adapter *padapter, unsigned char channel) void SelectChannel(struct adapter *padapter, unsigned char channel)
{ {
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -425,7 +425,7 @@ void SelectChannel(_adapter *padapter, unsigned char channel)
rtw_hal_set_chan(padapter, channel); rtw_hal_set_chan(padapter, channel);
} }
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; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -436,7 +436,7 @@ void SetBWMode(_adapter *padapter, unsigned short bwmode, unsigned char channel_
rtw_hal_set_bwmode(padapter, (enum ht_channel_width)bwmode, channel_offset); rtw_hal_set_bwmode(padapter, (enum ht_channel_width)bwmode, channel_offset);
} }
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; u8 center_ch;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -506,7 +506,7 @@ u16 get_beacon_interval(struct wlan_bssid_ex *bss)
} }
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_priv *pmlmeext;
struct mlme_ext_info *pmlmeinfo; struct mlme_ext_info *pmlmeinfo;
@ -527,7 +527,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_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -542,7 +542,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; unsigned int i;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -577,19 +577,19 @@ unsigned int decide_wait_for_beacon_timeout(unsigned int bcn_interval)
} }
void CAM_empty_entry( void CAM_empty_entry(
PADAPTER Adapter, struct adapter * Adapter,
u8 ucIndex u8 ucIndex
) )
{ {
rtw_hal_set_hwreg(Adapter, HW_VAR_CAM_EMPTY_ENTRY, (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); rtw_hal_set_hwreg(padapter, HW_VAR_CAM_INVALID_ALL, NULL);
} }
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 i, val, addr;
int j; int j;
@ -632,7 +632,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)
{ {
unsigned char null_sta[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; unsigned char null_sta[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
unsigned char null_key[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,0x00, 0x00, 0x00, 0x00,0x00, 0x00, 0x00, 0x00}; unsigned char null_key[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,0x00, 0x00, 0x00, 0x00,0x00, 0x00, 0x00, 0x00};
@ -640,7 +640,7 @@ void clear_cam_entry(_adapter *padapter, u8 entry)
write_cam(padapter, entry, 0, null_sta, null_key); write_cam(padapter, entry, 0, null_sta, null_key);
} }
int allocate_fw_sta_entry(_adapter *padapter) int allocate_fw_sta_entry(struct adapter *padapter)
{ {
unsigned int mac_id; unsigned int mac_id;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -659,7 +659,7 @@ int allocate_fw_sta_entry(_adapter *padapter)
return mac_id; 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_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -669,7 +669,7 @@ void flush_all_cam_entry(_adapter *padapter)
_rtw_memset((u8 *)(pmlmeinfo->FW_sta_info), 0, sizeof(pmlmeinfo->FW_sta_info)); _rtw_memset((u8 *)(pmlmeinfo->FW_sta_info), 0, sizeof(pmlmeinfo->FW_sta_info));
} }
int WMM_param_handler(_adapter *padapter, struct ndis_802_11_var_ie * pIE) int WMM_param_handler(struct adapter *padapter, struct ndis_802_11_var_ie * pIE)
{ {
/* struct registry_priv *pregpriv = &padapter->registrypriv; */ /* struct registry_priv *pregpriv = &padapter->registrypriv; */
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@ -687,7 +687,7 @@ int WMM_param_handler(_adapter *padapter, struct ndis_802_11_var_ie * pIE)
return true; return true;
} }
void WMMOnAssocRsp(_adapter *padapter) void WMMOnAssocRsp(struct adapter *padapter)
{ {
u8 ACI, ACM, AIFS, ECWMin, ECWMax, aSifsTime; u8 ACI, ACM, AIFS, ECWMin, ECWMax, aSifsTime;
u8 acm_mask; u8 acm_mask;
@ -805,7 +805,7 @@ void WMMOnAssocRsp(_adapter *padapter)
return; return;
} }
static void bwmode_update_check(_adapter *padapter, struct ndis_802_11_var_ie * pIE) static void bwmode_update_check(struct adapter *padapter, struct ndis_802_11_var_ie * pIE)
{ {
#ifdef CONFIG_80211N_HT #ifdef CONFIG_80211N_HT
unsigned char new_bwmode; unsigned char new_bwmode;
@ -900,7 +900,7 @@ static void bwmode_update_check(_adapter *padapter, struct ndis_802_11_var_ie *
#endif /* CONFIG_80211N_HT */ #endif /* CONFIG_80211N_HT */
} }
void HT_caps_handler(_adapter *padapter, struct ndis_802_11_var_ie * pIE) void HT_caps_handler(struct adapter *padapter, struct ndis_802_11_var_ie * pIE)
{ {
#ifdef CONFIG_80211N_HT #ifdef CONFIG_80211N_HT
unsigned int i; unsigned int i;
@ -964,7 +964,7 @@ void HT_caps_handler(_adapter *padapter, struct ndis_802_11_var_ie * pIE)
return; return;
} }
void HT_info_handler(_adapter *padapter, struct ndis_802_11_var_ie * pIE) void HT_info_handler(struct adapter *padapter, struct ndis_802_11_var_ie * pIE)
{ {
#ifdef CONFIG_80211N_HT #ifdef CONFIG_80211N_HT
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -986,7 +986,7 @@ void HT_info_handler(_adapter *padapter, struct ndis_802_11_var_ie * pIE)
return; return;
} }
void HTOnAssocRsp(_adapter *padapter) void HTOnAssocRsp(struct adapter *padapter)
{ {
unsigned char max_AMPDU_len; unsigned char max_AMPDU_len;
unsigned char min_MPDU_spacing; unsigned char min_MPDU_spacing;
@ -1021,7 +1021,7 @@ void HTOnAssocRsp(_adapter *padapter)
rtw_hal_set_hwreg(padapter, HW_VAR_AMPDU_FACTOR, (u8 *)(&max_AMPDU_len)); rtw_hal_set_hwreg(padapter, HW_VAR_AMPDU_FACTOR, (u8 *)(&max_AMPDU_len));
} }
void ERP_IE_handler(_adapter *padapter, struct ndis_802_11_var_ie * pIE) void ERP_IE_handler(struct adapter *padapter, struct ndis_802_11_var_ie * pIE)
{ {
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -1033,7 +1033,7 @@ void ERP_IE_handler(_adapter *padapter, struct ndis_802_11_var_ie * pIE)
_rtw_memcpy(&(pmlmeinfo->ERP_IE), pIE->data, pIE->Length); _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 registry_priv *pregpriv = &padapter->registrypriv;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -1083,7 +1083,7 @@ void VCS_update(_adapter *padapter, struct sta_info *psta)
} }
} }
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 int len;
unsigned char *p; unsigned char *p;
@ -1292,7 +1292,7 @@ _mismatch:
_func_exit_; _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 i;
unsigned int len; unsigned int len;
@ -1323,7 +1323,7 @@ void update_beacon_info(_adapter *padapter, u8 *pframe, uint pkt_len, struct sta
} }
} }
unsigned int is_ap_in_tkip(_adapter *padapter) unsigned int is_ap_in_tkip(struct adapter *padapter)
{ {
u32 i; u32 i;
struct ndis_802_11_var_ie * pIE; struct ndis_802_11_var_ie * pIE;
@ -1368,7 +1368,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; u32 i;
struct ndis_802_11_var_ie * pIE; struct ndis_802_11_var_ie * pIE;
@ -1412,7 +1412,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; u32 i;
struct ndis_802_11_var_ie * pIE; struct ndis_802_11_var_ie * pIE;
@ -1552,7 +1552,7 @@ unsigned int update_MSC_rate(struct HT_caps_element *pHT_caps)
return mask; 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; unsigned char bit_offset;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -1607,25 +1607,25 @@ unsigned char get_highest_mcs_rate(struct HT_caps_element *pHT_caps)
return i; return i;
} }
void Update_RA_Entry(_adapter *padapter, u32 mac_id) void Update_RA_Entry(struct adapter *padapter, u32 mac_id)
{ {
rtw_hal_update_ra_mask(padapter, mac_id,0); rtw_hal_update_ra_mask(padapter, mac_id,0);
} }
void enable_rate_adaptive(_adapter *padapter, u32 mac_id); void enable_rate_adaptive(struct adapter *padapter, u32 mac_id);
void enable_rate_adaptive(_adapter *padapter, u32 mac_id) void enable_rate_adaptive(struct adapter *padapter, u32 mac_id)
{ {
Update_RA_Entry(padapter, mac_id); Update_RA_Entry(padapter, mac_id);
} }
void set_sta_rate(_adapter *padapter, struct sta_info *psta) void set_sta_rate(struct adapter *padapter, struct sta_info *psta)
{ {
/* rate adaptive */ /* rate adaptive */
enable_rate_adaptive(padapter, psta->mac_id); enable_rate_adaptive(padapter, psta->mac_id);
} }
/* Update RRSR and Rate for USERATE */ /* 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)
{ {
unsigned char supported_rates[NDIS_802_11_LENGTH_RATES_EX]; unsigned char supported_rates[NDIS_802_11_LENGTH_RATES_EX];
#ifdef CONFIG_P2P #ifdef CONFIG_P2P
@ -1746,7 +1746,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_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -1778,7 +1778,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_priv *pmlmeext = &Adapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -1848,7 +1848,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; int ratelen, network_type = 0;
u32 SIFS_Timer; u32 SIFS_Timer;
@ -1905,7 +1905,7 @@ void update_wireless_mode(_adapter *padapter)
update_mgnt_tx_rate(padapter, IEEE80211_OFDM_RATE_6MB); update_mgnt_tx_rate(padapter, IEEE80211_OFDM_RATE_6MB);
} }
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_priv *pmlmeext = &(padapter->mlmeextpriv);
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -1921,7 +1921,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; unsigned int ie_len;
struct ndis_802_11_var_ie * pIE; struct ndis_802_11_var_ie * pIE;
@ -1948,7 +1948,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; struct sta_info *psta;
u16 tid; u16 tid;
@ -1985,19 +1985,19 @@ void update_TSF(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint len)
pmlmeext->TSFValue |= le32_to_cpu(*pbuf); 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, NULL); rtw_hal_set_hwreg(padapter, HW_VAR_CORRECT_TSF, NULL);
} }
void beacon_timing_control(_adapter *padapter) void beacon_timing_control(struct adapter *padapter)
{ {
rtw_hal_bcn_related_reg_setting(padapter); rtw_hal_bcn_related_reg_setting(padapter);
} }
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; int status = _SUCCESS;
struct dvobj_priv *dvobj = adapter_to_dvobj(adapter); struct dvobj_priv *dvobj = adapter_to_dvobj(adapter);

58
core/rtw_xmit.c
View file

@ -65,7 +65,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; int i;
struct xmit_buf *pxmitbuf; struct xmit_buf *pxmitbuf;
@ -277,7 +277,7 @@ void rtw_mfree_xmit_priv_lock (struct xmit_priv *pxmitpriv)
void _rtw_free_xmit_priv (struct xmit_priv *pxmitpriv) void _rtw_free_xmit_priv (struct xmit_priv *pxmitpriv)
{ {
int i; int i;
_adapter *padapter = pxmitpriv->adapter; struct adapter *padapter = pxmitpriv->adapter;
struct xmit_frame *pxmitframe = (struct xmit_frame*) pxmitpriv->pxmit_frame_buf; struct xmit_frame *pxmitframe = (struct xmit_frame*) pxmitpriv->pxmit_frame_buf;
struct xmit_buf *pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmitbuf; struct xmit_buf *pxmitbuf = (struct xmit_buf *)pxmitpriv->pxmitbuf;
u32 max_xmit_extbuf_size = MAX_XMIT_EXTBUF_SZ; u32 max_xmit_extbuf_size = MAX_XMIT_EXTBUF_SZ;
@ -345,7 +345,7 @@ out:
_func_exit_; _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; u32 sz;
struct pkt_attrib *pattrib = &pxmitframe->attrib; struct pkt_attrib *pattrib = &pxmitframe->attrib;
@ -534,7 +534,7 @@ static void set_qos(struct pkt_file *ppktfile, struct pkt_attrib *pattrib)
pattrib->subtype = WIFI_QOS_DATA_TYPE; pattrib->subtype = WIFI_QOS_DATA_TYPE;
} }
static s32 update_attrib(_adapter *padapter, struct sk_buff *pkt, struct pkt_attrib *pattrib) static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct pkt_attrib *pattrib)
{ {
struct pkt_file pktfile; struct pkt_file pktfile;
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
@ -763,7 +763,7 @@ _func_exit_;
return res; return res;
} }
static s32 xmitframe_addmic(_adapter *padapter, struct xmit_frame *pxmitframe){ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitframe){
int curfragnum,length; int curfragnum,length;
u8 *pframe, *payload,mic[8]; u8 *pframe, *payload,mic[8];
struct mic_data micdata; struct mic_data micdata;
@ -891,7 +891,7 @@ _func_exit_;
return _SUCCESS; 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 pkt_attrib *pattrib = &pxmitframe->attrib;
/* struct security_priv *psecuritypriv=&padapter->securitypriv; */ /* struct security_priv *psecuritypriv=&padapter->securitypriv; */
@ -927,7 +927,7 @@ _func_exit_;
return _SUCCESS; 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; u16 *qc;
@ -1073,7 +1073,7 @@ _func_exit_;
return res; return res;
} }
s32 rtw_txframes_pending(_adapter *padapter) s32 rtw_txframes_pending(struct adapter *padapter)
{ {
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@ -1083,7 +1083,7 @@ s32 rtw_txframes_pending(_adapter *padapter)
(_rtw_queue_empty(&pxmitpriv->vo_pending) == false)); (_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 sta_info *psta;
struct tx_servq *ptxservq; struct tx_servq *ptxservq;
@ -1145,7 +1145,7 @@ This sub-routine will perform all the following:
6. apply sw-encrypt, if necessary. 6. apply sw-encrypt, if necessary.
*/ */
s32 rtw_xmitframe_coalesce(_adapter *padapter, struct sk_buff *pkt, struct xmit_frame *pxmitframe) s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct xmit_frame *pxmitframe)
{ {
struct pkt_file pktfile; struct pkt_file pktfile;
@ -1364,7 +1364,7 @@ _func_exit_;
return SNAP_SIZE + sizeof(u16); 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; uint protection;
@ -1413,7 +1413,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 sta_info *psta = NULL;
struct stainfo_stats *pstats = NULL; struct stainfo_stats *pstats = NULL;
@ -1612,7 +1612,7 @@ struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv)/* _queue *pf
struct xmit_frame *pxframe = NULL; struct xmit_frame *pxframe = NULL;
struct list_head *plist, *phead; struct list_head *plist, *phead;
struct __queue *pfree_xmit_queue = &pxmitpriv->free_xmit_queue; struct __queue *pfree_xmit_queue = &pxmitpriv->free_xmit_queue;
_adapter *padapter = pxmitpriv->adapter; struct adapter *padapter = pxmitpriv->adapter;
_func_enter_; _func_enter_;
@ -1663,7 +1663,7 @@ s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitfram
{ {
unsigned long irqL; unsigned long irqL;
struct __queue *pfree_xmit_queue = &pxmitpriv->free_xmit_queue; struct __queue *pfree_xmit_queue = &pxmitpriv->free_xmit_queue;
_adapter *padapter = pxmitpriv->adapter; struct adapter *padapter = pxmitpriv->adapter;
struct sk_buff *pndis_pkt = NULL; struct sk_buff *pndis_pkt = NULL;
_func_enter_; _func_enter_;
@ -1728,7 +1728,7 @@ _func_enter_;
_func_exit_; _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) if (rtw_xmit_classifier(padapter, pxmitframe) == _FAIL)
{ {
@ -1776,7 +1776,7 @@ struct xmit_frame* rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmi
struct tx_servq *ptxservq = NULL; struct tx_servq *ptxservq = NULL;
struct __queue *pframe_queue = NULL; struct __queue *pframe_queue = NULL;
struct xmit_frame *pxmitframe = NULL; struct xmit_frame *pxmitframe = NULL;
_adapter *padapter = pxmitpriv->adapter; struct adapter *padapter = pxmitpriv->adapter;
struct registry_priv *pregpriv = &padapter->registrypriv; struct registry_priv *pregpriv = &padapter->registrypriv;
int i, inx[4]; int i, inx[4];
@ -1831,7 +1831,7 @@ _func_exit_;
} }
#if 1 #if 1
struct tx_servq *rtw_get_sta_pending(_adapter *padapter, struct sta_info *psta, int up, u8 *ac) struct tx_servq *rtw_get_sta_pending(struct adapter *padapter, struct sta_info *psta, int up, u8 *ac)
{ {
struct tx_servq *ptxservq; struct tx_servq *ptxservq;
@ -1876,7 +1876,7 @@ _func_exit_;
} }
#else #else
__inline static struct tx_servq *rtw_get_sta_pending __inline static struct tx_servq *rtw_get_sta_pending
(_adapter *padapter, struct __queue **ppstapending, struct sta_info *psta, int up) (struct adapter *padapter, struct __queue **ppstapending, struct sta_info *psta, int up)
{ {
struct tx_servq *ptxservq; struct tx_servq *ptxservq;
struct hw_xmit *phwxmits = padapter->xmitpriv.hwxmits; struct hw_xmit *phwxmits = padapter->xmitpriv.hwxmits;
@ -1926,7 +1926,7 @@ _func_exit_;
* Will enqueue pxmitframe to the proper queue, * Will enqueue pxmitframe to the proper queue,
* and indicate it to xx_pending list..... * 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)
{ {
/* unsigned long irqL0; */ /* unsigned long irqL0; */
u8 ac_index; u8 ac_index;
@ -1967,7 +1967,7 @@ _func_exit_;
return res; return res;
} }
void rtw_alloc_hwxmits(_adapter *padapter) void rtw_alloc_hwxmits(struct adapter *padapter)
{ {
struct hw_xmit *hwxmits; struct hw_xmit *hwxmits;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@ -2029,7 +2029,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 hw_xmit *hwxmits;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@ -2048,7 +2048,7 @@ _func_enter_;
_func_exit_; _func_exit_;
} }
static int rtw_br_client_tx(_adapter *padapter, struct sk_buff **pskb) static int rtw_br_client_tx(struct adapter *padapter, struct sk_buff **pskb)
{ {
struct sk_buff *skb = *pskb; struct sk_buff *skb = *pskb;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@ -2231,7 +2231,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; u8 qsel;
@ -2249,7 +2249,7 @@ static void do_queue_select(_adapter *padapter, struct pkt_attrib *pattrib)
* 0 success, hardware will handle this xmit frame(packet) * 0 success, hardware will handle this xmit frame(packet)
* <0 fail * <0 fail
*/ */
s32 rtw_xmit(_adapter *padapter, struct sk_buff **ppkt) s32 rtw_xmit(struct adapter *padapter, struct sk_buff **ppkt)
{ {
#ifdef CONFIG_AP_MODE #ifdef CONFIG_AP_MODE
unsigned long irqL0; unsigned long irqL0;
@ -2316,7 +2316,7 @@ s32 rtw_xmit(_adapter *padapter, struct sk_buff **ppkt)
#if defined(CONFIG_AP_MODE) #if defined(CONFIG_AP_MODE)
int xmitframe_enqueue_for_sleeping_sta(_adapter *padapter, struct xmit_frame *pxmitframe) int xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_frame *pxmitframe)
{ {
unsigned long irqL; unsigned long irqL;
int ret=false; int ret=false;
@ -2447,7 +2447,7 @@ int xmitframe_enqueue_for_sleeping_sta(_adapter *padapter, struct xmit_frame *px
} }
static void dequeue_xmitframes_to_sleeping_queue(_adapter *padapter, struct sta_info *psta, struct __queue *pframequeue) static void dequeue_xmitframes_to_sleeping_queue(struct adapter *padapter, struct sta_info *psta, struct __queue *pframequeue)
{ {
struct list_head *plist, *phead; struct list_head *plist, *phead;
u8 ac_index; u8 ac_index;
@ -2477,7 +2477,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)
{ {
unsigned long irqL0; unsigned long irqL0;
struct sta_info *psta_bmc; struct sta_info *psta_bmc;
@ -2520,7 +2520,7 @@ void stop_sta_xmit(_adapter *padapter, struct sta_info *psta)
_exit_critical_bh(&pxmitpriv->lock, &irqL0); _exit_critical_bh(&pxmitpriv->lock, &irqL0);
} }
void wakeup_sta_to_xmit(_adapter *padapter, struct sta_info *psta) void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta)
{ {
unsigned long irqL; unsigned long irqL;
u8 update_mask=0, wmmps_ac=0; u8 update_mask=0, wmmps_ac=0;
@ -2679,7 +2679,7 @@ void wakeup_sta_to_xmit(_adapter *padapter, struct sta_info *psta)
} }
void xmit_delivery_enabled_frames(_adapter *padapter, struct sta_info *psta) void xmit_delivery_enabled_frames(struct adapter *padapter, struct sta_info *psta)
{ {
unsigned long irqL; unsigned long irqL;
u8 wmmps_ac=0; u8 wmmps_ac=0;

4
hal/HalHWImg8188E_BB.c
View file

@ -206,7 +206,7 @@ ODM_ReadAndConfig_AGC_TAB_1T_8188E(
u4Byte ArrayLen = sizeof(Array_AGC_TAB_1T_8188E)/sizeof(u4Byte); u4Byte ArrayLen = sizeof(Array_AGC_TAB_1T_8188E)/sizeof(u4Byte);
pu4Byte Array = Array_AGC_TAB_1T_8188E; pu4Byte Array = Array_AGC_TAB_1T_8188E;
bool biol = false; bool biol = false;
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
struct xmit_frame *pxmit_frame; struct xmit_frame *pxmit_frame;
u8 bndy_cnt=1; u8 bndy_cnt=1;
enum HAL_STATUS rst =HAL_STATUS_SUCCESS; enum HAL_STATUS rst =HAL_STATUS_SUCCESS;
@ -508,7 +508,7 @@ ODM_ReadAndConfig_PHY_REG_1T_8188E(
u4Byte ArrayLen = sizeof(Array_PHY_REG_1T_8188E)/sizeof(u4Byte); u4Byte ArrayLen = sizeof(Array_PHY_REG_1T_8188E)/sizeof(u4Byte);
pu4Byte Array = Array_PHY_REG_1T_8188E; pu4Byte Array = Array_PHY_REG_1T_8188E;
bool biol = false; bool biol = false;
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
struct xmit_frame *pxmit_frame; struct xmit_frame *pxmit_frame;
u8 bndy_cnt=1; u8 bndy_cnt=1;
enum HAL_STATUS rst =HAL_STATUS_SUCCESS; enum HAL_STATUS rst =HAL_STATUS_SUCCESS;

2
hal/HalHWImg8188E_MAC.c
View file

@ -167,7 +167,7 @@ ODM_ReadAndConfig_MAC_REG_8188E(
pu4Byte Array = Array_MAC_REG_8188E; pu4Byte Array = Array_MAC_REG_8188E;
bool biol = false; bool biol = false;
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
struct xmit_frame *pxmit_frame; struct xmit_frame *pxmit_frame;
u8 bndy_cnt = 1; u8 bndy_cnt = 1;
enum HAL_STATUS rst = HAL_STATUS_SUCCESS; enum HAL_STATUS rst = HAL_STATUS_SUCCESS;

2
hal/HalHWImg8188E_RF.c
View file

@ -174,7 +174,7 @@ enum HAL_STATUS ODM_ReadAndConfig_RadioA_1T_8188E(struct odm_dm_struct * pDM_Odm
u4Byte ArrayLen = sizeof(Array_RadioA_1T_8188E)/sizeof(u4Byte); u4Byte ArrayLen = sizeof(Array_RadioA_1T_8188E)/sizeof(u4Byte);
pu4Byte Array = Array_RadioA_1T_8188E; pu4Byte Array = Array_RadioA_1T_8188E;
bool biol = false; bool biol = false;
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
struct xmit_frame *pxmit_frame; struct xmit_frame *pxmit_frame;
u8 bndy_cnt = 1; u8 bndy_cnt = 1;
enum HAL_STATUS rst = HAL_STATUS_SUCCESS; enum HAL_STATUS rst = HAL_STATUS_SUCCESS;

2
hal/HalPhyRf.c
View file

@ -30,7 +30,7 @@ ODM_ResetIQKResult(
) )
{ {
u1Byte i; u1Byte i;
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
if (!IS_HARDWARE_TYPE_8192D(Adapter)) if (!IS_HARDWARE_TYPE_8192D(Adapter))
return; return;

48
hal/HalPhyRf_8188e.c
View file

@ -148,7 +148,7 @@ odm_TxPwrTrackSetPwr88E(
/* 091212 chiyokolin */ /* 091212 chiyokolin */
void void
odm_TXPowerTrackingCallback_ThermalMeter_8188E( odm_TXPowerTrackingCallback_ThermalMeter_8188E(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
@ -547,7 +547,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E(
static u1Byte /* bit0 = 1 => Tx OK, bit1 = 1 => Rx OK */ static u1Byte /* bit0 = 1 => Tx OK, bit1 = 1 => Rx OK */
phy_PathA_IQK_8188E( phy_PathA_IQK_8188E(
PADAPTER pAdapter, struct adapter * pAdapter,
bool configPathB bool configPathB
) )
{ {
@ -600,7 +600,7 @@ phy_PathA_IQK_8188E(
static u1Byte /* bit0 = 1 => Tx OK, bit1 = 1 => Rx OK */ static u1Byte /* bit0 = 1 => Tx OK, bit1 = 1 => Rx OK */
phy_PathA_RxIQK( phy_PathA_RxIQK(
PADAPTER pAdapter, struct adapter * pAdapter,
bool configPathB bool configPathB
) )
{ {
@ -734,7 +734,7 @@ phy_PathA_RxIQK(
static u1Byte /* bit0 = 1 => Tx OK, bit1 = 1 => Rx OK */ static u1Byte /* bit0 = 1 => Tx OK, bit1 = 1 => Rx OK */
phy_PathB_IQK_8188E( phy_PathB_IQK_8188E(
PADAPTER pAdapter struct adapter * pAdapter
) )
{ {
u4Byte regEAC, regEB4, regEBC, regEC4, regECC; u4Byte regEAC, regEB4, regEBC, regEC4, regECC;
@ -786,7 +786,7 @@ phy_PathB_IQK_8188E(
static void static void
_PHY_PathAFillIQKMatrix( _PHY_PathAFillIQKMatrix(
PADAPTER pAdapter, struct adapter * pAdapter,
bool bIQKOK, bool bIQKOK,
s4Byte result[][8], s4Byte result[][8],
u1Byte final_candidate, u1Byte final_candidate,
@ -846,7 +846,7 @@ _PHY_PathAFillIQKMatrix(
static void static void
_PHY_PathBFillIQKMatrix( _PHY_PathBFillIQKMatrix(
PADAPTER pAdapter, struct adapter * pAdapter,
bool bIQKOK, bool bIQKOK,
s4Byte result[][8], s4Byte result[][8],
u1Byte final_candidate, u1Byte final_candidate,
@ -906,14 +906,14 @@ _PHY_PathBFillIQKMatrix(
/* MP Already declare in odm.c */ /* MP Already declare in odm.c */
static bool static bool
ODM_CheckPowerStatus( ODM_CheckPowerStatus(
PADAPTER Adapter) struct adapter * Adapter)
{ {
return true; return true;
} }
void void
_PHY_SaveADDARegisters( _PHY_SaveADDARegisters(
PADAPTER pAdapter, struct adapter * pAdapter,
pu4Byte ADDAReg, pu4Byte ADDAReg,
pu4Byte ADDABackup, pu4Byte ADDABackup,
u4Byte RegisterNum u4Byte RegisterNum
@ -934,7 +934,7 @@ _PHY_SaveADDARegisters(
static void _PHY_SaveMACRegisters( static void _PHY_SaveMACRegisters(
PADAPTER pAdapter, struct adapter * pAdapter,
pu4Byte MACReg, pu4Byte MACReg,
pu4Byte MACBackup pu4Byte MACBackup
) )
@ -953,7 +953,7 @@ static void _PHY_SaveMACRegisters(
static void static void
_PHY_ReloadADDARegisters( _PHY_ReloadADDARegisters(
PADAPTER pAdapter, struct adapter * pAdapter,
pu4Byte ADDAReg, pu4Byte ADDAReg,
pu4Byte ADDABackup, pu4Byte ADDABackup,
u4Byte RegiesterNum u4Byte RegiesterNum
@ -972,7 +972,7 @@ _PHY_ReloadADDARegisters(
static void static void
_PHY_ReloadMACRegisters( _PHY_ReloadMACRegisters(
PADAPTER pAdapter, struct adapter * pAdapter,
pu4Byte MACReg, pu4Byte MACReg,
pu4Byte MACBackup pu4Byte MACBackup
) )
@ -991,7 +991,7 @@ _PHY_ReloadMACRegisters(
void void
_PHY_PathADDAOn( _PHY_PathADDAOn(
PADAPTER pAdapter, struct adapter * pAdapter,
pu4Byte ADDAReg, pu4Byte ADDAReg,
bool isPathAOn, bool isPathAOn,
bool is2T bool is2T
@ -1020,7 +1020,7 @@ _PHY_PathADDAOn(
void void
_PHY_MACSettingCalibration( _PHY_MACSettingCalibration(
PADAPTER pAdapter, struct adapter * pAdapter,
pu4Byte MACReg, pu4Byte MACReg,
pu4Byte MACBackup pu4Byte MACBackup
) )
@ -1042,7 +1042,7 @@ _PHY_MACSettingCalibration(
void void
_PHY_PathAStandBy( _PHY_PathAStandBy(
PADAPTER pAdapter struct adapter * pAdapter
) )
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
@ -1056,7 +1056,7 @@ _PHY_PathAStandBy(
} }
static void _PHY_PIModeSwitch( static void _PHY_PIModeSwitch(
PADAPTER pAdapter, struct adapter * pAdapter,
bool PIMode bool PIMode
) )
{ {
@ -1072,7 +1072,7 @@ static void _PHY_PIModeSwitch(
} }
static bool phy_SimularityCompare_8188E( static bool phy_SimularityCompare_8188E(
PADAPTER pAdapter, struct adapter * pAdapter,
s4Byte result[][8], s4Byte result[][8],
u1Byte c1, u1Byte c1,
u1Byte c2 u1Byte c2
@ -1192,7 +1192,7 @@ static bool phy_SimularityCompare_8188E(
} }
static void phy_IQCalibrate_8188E( static void phy_IQCalibrate_8188E(
PADAPTER pAdapter, struct adapter * pAdapter,
s4Byte result[][8], s4Byte result[][8],
u1Byte t, u1Byte t,
bool is2T bool is2T
@ -1380,7 +1380,7 @@ else
} }
static void phy_LCCalibrate_8188E( static void phy_LCCalibrate_8188E(
PADAPTER pAdapter, struct adapter * pAdapter,
bool is2T bool is2T
) )
{ {
@ -1448,7 +1448,7 @@ static void phy_LCCalibrate_8188E(
#define PATH_NUM 2 #define PATH_NUM 2
static void phy_APCalibrate_8188E( static void phy_APCalibrate_8188E(
PADAPTER pAdapter, struct adapter * pAdapter,
s1Byte delta, s1Byte delta,
bool is2T bool is2T
) )
@ -1881,7 +1881,7 @@ if (*(pDM_Odm->mp_mode) != 1)
void void
PHY_IQCalibrate_8188E( PHY_IQCalibrate_8188E(
PADAPTER pAdapter, struct adapter * pAdapter,
bool bReCovery bool bReCovery
) )
{ {
@ -2070,7 +2070,7 @@ if (*(pDM_Odm->mp_mode) == 1)
void void
PHY_LCCalibrate_8188E( PHY_LCCalibrate_8188E(
PADAPTER pAdapter struct adapter * pAdapter
) )
{ {
bool bSingleTone = false, bCarrierSuppression = false; bool bSingleTone = false, bCarrierSuppression = false;
@ -2131,7 +2131,7 @@ if (*(pDM_Odm->mp_mode) == 1)
void void
PHY_APCalibrate_8188E( PHY_APCalibrate_8188E(
PADAPTER pAdapter, struct adapter * pAdapter,
s1Byte delta s1Byte delta
) )
{ {
@ -2162,7 +2162,7 @@ PHY_APCalibrate_8188E(
} }
static void phy_SetRFPathSwitch_8188E( static void phy_SetRFPathSwitch_8188E(
PADAPTER pAdapter, struct adapter * pAdapter,
bool bMain, bool bMain,
bool is2T bool is2T
) )
@ -2195,7 +2195,7 @@ static void phy_SetRFPathSwitch_8188E(
} }
} }
void PHY_SetRFPathSwitch_8188E( void PHY_SetRFPathSwitch_8188E(
PADAPTER pAdapter, struct adapter * pAdapter,
bool bMain bool bMain
) )
{ {

2
hal/HalPwrSeqCmd.c
View file

@ -45,7 +45,7 @@ Major Change History:
/* 2011.07.07, added by Roger. */ /* 2011.07.07, added by Roger. */
/* */ /* */
u8 HalPwrSeqCmdParsing( u8 HalPwrSeqCmdParsing(
PADAPTER padapter, struct adapter * padapter,
u8 CutVersion, u8 CutVersion,
u8 FabVersion, u8 FabVersion,
u8 InterfaceType, u8 InterfaceType,

18
hal/hal_com.c
View file

@ -74,7 +74,7 @@ void dump_chip_info(struct HAL_VERSION ChipVersion)
u8 /* return the final channel plan decision */ u8 /* return the final channel plan decision */
hal_com_get_channel_plan( hal_com_get_channel_plan(
PADAPTER padapter, struct adapter * padapter,
u8 hw_channel_plan, /* channel plan from HW (efuse/eeprom) */ u8 hw_channel_plan, /* channel plan from HW (efuse/eeprom) */
u8 sw_channel_plan, /* channel plan from SW (registry/module param) */ u8 sw_channel_plan, /* channel plan from SW (registry/module param) */
u8 def_channel_plan, /* channel plan used when the former two is invalid */ u8 def_channel_plan, /* channel plan used when the former two is invalid */
@ -153,7 +153,7 @@ u8 MRateToHwRate(u8 rate)
} }
void HalSetBrateCfg( void HalSetBrateCfg(
PADAPTER Adapter, struct adapter * Adapter,
u8 *mBratesOS, u8 *mBratesOS,
u16 *pBrateCfg) u16 *pBrateCfg)
{ {
@ -206,7 +206,7 @@ void HalSetBrateCfg(
} }
} }
static void _OneOutPipeMapping(PADAPTER pAdapter) static void _OneOutPipeMapping(struct adapter * pAdapter)
{ {
struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(pAdapter); struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(pAdapter);
@ -221,7 +221,7 @@ static void _OneOutPipeMapping(PADAPTER pAdapter)
pdvobjpriv->Queue2Pipe[7] = pdvobjpriv->RtOutPipe[0];/* TXCMD */ pdvobjpriv->Queue2Pipe[7] = pdvobjpriv->RtOutPipe[0];/* TXCMD */
} }
static void _TwoOutPipeMapping(PADAPTER pAdapter, bool bWIFICfg) static void _TwoOutPipeMapping(struct adapter * pAdapter, bool bWIFICfg)
{ {
struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(pAdapter); struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(pAdapter);
@ -264,7 +264,7 @@ static void _TwoOutPipeMapping(PADAPTER pAdapter, bool bWIFICfg)
} }
static void _ThreeOutPipeMapping( static void _ThreeOutPipeMapping(
PADAPTER pAdapter, struct adapter * pAdapter,
bool bWIFICfg bool bWIFICfg
) )
{ {
@ -306,7 +306,7 @@ static void _ThreeOutPipeMapping(
bool bool
Hal_MappingOutPipe( Hal_MappingOutPipe(
PADAPTER pAdapter, struct adapter * pAdapter,
u8 NumOutPipe u8 NumOutPipe
) )
{ {
@ -336,7 +336,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); rtw_hal_set_hwreg(adapter, HW_VAR_MAC_ADDR, adapter->eeprompriv.mac_addr);
} }
@ -347,12 +347,12 @@ void hal_init_macaddr(_adapter *adapter)
* BITS [127:120] [119:16] [15:8] [7:4] [3:0] * 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); 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; s32 ret = _FAIL;
struct c2h_evt_hdr *c2h_evt; struct c2h_evt_hdr *c2h_evt;

110
hal/hal_intf.c
View file

@ -24,58 +24,58 @@
#include <hal_intf.h> #include <hal_intf.h>
#include <usb_hal.h> #include <usb_hal.h>
void rtw_hal_chip_configure(_adapter *padapter) void rtw_hal_chip_configure(struct adapter *padapter)
{ {
if (padapter->HalFunc.intf_chip_configure) if (padapter->HalFunc.intf_chip_configure)
padapter->HalFunc.intf_chip_configure(padapter); 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) if (padapter->HalFunc.read_adapter_info)
padapter->HalFunc.read_adapter_info(padapter); 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) if (padapter->HalFunc.read_chip_version)
padapter->HalFunc.read_chip_version(padapter); padapter->HalFunc.read_chip_version(padapter);
} }
void rtw_hal_def_value_init(_adapter *padapter) void rtw_hal_def_value_init(struct adapter *padapter)
{ {
if (padapter->HalFunc.init_default_value) if (padapter->HalFunc.init_default_value)
padapter->HalFunc.init_default_value(padapter); padapter->HalFunc.init_default_value(padapter);
} }
void rtw_hal_free_data(_adapter *padapter) void rtw_hal_free_data(struct adapter *padapter)
{ {
if (padapter->HalFunc.free_hal_data) if (padapter->HalFunc.free_hal_data)
padapter->HalFunc.free_hal_data(padapter); padapter->HalFunc.free_hal_data(padapter);
} }
void rtw_hal_dm_init(_adapter *padapter) void rtw_hal_dm_init(struct adapter *padapter)
{ {
if (padapter->HalFunc.dm_init) if (padapter->HalFunc.dm_init)
padapter->HalFunc.dm_init(padapter); padapter->HalFunc.dm_init(padapter);
} }
void rtw_hal_dm_deinit(_adapter *padapter) void rtw_hal_dm_deinit(struct adapter *padapter)
{ {
/* cancel dm timer */ /* cancel dm timer */
if (padapter->HalFunc.dm_deinit) if (padapter->HalFunc.dm_deinit)
padapter->HalFunc.dm_deinit(padapter); 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) if (padapter->HalFunc.InitSwLeds)
padapter->HalFunc.InitSwLeds(padapter); 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) if (padapter->HalFunc.DeInitSwLeds)
padapter->HalFunc.DeInitSwLeds(padapter); 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) if (padapter->HalFunc.hal_power_on)
return padapter->HalFunc.hal_power_on(padapter); return padapter->HalFunc.hal_power_on(padapter);
@ -83,7 +83,7 @@ u32 rtw_hal_power_on(_adapter *padapter)
} }
uint rtw_hal_init(_adapter *padapter) uint rtw_hal_init(struct adapter *padapter)
{ {
uint status = _SUCCESS; uint status = _SUCCESS;
@ -110,7 +110,7 @@ uint rtw_hal_init(_adapter *padapter)
} }
uint rtw_hal_deinit(_adapter *padapter) uint rtw_hal_deinit(struct adapter *padapter)
{ {
uint status = _SUCCESS; uint status = _SUCCESS;
@ -131,43 +131,43 @@ _func_exit_;
return status; 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) if (padapter->HalFunc.SetHwRegHandler)
padapter->HalFunc.SetHwRegHandler(padapter, variable, val); 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) if (padapter->HalFunc.GetHwRegHandler)
padapter->HalFunc.GetHwRegHandler(padapter, variable, val); padapter->HalFunc.GetHwRegHandler(padapter, variable, val);
} }
u8 rtw_hal_set_def_var(_adapter *padapter, enum hal_def_variable eVariable, void * pValue) u8 rtw_hal_set_def_var(struct adapter *padapter, enum hal_def_variable eVariable, void * pValue)
{ {
if (padapter->HalFunc.SetHalDefVarHandler) if (padapter->HalFunc.SetHalDefVarHandler)
return padapter->HalFunc.SetHalDefVarHandler(padapter,eVariable,pValue); return padapter->HalFunc.SetHalDefVarHandler(padapter,eVariable,pValue);
return _FAIL; return _FAIL;
} }
u8 rtw_hal_get_def_var(_adapter *padapter, enum hal_def_variable eVariable, void * pValue) u8 rtw_hal_get_def_var(struct adapter *padapter, enum hal_def_variable eVariable, void * pValue)
{ {
if (padapter->HalFunc.GetHalDefVarHandler) if (padapter->HalFunc.GetHalDefVarHandler)
return padapter->HalFunc.GetHalDefVarHandler(padapter,eVariable,pValue); return padapter->HalFunc.GetHalDefVarHandler(padapter,eVariable,pValue);
return _FAIL; return _FAIL;
} }
void rtw_hal_set_odm_var(_adapter *padapter, enum hal_odm_variable eVariable, void * pValue1,bool bSet) void rtw_hal_set_odm_var(struct adapter *padapter, enum hal_odm_variable eVariable, void * pValue1,bool bSet)
{ {
if (padapter->HalFunc.SetHalODMVarHandler) if (padapter->HalFunc.SetHalODMVarHandler)
padapter->HalFunc.SetHalODMVarHandler(padapter,eVariable,pValue1,bSet); padapter->HalFunc.SetHalODMVarHandler(padapter,eVariable,pValue1,bSet);
} }
void rtw_hal_get_odm_var(_adapter *padapter, enum hal_odm_variable eVariable, void * pValue1,bool bSet) void rtw_hal_get_odm_var(struct adapter *padapter, enum hal_odm_variable eVariable, void * pValue1,bool bSet)
{ {
if (padapter->HalFunc.GetHalODMVarHandler) if (padapter->HalFunc.GetHalODMVarHandler)
padapter->HalFunc.GetHalODMVarHandler(padapter,eVariable,pValue1,bSet); padapter->HalFunc.GetHalODMVarHandler(padapter,eVariable,pValue1,bSet);
} }
void rtw_hal_enable_interrupt(_adapter *padapter) void rtw_hal_enable_interrupt(struct adapter *padapter)
{ {
if (padapter->HalFunc.enable_interrupt) if (padapter->HalFunc.enable_interrupt)
padapter->HalFunc.enable_interrupt(padapter); padapter->HalFunc.enable_interrupt(padapter);
@ -175,7 +175,7 @@ void rtw_hal_enable_interrupt(_adapter *padapter)
DBG_88E("%s: HalFunc.enable_interrupt is NULL!\n", __func__); DBG_88E("%s: HalFunc.enable_interrupt is NULL!\n", __func__);
} }
void rtw_hal_disable_interrupt(_adapter *padapter) void rtw_hal_disable_interrupt(struct adapter *padapter)
{ {
if (padapter->HalFunc.disable_interrupt) if (padapter->HalFunc.disable_interrupt)
padapter->HalFunc.disable_interrupt(padapter); padapter->HalFunc.disable_interrupt(padapter);
@ -185,7 +185,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; u32 rst = _FAIL;
if (padapter->HalFunc.inirp_init) if (padapter->HalFunc.inirp_init)
@ -195,7 +195,7 @@ u32 rtw_hal_inirp_init(_adapter *padapter)
return rst; return rst;
} }
u32 rtw_hal_inirp_deinit(_adapter *padapter) u32 rtw_hal_inirp_deinit(struct adapter *padapter)
{ {
if (padapter->HalFunc.inirp_deinit) if (padapter->HalFunc.inirp_deinit)
@ -205,14 +205,14 @@ u32 rtw_hal_inirp_deinit(_adapter *padapter)
} }
u8 rtw_hal_intf_ps_func(_adapter *padapter,enum hal_intf_ps_func efunc_id, u8* val) u8 rtw_hal_intf_ps_func(struct adapter *padapter,enum hal_intf_ps_func efunc_id, u8* val)
{ {
if (padapter->HalFunc.interface_ps_func) if (padapter->HalFunc.interface_ps_func)
return padapter->HalFunc.interface_ps_func(padapter,efunc_id,val); return padapter->HalFunc.interface_ps_func(padapter,efunc_id,val);
return _FAIL; return _FAIL;
} }
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) if (padapter->HalFunc.hal_xmit)
return padapter->HalFunc.hal_xmit(padapter, pxmitframe); return padapter->HalFunc.hal_xmit(padapter, pxmitframe);
@ -220,7 +220,7 @@ s32 rtw_hal_xmit(_adapter *padapter, struct xmit_frame *pxmitframe)
return false; 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; s32 ret = _FAIL;
if (padapter->HalFunc.mgnt_xmit) if (padapter->HalFunc.mgnt_xmit)
@ -228,32 +228,32 @@ s32 rtw_hal_mgnt_xmit(_adapter *padapter, struct xmit_frame *pmgntframe)
return ret; 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) if (padapter->HalFunc.init_xmit_priv != NULL)
return padapter->HalFunc.init_xmit_priv(padapter); return padapter->HalFunc.init_xmit_priv(padapter);
return _FAIL; 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) if (padapter->HalFunc.free_xmit_priv != NULL)
padapter->HalFunc.free_xmit_priv(padapter); 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) if (padapter->HalFunc.init_recv_priv)
return padapter->HalFunc.init_recv_priv(padapter); return padapter->HalFunc.init_recv_priv(padapter);
return _FAIL; 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) if (padapter->HalFunc.free_recv_priv)
padapter->HalFunc.free_recv_priv(padapter); padapter->HalFunc.free_recv_priv(padapter);
} }
void rtw_hal_update_ra_mask(_adapter *padapter, u32 mac_id, u8 rssi_level) void rtw_hal_update_ra_mask(struct adapter *padapter, u32 mac_id, u8 rssi_level)
{ {
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@ -275,122 +275,122 @@ void rtw_hal_update_ra_mask(_adapter *padapter, u32 mac_id, 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) if (padapter->HalFunc.Add_RateATid)
padapter->HalFunc.Add_RateATid(padapter, bitmap, arg, rssi_level); padapter->HalFunc.Add_RateATid(padapter, bitmap, arg, rssi_level);
} }
/* Start specifical interface thread */ /* Start specifical interface thread */
void rtw_hal_start_thread(_adapter *padapter) void rtw_hal_start_thread(struct adapter *padapter)
{ {
if (padapter->HalFunc.run_thread) if (padapter->HalFunc.run_thread)
padapter->HalFunc.run_thread(padapter); padapter->HalFunc.run_thread(padapter);
} }
/* Start specifical interface thread */ /* Start specifical interface thread */
void rtw_hal_stop_thread(_adapter *padapter) void rtw_hal_stop_thread(struct adapter *padapter)
{ {
if (padapter->HalFunc.cancel_thread) if (padapter->HalFunc.cancel_thread)
padapter->HalFunc.cancel_thread(padapter); 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; u32 data = 0;
if (padapter->HalFunc.read_bbreg) if (padapter->HalFunc.read_bbreg)
data = padapter->HalFunc.read_bbreg(padapter, RegAddr, BitMask); data = padapter->HalFunc.read_bbreg(padapter, RegAddr, BitMask);
return data; 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) if (padapter->HalFunc.write_bbreg)
padapter->HalFunc.write_bbreg(padapter, RegAddr, BitMask, Data); padapter->HalFunc.write_bbreg(padapter, RegAddr, BitMask, Data);
} }
u32 rtw_hal_read_rfreg(_adapter *padapter, enum rf_radio_path rfpath, u32 RegAddr, u32 BitMask) u32 rtw_hal_read_rfreg(struct adapter *padapter, enum rf_radio_path rfpath, u32 RegAddr, u32 BitMask)
{ {
u32 data = 0; u32 data = 0;
if ( padapter->HalFunc.read_rfreg) if ( padapter->HalFunc.read_rfreg)
data = padapter->HalFunc.read_rfreg(padapter, rfpath, RegAddr, BitMask); data = padapter->HalFunc.read_rfreg(padapter, rfpath, RegAddr, BitMask);
return data; return data;
} }
void rtw_hal_write_rfreg(_adapter *padapter, enum rf_radio_path rfpath, u32 RegAddr, u32 BitMask, u32 Data) void rtw_hal_write_rfreg(struct adapter *padapter, enum rf_radio_path rfpath, u32 RegAddr, u32 BitMask, u32 Data)
{ {
if (padapter->HalFunc.write_rfreg) if (padapter->HalFunc.write_rfreg)
padapter->HalFunc.write_rfreg(padapter, rfpath, RegAddr, BitMask, Data); padapter->HalFunc.write_rfreg(padapter, rfpath, RegAddr, BitMask, Data);
} }
s32 rtw_hal_interrupt_handler(_adapter *padapter) s32 rtw_hal_interrupt_handler(struct adapter *padapter)
{ {
if (padapter->HalFunc.interrupt_handler) if (padapter->HalFunc.interrupt_handler)
return padapter->HalFunc.interrupt_handler(padapter); return padapter->HalFunc.interrupt_handler(padapter);
return _FAIL; return _FAIL;
} }
void rtw_hal_set_bwmode(_adapter *padapter, enum ht_channel_width Bandwidth, u8 Offset) void rtw_hal_set_bwmode(struct adapter *padapter, enum ht_channel_width Bandwidth, u8 Offset)
{ {
if (padapter->HalFunc.set_bwmode_handler) if (padapter->HalFunc.set_bwmode_handler)
padapter->HalFunc.set_bwmode_handler(padapter, Bandwidth, Offset); 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) if (padapter->HalFunc.set_channel_handler)
padapter->HalFunc.set_channel_handler(padapter, channel); padapter->HalFunc.set_channel_handler(padapter, channel);
} }
void rtw_hal_dm_watchdog(_adapter *padapter) void rtw_hal_dm_watchdog(struct adapter *padapter)
{ {
if (padapter->HalFunc.hal_dm_watchdog) if (padapter->HalFunc.hal_dm_watchdog)
padapter->HalFunc.hal_dm_watchdog(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) if (padapter->HalFunc.SetBeaconRelatedRegistersHandler)
padapter->HalFunc.SetBeaconRelatedRegistersHandler(padapter); padapter->HalFunc.SetBeaconRelatedRegistersHandler(padapter);
} }
u8 rtw_hal_antdiv_before_linked(_adapter *padapter) u8 rtw_hal_antdiv_before_linked(struct adapter *padapter)
{ {
if (padapter->HalFunc.AntDivBeforeLinkHandler) if (padapter->HalFunc.AntDivBeforeLinkHandler)
return padapter->HalFunc.AntDivBeforeLinkHandler(padapter); return padapter->HalFunc.AntDivBeforeLinkHandler(padapter);
return false; return false;
} }
void rtw_hal_antdiv_rssi_compared(_adapter *padapter, struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src) void rtw_hal_antdiv_rssi_compared(struct adapter *padapter, struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src)
{ {
if (padapter->HalFunc.AntDivCompareHandler) if (padapter->HalFunc.AntDivCompareHandler)
padapter->HalFunc.AntDivCompareHandler(padapter, dst, src); padapter->HalFunc.AntDivCompareHandler(padapter, dst, src);
} }
void rtw_hal_sreset_init(_adapter *padapter) void rtw_hal_sreset_init(struct adapter *padapter)
{ {
if (padapter->HalFunc.sreset_init_value) if (padapter->HalFunc.sreset_init_value)
padapter->HalFunc.sreset_init_value(padapter); padapter->HalFunc.sreset_init_value(padapter);
} }
void rtw_hal_sreset_reset(_adapter *padapter) void rtw_hal_sreset_reset(struct adapter *padapter)
{ {
if (padapter->HalFunc.silentreset) if (padapter->HalFunc.silentreset)
padapter->HalFunc.silentreset(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) if (padapter->HalFunc.sreset_reset_value)
padapter->HalFunc.sreset_reset_value(padapter); 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 (padapter->HalFunc.sreset_xmit_status_check) if (padapter->HalFunc.sreset_xmit_status_check)
padapter->HalFunc.sreset_xmit_status_check(padapter); 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 (padapter->HalFunc.sreset_linked_status_check) if (padapter->HalFunc.sreset_linked_status_check)
padapter->HalFunc.sreset_linked_status_check(padapter); 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; u8 status = 0;
if (padapter->HalFunc.sreset_get_wifi_status) if (padapter->HalFunc.sreset_get_wifi_status)
@ -398,26 +398,26 @@ u8 rtw_hal_sreset_get_wifi_status(_adapter *padapter)
return status; return status;
} }
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) if (adapter->HalFunc.IOL_exec_cmds_sync)
return adapter->HalFunc.IOL_exec_cmds_sync(adapter, xmit_frame, max_wating_ms,bndy_cnt); return adapter->HalFunc.IOL_exec_cmds_sync(adapter, xmit_frame, max_wating_ms,bndy_cnt);
return _FAIL; return _FAIL;
} }
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) if (adapter->HalFunc.hal_notch_filter)
adapter->HalFunc.hal_notch_filter(adapter,enable); 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) if (adapter->HalFunc.hal_reset_security_engine)
adapter->HalFunc.hal_reset_security_engine(adapter); 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; s32 ret = _FAIL;
if (adapter->HalFunc.c2h_handler) if (adapter->HalFunc.c2h_handler)
@ -425,7 +425,7 @@ s32 rtw_hal_c2h_handler(_adapter *adapter, struct c2h_evt_hdr *c2h_evt)
return ret; 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; return adapter->HalFunc.c2h_id_filter_ccx;
} }

38
hal/odm.c
View file

@ -714,7 +714,7 @@ ODM_CmnInfoHook(
break; break;
case ODM_CMNINFO_BUDDY_ADAPTOR: case ODM_CMNINFO_BUDDY_ADAPTOR:
pDM_Odm->pBuddyAdapter = (PADAPTER *)pValue; pDM_Odm->pBuddyAdapter = (struct adapter * *)pValue;
break; break;
case ODM_CMNINFO_DMSP_IS_MASTER: case ODM_CMNINFO_DMSP_IS_MASTER:
@ -1125,7 +1125,7 @@ odm_DIGbyRSSI_LPS(
struct odm_dm_struct * pDM_Odm struct odm_dm_struct * pDM_Odm
) )
{ {
PADAPTER pAdapter =pDM_Odm->Adapter; struct adapter * pAdapter =pDM_Odm->Adapter;
struct rtw_dig * pDM_DigTable = &pDM_Odm->DM_DigTable; struct rtw_dig * pDM_DigTable = &pDM_Odm->DM_DigTable;
struct false_alarm_stats *pFalseAlmCnt = &pDM_Odm->FalseAlmCnt; struct false_alarm_stats *pFalseAlmCnt = &pDM_Odm->FalseAlmCnt;
@ -2063,7 +2063,7 @@ odm_RefreshRateAdaptiveMaskCE(
) )
{ {
u1Byte i; u1Byte i;
PADAPTER pAdapter = pDM_Odm->Adapter; struct adapter * pAdapter = pDM_Odm->Adapter;
if (pAdapter->bDriverStopped) { if (pAdapter->bDriverStopped) {
ODM_RT_TRACE(pDM_Odm, ODM_COMP_RA_MASK, ODM_DBG_TRACE, ("<---- odm_RefreshRateAdaptiveMask(): driver is going to unload\n")); ODM_RT_TRACE(pDM_Odm, ODM_COMP_RA_MASK, ODM_DBG_TRACE, ("<---- odm_RefreshRateAdaptiveMask(): driver is going to unload\n"));
@ -2162,7 +2162,7 @@ odm_DynamicTxPowerInit(
struct odm_dm_struct * pDM_Odm struct odm_dm_struct * pDM_Odm
) )
{ {
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
struct dm_priv *pdmpriv = &pHalData->dmpriv; struct dm_priv *pdmpriv = &pHalData->dmpriv;
pdmpriv->bDynamicTxPowerEnable = false; pdmpriv->bDynamicTxPowerEnable = false;
@ -2178,7 +2178,7 @@ odm_DynamicTxPowerSavePowerIndex(
u1Byte index; u1Byte index;
u4Byte Power_Index_REG[6] = {0xc90, 0xc91, 0xc92, 0xc98, 0xc99, 0xc9a}; u4Byte Power_Index_REG[6] = {0xc90, 0xc91, 0xc92, 0xc98, 0xc99, 0xc9a};
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
struct dm_priv *pdmpriv = &pHalData->dmpriv; struct dm_priv *pdmpriv = &pHalData->dmpriv;
for (index = 0; index< 6; index++) for (index = 0; index< 6; index++)
@ -2191,7 +2191,7 @@ odm_DynamicTxPowerRestorePowerIndex(
) )
{ {
u1Byte index; u1Byte index;
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
u4Byte Power_Index_REG[6] = {0xc90, 0xc91, 0xc92, 0xc98, 0xc99, 0xc9a}; u4Byte Power_Index_REG[6] = {0xc90, 0xc91, 0xc92, 0xc98, 0xc99, 0xc9a};
@ -2221,7 +2221,7 @@ odm_DynamicTxPower(
{ {
/* */ /* */
/* For AP/ADSL use struct rtl8192cd_priv * */ /* For AP/ADSL use struct rtl8192cd_priv * */
/* For CE/NIC use PADAPTER */ /* For CE/NIC use struct adapter * */
/* */ /* */
if (!(pDM_Odm->SupportAbility & ODM_BB_DYNAMIC_TXPWR)) if (!(pDM_Odm->SupportAbility & ODM_BB_DYNAMIC_TXPWR))
@ -2292,9 +2292,9 @@ odm_RSSIMonitorCheck(
{ {
/* */ /* */
/* For AP/ADSL use struct rtl8192cd_priv * */ /* For AP/ADSL use struct rtl8192cd_priv * */
/* For CE/NIC use PADAPTER */ /* For CE/NIC use struct adapter * */
/* */ /* */
PADAPTER pAdapter = pDM_Odm->Adapter; struct adapter * pAdapter = pDM_Odm->Adapter;
struct rtl8192cd_priv *priv = pDM_Odm->priv; struct rtl8192cd_priv *priv = pDM_Odm->priv;
if (!(pDM_Odm->SupportAbility & ODM_BB_RSSI_MONITOR)) if (!(pDM_Odm->SupportAbility & ODM_BB_RSSI_MONITOR))
@ -2339,14 +2339,14 @@ odm_RSSIMonitorCheckMP(
/* */ /* */
static void static void
FindMinimumRSSI_Dmsp( FindMinimumRSSI_Dmsp(
PADAPTER pAdapter struct adapter * pAdapter
) )
{ {
} }
static void static void
FindMinimumRSSI( FindMinimumRSSI(
PADAPTER pAdapter struct adapter * pAdapter
) )
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
@ -2374,7 +2374,7 @@ odm_RSSIMonitorCheckCE(
struct odm_dm_struct * pDM_Odm struct odm_dm_struct * pDM_Odm
) )
{ {
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
struct dm_priv *pdmpriv = &pHalData->dmpriv; struct dm_priv *pdmpriv = &pHalData->dmpriv;
int i; int i;
@ -2513,9 +2513,9 @@ ODM_TXPowerTrackingCheck(
{ {
/* */ /* */
/* For AP/ADSL use struct rtl8192cd_priv * */ /* For AP/ADSL use struct rtl8192cd_priv * */
/* For CE/NIC use PADAPTER */ /* For CE/NIC use struct adapter * */
/* */ /* */
PADAPTER pAdapter = pDM_Odm->Adapter; struct adapter * pAdapter = pDM_Odm->Adapter;
struct rtl8192cd_priv *priv = pDM_Odm->priv; struct rtl8192cd_priv *priv = pDM_Odm->priv;
/* if (!(pDM_Odm->SupportAbility & ODM_RF_TX_PWR_TRACK)) */ /* if (!(pDM_Odm->SupportAbility & ODM_RF_TX_PWR_TRACK)) */
@ -2552,7 +2552,7 @@ odm_TXPowerTrackingCheckCE(
struct odm_dm_struct * pDM_Odm struct odm_dm_struct * pDM_Odm
) )
{ {
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
if (!(pDM_Odm->SupportAbility & ODM_RF_TX_PWR_TRACK)) if (!(pDM_Odm->SupportAbility & ODM_RF_TX_PWR_TRACK))
{ {
@ -2931,7 +2931,7 @@ ODM_EdcaTurboInit(
struct odm_dm_struct * pDM_Odm) struct odm_dm_struct * pDM_Odm)
{ {
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
pDM_Odm->DM_EDCA_Table.bCurrentTurboEDCA = false; pDM_Odm->DM_EDCA_Table.bCurrentTurboEDCA = false;
pDM_Odm->DM_EDCA_Table.bIsCurRDLState = false; pDM_Odm->DM_EDCA_Table.bIsCurRDLState = false;
Adapter->recvpriv.bIsAnyNonBEPkts =false; Adapter->recvpriv.bIsAnyNonBEPkts =false;
@ -2951,9 +2951,9 @@ odm_EdcaTurboCheck(
{ {
/* */ /* */
/* For AP/ADSL use struct rtl8192cd_priv * */ /* For AP/ADSL use struct rtl8192cd_priv * */
/* For CE/NIC use PADAPTER */ /* For CE/NIC use struct adapter * */
/* */ /* */
PADAPTER pAdapter = pDM_Odm->Adapter; struct adapter * pAdapter = pDM_Odm->Adapter;
struct rtl8192cd_priv *priv = pDM_Odm->priv; struct rtl8192cd_priv *priv = pDM_Odm->priv;
/* */ /* */
@ -2986,7 +2986,7 @@ odm_EdcaTurboCheckCE(
struct odm_dm_struct * pDM_Odm struct odm_dm_struct * pDM_Odm
) )
{ {
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
u32 trafficIndex; u32 trafficIndex;
u32 edca_param; u32 edca_param;

8
hal/odm_RTL8188E.c
View file

@ -50,7 +50,7 @@ odm_RX_HWAntDivInit(
) )
{ {
u4Byte value32; u4Byte value32;
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
#if (MP_DRIVER == 1) #if (MP_DRIVER == 1)
if (*(pDM_Odm->mp_mode) == 1) if (*(pDM_Odm->mp_mode) == 1)
{ {
@ -85,7 +85,7 @@ odm_TRX_HWAntDivInit(
) )
{ {
u4Byte value32; u4Byte value32;
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
#if (MP_DRIVER == 1) #if (MP_DRIVER == 1)
if (*(pDM_Odm->mp_mode) == 1) if (*(pDM_Odm->mp_mode) == 1)
@ -135,7 +135,7 @@ odm_FastAntTrainingInit(
u4Byte value32, i; u4Byte value32, i;
struct fast_ant_train *pDM_FatTable = &pDM_Odm->DM_FatTable; struct fast_ant_train *pDM_FatTable = &pDM_Odm->DM_FatTable;
u4Byte AntCombination = 2; 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")); ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("odm_FastAntTrainingInit()\n"));
#if (MP_DRIVER == 1) #if (MP_DRIVER == 1)
@ -509,7 +509,7 @@ odm_DynamicPrimaryCCA(
struct odm_dm_struct * pDM_Odm struct odm_dm_struct * pDM_Odm
) )
{ {
PADAPTER Adapter = pDM_Odm->Adapter; /* for NIC */ struct adapter * Adapter = pDM_Odm->Adapter; /* for NIC */
struct rtl8192cd_priv *priv = pDM_Odm->priv; /* for AP */ struct rtl8192cd_priv *priv = pDM_Odm->priv; /* for AP */
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);

26
hal/odm_interface.c
View file

@ -29,43 +29,43 @@
u1Byte ODM_Read1Byte(struct odm_dm_struct *pDM_Odm, u4Byte RegAddr) u1Byte ODM_Read1Byte(struct odm_dm_struct *pDM_Odm, u4Byte RegAddr)
{ {
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
return rtw_read8(Adapter,RegAddr); return rtw_read8(Adapter,RegAddr);
} }
u2Byte ODM_Read2Byte(struct odm_dm_struct *pDM_Odm, u4Byte RegAddr) u2Byte ODM_Read2Byte(struct odm_dm_struct *pDM_Odm, u4Byte RegAddr)
{ {
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
return rtw_read16(Adapter,RegAddr); return rtw_read16(Adapter,RegAddr);
} }
u4Byte ODM_Read4Byte(struct odm_dm_struct *pDM_Odm, u4Byte RegAddr) u4Byte ODM_Read4Byte(struct odm_dm_struct *pDM_Odm, u4Byte RegAddr)
{ {
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
return rtw_read32(Adapter,RegAddr); return rtw_read32(Adapter,RegAddr);
} }
void ODM_Write1Byte(struct odm_dm_struct *pDM_Odm, u4Byte RegAddr, u1Byte Data) void ODM_Write1Byte(struct odm_dm_struct *pDM_Odm, u4Byte RegAddr, u1Byte Data)
{ {
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
rtw_write8(Adapter,RegAddr, Data); rtw_write8(Adapter,RegAddr, Data);
} }
void ODM_Write2Byte(struct odm_dm_struct *pDM_Odm, u4Byte RegAddr, u2Byte Data) void ODM_Write2Byte(struct odm_dm_struct *pDM_Odm, u4Byte RegAddr, u2Byte Data)
{ {
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
rtw_write16(Adapter,RegAddr, Data); rtw_write16(Adapter,RegAddr, Data);
} }
void ODM_Write4Byte(struct odm_dm_struct *pDM_Odm, u4Byte RegAddr, u4Byte Data) void ODM_Write4Byte(struct odm_dm_struct *pDM_Odm, u4Byte RegAddr, u4Byte Data)
{ {
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
rtw_write32(Adapter,RegAddr, Data); rtw_write32(Adapter,RegAddr, Data);
} }
void ODM_SetMACReg(struct odm_dm_struct *pDM_Odm, u4Byte RegAddr, u4Byte BitMask, u4Byte Data) void ODM_SetMACReg(struct odm_dm_struct *pDM_Odm, u4Byte RegAddr, u4Byte BitMask, u4Byte Data)
{ {
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
PHY_SetBBReg(Adapter, RegAddr, BitMask, Data); PHY_SetBBReg(Adapter, RegAddr, BitMask, Data);
} }
@ -76,7 +76,7 @@ ODM_GetMACReg(
u4Byte BitMask u4Byte BitMask
) )
{ {
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
return PHY_QueryBBReg(Adapter, RegAddr, BitMask); return PHY_QueryBBReg(Adapter, RegAddr, BitMask);
} }
@ -88,7 +88,7 @@ ODM_SetBBReg(
u4Byte Data u4Byte Data
) )
{ {
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
PHY_SetBBReg(Adapter, RegAddr, BitMask, Data); PHY_SetBBReg(Adapter, RegAddr, BitMask, Data);
} }
@ -99,7 +99,7 @@ ODM_GetBBReg(
u4Byte BitMask u4Byte BitMask
) )
{ {
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
return PHY_QueryBBReg(Adapter, RegAddr, BitMask); return PHY_QueryBBReg(Adapter, RegAddr, BitMask);
} }
@ -113,7 +113,7 @@ ODM_SetRFReg(
u4Byte Data u4Byte Data
) )
{ {
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
PHY_SetRFReg(Adapter, (enum rf_radio_path)eRFPath, RegAddr, BitMask, Data); PHY_SetRFReg(Adapter, (enum rf_radio_path)eRFPath, RegAddr, BitMask, Data);
} }
@ -126,7 +126,7 @@ ODM_GetRFReg(
u4Byte BitMask u4Byte BitMask
) )
{ {
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
return PHY_QueryRFReg(Adapter, (enum rf_radio_path)eRFPath, RegAddr, BitMask); return PHY_QueryRFReg(Adapter, (enum rf_radio_path)eRFPath, RegAddr, BitMask);
} }
@ -249,7 +249,7 @@ void ODM_InitializeTimer(struct odm_dm_struct *pDM_Odm, struct timer_list *pTime
void *CallBackFunc, void *pContext, void *CallBackFunc, void *pContext,
const char *szID) const char *szID)
{ {
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
_init_timer(pTimer,Adapter->pnetdev,CallBackFunc,pDM_Odm); _init_timer(pTimer,Adapter->pnetdev,CallBackFunc,pDM_Odm);
} }

32
hal/rtl8188e_cmd.c
View file

@ -35,7 +35,7 @@
#define RTL88E_EX_MESSAGE_BOX_SIZE 4 #define RTL88E_EX_MESSAGE_BOX_SIZE 4
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; u8 read_down = false;
int retry_cnts = 100; int retry_cnts = 100;
@ -67,7 +67,7 @@ static u8 _is_fw_read_cmd_down(_adapter* padapter, u8 msgbox_num)
*|31 - 0 | *|31 - 0 |
*|ext_msg| *|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; u8 bcmd_down = false;
s32 retry_cnts = 100; s32 retry_cnts = 100;
@ -143,7 +143,7 @@ _func_exit_;
return ret; return ret;
} }
u8 rtl8188e_set_rssi_cmd(_adapter*padapter, u8 *param) u8 rtl8188e_set_rssi_cmd(struct adapter*padapter, u8 *param)
{ {
u8 res=_SUCCESS; u8 res=_SUCCESS;
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
@ -161,7 +161,7 @@ _func_exit_;
return res; 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 buf[3];
u8 res=_SUCCESS; u8 res=_SUCCESS;
@ -191,7 +191,7 @@ _func_exit_;
/* bitmap[28:31]= Rate Adaptive id */ /* bitmap[28:31]= Rate Adaptive id */
/* arg[0:4] = macid */ /* arg[0:4] = macid */
/* arg[5] = Short GI */ /* 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)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
@ -235,7 +235,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)
{ {
struct setpwrmode_parm H2CSetPwrMode; struct setpwrmode_parm H2CSetPwrMode;
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
@ -286,7 +286,7 @@ _func_enter_;
_func_exit_; _func_exit_;
} }
void rtl8188e_set_FwMediaStatus_cmd(PADAPTER padapter, __le16 mstatus_rpt ) void rtl8188e_set_FwMediaStatus_cmd(struct adapter * padapter, __le16 mstatus_rpt )
{ {
u8 opmode,macid; u8 opmode,macid;
u16 mst_rpt = le16_to_cpu(mstatus_rpt); u16 mst_rpt = le16_to_cpu(mstatus_rpt);
@ -297,7 +297,7 @@ void rtl8188e_set_FwMediaStatus_cmd(PADAPTER padapter, __le16 mstatus_rpt )
FillH2CCmd_88E(padapter, H2C_COM_MEDIA_STATUS_RPT, sizeof(mst_rpt), (u8 *)&mst_rpt); FillH2CCmd_88E(padapter, H2C_COM_MEDIA_STATUS_RPT, sizeof(mst_rpt), (u8 *)&mst_rpt);
} }
static void ConstructBeacon(_adapter *padapter, u8 *pframe, u32 *pLength) static void ConstructBeacon(struct adapter *padapter, u8 *pframe, u32 *pLength)
{ {
struct rtw_ieee80211_hdr *pwlanhdr; struct rtw_ieee80211_hdr *pwlanhdr;
u16 *fctrl; u16 *fctrl;
@ -390,7 +390,7 @@ _ConstructBeacon:
*pLength = pktlen; *pLength = pktlen;
} }
static void ConstructPSPoll(_adapter *padapter, u8 *pframe, u32 *pLength) static void ConstructPSPoll(struct adapter *padapter, u8 *pframe, u32 *pLength)
{ {
struct rtw_ieee80211_hdr *pwlanhdr; struct rtw_ieee80211_hdr *pwlanhdr;
u16 *fctrl; u16 *fctrl;
@ -419,7 +419,7 @@ static void ConstructPSPoll(_adapter *padapter, u8 *pframe, u32 *pLength)
} }
static void ConstructNullFunctionData( static void ConstructNullFunctionData(
PADAPTER padapter, struct adapter * padapter,
u8 *pframe, u8 *pframe,
u32 *pLength, u32 *pLength,
u8 *StaAddr, u8 *StaAddr,
@ -485,7 +485,7 @@ static void ConstructNullFunctionData(
*pLength = pktlen; *pLength = pktlen;
} }
static void ConstructProbeRsp(_adapter *padapter, u8 *pframe, u32 *pLength, u8 *StaAddr, bool bHideSSID) static void ConstructProbeRsp(struct adapter *padapter, u8 *pframe, u32 *pLength, u8 *StaAddr, bool bHideSSID)
{ {
struct rtw_ieee80211_hdr *pwlanhdr; struct rtw_ieee80211_hdr *pwlanhdr;
u16 *fctrl; u16 *fctrl;
@ -526,7 +526,7 @@ static void ConstructProbeRsp(_adapter *padapter, u8 *pframe, u32 *pLength, u8 *
/* 2010.06.23. Added by tynli. */ /* 2010.06.23. Added by tynli. */
void void
CheckFwRsvdPageContent( CheckFwRsvdPageContent(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
} }
@ -541,7 +541,7 @@ CheckFwRsvdPageContent(
/* true: At the second time, we should send the first packet (default:beacon) */ /* 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. */ /* to Hw again and set the lengh in descriptor to the real beacon lengh. */
/* 2009.10.15 by tynli. */ /* 2009.10.15 by tynli. */
static void SetFwRsvdPagePkt(PADAPTER padapter, bool bDLFinished) static void SetFwRsvdPagePkt(struct adapter * padapter, bool bDLFinished)
{ {
struct hal_data_8188e *pHalData; struct hal_data_8188e *pHalData;
struct xmit_frame *pmgntframe; struct xmit_frame *pmgntframe;
@ -662,7 +662,7 @@ exit:
rtw_mfree(ReservedPagePacket, 1000); rtw_mfree(ReservedPagePacket, 1000);
} }
void rtl8188e_set_FwJoinBssReport_cmd(PADAPTER padapter, u8 mstatus) void rtl8188e_set_FwJoinBssReport_cmd(struct adapter * padapter, u8 mstatus)
{ {
struct joinbssrpt_parm JoinBssRptParm; struct joinbssrpt_parm JoinBssRptParm;
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
@ -780,7 +780,7 @@ _func_enter_;
_func_exit_; _func_exit_;
} }
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)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
@ -862,7 +862,7 @@ _func_exit_;
} }
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
void rtl8188es_set_wowlan_cmd(_adapter* padapter, u8 enable) void rtl8188es_set_wowlan_cmd(struct adapter* padapter, u8 enable)
{ {
u8 res=_SUCCESS; u8 res=_SUCCESS;
u32 test=0; u32 test=0;

24
hal/rtl8188e_dm.c
View file

@ -41,19 +41,19 @@
static void static void
dm_CheckProtection( dm_CheckProtection(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
} }
static void static void
dm_CheckStatistics( dm_CheckStatistics(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
} }
static void dm_CheckPbcGPIO(_adapter *padapter) static void dm_CheckPbcGPIO(struct adapter *padapter)
{ {
u8 tmp1byte; u8 tmp1byte;
u8 bPbcPressed = false; u8 bPbcPressed = false;
@ -102,7 +102,7 @@ static void dm_CheckPbcGPIO(_adapter *padapter)
/* */ /* */
static void static void
dm_InitGPIOSetting( dm_InitGPIOSetting(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
@ -127,7 +127,7 @@ dm_InitGPIOSetting(
/* */ /* */
/* functions */ /* functions */
/* */ /* */
static void Init_ODM_ComInfo_88E(PADAPTER Adapter) static void Init_ODM_ComInfo_88E(struct adapter * Adapter)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
@ -181,7 +181,7 @@ static void Init_ODM_ComInfo_88E(PADAPTER Adapter)
ODM_CmnInfoUpdate(pDM_Odm,ODM_CMNINFO_ABILITY,pdmpriv->InitODMFlag); 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_ext_priv *pmlmeext = &Adapter->mlmeextpriv;
struct mlme_priv *pmlmepriv = &Adapter->mlmepriv; struct mlme_priv *pmlmepriv = &Adapter->mlmepriv;
@ -233,7 +233,7 @@ static void Update_ODM_ComInfo_88E(PADAPTER Adapter)
void void
rtl8188e_InitHalDm( rtl8188e_InitHalDm(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
@ -256,7 +256,7 @@ rtl8188e_InitHalDm(
void void
rtl8188e_HalDmWatchDog( rtl8188e_HalDmWatchDog(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
bool bFwCurrentInPSMode = false; bool bFwCurrentInPSMode = false;
@ -322,7 +322,7 @@ skip_dm:
return; return;
} }
void rtl8188e_init_dm_priv(PADAPTER Adapter) void rtl8188e_init_dm_priv(struct adapter * Adapter)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
struct dm_priv *pdmpriv = &pHalData->dmpriv; struct dm_priv *pdmpriv = &pHalData->dmpriv;
@ -332,7 +332,7 @@ void rtl8188e_init_dm_priv(PADAPTER Adapter)
ODM_InitDebugSetting(podmpriv); ODM_InitDebugSetting(podmpriv);
} }
void rtl8188e_deinit_dm_priv(PADAPTER Adapter) void rtl8188e_deinit_dm_priv(struct adapter * Adapter)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
struct dm_priv *pdmpriv = &pHalData->dmpriv; struct dm_priv *pdmpriv = &pHalData->dmpriv;
@ -342,7 +342,7 @@ void rtl8188e_deinit_dm_priv(PADAPTER Adapter)
/* Add new function to reset the state of antenna diversity before link. */ /* Add new function to reset the state of antenna diversity before link. */
/* */ /* */
/* Compare RSSI for deciding antenna */ /* Compare RSSI for deciding antenna */
void AntDivCompare8188E(PADAPTER Adapter, struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src) void AntDivCompare8188E(struct adapter * Adapter, struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
if (0 != pHalData->AntDivCfg) { if (0 != pHalData->AntDivCfg) {
@ -356,7 +356,7 @@ void AntDivCompare8188E(PADAPTER Adapter, struct wlan_bssid_ex *dst, struct wlan
} }
/* Add new function to reset the state of antenna diversity before link. */ /* Add new function to reset the state of antenna diversity before link. */
u8 AntDivBeforeLink8188E(PADAPTER Adapter ) u8 AntDivBeforeLink8188E(struct adapter * Adapter )
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);

168
hal/rtl8188e_hal_init.c
View file

@ -28,7 +28,7 @@
#include <usb_ops.h> #include <usb_ops.h>
static void iol_mode_enable(PADAPTER padapter, u8 enable) static void iol_mode_enable(struct adapter * padapter, u8 enable)
{ {
u8 reg_0xf0 = 0; u8 reg_0xf0 = 0;
@ -50,7 +50,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; s32 status = _FAIL;
u8 reg_0x88 = 0,reg_1c7=0; u8 reg_0x88 = 0,reg_1c7=0;
@ -73,7 +73,7 @@ static s32 iol_execute(PADAPTER padapter, u8 control)
} }
static s32 iol_InitLLTTable( static s32 iol_InitLLTTable(
PADAPTER padapter, struct adapter * padapter,
u8 txpktbuf_bndy u8 txpktbuf_bndy
) )
{ {
@ -212,7 +212,7 @@ exit:
} }
static void efuse_read_phymap_from_txpktbuf( static 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. */ int bcnhead, /* beacon head, where FW store len(2-byte) and efuse physical map. */
u8 *content, /* buffer to store 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 */ u16 *size /* for efuse content: the max byte to read. will update to byte read */
@ -294,7 +294,7 @@ static void efuse_read_phymap_from_txpktbuf(
} }
static s32 iol_read_efuse( static s32 iol_read_efuse(
PADAPTER padapter, struct adapter * padapter,
u8 txpktbuf_bndy, u8 txpktbuf_bndy,
u16 offset, u16 offset,
u16 size_byte, u16 size_byte,
@ -317,7 +317,7 @@ static s32 iol_read_efuse(
return status; return status;
} }
s32 rtl8188e_iol_efuse_patch(PADAPTER padapter) s32 rtl8188e_iol_efuse_patch(struct adapter * padapter)
{ {
s32 result = _SUCCESS; s32 result = _SUCCESS;
@ -334,7 +334,7 @@ s32 rtl8188e_iol_efuse_patch(PADAPTER padapter)
} }
static s32 iol_ioconfig( static s32 iol_ioconfig(
PADAPTER padapter, struct adapter * padapter,
u8 iocfg_bndy u8 iocfg_bndy
) )
{ {
@ -346,7 +346,7 @@ static s32 iol_ioconfig(
return rst; return rst;
} }
static int rtl8188e_IOL_exec_cmds_sync(ADAPTER *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms,u32 bndy_cnt) static 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(); u32 start_time = rtw_get_current_time();
@ -381,7 +381,7 @@ exit:
return ret; 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 fifo_data,reg_140;
u32 addr,rstatus,loop=0; u32 addr,rstatus,loop=0;
@ -413,7 +413,7 @@ void rtw_IOL_cmd_tx_pkt_buf_dump(ADAPTER *Adapter,int data_len)
DBG_88E("###### %s ######\n",__func__); DBG_88E("###### %s ######\n",__func__);
} }
static void _FWDownloadEnable(PADAPTER padapter, bool enable) static void _FWDownloadEnable(struct adapter * padapter, bool enable)
{ {
u8 tmp; u8 tmp;
@ -437,7 +437,7 @@ static void _FWDownloadEnable(PADAPTER padapter, bool enable)
#define MAX_REG_BOLCK_SIZE 196 #define MAX_REG_BOLCK_SIZE 196
static int _BlockWrite(PADAPTER padapter, void *buffer, u32 buffSize) static int _BlockWrite(struct adapter * padapter, void *buffer, u32 buffSize)
{ {
int ret = _SUCCESS; int ret = _SUCCESS;
u32 blockSize_p1 = 4; /* (Default) Phase #1 : PCI muse use 4-byte write to download FW */ u32 blockSize_p1 = 4; /* (Default) Phase #1 : PCI muse use 4-byte write to download FW */
@ -510,7 +510,7 @@ exit:
return ret; return ret;
} }
static int _PageWrite(PADAPTER padapter, u32 page, void *buffer, u32 size) static int _PageWrite(struct adapter * padapter, u32 page, void *buffer, u32 size)
{ {
u8 value8; u8 value8;
u8 u8Page = (u8) (page & 0x07) ; u8 u8Page = (u8) (page & 0x07) ;
@ -537,7 +537,7 @@ static void _FillDummy(u8 *pFwBuf, u32 *pFwLen)
*pFwLen = FwLen; *pFwLen = FwLen;
} }
static int _WriteFW(PADAPTER padapter, void *buffer, u32 size) static int _WriteFW(struct adapter * padapter, void *buffer, u32 size)
{ {
/* Since we need dynamic decide method of dwonload fw, so we call this function to get chip version. */ /* Since we need dynamic decide method of dwonload fw, so we call this function to get chip version. */
/* We can remove _ReadChipVersion from ReadpadapterInfo8192C later. */ /* We can remove _ReadChipVersion from ReadpadapterInfo8192C later. */
@ -569,7 +569,7 @@ exit:
return ret; return ret;
} }
void _8051Reset88E(PADAPTER padapter) void _8051Reset88E(struct adapter * padapter)
{ {
u8 u1bTmp; u8 u1bTmp;
@ -579,7 +579,7 @@ void _8051Reset88E(PADAPTER padapter)
DBG_88E("=====> _8051Reset88E(): 8051 reset success .\n"); DBG_88E("=====> _8051Reset88E(): 8051 reset success .\n");
} }
static s32 _FWFreeToGo(PADAPTER padapter) static s32 _FWFreeToGo(struct adapter * padapter)
{ {
u32 counter = 0; u32 counter = 0;
u32 value32; u32 value32;
@ -631,9 +631,9 @@ u8 FwBuffer8188E[FW_8188E_SIZE];
/* Download 8192C firmware code. */ /* Download 8192C firmware code. */
/* */ /* */
/* */ /* */
s32 rtl8188e_FirmwareDownload(PADAPTER padapter, bool bUsedWoWLANFw) s32 rtl8188e_FirmwareDownload(struct adapter * padapter, bool bUsedWoWLANFw)
#else #else
s32 rtl8188e_FirmwareDownload(PADAPTER padapter) s32 rtl8188e_FirmwareDownload(struct adapter * padapter)
#endif #endif
{ {
s32 rtStatus = _SUCCESS; s32 rtStatus = _SUCCESS;
@ -798,7 +798,7 @@ Exit:
} }
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
void rtl8188e_InitializeFirmwareVars(PADAPTER padapter) void rtl8188e_InitializeFirmwareVars(struct adapter * padapter)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
struct pwrctrl_priv *pwrpriv; struct pwrctrl_priv *pwrpriv;
@ -822,7 +822,7 @@ void rtl8188e_InitializeFirmwareVars(PADAPTER padapter)
/* */ /* */
void void
SetFwRelatedForWoWLAN8188ES( SetFwRelatedForWoWLAN8188ES(
PADAPTER padapter, struct adapter * padapter,
u8 bHostIsGoingtoSleep u8 bHostIsGoingtoSleep
) )
{ {
@ -845,7 +845,7 @@ SetFwRelatedForWoWLAN8188ES(
rtl8188e_InitializeFirmwareVars(padapter); rtl8188e_InitializeFirmwareVars(padapter);
} }
#else #else
void rtl8188e_InitializeFirmwareVars(PADAPTER padapter) void rtl8188e_InitializeFirmwareVars(struct adapter * padapter)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
@ -857,7 +857,7 @@ void rtl8188e_InitializeFirmwareVars(PADAPTER padapter)
} }
#endif /* CONFIG_WOWLAN */ #endif /* CONFIG_WOWLAN */
static void rtl8188e_free_hal_data(PADAPTER padapter) static void rtl8188e_free_hal_data(struct adapter * padapter)
{ {
_func_enter_; _func_enter_;
if (padapter->HalData) { if (padapter->HalData) {
@ -877,21 +877,21 @@ enum{
static bool static bool
hal_EfusePgPacketWrite2ByteHeader( hal_EfusePgPacketWrite2ByteHeader(
PADAPTER pAdapter, struct adapter * pAdapter,
u8 efuseType, u8 efuseType,
u16 *pAddr, u16 *pAddr,
struct pgpkt *pTargetPkt, struct pgpkt *pTargetPkt,
bool bPseudoTest); bool bPseudoTest);
static bool static bool
hal_EfusePgPacketWrite1ByteHeader( hal_EfusePgPacketWrite1ByteHeader(
PADAPTER pAdapter, struct adapter * pAdapter,
u8 efuseType, u8 efuseType,
u16 *pAddr, u16 *pAddr,
struct pgpkt *pTargetPkt, struct pgpkt *pTargetPkt,
bool bPseudoTest); bool bPseudoTest);
static bool static bool
hal_EfusePgPacketWriteData( hal_EfusePgPacketWriteData(
PADAPTER pAdapter, struct adapter * pAdapter,
u8 efuseType, u8 efuseType,
u16 *pAddr, u16 *pAddr,
struct pgpkt *pTargetPkt, struct pgpkt *pTargetPkt,
@ -899,7 +899,7 @@ hal_EfusePgPacketWriteData(
static void static void
hal_EfusePowerSwitch_RTL8188E( hal_EfusePowerSwitch_RTL8188E(
PADAPTER pAdapter, struct adapter * pAdapter,
u8 bWrite, u8 bWrite,
u8 PwrState) u8 PwrState)
{ {
@ -953,7 +953,7 @@ hal_EfusePowerSwitch_RTL8188E(
static void static void
rtl8188e_EfusePowerSwitch( rtl8188e_EfusePowerSwitch(
PADAPTER pAdapter, struct adapter * pAdapter,
u8 bWrite, u8 bWrite,
u8 PwrState) u8 PwrState)
{ {
@ -963,7 +963,7 @@ rtl8188e_EfusePowerSwitch(
static bool efuse_read_phymap( static bool efuse_read_phymap(
PADAPTER Adapter, struct adapter * Adapter,
u8 *pbuf, /* buffer to store efuse physical map */ u8 *pbuf, /* buffer to store efuse physical map */
u16 *size /* the max byte to read. will update to byte read */ u16 *size /* the max byte to read. will update to byte read */
) )
@ -1005,7 +1005,7 @@ static bool efuse_read_phymap(
static void static void
Hal_EfuseReadEFuse88E( Hal_EfuseReadEFuse88E(
PADAPTER Adapter, struct adapter * Adapter,
u16 _offset, u16 _offset,
u16 _size_byte, u16 _size_byte,
u8 *pbuf, u8 *pbuf,
@ -1185,7 +1185,7 @@ exit:
static bool static bool
Hal_EfuseSwitchToBank( Hal_EfuseSwitchToBank(
PADAPTER pAdapter, struct adapter * pAdapter,
u8 bank, u8 bank,
bool bPseudoTest bool bPseudoTest
) )
@ -1234,7 +1234,7 @@ Hal_EfuseSwitchToBank(
static void ReadEFuseByIC(PADAPTER Adapter, u8 efuseType, u16 _offset, u16 _size_byte, u8 *pbuf, bool bPseudoTest) static void ReadEFuseByIC(struct adapter * Adapter, u8 efuseType, u16 _offset, u16 _size_byte, u8 *pbuf, bool bPseudoTest)
{ {
if (!bPseudoTest )/* rtw_IOL_applied(Adapter)) */ if (!bPseudoTest )/* rtw_IOL_applied(Adapter)) */
{ {
@ -1259,7 +1259,7 @@ exit:
static void static void
ReadEFuse_Pseudo ( ReadEFuse_Pseudo (
PADAPTER Adapter, struct adapter * Adapter,
u8 efuseType, u8 efuseType,
u16 _offset, u16 _offset,
u16 _size_byte, u16 _size_byte,
@ -1272,7 +1272,7 @@ ReadEFuse_Pseudo (
static void static void
rtl8188e_ReadEFuse( rtl8188e_ReadEFuse(
PADAPTER Adapter, struct adapter * Adapter,
u8 efuseType, u8 efuseType,
u16 _offset, u16 _offset,
u16 _size_byte, u16 _size_byte,
@ -1293,7 +1293,7 @@ rtl8188e_ReadEFuse(
/* Do not support BT */ /* Do not support BT */
static void static void
Hal_EFUSEGetEfuseDefinition88E( Hal_EFUSEGetEfuseDefinition88E(
PADAPTER pAdapter, struct adapter * pAdapter,
u1Byte efuseType, u1Byte efuseType,
u1Byte type, u1Byte type,
void * pOut void * pOut
@ -1361,7 +1361,7 @@ Hal_EFUSEGetEfuseDefinition88E(
} }
static void Hal_EFUSEGetEfuseDefinition_Pseudo88E( static void Hal_EFUSEGetEfuseDefinition_Pseudo88E(
PADAPTER pAdapter, struct adapter * pAdapter,
u8 efuseType, u8 efuseType,
u8 type, u8 type,
void * pOut void * pOut
@ -1431,7 +1431,7 @@ static void Hal_EFUSEGetEfuseDefinition_Pseudo88E(
static void static void
rtl8188e_EFUSE_GetEfuseDefinition( rtl8188e_EFUSE_GetEfuseDefinition(
PADAPTER pAdapter, struct adapter * pAdapter,
u8 efuseType, u8 efuseType,
u8 type, u8 type,
void *pOut, void *pOut,
@ -1449,7 +1449,7 @@ rtl8188e_EFUSE_GetEfuseDefinition(
} }
static u8 static u8
Hal_EfuseWordEnableDataWrite( PADAPTER pAdapter, Hal_EfuseWordEnableDataWrite( struct adapter * pAdapter,
u16 efuse_addr, u16 efuse_addr,
u8 word_en, u8 word_en,
u8 *data, u8 *data,
@ -1514,7 +1514,7 @@ Hal_EfuseWordEnableDataWrite( PADAPTER pAdapter,
} }
static u8 static u8
Hal_EfuseWordEnableDataWrite_Pseudo ( PADAPTER pAdapter, Hal_EfuseWordEnableDataWrite_Pseudo ( struct adapter * pAdapter,
u16 efuse_addr, u16 efuse_addr,
u8 word_en, u8 word_en,
u8 *data, u8 *data,
@ -1528,7 +1528,7 @@ Hal_EfuseWordEnableDataWrite_Pseudo ( PADAPTER pAdapter,
} }
static u8 static u8
rtl8188e_Efuse_WordEnableDataWrite( PADAPTER pAdapter, rtl8188e_Efuse_WordEnableDataWrite( struct adapter * pAdapter,
u16 efuse_addr, u16 efuse_addr,
u8 word_en, u8 word_en,
u8 *data, u8 *data,
@ -1550,7 +1550,7 @@ rtl8188e_Efuse_WordEnableDataWrite( PADAPTER pAdapter,
static u16 static u16
hal_EfuseGetCurrentSize_8188e( PADAPTER pAdapter, hal_EfuseGetCurrentSize_8188e( struct adapter * pAdapter,
bool bPseudoTest) bool bPseudoTest)
{ {
int bContinual = true; int bContinual = true;
@ -1618,7 +1618,7 @@ hal_EfuseGetCurrentSize_8188e( PADAPTER pAdapter,
} }
static u16 static u16
Hal_EfuseGetCurrentSize_Pseudo ( PADAPTER pAdapter, Hal_EfuseGetCurrentSize_Pseudo ( struct adapter * pAdapter,
bool bPseudoTest) bool bPseudoTest)
{ {
u16 ret=0; u16 ret=0;
@ -1631,7 +1631,7 @@ Hal_EfuseGetCurrentSize_Pseudo ( PADAPTER pAdapter,
static u16 static u16
rtl8188e_EfuseGetCurrentSize( rtl8188e_EfuseGetCurrentSize(
PADAPTER pAdapter, struct adapter * pAdapter,
u8 efuseType, u8 efuseType,
bool bPseudoTest) bool bPseudoTest)
{ {
@ -1653,7 +1653,7 @@ rtl8188e_EfuseGetCurrentSize(
static int static int
hal_EfusePgPacketRead_8188e( hal_EfusePgPacketRead_8188e(
PADAPTER pAdapter, struct adapter * pAdapter,
u8 offset, u8 offset,
u8 *data, u8 *data,
bool bPseudoTest) bool bPseudoTest)
@ -1768,7 +1768,7 @@ hal_EfusePgPacketRead_8188e(
} }
static int static int
Hal_EfusePgPacketRead( PADAPTER pAdapter, Hal_EfusePgPacketRead( struct adapter * pAdapter,
u8 offset, u8 offset,
u8 *data, u8 *data,
bool bPseudoTest) bool bPseudoTest)
@ -1782,7 +1782,7 @@ Hal_EfusePgPacketRead( PADAPTER pAdapter,
} }
static int static int
Hal_EfusePgPacketRead_Pseudo ( PADAPTER pAdapter, Hal_EfusePgPacketRead_Pseudo ( struct adapter * pAdapter,
u8 offset, u8 offset,
u8 *data, u8 *data,
bool bPseudoTest) bool bPseudoTest)
@ -1795,7 +1795,7 @@ Hal_EfusePgPacketRead_Pseudo ( PADAPTER pAdapter,
} }
static int static int
rtl8188e_Efuse_PgPacketRead( PADAPTER pAdapter, rtl8188e_Efuse_PgPacketRead( struct adapter * pAdapter,
u8 offset, u8 offset,
u8 *data, u8 *data,
bool bPseudoTest) bool bPseudoTest)
@ -1816,7 +1816,7 @@ rtl8188e_Efuse_PgPacketRead( PADAPTER pAdapter,
static bool static bool
hal_EfuseFixHeaderProcess( hal_EfuseFixHeaderProcess(
PADAPTER pAdapter, struct adapter * pAdapter,
u8 efuseType, u8 efuseType,
struct pgpkt *pFixPkt, struct pgpkt *pFixPkt,
u16 *pAddr, u16 *pAddr,
@ -1857,7 +1857,7 @@ hal_EfuseFixHeaderProcess(
static bool static bool
hal_EfusePgPacketWrite2ByteHeader( hal_EfusePgPacketWrite2ByteHeader(
PADAPTER pAdapter, struct adapter * pAdapter,
u8 efuseType, u8 efuseType,
u16 *pAddr, u16 *pAddr,
struct pgpkt *pTargetPkt, struct pgpkt *pTargetPkt,
@ -1948,7 +1948,7 @@ hal_EfusePgPacketWrite2ByteHeader(
static bool static bool
hal_EfusePgPacketWrite1ByteHeader( hal_EfusePgPacketWrite1ByteHeader(
PADAPTER pAdapter, struct adapter * pAdapter,
u8 efuseType, u8 efuseType,
u16 *pAddr, u16 *pAddr,
struct pgpkt *pTargetPkt, struct pgpkt *pTargetPkt,
@ -1994,7 +1994,7 @@ hal_EfusePgPacketWrite1ByteHeader(
static bool static bool
hal_EfusePgPacketWriteData( hal_EfusePgPacketWriteData(
PADAPTER pAdapter, struct adapter * pAdapter,
u8 efuseType, u8 efuseType,
u16 *pAddr, u16 *pAddr,
struct pgpkt *pTargetPkt, struct pgpkt *pTargetPkt,
@ -2029,7 +2029,7 @@ hal_EfusePgPacketWriteData(
static bool static bool
hal_EfusePgPacketWriteHeader( hal_EfusePgPacketWriteHeader(
PADAPTER pAdapter, struct adapter * pAdapter,
u8 efuseType, u8 efuseType,
u16 *pAddr, u16 *pAddr,
struct pgpkt *pTargetPkt, struct pgpkt *pTargetPkt,
@ -2091,7 +2091,7 @@ wordEnMatched(
static bool static bool
hal_EfuseCheckIfDatafollowed( hal_EfuseCheckIfDatafollowed(
PADAPTER pAdapter, struct adapter * pAdapter,
u8 word_cnts, u8 word_cnts,
u16 startAddr, u16 startAddr,
bool bPseudoTest bool bPseudoTest
@ -2111,7 +2111,7 @@ hal_EfuseCheckIfDatafollowed(
static bool static bool
hal_EfusePartialWriteCheck( hal_EfusePartialWriteCheck(
PADAPTER pAdapter, struct adapter * pAdapter,
u8 efuseType, u8 efuseType,
u16 *pAddr, u16 *pAddr,
struct pgpkt *pTargetPkt, struct pgpkt *pTargetPkt,
@ -2232,7 +2232,7 @@ hal_EfusePartialWriteCheck(
static bool static bool
hal_EfusePgCheckAvailableAddr( hal_EfusePgCheckAvailableAddr(
PADAPTER pAdapter, struct adapter * pAdapter,
u8 efuseType, u8 efuseType,
bool bPseudoTest bool bPseudoTest
) )
@ -2269,7 +2269,7 @@ hal_EfuseConstructPGPkt(
static bool static bool
hal_EfusePgPacketWrite_BT( hal_EfusePgPacketWrite_BT(
PADAPTER pAdapter, struct adapter * pAdapter,
u8 offset, u8 offset,
u8 word_en, u8 word_en,
u8 *pData, u8 *pData,
@ -2299,7 +2299,7 @@ hal_EfusePgPacketWrite_BT(
static bool static bool
hal_EfusePgPacketWrite_8188e( hal_EfusePgPacketWrite_8188e(
PADAPTER pAdapter, struct adapter * pAdapter,
u8 offset, u8 offset,
u8 word_en, u8 word_en,
u8 *pData, u8 *pData,
@ -2329,7 +2329,7 @@ hal_EfusePgPacketWrite_8188e(
static int static int
Hal_EfusePgPacketWrite_Pseudo ( PADAPTER pAdapter, Hal_EfusePgPacketWrite_Pseudo ( struct adapter * pAdapter,
u8 offset, u8 offset,
u8 word_en, u8 word_en,
u8 *data, u8 *data,
@ -2343,7 +2343,7 @@ Hal_EfusePgPacketWrite_Pseudo ( PADAPTER pAdapter,
} }
static int static int
Hal_EfusePgPacketWrite( PADAPTER pAdapter, Hal_EfusePgPacketWrite( struct adapter * pAdapter,
u8 offset, u8 offset,
u8 word_en, u8 word_en,
u8 *data, u8 *data,
@ -2357,7 +2357,7 @@ Hal_EfusePgPacketWrite( PADAPTER pAdapter,
} }
static int static int
rtl8188e_Efuse_PgPacketWrite( PADAPTER pAdapter, rtl8188e_Efuse_PgPacketWrite( struct adapter * pAdapter,
u8 offset, u8 offset,
u8 word_en, u8 word_en,
u8 *data, u8 *data,
@ -2376,7 +2376,7 @@ rtl8188e_Efuse_PgPacketWrite( PADAPTER pAdapter,
return ret; return ret;
} }
static struct HAL_VERSION ReadChipVersion8188E(PADAPTER padapter) static struct HAL_VERSION ReadChipVersion8188E(struct adapter * padapter)
{ {
u32 value32; u32 value32;
struct HAL_VERSION ChipVersion; struct HAL_VERSION ChipVersion;
@ -2421,13 +2421,13 @@ static struct HAL_VERSION ReadChipVersion8188E(PADAPTER padapter)
return ChipVersion; return ChipVersion;
} }
static void rtl8188e_read_chip_version(PADAPTER padapter) static void rtl8188e_read_chip_version(struct adapter * padapter)
{ {
ReadChipVersion8188E(padapter); ReadChipVersion8188E(padapter);
} }
static void rtl8188e_GetHalODMVar( static void rtl8188e_GetHalODMVar(
PADAPTER Adapter, struct adapter * Adapter,
enum hal_odm_variable eVariable, enum hal_odm_variable eVariable,
void * pValue1, void * pValue1,
bool bSet) bool bSet)
@ -2442,7 +2442,7 @@ static void rtl8188e_GetHalODMVar(
} }
} }
static void rtl8188e_SetHalODMVar( static void rtl8188e_SetHalODMVar(
PADAPTER Adapter, struct adapter * Adapter,
enum hal_odm_variable eVariable, enum hal_odm_variable eVariable,
void * pValue1, void * pValue1,
bool bSet) bool bSet)
@ -2477,20 +2477,20 @@ static void rtl8188e_SetHalODMVar(
} }
} }
void rtl8188e_clone_haldata(_adapter* dst_adapter, _adapter* src_adapter) void rtl8188e_clone_haldata(struct adapter* dst_adapter, struct adapter* src_adapter)
{ {
_rtw_memcpy(dst_adapter->HalData, src_adapter->HalData, dst_adapter->hal_data_sz); _rtw_memcpy(dst_adapter->HalData, src_adapter->HalData, dst_adapter->hal_data_sz);
} }
void rtl8188e_start_thread(_adapter *padapter) void rtl8188e_start_thread(struct adapter *padapter)
{ {
} }
void rtl8188e_stop_thread(_adapter *padapter) void rtl8188e_stop_thread(struct adapter *padapter)
{ {
} }
static void hal_notch_filter_8188e(_adapter *adapter, bool enable) static void hal_notch_filter_8188e(struct adapter *adapter, bool enable)
{ {
if (enable) { if (enable) {
DBG_88E("Enable notch filter\n"); DBG_88E("Enable notch filter\n");
@ -2550,7 +2550,7 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)
pHalFunc->hal_notch_filter = &hal_notch_filter_8188e; pHalFunc->hal_notch_filter = &hal_notch_filter_8188e;
} }
u8 GetEEPROMSize8188E(PADAPTER padapter) u8 GetEEPROMSize8188E(struct adapter * padapter)
{ {
u8 size = 0; u8 size = 0;
u32 cr; u32 cr;
@ -2569,7 +2569,7 @@ u8 GetEEPROMSize8188E(PADAPTER padapter)
/* LLT R/W/Init function */ /* LLT R/W/Init function */
/* */ /* */
/* */ /* */
static s32 _LLTWrite(PADAPTER padapter, u32 address, u32 data) static s32 _LLTWrite(struct adapter * padapter, u32 address, u32 data)
{ {
s32 status = _SUCCESS; s32 status = _SUCCESS;
s32 count = 0; s32 count = 0;
@ -2596,7 +2596,7 @@ static s32 _LLTWrite(PADAPTER padapter, u32 address, u32 data)
return status; return status;
} }
s32 InitLLTTable(PADAPTER padapter, u8 txpktbuf_bndy) s32 InitLLTTable(struct adapter * padapter, u8 txpktbuf_bndy)
{ {
s32 status = _FAIL; s32 status = _FAIL;
u32 i; u32 i;
@ -2640,7 +2640,7 @@ s32 InitLLTTable(PADAPTER padapter, u8 txpktbuf_bndy)
} }
void void
Hal_InitPGData88E(PADAPTER padapter) Hal_InitPGData88E(struct adapter * padapter)
{ {
struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter); struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter);
u32 i; u32 i;
@ -2662,7 +2662,7 @@ Hal_InitPGData88E(PADAPTER padapter)
void void
Hal_EfuseParseIDCode88E( Hal_EfuseParseIDCode88E(
PADAPTER padapter, struct adapter * padapter,
u8 *hwinfo u8 *hwinfo
) )
{ {
@ -2914,7 +2914,7 @@ static u8 Hal_GetChnlGroup88E(u8 chnl, u8 *pGroup)
return bIn24G; return bIn24G;
} }
void Hal_ReadPowerSavingMode88E(PADAPTER padapter, u8 *hwinfo, bool AutoLoadFail) void Hal_ReadPowerSavingMode88E(struct adapter * padapter, u8 *hwinfo, bool AutoLoadFail)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv;
@ -2948,7 +2948,7 @@ void Hal_ReadPowerSavingMode88E(PADAPTER padapter, u8 *hwinfo, bool AutoLoadFail
void void
Hal_ReadTxPowerInfo88E( Hal_ReadTxPowerInfo88E(
PADAPTER padapter, struct adapter * padapter,
u8* PROMContent, u8* PROMContent,
bool AutoLoadFail bool AutoLoadFail
) )
@ -3022,7 +3022,7 @@ Hal_ReadTxPowerInfo88E(
void void
Hal_EfuseParseXtal_8188E( Hal_EfuseParseXtal_8188E(
PADAPTER pAdapter, struct adapter * pAdapter,
u8* hwinfo, u8* hwinfo,
bool AutoLoadFail bool AutoLoadFail
) )
@ -3044,7 +3044,7 @@ Hal_EfuseParseXtal_8188E(
void void
Hal_EfuseParseBoardType88E( Hal_EfuseParseBoardType88E(
PADAPTER pAdapter, struct adapter * pAdapter,
u8* hwinfo, u8* hwinfo,
bool AutoLoadFail bool AutoLoadFail
) )
@ -3060,7 +3060,7 @@ Hal_EfuseParseBoardType88E(
void void
Hal_EfuseParseEEPROMVer88E( Hal_EfuseParseEEPROMVer88E(
PADAPTER padapter, struct adapter * padapter,
u8* hwinfo, u8* hwinfo,
bool AutoLoadFail bool AutoLoadFail
) )
@ -3081,7 +3081,7 @@ Hal_EfuseParseEEPROMVer88E(
void void
rtl8188e_EfuseParseChnlPlan( rtl8188e_EfuseParseChnlPlan(
PADAPTER padapter, struct adapter * padapter,
u8* hwinfo, u8* hwinfo,
bool AutoLoadFail bool AutoLoadFail
) )
@ -3099,7 +3099,7 @@ rtl8188e_EfuseParseChnlPlan(
void void
Hal_EfuseParseCustomerID88E( Hal_EfuseParseCustomerID88E(
PADAPTER padapter, struct adapter * padapter,
u8* hwinfo, u8* hwinfo,
bool AutoLoadFail bool AutoLoadFail
) )
@ -3121,7 +3121,7 @@ Hal_EfuseParseCustomerID88E(
void void
Hal_ReadAntennaDiversity88E( Hal_ReadAntennaDiversity88E(
PADAPTER pAdapter, struct adapter * pAdapter,
u8* PROMContent, u8* PROMContent,
bool AutoLoadFail bool AutoLoadFail
) )
@ -3169,7 +3169,7 @@ Hal_ReadAntennaDiversity88E(
void void
Hal_ReadThermalMeter_88E( Hal_ReadThermalMeter_88E(
PADAPTER Adapter, struct adapter * Adapter,
u8* PROMContent, u8* PROMContent,
bool AutoloadFail bool AutoloadFail
) )
@ -3198,12 +3198,12 @@ Hal_ReadThermalMeter_88E(
void void
Hal_InitChannelPlan( Hal_InitChannelPlan(
PADAPTER padapter struct adapter * padapter
) )
{ {
} }
bool HalDetectPwrDownMode88E(PADAPTER Adapter) bool HalDetectPwrDownMode88E(struct adapter * Adapter)
{ {
u8 tmpvalue = 0; u8 tmpvalue = 0;
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
@ -3227,7 +3227,7 @@ bool HalDetectPwrDownMode88E(PADAPTER Adapter)
} /* HalDetectPwrDownMode */ } /* HalDetectPwrDownMode */
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
void Hal_DetectWoWMode(PADAPTER pAdapter) void Hal_DetectWoWMode(struct adapter * pAdapter)
{ {
pAdapter->pwrctrlpriv.bSupportRemoteWakeup = true; pAdapter->pwrctrlpriv.bSupportRemoteWakeup = true;
DBG_88E("%s\n", __func__); DBG_88E("%s\n", __func__);
@ -3241,7 +3241,7 @@ void Hal_DetectWoWMode(PADAPTER pAdapter)
/* The value of pHalData->RegBcnCtrlVal is initialized in HwConfigureRTL8192CE() function. */ /* The value of pHalData->RegBcnCtrlVal is initialized in HwConfigureRTL8192CE() function. */
void SetBcnCtrlReg( void SetBcnCtrlReg(
PADAPTER padapter, struct adapter * padapter,
u8 SetBits, u8 SetBits,
u8 ClearBits) u8 ClearBits)
{ {

50
hal/rtl8188e_mp.c
View file

@ -26,7 +26,7 @@
#include <rtl8188e_dm.h> #include <rtl8188e_dm.h>
s32 Hal_SetPowerTracking(PADAPTER padapter, u8 enable) s32 Hal_SetPowerTracking(struct adapter * padapter, u8 enable)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
@ -54,7 +54,7 @@ s32 Hal_SetPowerTracking(PADAPTER padapter, u8 enable)
return _SUCCESS; return _SUCCESS;
} }
void Hal_GetPowerTracking(PADAPTER padapter, u8 *enable) void Hal_GetPowerTracking(struct adapter * padapter, u8 *enable)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
@ -65,7 +65,7 @@ void Hal_GetPowerTracking(PADAPTER padapter, u8 *enable)
*enable = pDM_Odm->RFCalibrateInfo.TxPowerTrackControl; *enable = pDM_Odm->RFCalibrateInfo.TxPowerTrackControl;
} }
static void Hal_disable_dm(PADAPTER padapter) static void Hal_disable_dm(struct adapter * padapter)
{ {
u8 v8; u8 v8;
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
@ -96,7 +96,7 @@ static void Hal_disable_dm(PADAPTER padapter)
* *
* Overview: Change RF Setting when we siwthc channel/rate/BW for MP. * Overview: Change RF Setting when we siwthc channel/rate/BW for MP.
* *
* Input: PADAPTER pAdapter * Input: struct adapter * pAdapter
* *
* Output: NONE * Output: NONE
* *
@ -108,7 +108,7 @@ static void Hal_disable_dm(PADAPTER padapter)
* 01/09/2009 MHC Add CCK modification for 40MHZ. Suggestion from SD3. * 01/09/2009 MHC Add CCK modification for 40MHZ. Suggestion from SD3.
* *
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
void Hal_mpt_SwitchRfSetting(PADAPTER pAdapter) void Hal_mpt_SwitchRfSetting(struct adapter * pAdapter)
{ {
/* struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter); */ /* struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter); */
struct mp_priv *pmp = &pAdapter->mppriv; struct mp_priv *pmp = &pAdapter->mppriv;
@ -128,7 +128,7 @@ void Hal_mpt_SwitchRfSetting(PADAPTER pAdapter)
/*---------------------------hal\rtl8192c\MPT_Phy.c---------------------------*/ /*---------------------------hal\rtl8192c\MPT_Phy.c---------------------------*/
/*---------------------------hal\rtl8192c\MPT_HelperFunc.c---------------------------*/ /*---------------------------hal\rtl8192c\MPT_HelperFunc.c---------------------------*/
void Hal_MPT_CCKTxPowerAdjust(PADAPTER Adapter, bool bInCH14) void Hal_MPT_CCKTxPowerAdjust(struct adapter * Adapter, bool bInCH14)
{ {
u32 TempVal = 0, TempVal2 = 0, TempVal3 = 0; u32 TempVal = 0, TempVal2 = 0, TempVal3 = 0;
u32 CurrCCKSwingVal = 0, CCKSwingIndex = 12; u32 CurrCCKSwingVal = 0, CCKSwingIndex = 12;
@ -204,7 +204,7 @@ void Hal_MPT_CCKTxPowerAdjust(PADAPTER Adapter, bool bInCH14)
write_bbreg(Adapter, rCCK0_DebugPort, bMaskLWord, TempVal3); write_bbreg(Adapter, rCCK0_DebugPort, bMaskLWord, TempVal3);
} }
void Hal_MPT_CCKTxPowerAdjustbyIndex(PADAPTER pAdapter, bool beven) void Hal_MPT_CCKTxPowerAdjustbyIndex(struct adapter * pAdapter, bool beven)
{ {
s32 TempCCk; s32 TempCCk;
u8 CCK_index, CCK_index_old; u8 CCK_index, CCK_index_old;
@ -290,7 +290,7 @@ void Hal_MPT_CCKTxPowerAdjustbyIndex(PADAPTER pAdapter, bool beven)
* Use H2C command to change channel, * Use H2C command to change channel,
* not only modify rf register, but also other setting need to be done. * not only modify rf register, but also other setting need to be done.
*/ */
void Hal_SetChannel(PADAPTER pAdapter) void Hal_SetChannel(struct adapter * pAdapter)
{ {
u8 eRFPath; u8 eRFPath;
@ -330,7 +330,7 @@ void Hal_SetChannel(PADAPTER pAdapter)
* Notice * Notice
* Switch bandwitdth may change center frequency(channel) * Switch bandwitdth may change center frequency(channel)
*/ */
void Hal_SetBandwidth(PADAPTER pAdapter) void Hal_SetBandwidth(struct adapter * pAdapter)
{ {
struct mp_priv *pmp = &pAdapter->mppriv; struct mp_priv *pmp = &pAdapter->mppriv;
@ -339,7 +339,7 @@ void Hal_SetBandwidth(PADAPTER pAdapter)
Hal_mpt_SwitchRfSetting(pAdapter); Hal_mpt_SwitchRfSetting(pAdapter);
} }
void Hal_SetCCKTxPower(PADAPTER pAdapter, u8 *TxPower) void Hal_SetCCKTxPower(struct adapter * pAdapter, u8 *TxPower)
{ {
u32 tmpval = 0; u32 tmpval = 0;
@ -359,7 +359,7 @@ void Hal_SetCCKTxPower(PADAPTER pAdapter, u8 *TxPower)
TxPower[RF_PATH_A], TxPower[RF_PATH_B])); TxPower[RF_PATH_A], TxPower[RF_PATH_B]));
} }
void Hal_SetOFDMTxPower(PADAPTER pAdapter, u8 *TxPower) void Hal_SetOFDMTxPower(struct adapter * pAdapter, u8 *TxPower)
{ {
u32 TxAGC = 0; u32 TxAGC = 0;
u8 tmpval = 0; u8 tmpval = 0;
@ -391,7 +391,7 @@ void Hal_SetOFDMTxPower(PADAPTER pAdapter, u8 *TxPower)
} }
void Hal_SetAntennaPathPower(PADAPTER pAdapter) void Hal_SetAntennaPathPower(struct adapter * pAdapter)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
u8 TxPowerLevel[MAX_RF_PATH_NUMS]; u8 TxPowerLevel[MAX_RF_PATH_NUMS];
@ -430,7 +430,7 @@ void Hal_SetAntennaPathPower(PADAPTER pAdapter)
} }
} }
void Hal_SetTxPower(PADAPTER pAdapter) void Hal_SetTxPower(struct adapter * pAdapter)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
u8 TxPower = pAdapter->mppriv.txpoweridx; u8 TxPower = pAdapter->mppriv.txpoweridx;
@ -473,12 +473,12 @@ void Hal_SetTxPower(PADAPTER pAdapter)
} }
} }
void Hal_SetDataRate(PADAPTER pAdapter) void Hal_SetDataRate(struct adapter * pAdapter)
{ {
Hal_mpt_SwitchRfSetting(pAdapter); Hal_mpt_SwitchRfSetting(pAdapter);
} }
void Hal_SetAntenna(PADAPTER pAdapter) void Hal_SetAntenna(struct adapter * pAdapter)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
@ -639,7 +639,7 @@ void Hal_SetAntenna(PADAPTER pAdapter)
RT_TRACE(_module_mp_, _drv_notice_, ("-SwitchAntenna: finished\n")); RT_TRACE(_module_mp_, _drv_notice_, ("-SwitchAntenna: finished\n"));
} }
s32 Hal_SetThermalMeter(PADAPTER pAdapter, u8 target_ther) s32 Hal_SetThermalMeter(struct adapter * pAdapter, u8 target_ther)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
@ -665,13 +665,13 @@ s32 Hal_SetThermalMeter(PADAPTER pAdapter, u8 target_ther)
return _SUCCESS; return _SUCCESS;
} }
void Hal_TriggerRFThermalMeter(PADAPTER pAdapter) void Hal_TriggerRFThermalMeter(struct adapter * pAdapter)
{ {
_write_rfreg( pAdapter, RF_PATH_A , RF_T_METER_88E , BIT17 |BIT16 , 0x03 ); _write_rfreg( pAdapter, RF_PATH_A , RF_T_METER_88E , BIT17 |BIT16 , 0x03 );
} }
u8 Hal_ReadRFThermalMeter(PADAPTER pAdapter) u8 Hal_ReadRFThermalMeter(struct adapter * pAdapter)
{ {
u32 ThermalValue = 0; u32 ThermalValue = 0;
@ -679,14 +679,14 @@ u8 Hal_ReadRFThermalMeter(PADAPTER pAdapter)
return (u8)ThermalValue; return (u8)ThermalValue;
} }
void Hal_GetThermalMeter(PADAPTER pAdapter, u8 *value) void Hal_GetThermalMeter(struct adapter * pAdapter, u8 *value)
{ {
Hal_TriggerRFThermalMeter(pAdapter); Hal_TriggerRFThermalMeter(pAdapter);
rtw_msleep_os(1000); rtw_msleep_os(1000);
*value = Hal_ReadRFThermalMeter(pAdapter); *value = Hal_ReadRFThermalMeter(pAdapter);
} }
void Hal_SetSingleCarrierTx(PADAPTER pAdapter, u8 bStart) void Hal_SetSingleCarrierTx(struct adapter * pAdapter, u8 bStart)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
pAdapter->mppriv.MptCtx.bSingleCarrier = bStart; pAdapter->mppriv.MptCtx.bSingleCarrier = bStart;
@ -734,7 +734,7 @@ void Hal_SetSingleCarrierTx(PADAPTER pAdapter, u8 bStart)
} }
void Hal_SetSingleToneTx(PADAPTER pAdapter, u8 bStart) void Hal_SetSingleToneTx(struct adapter * pAdapter, u8 bStart)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
bool is92C = IS_92C_SERIAL(pHalData->VersionID); bool is92C = IS_92C_SERIAL(pHalData->VersionID);
@ -834,7 +834,7 @@ void Hal_SetSingleToneTx(PADAPTER pAdapter, u8 bStart)
void Hal_SetCarrierSuppressionTx(PADAPTER pAdapter, u8 bStart) void Hal_SetCarrierSuppressionTx(struct adapter * pAdapter, u8 bStart)
{ {
pAdapter->mppriv.MptCtx.bCarrierSuppression = bStart; pAdapter->mppriv.MptCtx.bCarrierSuppression = bStart;
if (bStart) /* Start Carrier Suppression. */ if (bStart) /* Start Carrier Suppression. */
@ -882,7 +882,7 @@ void Hal_SetCarrierSuppressionTx(PADAPTER pAdapter, u8 bStart)
} }
} }
void Hal_SetCCKContinuousTx(PADAPTER pAdapter, u8 bStart) void Hal_SetCCKContinuousTx(struct adapter * pAdapter, u8 bStart)
{ {
u32 cckrate; u32 cckrate;
@ -930,7 +930,7 @@ void Hal_SetCCKContinuousTx(PADAPTER pAdapter, u8 bStart)
pAdapter->mppriv.MptCtx.bOfdmContTx = false; pAdapter->mppriv.MptCtx.bOfdmContTx = false;
}/* mpt_StartCckContTx */ }/* mpt_StartCckContTx */
void Hal_SetOFDMContinuousTx(PADAPTER pAdapter, u8 bStart) void Hal_SetOFDMContinuousTx(struct adapter * pAdapter, u8 bStart)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
@ -976,7 +976,7 @@ void Hal_SetOFDMContinuousTx(PADAPTER pAdapter, u8 bStart)
pAdapter->mppriv.MptCtx.bOfdmContTx = bStart; pAdapter->mppriv.MptCtx.bOfdmContTx = bStart;
}/* mpt_StartOfdmContTx */ }/* mpt_StartOfdmContTx */
void Hal_SetContinuousTx(PADAPTER pAdapter, u8 bStart) void Hal_SetContinuousTx(struct adapter * pAdapter, u8 bStart)
{ {
RT_TRACE(_module_mp_, _drv_info_, RT_TRACE(_module_mp_, _drv_info_,
("SetContinuousTx: rate:%d\n", pAdapter->mppriv.rateidx)); ("SetContinuousTx: rate:%d\n", pAdapter->mppriv.rateidx));

118
hal/rtl8188e_phycfg.c
View file

@ -79,7 +79,7 @@ phy_CalculateBitShift(
#if (SIC_ENABLE == 1) #if (SIC_ENABLE == 1)
static bool static bool
sic_IsSICReady( sic_IsSICReady(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
bool bRet=false; bool bRet=false;
@ -178,7 +178,7 @@ sic_Write4Byte(
/* */ /* */
static void static void
SIC_SetBBReg( SIC_SetBBReg(
PADAPTER Adapter, struct adapter * Adapter,
u32 RegAddr, u32 RegAddr,
u32 BitMask, u32 BitMask,
u32 Data u32 Data
@ -203,7 +203,7 @@ SIC_SetBBReg(
static u32 static u32
SIC_QueryBBReg( SIC_QueryBBReg(
PADAPTER Adapter, struct adapter * Adapter,
u32 RegAddr, u32 RegAddr,
u32 BitMask u32 BitMask
) )
@ -221,7 +221,7 @@ SIC_QueryBBReg(
void void
SIC_Init( SIC_Init(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
/* Here we need to write 0x1b8~0x1bf = 0 after fw is downloaded */ /* Here we need to write 0x1b8~0x1bf = 0 after fw is downloaded */
@ -238,7 +238,7 @@ SIC_Init(
static bool static bool
SIC_LedOff( SIC_LedOff(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
/* When SIC is enabled, led pin will be used as debug pin, */ /* When SIC is enabled, led pin will be used as debug pin, */
@ -253,7 +253,7 @@ SIC_LedOff(
* OverView: Read "sepcific bits" from BB register * OverView: Read "sepcific bits" from BB register
* *
* Input: * Input:
* PADAPTER Adapter, * struct adapter * Adapter,
* u4Byte RegAddr, The target address to be readback * u4Byte RegAddr, The target address to be readback
* u4Byte BitMask The target bit position in the target address * u4Byte BitMask The target bit position in the target address
* to be readback * to be readback
@ -263,7 +263,7 @@ SIC_LedOff(
*/ */
u32 u32
rtl8188e_PHY_QueryBBReg( rtl8188e_PHY_QueryBBReg(
PADAPTER Adapter, struct adapter * Adapter,
u32 RegAddr, u32 RegAddr,
u32 BitMask u32 BitMask
) )
@ -293,7 +293,7 @@ rtl8188e_PHY_QueryBBReg(
* OverView: Write "Specific bits" to BB register (page 8~) * OverView: Write "Specific bits" to BB register (page 8~)
* *
* Input: * Input:
* PADAPTER Adapter, * struct adapter * Adapter,
* u4Byte RegAddr, The target address to be modified * u4Byte RegAddr, The target address to be modified
* u4Byte BitMask The target bit position in the target address * u4Byte BitMask The target bit position in the target address
* to be modified * to be modified
@ -307,7 +307,7 @@ rtl8188e_PHY_QueryBBReg(
void void
rtl8188e_PHY_SetBBReg( rtl8188e_PHY_SetBBReg(
PADAPTER Adapter, struct adapter * Adapter,
u32 RegAddr, u32 RegAddr,
u32 BitMask, u32 BitMask,
u32 Data u32 Data
@ -344,7 +344,7 @@ rtl8188e_PHY_SetBBReg(
* OverView: Read regster from RF chips * OverView: Read regster from RF chips
* *
* Input: * Input:
* PADAPTER Adapter, * struct adapter * Adapter,
* enum rf_radio_path eRFPath, Radio path of A/B/C/D * enum rf_radio_path eRFPath, Radio path of A/B/C/D
* u4Byte Offset, The target address to be read * u4Byte Offset, The target address to be read
* *
@ -359,7 +359,7 @@ rtl8188e_PHY_SetBBReg(
*/ */
static u32 static u32
phy_RFSerialRead( phy_RFSerialRead(
PADAPTER Adapter, struct adapter * Adapter,
enum rf_radio_path eRFPath, enum rf_radio_path eRFPath,
u32 Offset u32 Offset
) )
@ -422,7 +422,7 @@ phy_RFSerialRead(
* OverView: Write data to RF register (page 8~) * OverView: Write data to RF register (page 8~)
* *
* Input: * Input:
* PADAPTER Adapter, * struct adapter * Adapter,
* enum rf_radio_path eRFPath, Radio path of A/B/C/D * enum rf_radio_path eRFPath, Radio path of A/B/C/D
* u4Byte Offset, The target address to be read * u4Byte Offset, The target address to be read
* u4Byte Data The new register Data in the target bit position * u4Byte Data The new register Data in the target bit position
@ -461,7 +461,7 @@ phy_RFSerialRead(
*/ */
static void static void
phy_RFSerialWrite( phy_RFSerialWrite(
PADAPTER Adapter, struct adapter * Adapter,
enum rf_radio_path eRFPath, enum rf_radio_path eRFPath,
u32 Offset, u32 Offset,
u32 Data u32 Data
@ -499,7 +499,7 @@ phy_RFSerialWrite(
* OverView: Query "Specific bits" to RF register (page 8~) * OverView: Query "Specific bits" to RF register (page 8~)
* *
* Input: * Input:
* PADAPTER Adapter, * struct adapter * Adapter,
* enum rf_radio_path eRFPath, Radio path of A/B/C/D * enum rf_radio_path eRFPath, Radio path of A/B/C/D
* u4Byte RegAddr, The target address to be read * u4Byte RegAddr, The target address to be read
* u4Byte BitMask The target bit position in the target address * u4Byte BitMask The target bit position in the target address
@ -509,7 +509,7 @@ phy_RFSerialWrite(
* Return: u4Byte Readback value * Return: u4Byte Readback value
* Note: This function is equal to "GetRFRegSetting" in PHY programming guide * Note: This function is equal to "GetRFRegSetting" in PHY programming guide
*/ */
u32 rtl8188e_PHY_QueryRFReg(PADAPTER Adapter, enum rf_radio_path eRFPath, u32 rtl8188e_PHY_QueryRFReg(struct adapter * Adapter, enum rf_radio_path eRFPath,
u32 RegAddr, u32 BitMask) u32 RegAddr, u32 BitMask)
{ {
u32 Original_Value, Readback_Value, BitShift; u32 Original_Value, Readback_Value, BitShift;
@ -531,7 +531,7 @@ u32 rtl8188e_PHY_QueryRFReg(PADAPTER Adapter, enum rf_radio_path eRFPath,
* OverView: Write "Specific bits" to RF register (page 8~) * OverView: Write "Specific bits" to RF register (page 8~)
* *
* Input: * Input:
* PADAPTER Adapter, * struct adapter * Adapter,
* enum rf_radio_path eRFPath, Radio path of A/B/C/D * enum rf_radio_path eRFPath, Radio path of A/B/C/D
* u4Byte RegAddr, The target address to be modified * u4Byte RegAddr, The target address to be modified
* u4Byte BitMask The target bit position in the target address * u4Byte BitMask The target bit position in the target address
@ -545,7 +545,7 @@ u32 rtl8188e_PHY_QueryRFReg(PADAPTER Adapter, enum rf_radio_path eRFPath,
*/ */
void void
rtl8188e_PHY_SetRFReg( rtl8188e_PHY_SetRFReg(
PADAPTER Adapter, struct adapter * Adapter,
enum rf_radio_path eRFPath, enum rf_radio_path eRFPath,
u32 RegAddr, u32 RegAddr,
u32 BitMask, u32 BitMask,
@ -579,7 +579,7 @@ rtl8188e_PHY_SetRFReg(
* Overview: This function read BB parameters from general file format, and do register * Overview: This function read BB parameters from general file format, and do register
* Read/Write * Read/Write
* *
* Input: PADAPTER Adapter * Input: struct adapter * Adapter
* ps1Byte pFileName * ps1Byte pFileName
* *
* Output: NONE * Output: NONE
@ -591,7 +591,7 @@ rtl8188e_PHY_SetRFReg(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
static int static int
phy_ConfigMACWithParaFile( phy_ConfigMACWithParaFile(
PADAPTER Adapter, struct adapter * Adapter,
u8* pFileName u8* pFileName
) )
{ {
@ -618,7 +618,7 @@ phy_ConfigMACWithParaFile(
* 08/12/2008 MHC Create Version 0. * 08/12/2008 MHC Create Version 0.
* *
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
s32 PHY_MACConfig8188E(PADAPTER Adapter) s32 PHY_MACConfig8188E(struct adapter * Adapter)
{ {
int rtStatus = _SUCCESS; int rtStatus = _SUCCESS;
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
@ -642,7 +642,7 @@ s32 PHY_MACConfig8188E(PADAPTER Adapter)
* OverView: Initialize Register definition offset for Radio Path A/B/C/D * OverView: Initialize Register definition offset for Radio Path A/B/C/D
* *
* Input: * Input:
* PADAPTER Adapter, * struct adapter * Adapter,
* *
* Output: None * Output: None
* Return: None * Return: None
@ -650,7 +650,7 @@ s32 PHY_MACConfig8188E(PADAPTER Adapter)
*/ */
static void static void
phy_InitBBRFRegisterDefinition( phy_InitBBRFRegisterDefinition(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
@ -758,7 +758,7 @@ phy_InitBBRFRegisterDefinition(
* Overview: This function read BB parameters from general file format, and do register * Overview: This function read BB parameters from general file format, and do register
* Read/Write * Read/Write
* *
* Input: PADAPTER Adapter * Input: struct adapter * Adapter
* ps1Byte pFileName * ps1Byte pFileName
* *
* Output: NONE * Output: NONE
@ -770,7 +770,7 @@ phy_InitBBRFRegisterDefinition(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
static int static int
phy_ConfigBBWithParaFile( phy_ConfigBBWithParaFile(
PADAPTER Adapter, struct adapter * Adapter,
u8* pFileName u8* pFileName
) )
{ {
@ -786,7 +786,7 @@ phy_ConfigBBWithParaFile(
/* */ /* */
/* The following is for High Power PA */ /* The following is for High Power PA */
/* */ /* */
static void phy_ConfigBBExternalPA(PADAPTER Adapter) static void phy_ConfigBBExternalPA(struct adapter * Adapter)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
u16 i=0; u16 i=0;
@ -801,7 +801,7 @@ static void phy_ConfigBBExternalPA(PADAPTER Adapter)
void void
storePwrIndexDiffRateOffset( storePwrIndexDiffRateOffset(
PADAPTER Adapter, struct adapter * Adapter,
u32 RegAddr, u32 RegAddr,
u32 BitMask, u32 BitMask,
u32 Data u32 Data
@ -866,7 +866,7 @@ storePwrIndexDiffRateOffset(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
static int static int
phy_ConfigBBWithPgParaFile( phy_ConfigBBWithPgParaFile(
PADAPTER Adapter, struct adapter * Adapter,
u8* pFileName) u8* pFileName)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
@ -880,7 +880,7 @@ phy_ConfigBBWithPgParaFile(
static void static void
phy_BB8192C_Config_1T( phy_BB8192C_Config_1T(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
/* for path - B */ /* for path - B */
@ -906,7 +906,7 @@ phy_BB8192C_Config_1T(
/* Now it is just for 8256. */ /* Now it is just for 8256. */
static int static int
phy_BB8190_Config_HardCode( phy_BB8190_Config_HardCode(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
return _SUCCESS; return _SUCCESS;
@ -914,7 +914,7 @@ phy_BB8190_Config_HardCode(
static int static int
phy_BB8188E_Config_ParaFile( phy_BB8188E_Config_ParaFile(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(Adapter); struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(Adapter);
@ -965,7 +965,7 @@ phy_BB8190_Config_ParaFile_Fail:
int int
PHY_BBConfig8188E( PHY_BBConfig8188E(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
int rtStatus = _SUCCESS; int rtStatus = _SUCCESS;
@ -1001,7 +1001,7 @@ PHY_BBConfig8188E(
int int
PHY_RFConfig8188E( PHY_RFConfig8188E(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
@ -1020,7 +1020,7 @@ PHY_RFConfig8188E(
* *
* Overview: This function read RF parameters from general file format, and do RF 3-wire * Overview: This function read RF parameters from general file format, and do RF 3-wire
* *
* Input: PADAPTER Adapter * Input: struct adapter * Adapter
* ps1Byte pFileName * ps1Byte pFileName
* enum rf_radio_path eRFPath * enum rf_radio_path eRFPath
* *
@ -1032,7 +1032,7 @@ PHY_RFConfig8188E(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
int int
rtl8188e_PHY_ConfigRFWithParaFile( rtl8188e_PHY_ConfigRFWithParaFile(
PADAPTER Adapter, struct adapter * Adapter,
u8* pFileName, u8* pFileName,
enum rf_radio_path eRFPath enum rf_radio_path eRFPath
) )
@ -1040,7 +1040,7 @@ rtl8188e_PHY_ConfigRFWithParaFile(
return _SUCCESS; return _SUCCESS;
} }
static int PHY_ConfigRFExternalPA(PADAPTER Adapter, enum rf_radio_path eRFPath) static int PHY_ConfigRFExternalPA(struct adapter * Adapter, enum rf_radio_path eRFPath)
{ {
int rtStatus = _SUCCESS; int rtStatus = _SUCCESS;
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
@ -1056,7 +1056,7 @@ static int PHY_ConfigRFExternalPA(PADAPTER Adapter, enum rf_radio_path eRFPath)
void void
rtl8192c_PHY_GetHWRegOriginalValue( rtl8192c_PHY_GetHWRegOriginalValue(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
@ -1081,7 +1081,7 @@ rtl8192c_PHY_GetHWRegOriginalValue(
/* */ /* */
static u8 static u8
phy_DbmToTxPwrIdx( phy_DbmToTxPwrIdx(
PADAPTER Adapter, struct adapter * Adapter,
enum wireless_mode WirelessMode, enum wireless_mode WirelessMode,
int PowerInDbm int PowerInDbm
) )
@ -1131,7 +1131,7 @@ phy_DbmToTxPwrIdx(
/* current wireless mode. */ /* current wireless mode. */
/* By Bruce, 2008-01-29. */ /* By Bruce, 2008-01-29. */
/* */ /* */
static int phy_TxPwrIdxToDbm(PADAPTER Adapter, enum wireless_mode WirelessMode, u8 TxPwrIdx) static int phy_TxPwrIdxToDbm(struct adapter * Adapter, enum wireless_mode WirelessMode, u8 TxPwrIdx)
{ {
int Offset = 0; int Offset = 0;
int PwrOutDbm = 0; int PwrOutDbm = 0;
@ -1167,7 +1167,7 @@ static int phy_TxPwrIdxToDbm(PADAPTER Adapter, enum wireless_mode WirelessMode,
* *
* Overview: This function is export to "common" moudule * Overview: This function is export to "common" moudule
* *
* Input: PADAPTER Adapter * Input: struct adapter * Adapter
* psByte Power Level * psByte Power Level
* *
* Output: NONE * Output: NONE
@ -1177,7 +1177,7 @@ static int phy_TxPwrIdxToDbm(PADAPTER Adapter, enum wireless_mode WirelessMode,
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
void void
PHY_GetTxPowerLevel8188E( PHY_GetTxPowerLevel8188E(
PADAPTER Adapter, struct adapter * Adapter,
u32* powerlevel u32* powerlevel
) )
{ {
@ -1211,7 +1211,7 @@ PHY_GetTxPowerLevel8188E(
*powerlevel = TxPwrDbm; *powerlevel = TxPwrDbm;
} }
static void getTxPowerIndex88E(PADAPTER Adapter, u8 channel, u8 *cckPowerLevel, static void getTxPowerIndex88E(struct adapter * Adapter, u8 channel, u8 *cckPowerLevel,
u8 *ofdmPowerLevel, u8 *BW20PowerLevel, u8 *ofdmPowerLevel, u8 *BW20PowerLevel,
u8 *BW40PowerLevel) u8 *BW40PowerLevel)
{ {
@ -1287,7 +1287,7 @@ static void getTxPowerIndex88E(PADAPTER Adapter, u8 channel, u8 *cckPowerLevel,
} }
} }
static void phy_PowerIndexCheck88E(PADAPTER Adapter, u8 channel, u8 *cckPowerLevel, static void phy_PowerIndexCheck88E(struct adapter * Adapter, u8 channel, u8 *cckPowerLevel,
u8 *ofdmPowerLevel, u8 *BW20PowerLevel, u8 *BW40PowerLevel) u8 *ofdmPowerLevel, u8 *BW20PowerLevel, u8 *BW40PowerLevel)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
@ -1304,7 +1304,7 @@ static void phy_PowerIndexCheck88E(PADAPTER Adapter, u8 channel, u8 *cckPowerLev
* Overview: This function is export to "HalCommon" moudule * Overview: This function is export to "HalCommon" moudule
* We must consider RF path later!!!!!!! * We must consider RF path later!!!!!!!
* *
* Input: PADAPTER Adapter * Input: struct adapter * Adapter
* u1Byte channel * u1Byte channel
* *
* Output: NONE * Output: NONE
@ -1317,7 +1317,7 @@ static void phy_PowerIndexCheck88E(PADAPTER Adapter, u8 channel, u8 *cckPowerLev
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
void void
PHY_SetTxPowerLevel8188E( PHY_SetTxPowerLevel8188E(
PADAPTER Adapter, struct adapter * Adapter,
u8 channel u8 channel
) )
{ {
@ -1345,7 +1345,7 @@ PHY_SetTxPowerLevel8188E(
/* */ /* */
bool bool
PHY_UpdateTxPowerDbm8188E( PHY_UpdateTxPowerDbm8188E(
PADAPTER Adapter, struct adapter * Adapter,
int powerInDbm int powerInDbm
) )
{ {
@ -1376,7 +1376,7 @@ PHY_UpdateTxPowerDbm8188E(
void void
PHY_ScanOperationBackup8188E( PHY_ScanOperationBackup8188E(
PADAPTER Adapter, struct adapter * Adapter,
u8 Operation u8 Operation
) )
{ {
@ -1399,7 +1399,7 @@ PHY_ScanOperationBackup8188E(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
static void static void
_PHY_SetBWMode92C( _PHY_SetBWMode92C(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
@ -1502,7 +1502,7 @@ _PHY_SetBWMode92C(
* *
* Overview: This function is export to "HalCommon" moudule * Overview: This function is export to "HalCommon" moudule
* *
* Input: PADAPTER Adapter * Input: struct adapter * Adapter
* enum ht_channel_width Bandwidth 20M or 40M * enum ht_channel_width Bandwidth 20M or 40M
* *
* Output: NONE * Output: NONE
@ -1513,7 +1513,7 @@ _PHY_SetBWMode92C(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
void void
PHY_SetBWMode8188E( PHY_SetBWMode8188E(
PADAPTER Adapter, struct adapter * Adapter,
enum ht_channel_width Bandwidth, /* 20M or 40M */ enum ht_channel_width Bandwidth, /* 20M or 40M */
unsigned char Offset /* Upper, Lower, or Don't care */ unsigned char Offset /* Upper, Lower, or Don't care */
) )
@ -1531,7 +1531,7 @@ PHY_SetBWMode8188E(
pHalData->CurrentChannelBW = tmpBW; pHalData->CurrentChannelBW = tmpBW;
} }
static void _PHY_SwChnl8192C(PADAPTER Adapter, u8 channel) static void _PHY_SwChnl8192C(struct adapter * Adapter, u8 channel)
{ {
u8 eRFPath; u8 eRFPath;
u32 param1, param2; u32 param1, param2;
@ -1556,7 +1556,7 @@ static void _PHY_SwChnl8192C(PADAPTER Adapter, u8 channel)
void void
PHY_SwChnl8188E( /* Call after initialization */ PHY_SwChnl8188E( /* Call after initialization */
PADAPTER Adapter, struct adapter * Adapter,
u8 channel u8 channel
) )
{ {
@ -1605,7 +1605,7 @@ PHY_SwChnl8188E( /* Call after initialization */
static bool static bool
phy_SwChnlStepByStep( phy_SwChnlStepByStep(
PADAPTER Adapter, struct adapter * Adapter,
u8 channel, u8 channel,
u8 *stage, u8 *stage,
u8 *step, u8 *step,
@ -1645,7 +1645,7 @@ phy_SetSwChnlCmdArray(
static void static void
phy_FinishSwChnlNow( /* We should not call this function directly */ phy_FinishSwChnlNow( /* We should not call this function directly */
PADAPTER Adapter, struct adapter * Adapter,
u8 channel u8 channel
) )
{ {
@ -1662,7 +1662,7 @@ phy_FinishSwChnlNow( /* We should not call this function directly */
/* */ /* */
void void
PHY_SwChnlPhy8192C( /* Only called during initialize */ PHY_SwChnlPhy8192C( /* Only called during initialize */
PADAPTER Adapter, struct adapter * Adapter,
u8 channel u8 channel
) )
{ {
@ -1688,7 +1688,7 @@ PHY_SwChnlPhy8192C( /* Only called during initialize */
/* */ /* */
void void
PHY_SetMonitorMode8192C( PHY_SetMonitorMode8192C(
PADAPTER pAdapter, struct adapter * pAdapter,
bool bEnableMonitorMode bool bEnableMonitorMode
) )
{ {
@ -1712,12 +1712,12 @@ PHY_SetMonitorMode8192C(
* 11/15/2007 MHC Create Version 0. * 11/15/2007 MHC Create Version 0.
* *
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
bool PHY_CheckIsLegalRfPath8192C(PADAPTER pAdapter, u32 eRFPath) bool PHY_CheckIsLegalRfPath8192C(struct adapter * pAdapter, u32 eRFPath)
{ {
return true; return true;
} /* PHY_CheckIsLegalRfPath8192C */ } /* PHY_CheckIsLegalRfPath8192C */
static void _PHY_SetRFPathSwitch(PADAPTER pAdapter, bool bMain, bool is2T) static void _PHY_SetRFPathSwitch(struct adapter * pAdapter, bool bMain, bool is2T)
{ {
u8 u1bTmp; u8 u1bTmp;
@ -1739,7 +1739,7 @@ static void _PHY_SetRFPathSwitch(PADAPTER pAdapter, bool bMain, bool is2T)
} }
} }
static bool _PHY_QueryRFPathSwitch(PADAPTER pAdapter, bool is2T) static bool _PHY_QueryRFPathSwitch(struct adapter * pAdapter, bool is2T)
{ {
if (!pAdapter->hw_init_completed) { if (!pAdapter->hw_init_completed) {
PHY_SetBBReg(pAdapter, REG_LEDCFG0, BIT23, 0x01); PHY_SetBBReg(pAdapter, REG_LEDCFG0, BIT23, 0x01);
@ -1759,6 +1759,6 @@ static bool _PHY_QueryRFPathSwitch(PADAPTER pAdapter, bool is2T)
} }
} }
static void _PHY_DumpRFReg(PADAPTER pAdapter) static void _PHY_DumpRFReg(struct adapter * pAdapter)
{ {
} }

22
hal/rtl8188e_rf6052.c
View file

@ -91,7 +91,7 @@ static struct rf_shadow RF_Shadow[RF6052_MAX_PATH][RF6052_MAX_REG];
* Firmwaer support the utility later. * Firmwaer support the utility later.
* *
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
void rtl8188e_RF_ChangeTxPath( PADAPTER Adapter, void rtl8188e_RF_ChangeTxPath( struct adapter * Adapter,
u16 DataRate) u16 DataRate)
{ {
/* We do not support gain table change inACUT now !!!! Delete later !!! */ /* We do not support gain table change inACUT now !!!! Delete later !!! */
@ -103,7 +103,7 @@ void rtl8188e_RF_ChangeTxPath( PADAPTER Adapter,
* *
* Overview: This function is called by SetBWModeCallback8190Pci() only * Overview: This function is called by SetBWModeCallback8190Pci() only
* *
* Input: PADAPTER Adapter * Input: struct adapter * Adapter
* WIRELESS_BANDWIDTH_E Bandwidth 20M or 40M * WIRELESS_BANDWIDTH_E Bandwidth 20M or 40M
* *
* Output: NONE * Output: NONE
@ -114,7 +114,7 @@ void rtl8188e_RF_ChangeTxPath( PADAPTER Adapter,
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
void void
rtl8188e_PHY_RF6052SetBandwidth( rtl8188e_PHY_RF6052SetBandwidth(
PADAPTER Adapter, struct adapter * Adapter,
enum ht_channel_width Bandwidth) /* 20M or 40M */ enum ht_channel_width Bandwidth) /* 20M or 40M */
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
@ -158,7 +158,7 @@ rtl8188e_PHY_RF6052SetBandwidth(
void void
rtl8188e_PHY_RF6052SetCckTxPower( rtl8188e_PHY_RF6052SetCckTxPower(
PADAPTER Adapter, struct adapter * Adapter,
u8* pPowerlevel) u8* pPowerlevel)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
@ -274,7 +274,7 @@ rtl8188e_PHY_RF6052SetCckTxPower(
/* powerbase1 for HT MCS rates */ /* powerbase1 for HT MCS rates */
/* */ /* */
static void getPowerBase88E( static void getPowerBase88E(
PADAPTER Adapter, struct adapter * Adapter,
u8* pPowerLevelOFDM, u8* pPowerLevelOFDM,
u8* pPowerLevelBW20, u8* pPowerLevelBW20,
u8* pPowerLevelBW40, u8* pPowerLevelBW40,
@ -315,7 +315,7 @@ static void getPowerBase88E(
} }
static void getTxPowerWriteValByRegulatory88E( static void getTxPowerWriteValByRegulatory88E(
PADAPTER Adapter, struct adapter * Adapter,
u8 Channel, u8 Channel,
u8 index, u8 index,
u32* powerBase0, u32* powerBase0,
@ -433,7 +433,7 @@ static void getTxPowerWriteValByRegulatory88E(
} }
static void writeOFDMPowerReg88E( static void writeOFDMPowerReg88E(
PADAPTER Adapter, struct adapter * Adapter,
u8 index, u8 index,
u32* pValue u32* pValue
) )
@ -516,7 +516,7 @@ static void writeOFDMPowerReg88E(
void void
rtl8188e_PHY_RF6052SetOFDMTxPower( rtl8188e_PHY_RF6052SetOFDMTxPower(
PADAPTER Adapter, struct adapter * Adapter,
u8* pPowerLevelOFDM, u8* pPowerLevelOFDM,
u8* pPowerLevelBW20, u8* pPowerLevelBW20,
u8* pPowerLevelBW40, u8* pPowerLevelBW40,
@ -557,14 +557,14 @@ rtl8188e_PHY_RF6052SetOFDMTxPower(
static void static void
phy_RF6052_Config_HardCode( phy_RF6052_Config_HardCode(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
} }
static int static int
phy_RF6052_Config_ParaFile( phy_RF6052_Config_ParaFile(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
u32 u4RegValue; u32 u4RegValue;
@ -653,7 +653,7 @@ phy_RF6052_Config_ParaFile_Fail:
int int
PHY_RF6052_Config8188E( PHY_RF6052_Config8188E(
PADAPTER Adapter) struct adapter * Adapter)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
int rtStatus = _SUCCESS; int rtStatus = _SUCCESS;

8
hal/rtl8188e_rxdesc.c
View file

@ -36,7 +36,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; u32 last_rssi, tmp_val;
struct rx_pkt_attrib *pattrib = &prframe->u.hdr.attrib; struct rx_pkt_attrib *pattrib = &prframe->u.hdr.attrib;
@ -57,7 +57,7 @@ static void process_rssi(_adapter *padapter,union recv_frame *prframe)
}/* Process_UI_RSSI_8192C */ }/* Process_UI_RSSI_8192C */
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; u32 last_evm=0, tmpVal;
struct rx_pkt_attrib *pattrib; struct rx_pkt_attrib *pattrib;
@ -81,7 +81,7 @@ static void process_link_qual(_adapter *padapter,union recv_frame *prframe)
signal_stat->avg_val = signal_stat->total_val / signal_stat->total_num; signal_stat->avg_val = signal_stat->total_val / signal_stat->total_num;
} }
void rtl8188e_process_phy_info(_adapter *padapter, void *prframe) void rtl8188e_process_phy_info(struct adapter *padapter, void *prframe)
{ {
union recv_frame *precvframe = (union recv_frame *)prframe; union recv_frame *precvframe = (union recv_frame *)prframe;
@ -174,7 +174,7 @@ void update_recvframe_phyinfo_88e(
union recv_frame *precvframe, union recv_frame *precvframe,
struct phy_stat *pphy_status) 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; struct rx_pkt_attrib *pattrib = &precvframe->u.hdr.attrib;
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
struct odm_phy_status_info *pPHYInfo = (struct odm_phy_status_info *)(&pattrib->phy_info); struct odm_phy_status_info *pPHYInfo = (struct odm_phy_status_info *)(&pattrib->phy_info);

12
hal/rtl8188e_sreset.c
View file

@ -22,8 +22,8 @@
#include <rtl8188e_sreset.h> #include <rtl8188e_sreset.h>
#include <rtl8188e_hal.h> #include <rtl8188e_hal.h>
extern void rtw_cancel_all_timer(_adapter *padapter); extern void rtw_cancel_all_timer(struct adapter *padapter);
static void _restore_security_setting(_adapter *padapter) static void _restore_security_setting(struct adapter *padapter)
{ {
u8 EntryId = 0; u8 EntryId = 0;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -63,7 +63,7 @@ static void _restore_security_setting(_adapter *padapter)
} }
static void _restore_network_status(_adapter *padapter) static void _restore_network_status(struct adapter *padapter)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -119,11 +119,11 @@ static void _restore_network_status(_adapter *padapter)
rtw_write8(padapter,0x4dc,padapter->xmitpriv.nqos_ssn); rtw_write8(padapter,0x4dc,padapter->xmitpriv.nqos_ssn);
} }
void rtl8188e_silentreset_for_specific_platform(_adapter *padapter) void rtl8188e_silentreset_for_specific_platform(struct adapter *padapter)
{ {
} }
void rtl8188e_sreset_xmit_status_check(_adapter *padapter) void rtl8188e_sreset_xmit_status_check(struct adapter *padapter)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
struct sreset_priv *psrtpriv = &pHalData->srestpriv; struct sreset_priv *psrtpriv = &pHalData->srestpriv;
@ -159,7 +159,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)
{ {
u32 rx_dma_status = 0; u32 rx_dma_status = 0;
u8 fw_status=0; u8 fw_status=0;

4
hal/rtl8188e_xmit.c
View file

@ -44,7 +44,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; struct txrpt_ccx_88e *txrpt_ccx = (struct txrpt_ccx_88e *)buf;
@ -56,7 +56,7 @@ void handle_txrpt_ccx_88e(_adapter *adapter, u8 *buf)
} }
} }
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 bDumpTxPkt;
u8 bDumpTxDesc = false; u8 bDumpTxDesc = false;

8
hal/rtl8188eu_led.c
View file

@ -40,7 +40,7 @@
/* Description: */ /* Description: */
/* Turn on LED according to LedPin specified. */ /* Turn on LED according to LedPin specified. */
/* */ /* */
void SwLedOn(_adapter *padapter, struct LED_871x * pLed) void SwLedOn(struct adapter *padapter, struct LED_871x * pLed)
{ {
u8 LedCfg; u8 LedCfg;
@ -72,7 +72,7 @@ void SwLedOn(_adapter *padapter, struct LED_871x * pLed)
/* Description: */ /* Description: */
/* Turn off LED according to LedPin specified. */ /* Turn off LED according to LedPin specified. */
/* */ /* */
void SwLedOff(_adapter *padapter, struct LED_871x * pLed) void SwLedOff(struct adapter *padapter, struct LED_871x * pLed)
{ {
u8 LedCfg; u8 LedCfg;
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
@ -130,7 +130,7 @@ exit:
/* */ /* */
void void
rtl8188eu_InitSwLeds( rtl8188eu_InitSwLeds(
_adapter *padapter struct adapter *padapter
) )
{ {
struct led_priv *pledpriv = &(padapter->ledpriv); struct led_priv *pledpriv = &(padapter->ledpriv);
@ -149,7 +149,7 @@ rtl8188eu_InitSwLeds(
/* */ /* */
void void
rtl8188eu_DeInitSwLeds( rtl8188eu_DeInitSwLeds(
_adapter *padapter struct adapter *padapter
) )
{ {
struct led_priv *ledpriv = &(padapter->ledpriv); struct led_priv *ledpriv = &(padapter->ledpriv);

6
hal/rtl8188eu_recv.c
View file

@ -33,7 +33,7 @@
#include <rtl8188e_hal.h> #include <rtl8188e_hal.h>
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; precvbuf->transfer_len = 0;
@ -50,7 +50,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; struct recv_priv *precvpriv = &padapter->recvpriv;
int i, res = _SUCCESS; int i, res = _SUCCESS;
@ -138,7 +138,7 @@ exit:
} }
void rtl8188eu_free_recv_priv (_adapter *padapter) void rtl8188eu_free_recv_priv (struct adapter *padapter)
{ {
int i; int i;
struct recv_buf *precvbuf; struct recv_buf *precvbuf;

22
hal/rtl8188eu_xmit.c
View file

@ -26,7 +26,7 @@
#include <usb_ops.h> #include <usb_ops.h>
#include <rtl8188e_hal.h> #include <rtl8188e_hal.h>
s32 rtl8188eu_init_xmit_priv(_adapter *padapter) s32 rtl8188eu_init_xmit_priv(struct adapter *padapter)
{ {
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
@ -37,11 +37,11 @@ s32 rtl8188eu_init_xmit_priv(_adapter *padapter)
return _SUCCESS; return _SUCCESS;
} }
void rtl8188eu_free_xmit_priv(_adapter *padapter) void rtl8188eu_free_xmit_priv(struct adapter *padapter)
{ {
} }
static u8 urb_zero_packet_chk(_adapter *padapter, int sz) static u8 urb_zero_packet_chk(struct adapter *padapter, int sz)
{ {
u8 blnSetTxDescOffset; u8 blnSetTxDescOffset;
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
@ -70,7 +70,7 @@ static void rtl8188eu_cal_txdesc_chksum(struct tx_desc *ptxdesc)
/* Fw can tell Hw to send these packet derectly. */ /* Fw can tell Hw to send these packet derectly. */
/* */ /* */
void rtl8188e_fill_fake_txdesc( void rtl8188e_fill_fake_txdesc(
PADAPTER padapter, struct adapter * padapter,
u8* pDesc, u8* pDesc,
u32 BufferLen, u32 BufferLen,
u8 IsPsPoll, u8 IsPsPoll,
@ -196,7 +196,7 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz ,u8 bag
int pull=0; int pull=0;
uint qsel; uint qsel;
u8 data_rate,pwr_status,offset; u8 data_rate,pwr_status,offset;
_adapter *padapter = pxmitframe->padapter; struct adapter *padapter = pxmitframe->padapter;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct pkt_attrib *pattrib = &pxmitframe->attrib; struct pkt_attrib *pattrib = &pxmitframe->attrib;
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
@ -411,7 +411,7 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz ,u8 bag
} }
/* for non-agg data frame or management frame */ /* 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 ret = _SUCCESS;
s32 inner_ret = _SUCCESS; s32 inner_ret = _SUCCESS;
@ -507,7 +507,7 @@ static u32 xmitframe_need_length(struct xmit_frame *pxmitframe)
return len; return len;
} }
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 hal_data_8188e *pHalData = GET_HAL_DATA(padapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
struct xmit_frame *pxmitframe = NULL; struct xmit_frame *pxmitframe = NULL;
@ -710,7 +710,7 @@ s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
return true; return true;
} }
static s32 xmitframe_direct(_adapter *padapter, struct xmit_frame *pxmitframe) static s32 xmitframe_direct(struct adapter *padapter, struct xmit_frame *pxmitframe)
{ {
s32 res = _SUCCESS; s32 res = _SUCCESS;
@ -730,7 +730,7 @@ static s32 xmitframe_direct(_adapter *padapter, struct xmit_frame *pxmitframe)
* true dump packet directly * true dump packet directly
* false enqueue packet * false enqueue packet
*/ */
static s32 pre_xmitframe(_adapter *padapter, struct xmit_frame *pxmitframe) static s32 pre_xmitframe(struct adapter *padapter, struct xmit_frame *pxmitframe)
{ {
unsigned long irqL; unsigned long irqL;
s32 res; s32 res;
@ -784,7 +784,7 @@ enqueue:
return false; 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); return rtw_dump_xframe(padapter, pmgntframe);
} }
@ -794,7 +794,7 @@ s32 rtl8188eu_mgnt_xmit(_adapter *padapter, struct xmit_frame *pmgntframe)
* true dump packet directly ok * true dump packet directly ok
* false temporary can't transmit packets to hardware * 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); return pre_xmitframe(padapter, pxmitframe);
} }

199
hal/usb_halinit.c
View file

@ -43,7 +43,7 @@
static void static void
_ConfigNormalChipOutEP_8188E( _ConfigNormalChipOutEP_8188E(
PADAPTER pAdapter, struct adapter * pAdapter,
u8 NumOutPipe u8 NumOutPipe
) )
{ {
@ -71,7 +71,7 @@ _ConfigNormalChipOutEP_8188E(
} }
static bool HalUsbSetQueuePipeMapping8188EUsb( static bool HalUsbSetQueuePipeMapping8188EUsb(
PADAPTER pAdapter, struct adapter * pAdapter,
u8 NumInPipe, u8 NumInPipe,
u8 NumOutPipe u8 NumOutPipe
) )
@ -96,7 +96,7 @@ static bool HalUsbSetQueuePipeMapping8188EUsb(
} }
static void rtl8188eu_interface_configure(_adapter *padapter) static void rtl8188eu_interface_configure(struct adapter *padapter)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter); struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);
@ -126,7 +126,7 @@ static void rtl8188eu_interface_configure(_adapter *padapter)
} }
static u32 rtl8188eu_InitPowerOn(_adapter *padapter) static u32 rtl8188eu_InitPowerOn(struct adapter *padapter)
{ {
u16 value16; u16 value16;
/* HW Power on sequence */ /* HW Power on sequence */
@ -159,7 +159,7 @@ static u32 rtl8188eu_InitPowerOn(_adapter *padapter)
} }
static void _dbg_dump_macreg(_adapter *padapter) static void _dbg_dump_macreg(struct adapter *padapter)
{ {
u32 offset = 0; u32 offset = 0;
u32 val32 = 0; u32 val32 = 0;
@ -173,7 +173,7 @@ static void _dbg_dump_macreg(_adapter *padapter)
} }
static void _InitPABias(_adapter *padapter) static void _InitPABias(struct adapter *padapter)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
u8 pa_setting; u8 pa_setting;
@ -207,7 +207,7 @@ static void _InitPABias(_adapter *padapter)
} }
} }
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
static void _InitBTCoexist(_adapter *padapter) static void _InitBTCoexist(struct adapter *padapter)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
struct btcoexist_priv *pbtpriv = &(pHalData->bt_coexist); struct btcoexist_priv *pbtpriv = &(pHalData->bt_coexist);
@ -268,7 +268,7 @@ static void _InitBTCoexist(_adapter *padapter)
/* */ /* */
static void static void
_SetMacID( _SetMacID(
PADAPTER Adapter, u8* MacID struct adapter * Adapter, u8* MacID
) )
{ {
u32 i; u32 i;
@ -279,7 +279,7 @@ _SetMacID(
static void static void
_SetBSSID( _SetBSSID(
PADAPTER Adapter, u8* BSSID struct adapter * Adapter, u8* BSSID
) )
{ {
u32 i; u32 i;
@ -292,7 +292,7 @@ _SetBSSID(
/* Shall USB interface init this? */ /* Shall USB interface init this? */
static void static void
_InitInterrupt( _InitInterrupt(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
u32 imr,imr_ex; u32 imr,imr_ex;
@ -326,7 +326,7 @@ _InitInterrupt(
static void static void
_InitQueueReservedPage( _InitQueueReservedPage(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
@ -375,7 +375,7 @@ _InitQueueReservedPage(
static void static void
_InitTxBufferBoundary( _InitTxBufferBoundary(
PADAPTER Adapter, struct adapter * Adapter,
u8 txpktbuf_bndy u8 txpktbuf_bndy
) )
{ {
@ -392,7 +392,7 @@ _InitTxBufferBoundary(
static void static void
_InitPageBoundary( _InitPageBoundary(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
/* RX Page Boundary */ /* RX Page Boundary */
@ -405,7 +405,7 @@ _InitPageBoundary(
static void static void
_InitNormalChipRegPriority( _InitNormalChipRegPriority(
PADAPTER Adapter, struct adapter * Adapter,
u16 beQ, u16 beQ,
u16 bkQ, u16 bkQ,
u16 viQ, u16 viQ,
@ -425,7 +425,7 @@ _InitNormalChipRegPriority(
static void static void
_InitNormalChipOneOutEpPriority( _InitNormalChipOneOutEpPriority(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
@ -459,7 +459,7 @@ _InitNormalChipOneOutEpPriority(
static void static void
_InitNormalChipTwoOutEpPriority( _InitNormalChipTwoOutEpPriority(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
@ -511,7 +511,7 @@ _InitNormalChipTwoOutEpPriority(
static void static void
_InitNormalChipThreeOutEpPriority( _InitNormalChipThreeOutEpPriority(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
struct registry_priv *pregistrypriv = &Adapter->registrypriv; struct registry_priv *pregistrypriv = &Adapter->registrypriv;
@ -538,7 +538,7 @@ _InitNormalChipThreeOutEpPriority(
static void static void
_InitQueuePriority( _InitQueuePriority(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
@ -565,7 +565,7 @@ _InitQueuePriority(
static void static void
_InitHardwareDropIncorrectBulkOut( _InitHardwareDropIncorrectBulkOut(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
u32 value32 = rtw_read32(Adapter, REG_TXDMA_OFFSET_CHK); u32 value32 = rtw_read32(Adapter, REG_TXDMA_OFFSET_CHK);
@ -575,7 +575,7 @@ _InitHardwareDropIncorrectBulkOut(
static void static void
_InitNetworkType( _InitNetworkType(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
u32 value32; u32 value32;
@ -589,7 +589,7 @@ _InitNetworkType(
static void static void
_InitTransferPageSize( _InitTransferPageSize(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
/* Tx page size is always 128. */ /* Tx page size is always 128. */
@ -601,7 +601,7 @@ _InitTransferPageSize(
static void static void
_InitDriverInfoSize( _InitDriverInfoSize(
PADAPTER Adapter, struct adapter * Adapter,
u8 drvInfoSize u8 drvInfoSize
) )
{ {
@ -610,7 +610,7 @@ _InitDriverInfoSize(
static void static void
_InitWMACSetting( _InitWMACSetting(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
@ -632,7 +632,7 @@ _InitWMACSetting(
static void static void
_InitAdaptiveCtrl( _InitAdaptiveCtrl(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
u16 value16; u16 value16;
@ -658,7 +658,7 @@ _InitAdaptiveCtrl(
static void static void
_InitRateFallback( _InitRateFallback(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
/* Set Data Auto Rate Fallback Retry Count register. */ /* Set Data Auto Rate Fallback Retry Count register. */
@ -672,7 +672,7 @@ _InitRateFallback(
static void static void
_InitEDCA( _InitEDCA(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
/* Set Spec SIFS (used in NAV) */ /* Set Spec SIFS (used in NAV) */
@ -692,11 +692,11 @@ _InitEDCA(
rtw_write32(Adapter, REG_EDCA_VO_PARAM, 0x002FA226); rtw_write32(Adapter, REG_EDCA_VO_PARAM, 0x002FA226);
} }
static void _InitBeaconMaxError(PADAPTER Adapter, bool InfraMode) static void _InitBeaconMaxError(struct adapter * Adapter, bool InfraMode)
{ {
} }
static void _InitHWLed(PADAPTER Adapter) static void _InitHWLed(struct adapter * Adapter)
{ {
struct led_priv *pledpriv = &(Adapter->ledpriv); struct led_priv *pledpriv = &(Adapter->ledpriv);
@ -709,7 +709,7 @@ static void _InitHWLed(PADAPTER Adapter)
} }
static void _InitRDGSetting(PADAPTER Adapter) static void _InitRDGSetting(struct adapter * Adapter)
{ {
rtw_write8(Adapter,REG_RD_CTRL,0xFF); rtw_write8(Adapter,REG_RD_CTRL,0xFF);
rtw_write16(Adapter, REG_RD_NAV_NXT, 0x200); rtw_write16(Adapter, REG_RD_NAV_NXT, 0x200);
@ -718,7 +718,7 @@ static void _InitRDGSetting(PADAPTER Adapter)
static void static void
_InitRxSetting( _InitRxSetting(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
rtw_write32(Adapter, REG_MACID, 0x87654321); rtw_write32(Adapter, REG_MACID, 0x87654321);
@ -727,7 +727,7 @@ _InitRxSetting(
static void static void
_InitRetryFunction( _InitRetryFunction(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
u8 value8; u8 value8;
@ -746,7 +746,7 @@ _InitRetryFunction(
* Overview: Seperate TX/RX parameters update independent for TP detection and * Overview: Seperate TX/RX parameters update independent for TP detection and
* dynamic TX/RX aggreagtion parameters update. * dynamic TX/RX aggreagtion parameters update.
* *
* Input: PADAPTER * Input: struct adapter *
* *
* Output/Return: NONE * Output/Return: NONE
* *
@ -757,7 +757,7 @@ _InitRetryFunction(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
static void static void
usb_AggSettingTxUpdate( usb_AggSettingTxUpdate(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
@ -782,7 +782,7 @@ usb_AggSettingTxUpdate(
* Overview: Seperate TX/RX parameters update independent for TP detection and * Overview: Seperate TX/RX parameters update independent for TP detection and
* dynamic TX/RX aggreagtion parameters update. * dynamic TX/RX aggreagtion parameters update.
* *
* Input: PADAPTER * Input: struct adapter *
* *
* Output/Return: NONE * Output/Return: NONE
* *
@ -793,7 +793,7 @@ usb_AggSettingTxUpdate(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
static void static void
usb_AggSettingRxUpdate( usb_AggSettingRxUpdate(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
@ -875,7 +875,7 @@ usb_AggSettingRxUpdate(
static void static void
InitUsbAggregationSetting( InitUsbAggregationSetting(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
@ -891,7 +891,7 @@ InitUsbAggregationSetting(
} }
static void static void
HalRxAggr8188EUsb( HalRxAggr8188EUsb(
PADAPTER Adapter, struct adapter * Adapter,
bool Value bool Value
) )
{ {
@ -905,7 +905,7 @@ HalRxAggr8188EUsb(
* need to monitor the influence of FTP/network share. * need to monitor the influence of FTP/network share.
* For TX mode, we are still ubder investigation. * For TX mode, we are still ubder investigation.
* *
* Input: PADAPTER * Input: struct adapter *
* *
* Output: NONE * Output: NONE
* *
@ -918,14 +918,14 @@ HalRxAggr8188EUsb(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
static void static void
USB_AggModeSwitch( USB_AggModeSwitch(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
} /* USB_AggModeSwitch */ } /* USB_AggModeSwitch */
static void static void
_InitOperationMode( _InitOperationMode(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
} }
@ -933,7 +933,7 @@ _InitOperationMode(
static void static void
_InitBeaconParameters( _InitBeaconParameters(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
@ -958,7 +958,7 @@ _InitBeaconParameters(
static void static void
_InitRFType( _InitRFType(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
struct registry_priv *pregpriv = &Adapter->registrypriv; struct registry_priv *pregpriv = &Adapter->registrypriv;
@ -987,7 +987,7 @@ _InitRFType(
static void static void
_BeaconFunctionEnable( _BeaconFunctionEnable(
PADAPTER Adapter, struct adapter * Adapter,
bool Enable, bool Enable,
bool Linked bool Linked
) )
@ -1000,7 +1000,7 @@ _BeaconFunctionEnable(
/* Set CCK and OFDM Block "ON" */ /* Set CCK and OFDM Block "ON" */
static void _BBTurnOnBlock( static void _BBTurnOnBlock(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
#if (DISABLE_BB_RF) #if (DISABLE_BB_RF)
@ -1012,7 +1012,7 @@ static void _BBTurnOnBlock(
} }
static void _RfPowerSave( static void _RfPowerSave(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
} }
@ -1023,7 +1023,7 @@ enum {
}; };
static void static void
_InitAntenna_Selection( PADAPTER Adapter) _InitAntenna_Selection( struct adapter * Adapter)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
@ -1051,7 +1051,7 @@ _InitAntenna_Selection( PADAPTER Adapter)
/* */ /* */
static void static void
HalDetectSelectiveSuspendMode( HalDetectSelectiveSuspendMode(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
} /* HalDetectSelectiveSuspendMode */ } /* HalDetectSelectiveSuspendMode */
@ -1072,13 +1072,13 @@ HalDetectSelectiveSuspendMode(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
static void static void
HwSuspendModeEnable_88eu( HwSuspendModeEnable_88eu(
PADAPTER pAdapter, struct adapter * pAdapter,
u8 Type u8 Type
) )
{ {
} /* HwSuspendModeEnable92Cu */ } /* HwSuspendModeEnable92Cu */
enum rt_rf_power_state RfOnOffDetect(PADAPTER pAdapter) enum rt_rf_power_state RfOnOffDetect(struct adapter * pAdapter)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
u8 val8; u8 val8;
@ -1100,9 +1100,9 @@ enum rt_rf_power_state RfOnOffDetect(PADAPTER pAdapter)
return rfpowerstate; return rfpowerstate;
} /* HalDetectPwrDownMode */ } /* HalDetectPwrDownMode */
void _ps_open_RF(_adapter *padapter); void _ps_open_RF(struct adapter *padapter);
static u32 rtl8188eu_hal_init(PADAPTER Adapter) static u32 rtl8188eu_hal_init(struct adapter * Adapter)
{ {
u8 value8 = 0; u8 value8 = 0;
u16 value16; u16 value16;
@ -1390,7 +1390,7 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_INIT_HAL_DM);
/* */ /* */
/* 2010/08/11 MH Merge from 8192SE for Minicard init. We need to confirm current radio status */ /* 2010/08/11 MH Merge from 8192SE for Minicard init. We need to confirm current radio status */
/* and then decide to enable RF or not.!!!??? For Selective suspend mode. We may not */ /* and then decide to enable RF or not.!!!??? For Selective suspend mode. We may not */
/* call init_adapter. May cause some problem?? */ /* call initstruct adapter. May cause some problem?? */
/* */ /* */
/* Fix the bug that Hw/Sw radio off before S3/S4, the RF off action will not be executed */ /* Fix the bug that Hw/Sw radio off before S3/S4, the RF off action will not be executed */
/* in MgntActSet_RF_State() after wake up, because the value of pHalData->eRFPowerState */ /* in MgntActSet_RF_State() after wake up, because the value of pHalData->eRFPowerState */
@ -1450,17 +1450,17 @@ _func_exit_;
return status; 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 */ /* here call with bRegSSPwrLvl 1, bRegSSPwrLvl 2 needs to be verified */
/* phy_SsPwrSwitch92CU(padapter, rf_on, 1); */ /* phy_SsPwrSwitch92CU(padapter, rf_on, 1); */
} }
static void _ps_close_RF(_adapter *padapter){ static void _ps_close_RF(struct adapter *padapter){
/* here call with bRegSSPwrLvl 1, bRegSSPwrLvl 2 needs to be verified */ /* here call with bRegSSPwrLvl 1, bRegSSPwrLvl 2 needs to be verified */
/* phy_SsPwrSwitch92CU(padapter, rf_off, 1); */ /* phy_SsPwrSwitch92CU(padapter, rf_off, 1); */
} }
static void CardDisableRTL8188EU(PADAPTER Adapter) static void CardDisableRTL8188EU(struct adapter * Adapter)
{ {
u8 val8; u8 val8;
u16 val16; u16 val16;
@ -1521,7 +1521,7 @@ static void CardDisableRTL8188EU(PADAPTER Adapter)
pHalData->bMacPwrCtrlOn = false; pHalData->bMacPwrCtrlOn = false;
Adapter->bFWReady = false; Adapter->bFWReady = false;
} }
static void rtl8192cu_hw_power_down(_adapter *padapter) static void rtl8192cu_hw_power_down(struct adapter *padapter)
{ {
/* 2010/-8/09 MH For power down module, we need to enable register block contrl reg at 0x1c. */ /* 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. */ /* Then enable power down control bit of register 0x04 BIT4 and BIT15 as 1. */
@ -1531,7 +1531,7 @@ static void rtl8192cu_hw_power_down(_adapter *padapter)
rtw_write16(padapter, REG_APS_FSMCO, 0x8812); rtw_write16(padapter, REG_APS_FSMCO, 0x8812);
} }
static u32 rtl8188eu_hal_deinit(PADAPTER Adapter) static u32 rtl8188eu_hal_deinit(struct adapter * Adapter)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
@ -1559,7 +1559,7 @@ static u32 rtl8188eu_hal_deinit(PADAPTER Adapter)
} }
static unsigned int rtl8188eu_inirp_init(PADAPTER Adapter) static unsigned int rtl8188eu_inirp_init(struct adapter * Adapter)
{ {
u8 i; u8 i;
struct recv_buf *precvbuf; struct recv_buf *precvbuf;
@ -1602,7 +1602,7 @@ _func_exit_;
return status; return status;
} }
static unsigned int rtl8188eu_inirp_deinit(PADAPTER Adapter) static unsigned int rtl8188eu_inirp_deinit(struct adapter * Adapter)
{ {
RT_TRACE(_module_hci_hal_init_c_,_drv_info_,("\n ===> usb_rx_deinit\n")); RT_TRACE(_module_hci_hal_init_c_,_drv_info_,("\n ===> usb_rx_deinit\n"));
@ -1618,13 +1618,13 @@ static unsigned int rtl8188eu_inirp_deinit(PADAPTER Adapter)
/* EEPROM/EFUSE Content Parsing */ /* EEPROM/EFUSE Content Parsing */
/* */ /* */
/* */ /* */
static void _ReadIDs(PADAPTER Adapter, u8 *PROMContent, bool AutoloadFail) static void _ReadIDs(struct adapter * Adapter, u8 *PROMContent, bool AutoloadFail)
{ {
} }
static void static void
_ReadBoardType( _ReadBoardType(
PADAPTER Adapter, struct adapter * Adapter,
u8* PROMContent, u8* PROMContent,
bool AutoloadFail bool AutoloadFail
) )
@ -1635,7 +1635,7 @@ _ReadBoardType(
static void static void
_ReadLEDSetting( _ReadLEDSetting(
PADAPTER Adapter, struct adapter * Adapter,
u8* PROMContent, u8* PROMContent,
bool AutoloadFail bool AutoloadFail
) )
@ -1655,7 +1655,7 @@ _ReadLEDSetting(
static void static void
_ReadThermalMeter( _ReadThermalMeter(
PADAPTER Adapter, struct adapter * Adapter,
u8* PROMContent, u8* PROMContent,
bool AutoloadFail bool AutoloadFail
) )
@ -1664,7 +1664,7 @@ _ReadThermalMeter(
static void static void
_ReadRFSetting( _ReadRFSetting(
PADAPTER Adapter, struct adapter * Adapter,
u8* PROMContent, u8* PROMContent,
bool AutoloadFail bool AutoloadFail
) )
@ -1673,7 +1673,7 @@ _ReadRFSetting(
static void static void
_ReadPROMVersion( _ReadPROMVersion(
PADAPTER Adapter, struct adapter * Adapter,
u8* PROMContent, u8* PROMContent,
bool AutoloadFail bool AutoloadFail
) )
@ -1682,7 +1682,7 @@ _ReadPROMVersion(
static void static void
readAntennaDiversity( readAntennaDiversity(
PADAPTER pAdapter, struct adapter * pAdapter,
u8 *hwinfo, u8 *hwinfo,
bool AutoLoadFail bool AutoLoadFail
) )
@ -1695,14 +1695,14 @@ readAntennaDiversity(
static void static void
hal_InitPGData( hal_InitPGData(
PADAPTER pAdapter, struct adapter * pAdapter,
u8 *PROMContent u8 *PROMContent
) )
{ {
} }
static void static void
Hal_EfuseParsePIDVID_8188EU( Hal_EfuseParsePIDVID_8188EU(
PADAPTER pAdapter, struct adapter * pAdapter,
u8* hwinfo, u8* hwinfo,
bool AutoLoadFail bool AutoLoadFail
) )
@ -1738,7 +1738,7 @@ Hal_EfuseParsePIDVID_8188EU(
static void static void
Hal_EfuseParseMACAddr_8188EU( Hal_EfuseParseMACAddr_8188EU(
PADAPTER padapter, struct adapter * padapter,
u8* hwinfo, u8* hwinfo,
bool AutoLoadFail bool AutoLoadFail
) )
@ -1770,19 +1770,19 @@ Hal_EfuseParseMACAddr_8188EU(
static void static void
Hal_CustomizeByCustomerID_8188EU( Hal_CustomizeByCustomerID_8188EU(
PADAPTER padapter struct adapter * padapter
) )
{ {
} }
/* Read HW power down mode selection */ /* Read HW power down mode selection */
static void _ReadPSSetting(PADAPTER Adapter, u8 *PROMContent, u8 AutoloadFail) static void _ReadPSSetting(struct adapter * Adapter, u8 *PROMContent, u8 AutoloadFail)
{ {
} }
static void static void
readAdapterInfo_8188EU( readAdapterInfo_8188EU(
PADAPTER padapter struct adapter * padapter
) )
{ {
struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter); struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter);
@ -1812,7 +1812,7 @@ readAdapterInfo_8188EU(
} }
static void _ReadPROMContent( static void _ReadPROMContent(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(Adapter); struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(Adapter);
@ -1835,7 +1835,7 @@ static void _ReadPROMContent(
static void static void
_ReadRFType( _ReadRFType(
PADAPTER Adapter struct adapter * Adapter
) )
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
@ -1847,7 +1847,7 @@ _ReadRFType(
#endif #endif
} }
static int _ReadAdapterInfo8188EU(PADAPTER Adapter) static int _ReadAdapterInfo8188EU(struct adapter * Adapter)
{ {
u32 start=rtw_get_current_time(); u32 start=rtw_get_current_time();
@ -1862,7 +1862,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 */ /* Read EEPROM size before call any EEPROM function */
Adapter->EepromAddressSize = GetEEPROMSize8188E(Adapter); Adapter->EepromAddressSize = GetEEPROMSize8188E(Adapter);
@ -1872,11 +1872,11 @@ static void ReadAdapterInfo8188EU(PADAPTER Adapter)
#define GPIO_DEBUG_PORT_NUM 0 #define GPIO_DEBUG_PORT_NUM 0
static void rtl8192cu_trigger_gpio_0(_adapter *padapter) static void rtl8192cu_trigger_gpio_0(struct adapter *padapter)
{ {
} }
static void ResumeTxBeacon(_adapter *padapter) static void ResumeTxBeacon(struct adapter *padapter)
{ {
struct hal_data_8188e* pHalData = GET_HAL_DATA(padapter); struct hal_data_8188e* pHalData = GET_HAL_DATA(padapter);
@ -1890,7 +1890,7 @@ static void ResumeTxBeacon(_adapter *padapter)
rtw_write8(padapter, REG_TBTT_PROHIBIT+2, pHalData->RegReg542); rtw_write8(padapter, REG_TBTT_PROHIBIT+2, pHalData->RegReg542);
} }
static void UpdateInterruptMask8188EU(PADAPTER padapter,u8 bHIMR0 ,u32 AddMSR, u32 RemoveMSR) static void UpdateInterruptMask8188EU(struct adapter * padapter,u8 bHIMR0 ,u32 AddMSR, u32 RemoveMSR)
{ {
struct hal_data_8188e *pHalData; struct hal_data_8188e *pHalData;
@ -1915,7 +1915,7 @@ static void UpdateInterruptMask8188EU(PADAPTER padapter,u8 bHIMR0 ,u32 AddMSR, u
} }
static void StopTxBeacon(_adapter *padapter) static void StopTxBeacon(struct adapter *padapter)
{ {
struct hal_data_8188e* pHalData = GET_HAL_DATA(padapter); struct hal_data_8188e* pHalData = GET_HAL_DATA(padapter);
@ -1933,7 +1933,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 val8;
u8 mode = *((u8 *)val); u8 mode = *((u8 *)val);
@ -1998,7 +1998,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; u8 idx = 0;
u32 reg_macid; u32 reg_macid;
@ -2009,7 +2009,7 @@ static void hw_var_set_macaddr(PADAPTER Adapter, u8 variable, u8* val)
rtw_write8(Adapter, (reg_macid+idx), val[idx]); rtw_write8(Adapter, (reg_macid+idx), val[idx]);
} }
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; u8 idx = 0;
u32 reg_bssid; u32 reg_bssid;
@ -2020,7 +2020,7 @@ static void hw_var_set_bssid(PADAPTER Adapter, u8 variable, u8* val)
rtw_write8(Adapter, (reg_bssid+idx), val[idx]); rtw_write8(Adapter, (reg_bssid+idx), val[idx]);
} }
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; u32 bcn_ctrl_reg;
@ -2032,23 +2032,23 @@ static void hw_var_set_bcn_func(PADAPTER Adapter, u8 variable, u8* val)
rtw_write8(Adapter, bcn_ctrl_reg, rtw_read8(Adapter, bcn_ctrl_reg)&(~(EN_BCN_FUNCTION | EN_TXBCN_RPT))); rtw_write8(Adapter, bcn_ctrl_reg, rtw_read8(Adapter, bcn_ctrl_reg)&(~(EN_BCN_FUNCTION | EN_TXBCN_RPT)));
} }
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)
{ {
} }
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)
{ {
} }
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)
{ {
} }
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)
{ {
} }
static void SetHwReg8188EU(PADAPTER Adapter, u8 variable, u8* val) static void SetHwReg8188EU(struct adapter * Adapter, u8 variable, u8* val)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
struct dm_priv *pdmpriv = &pHalData->dmpriv; struct dm_priv *pdmpriv = &pHalData->dmpriv;
@ -2755,7 +2755,7 @@ _func_enter_;
_func_exit_; _func_exit_;
} }
static void GetHwReg8188EU(PADAPTER Adapter, u8 variable, u8* val) static void GetHwReg8188EU(struct adapter * Adapter, u8 variable, u8* val)
{ {
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
struct odm_dm_struct *podmpriv = &pHalData->odmpriv; struct odm_dm_struct *podmpriv = &pHalData->odmpriv;
@ -2824,7 +2824,7 @@ _func_exit_;
/* */ /* */
static u8 static u8
GetHalDefVar8188EUsb( GetHalDefVar8188EUsb(
PADAPTER Adapter, struct adapter * Adapter,
enum hal_def_variable eVariable, enum hal_def_variable eVariable,
void * pValue void * pValue
) )
@ -2953,7 +2953,7 @@ GetHalDefVar8188EUsb(
/* Change default setting of specified variable. */ /* Change default setting of specified variable. */
/* */ /* */
static u8 SetHalDefVar8188EUsb( static u8 SetHalDefVar8188EUsb(
PADAPTER Adapter, struct adapter * Adapter,
enum hal_def_variable eVariable, enum hal_def_variable eVariable,
void * pValue void * pValue
) )
@ -3030,7 +3030,7 @@ static u8 SetHalDefVar8188EUsb(
return bResult; return bResult;
} }
static void _update_response_rate(_adapter *padapter,unsigned int mask) static void _update_response_rate(struct adapter *padapter,unsigned int mask)
{ {
u8 RateIndex = 0; u8 RateIndex = 0;
/* Set RRSR rate table. */ /* Set RRSR rate table. */
@ -3046,7 +3046,7 @@ static void _update_response_rate(_adapter *padapter,unsigned int mask)
rtw_write8(padapter, REG_INIRTS_RATE_SEL, RateIndex); rtw_write8(padapter, REG_INIRTS_RATE_SEL, RateIndex);
} }
static void UpdateHalRAMask8188EUsb(PADAPTER padapter, u32 mac_id, u8 rssi_level) static void UpdateHalRAMask8188EUsb(struct adapter * padapter, u32 mac_id, u8 rssi_level)
{ {
u8 init_rate=0; u8 init_rate=0;
u8 networkType, raid; u8 networkType, raid;
@ -3163,7 +3163,7 @@ static void UpdateHalRAMask8188EUsb(PADAPTER padapter, u32 mac_id, u8 rssi_level
} }
static void SetBeaconRelatedRegisters8188EUsb(PADAPTER padapter) static void SetBeaconRelatedRegisters8188EUsb(struct adapter * padapter)
{ {
u32 value32; u32 value32;
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
@ -3201,7 +3201,7 @@ static void SetBeaconRelatedRegisters8188EUsb(PADAPTER padapter)
} }
static void rtl8188eu_init_default_value(_adapter * padapter) static void rtl8188eu_init_default_value(struct adapter * padapter)
{ {
struct hal_data_8188e *pHalData; struct hal_data_8188e *pHalData;
struct pwrctrl_priv *pwrctrlpriv; struct pwrctrl_priv *pwrctrlpriv;
@ -3226,13 +3226,13 @@ static void rtl8188eu_init_default_value(_adapter * padapter)
pHalData->odmpriv.RFCalibrateInfo.ThermalValue_HP[i] = 0; pHalData->odmpriv.RFCalibrateInfo.ThermalValue_HP[i] = 0;
} }
static u8 rtl8188eu_ps_func(PADAPTER Adapter,enum hal_intf_ps_func efunc_id, u8 *val) static u8 rtl8188eu_ps_func(struct adapter * Adapter,enum hal_intf_ps_func efunc_id, u8 *val)
{ {
u8 bResult = true; u8 bResult = true;
return bResult; return bResult;
} }
void rtl8188eu_set_hal_ops(_adapter * padapter) void rtl8188eu_set_hal_ops(struct adapter * padapter)
{ {
struct hal_ops *pHalFunc = &padapter->HalFunc; struct hal_ops *pHalFunc = &padapter->HalFunc;
@ -3264,9 +3264,6 @@ _func_enter_;
pHalFunc->intf_chip_configure = &rtl8188eu_interface_configure; pHalFunc->intf_chip_configure = &rtl8188eu_interface_configure;
pHalFunc->read_adapter_info = &ReadAdapterInfo8188EU; pHalFunc->read_adapter_info = &ReadAdapterInfo8188EU;
pHalFunc->SetHwRegHandler = &SetHwReg8188EU; pHalFunc->SetHwRegHandler = &SetHwReg8188EU;
pHalFunc->GetHwRegHandler = &GetHwReg8188EU; pHalFunc->GetHwRegHandler = &GetHwReg8188EU;
pHalFunc->GetHalDefVarHandler = &GetHalDefVar8188EUsb; pHalFunc->GetHalDefVarHandler = &GetHalDefVar8188EUsb;

16
hal/usb_ops_linux.c
View file

@ -29,7 +29,7 @@
static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u16 index, void *pdata, u16 len, u8 requesttype) 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 dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);
struct usb_device *udev = pdvobjpriv->pusbdev; struct usb_device *udev = pdvobjpriv->pusbdev;
@ -317,7 +317,7 @@ static int usb_writeN(struct intf_hdl *pintfhdl, u32 addr, u32 length, u8 *pdata
} }
static void interrupt_handler_8188eu(_adapter *padapter,u16 pkt_len,u8 *pbuf) static void interrupt_handler_8188eu(struct adapter *padapter,u16 pkt_len,u8 *pbuf)
{ {
struct hal_data_8188e *pHalData=GET_HAL_DATA(padapter); struct hal_data_8188e *pHalData=GET_HAL_DATA(padapter);
struct reportpwrstate_parm pwr_rpt; struct reportpwrstate_parm pwr_rpt;
@ -342,7 +342,7 @@ static s32 pre_recv_entry(union recv_frame *precvframe, struct recv_stat *prxsta
return _SUCCESS; return _SUCCESS;
} }
static int recvbuf2recvframe(_adapter *padapter, struct sk_buff *pskb) static int recvbuf2recvframe(struct adapter *padapter, struct sk_buff *pskb)
{ {
u8 *pbuf; u8 *pbuf;
u8 shift_sz = 0; u8 shift_sz = 0;
@ -537,7 +537,7 @@ _exit_recvbuf2recvframe:
void rtl8188eu_recv_tasklet(void *priv) void rtl8188eu_recv_tasklet(void *priv)
{ {
struct sk_buff *pskb; struct sk_buff *pskb;
_adapter *padapter = (_adapter*)priv; struct adapter *padapter = (struct adapter*)priv;
struct recv_priv *precvpriv = &padapter->recvpriv; struct recv_priv *precvpriv = &padapter->recvpriv;
while (NULL != (pskb = skb_dequeue(&precvpriv->rx_skb_queue))) { while (NULL != (pskb = skb_dequeue(&precvpriv->rx_skb_queue))) {
@ -558,7 +558,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
unsigned long irqL; unsigned long irqL;
uint isevt, *pbuf; uint isevt, *pbuf;
struct recv_buf *precvbuf = (struct recv_buf *)purb->context; 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; struct recv_priv *precvpriv = &padapter->recvpriv;
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete!!!\n")); RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete!!!\n"));
@ -647,7 +647,7 @@ static u32 usb_read_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem)
u32 ret = _SUCCESS; u32 ret = _SUCCESS;
struct urb * purb = NULL; struct urb * purb = NULL;
struct recv_buf *precvbuf = (struct recv_buf *)rmem; 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 dvobj_priv *pdvobj = adapter_to_dvobj(adapter);
struct recv_priv *precvpriv = &adapter->recvpriv; struct recv_priv *precvpriv = &adapter->recvpriv;
struct usb_device *pusbd = pdvobj->pusbdev; struct usb_device *pusbd = pdvobj->pusbdev;
@ -736,7 +736,7 @@ _func_exit_;
void rtl8188eu_xmit_tasklet(void *priv) void rtl8188eu_xmit_tasklet(void *priv)
{ {
int ret = false; int ret = false;
_adapter *padapter = (_adapter*)priv; struct adapter *padapter = (struct adapter*)priv;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
if (check_fwstate(&padapter->mlmepriv, _FW_UNDER_SURVEY) == true) if (check_fwstate(&padapter->mlmepriv, _FW_UNDER_SURVEY) == true)
@ -777,7 +777,7 @@ void rtl8188eu_set_intf_ops(struct _io_ops *pops)
_func_exit_; _func_exit_;
} }
void rtl8188eu_set_hw_type(_adapter *padapter) void rtl8188eu_set_hw_type(struct adapter *padapter)
{ {
padapter->chip_type = RTL8188E; padapter->chip_type = RTL8188E;
padapter->HardwareType = HARDWARE_TYPE_RTL8188EU; padapter->HardwareType = HARDWARE_TYPE_RTL8188EU;

62
include/Hal8188EPhyCfg.h
View file

@ -188,101 +188,101 @@ struct ant_sel_cck {
// //
// BB and RF register read/write // BB and RF register read/write
// //
u32 rtl8188e_PHY_QueryBBReg( PADAPTER Adapter, u32 rtl8188e_PHY_QueryBBReg( struct adapter * Adapter,
u32 RegAddr, u32 RegAddr,
u32 BitMask ); u32 BitMask );
void rtl8188e_PHY_SetBBReg( PADAPTER Adapter, void rtl8188e_PHY_SetBBReg( struct adapter * Adapter,
u32 RegAddr, u32 RegAddr,
u32 BitMask, u32 BitMask,
u32 Data ); u32 Data );
u32 rtl8188e_PHY_QueryRFReg(PADAPTER Adapter, enum rf_radio_path eRFPath, u32 RegAddr, u32 BitMask); u32 rtl8188e_PHY_QueryRFReg(struct adapter * Adapter, enum rf_radio_path eRFPath, u32 RegAddr, u32 BitMask);
void rtl8188e_PHY_SetRFReg(PADAPTER Adapter, enum rf_radio_path eRFPath, u32 RegAddr, u32 BitMask, u32 Data); void rtl8188e_PHY_SetRFReg(struct adapter * Adapter, enum rf_radio_path eRFPath, u32 RegAddr, u32 BitMask, u32 Data);
// //
// Initialization related function // Initialization related function
// //
/* MAC/BB/RF HAL config */ /* MAC/BB/RF HAL config */
int PHY_MACConfig8188E( PADAPTER Adapter ); int PHY_MACConfig8188E( struct adapter * Adapter );
int PHY_BBConfig8188E( PADAPTER Adapter ); int PHY_BBConfig8188E( struct adapter * Adapter );
int PHY_RFConfig8188E( PADAPTER Adapter ); int PHY_RFConfig8188E( struct adapter * Adapter );
/* RF config */ /* RF config */
int rtl8188e_PHY_ConfigRFWithParaFile(PADAPTER Adapter, u8 * pFileName, enum rf_radio_path eRFPath); int rtl8188e_PHY_ConfigRFWithParaFile(struct adapter * Adapter, u8 * pFileName, enum rf_radio_path eRFPath);
int rtl8188e_PHY_ConfigRFWithHeaderFile( PADAPTER Adapter, int rtl8188e_PHY_ConfigRFWithHeaderFile( struct adapter * Adapter,
enum rf_radio_path eRFPath); enum rf_radio_path eRFPath);
/* Read initi reg value for tx power setting. */ /* Read initi reg value for tx power setting. */
void rtl8192c_PHY_GetHWRegOriginalValue( PADAPTER Adapter ); void rtl8192c_PHY_GetHWRegOriginalValue( struct adapter * Adapter );
// //
// RF Power setting // RF Power setting
// //
//extern bool PHY_SetRFPowerState( PADAPTER Adapter, //extern bool PHY_SetRFPowerState( struct adapter * Adapter,
// RT_RF_POWER_STATE eRFPowerState); // RT_RF_POWER_STATE eRFPowerState);
// //
// BB TX Power R/W // BB TX Power R/W
// //
void PHY_GetTxPowerLevel8188E(PADAPTER Adapter, u32 *powerlevel); void PHY_GetTxPowerLevel8188E(struct adapter * Adapter, u32 *powerlevel);
void PHY_SetTxPowerLevel8188E(PADAPTER Adapter, u8 channel); void PHY_SetTxPowerLevel8188E(struct adapter * Adapter, u8 channel);
bool PHY_UpdateTxPowerDbm8188E(PADAPTER Adapter, int powerInDbm); bool PHY_UpdateTxPowerDbm8188E(struct adapter * Adapter, int powerInDbm);
// //
void void
PHY_ScanOperationBackup8188E( PADAPTER Adapter, PHY_ScanOperationBackup8188E( struct adapter * Adapter,
u8 Operation ); u8 Operation );
// //
// Switch bandwidth for 8192S // Switch bandwidth for 8192S
// //
void PHY_SetBWMode8188E(PADAPTER pAdapter, enum ht_channel_width ChnlWidth, unsigned char Offset); void PHY_SetBWMode8188E(struct adapter * pAdapter, enum ht_channel_width ChnlWidth, unsigned char Offset);
// //
// Set A2 entry to fw for 8192S // Set A2 entry to fw for 8192S
// //
extern void FillA2Entry8192C(PADAPTER Adapter, u8 index, u8 *val); extern void FillA2Entry8192C(struct adapter * Adapter, u8 index, u8 *val);
// //
// channel switch related funciton // channel switch related funciton
// //
void PHY_SwChnl8188E( PADAPTER pAdapter, void PHY_SwChnl8188E( struct adapter * pAdapter,
u8 channel ); u8 channel );
// Call after initialization // Call after initialization
void PHY_SwChnlPhy8192C( PADAPTER pAdapter, void PHY_SwChnlPhy8192C( struct adapter * pAdapter,
u8 channel ); u8 channel );
void ChkFwCmdIoDone( PADAPTER Adapter); void ChkFwCmdIoDone( struct adapter * Adapter);
// //
// BB/MAC/RF other monitor API // BB/MAC/RF other monitor API
// //
void PHY_SetMonitorMode8192C( PADAPTER pAdapter, void PHY_SetMonitorMode8192C( struct adapter * pAdapter,
bool bEnableMonitorMode ); bool bEnableMonitorMode );
bool PHY_CheckIsLegalRfPath8192C( PADAPTER pAdapter, bool PHY_CheckIsLegalRfPath8192C( struct adapter * pAdapter,
u32 eRFPath ); u32 eRFPath );
void PHY_SetRFPathSwitch_8188E( PADAPTER pAdapter, bool bMain); void PHY_SetRFPathSwitch_8188E( struct adapter * pAdapter, bool bMain);
extern void extern void
PHY_SwitchEphyParameter( PHY_SwitchEphyParameter(
PADAPTER Adapter struct adapter * Adapter
); );
extern void extern void
PHY_EnableHostClkReq( PHY_EnableHostClkReq(
PADAPTER Adapter struct adapter * Adapter
); );
bool bool
SetAntennaConfig92C( SetAntennaConfig92C(
PADAPTER Adapter, struct adapter * Adapter,
u8 DefaultAnt u8 DefaultAnt
); );
void void
storePwrIndexDiffRateOffset( storePwrIndexDiffRateOffset(
PADAPTER Adapter, struct adapter * Adapter,
u32 RegAddr, u32 RegAddr,
u32 BitMask, u32 BitMask,
u32 Data u32 Data
@ -301,9 +301,9 @@ storePwrIndexDiffRateOffset(
// Initialization related function // Initialization related function
// //
/* MAC/BB/RF HAL config */ /* MAC/BB/RF HAL config */
//extern s32 PHY_MACConfig8723(PADAPTER padapter); //extern s32 PHY_MACConfig8723(struct adapter * padapter);
//s32 PHY_BBConfig8723(PADAPTER padapter); //s32 PHY_BBConfig8723(struct adapter * padapter);
//s32 PHY_RFConfig8723(PADAPTER padapter); //s32 PHY_RFConfig8723(struct adapter * padapter);
@ -368,7 +368,7 @@ storePwrIndexDiffRateOffset(
#endif #endif
#if (SIC_ENABLE == 1) #if (SIC_ENABLE == 1)
void SIC_Init(PADAPTER Adapter); void SIC_Init(struct adapter * Adapter);
#endif #endif

18
include/HalPhyRf_8188e.h
View file

@ -38,33 +38,33 @@ ODM_TxPwrTrackAdjust88E(
void void
odm_TXPowerTrackingCallback_ThermalMeter_8188E( odm_TXPowerTrackingCallback_ThermalMeter_8188E(
PADAPTER Adapter struct adapter * Adapter
); );
//1 7. IQK //1 7. IQK
void void
PHY_IQCalibrate_8188E(PADAPTER Adapter, bool bReCovery); PHY_IQCalibrate_8188E(struct adapter * Adapter, bool bReCovery);
// //
// LC calibrate // LC calibrate
// //
void PHY_LCCalibrate_8188E( PADAPTER pAdapter); void PHY_LCCalibrate_8188E( struct adapter * pAdapter);
// //
// AP calibrate // AP calibrate
// //
void PHY_APCalibrate_8188E(PADAPTER pAdapter, s1Byte delta); void PHY_APCalibrate_8188E(struct adapter * pAdapter, s1Byte delta);
void void
PHY_DigitalPredistortion_8188E( PADAPTER pAdapter); PHY_DigitalPredistortion_8188E( struct adapter * pAdapter);
void void
_PHY_SaveADDARegisters( _PHY_SaveADDARegisters(
PADAPTER pAdapter, struct adapter * pAdapter,
pu4Byte ADDAReg, pu4Byte ADDAReg,
pu4Byte ADDABackup, pu4Byte ADDABackup,
u4Byte RegisterNum u4Byte RegisterNum
@ -72,7 +72,7 @@ _PHY_SaveADDARegisters(
void void
_PHY_PathADDAOn( _PHY_PathADDAOn(
PADAPTER pAdapter, struct adapter * pAdapter,
pu4Byte ADDAReg, pu4Byte ADDAReg,
bool isPathAOn, bool isPathAOn,
bool is2T bool is2T
@ -80,7 +80,7 @@ _PHY_PathADDAOn(
void void
_PHY_MACSettingCalibration( _PHY_MACSettingCalibration(
PADAPTER pAdapter, struct adapter * pAdapter,
pu4Byte MACReg, pu4Byte MACReg,
pu4Byte MACBackup pu4Byte MACBackup
); );
@ -88,7 +88,7 @@ _PHY_MACSettingCalibration(
void void
_PHY_PathAStandBy( _PHY_PathAStandBy(
PADAPTER pAdapter struct adapter *pAdapter
); );

2
include/HalPwrSeqCmd.h
View file

@ -125,7 +125,7 @@ struct wl_pwr_cfg {
// Prototype of protected function. // Prototype of protected function.
//================================================================================ //================================================================================
u8 HalPwrSeqCmdParsing( u8 HalPwrSeqCmdParsing(
PADAPTER padapter, struct adapter * padapter,
u8 CutVersion, u8 CutVersion,
u8 FabVersion, u8 FabVersion,
u8 InterfaceType, u8 InterfaceType,

18
include/drv_types.h
View file

@ -38,12 +38,8 @@ enum _NIC_VERSION {
RTL8712_NIC, RTL8712_NIC,
RTL8713_NIC, RTL8713_NIC,
RTL8716_NIC RTL8716_NIC
}; };
typedef struct _ADAPTER _adapter, ADAPTER,*PADAPTER;
#ifdef CONFIG_80211N_HT #ifdef CONFIG_80211N_HT
#include <rtw_ht.h> #include <rtw_ht.h>
#endif #endif
@ -182,8 +178,8 @@ struct registry_priv
struct dvobj_priv struct dvobj_priv
{ {
_adapter *if1; struct adapter *if1;
_adapter *if2; struct adapter *if2;
//For 92D, DMDP have 2 interface. //For 92D, DMDP have 2 interface.
u8 InterfaceNumber; u8 InterfaceNumber;
@ -240,7 +236,7 @@ typedef enum _DRIVER_STATE{
DRIVER_REPLACE_DONGLE = 2, DRIVER_REPLACE_DONGLE = 2,
}DRIVER_STATE; }DRIVER_STATE;
struct _ADAPTER{ struct adapter {
int DriverState;// for disable driver using module, use dongle to replace module. 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 pid[3];//process id from UI, 0:wps, 1:hostapd, 2:dhcpcd
int bDongle;//build-in module or external dongle int bDongle;//build-in module or external dongle
@ -299,8 +295,8 @@ struct _ADAPTER{
void *evtThread; void *evtThread;
void *xmitThread; void *xmitThread;
void *recvThread; void *recvThread;
void (*intf_start)(_adapter * adapter); void (*intf_start)(struct adapter * adapter);
void (*intf_stop)(_adapter * adapter); void (*intf_stop)(struct adapter * adapter);
struct net_device *pnetdev; struct net_device *pnetdev;
// used by rtw_rereg_nd_name related function // used by rtw_rereg_nd_name related function
@ -330,7 +326,7 @@ struct _ADAPTER{
// The driver will show the current P2P status when the upper application reads it. // The driver will show the current P2P status when the upper application reads it.
u8 bShowGetP2PState; u8 bShowGetP2PState;
#endif #endif
_adapter *pbuddy_adapter; struct adapter *pbuddy_adapter;
struct mutex *hw_init_mutex; struct mutex *hw_init_mutex;
@ -352,7 +348,7 @@ struct _ADAPTER{
#define adapter_to_dvobj(adapter) (adapter->dvobj) #define adapter_to_dvobj(adapter) (adapter->dvobj)
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) __inline static u8 *myid(struct eeprom_priv *peepriv)
{ {

6
include/h2clbk.h
View file

@ -26,10 +26,10 @@
#include <TypeDef.h> #include <TypeDef.h>
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); void h2c_event_callback(unsigned char *dev, unsigned char *pbuf);

12
include/hal_com.h
View file

@ -153,7 +153,7 @@ void dump_chip_info(struct HAL_VERSION ChipVersion);
u8 //return the final channel plan decision u8 //return the final channel plan decision
hal_com_get_channel_plan( hal_com_get_channel_plan(
PADAPTER padapter, struct adapter * padapter,
u8 hw_channel_plan, //channel plan from HW (efuse/eeprom) u8 hw_channel_plan, //channel plan from HW (efuse/eeprom)
u8 sw_channel_plan, //channel plan from SW (registry/module param) u8 sw_channel_plan, //channel plan from SW (registry/module param)
u8 def_channel_plan, //channel plan used when the former two is invalid u8 def_channel_plan, //channel plan used when the former two is invalid
@ -163,19 +163,19 @@ hal_com_get_channel_plan(
u8 MRateToHwRate(u8 rate); u8 MRateToHwRate(u8 rate);
void HalSetBrateCfg( void HalSetBrateCfg(
PADAPTER Adapter, struct adapter * Adapter,
u8 *mBratesOS, u8 *mBratesOS,
u16 *pBrateCfg); u16 *pBrateCfg);
bool bool
Hal_MappingOutPipe( Hal_MappingOutPipe(
PADAPTER pAdapter, struct adapter * pAdapter,
u8 NumOutPipe u8 NumOutPipe
); );
void hal_init_macaddr(_adapter *adapter); void hal_init_macaddr(struct adapter *adapter);
void c2h_evt_clear(_adapter *adapter); void c2h_evt_clear(struct adapter *adapter);
s32 c2h_evt_read(_adapter *adapter, u8 *buf); s32 c2h_evt_read(struct adapter *adapter, u8 *buf);
#endif //__HAL_COMMON_H__ #endif //__HAL_COMMON_H__

266
include/hal_intf.h
View file

@ -150,98 +150,98 @@ enum hal_intf_ps_func {
typedef s32 (*c2h_id_filter)(u8 id); typedef s32 (*c2h_id_filter)(u8 id);
struct hal_ops { struct hal_ops {
u32 (*hal_power_on)(_adapter *padapter); u32 (*hal_power_on)(struct adapter *padapter);
u32 (*hal_init)(_adapter *padapter); u32 (*hal_init)(struct adapter *padapter);
u32 (*hal_deinit)(_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_init)(struct adapter *padapter);
u32 (*inirp_deinit)(_adapter *padapter); u32 (*inirp_deinit)(struct adapter *padapter);
s32 (*init_xmit_priv)(_adapter *padapter); s32 (*init_xmit_priv)(struct adapter *padapter);
void (*free_xmit_priv)(_adapter *padapter); void (*free_xmit_priv)(struct adapter *padapter);
s32 (*init_recv_priv)(_adapter *padapter); s32 (*init_recv_priv)(struct adapter *padapter);
void (*free_recv_priv)(_adapter *padapter); void (*free_recv_priv)(struct adapter *padapter);
void (*InitSwLeds)(_adapter *padapter); void (*InitSwLeds)(struct adapter *padapter);
void (*DeInitSwLeds)(_adapter *padapter); void (*DeInitSwLeds)(struct adapter *padapter);
void (*dm_init)(_adapter *padapter); void (*dm_init)(struct adapter *padapter);
void (*dm_deinit)(_adapter *padapter); void (*dm_deinit)(struct adapter *padapter);
void (*read_chip_version)(_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 (*enable_interrupt)(struct adapter *padapter);
void (*disable_interrupt)(_adapter *padapter); void (*disable_interrupt)(struct adapter *padapter);
s32 (*interrupt_handler)(_adapter *padapter); s32 (*interrupt_handler)(struct adapter *padapter);
void (*set_bwmode_handler)(_adapter *padapter, enum ht_channel_width Bandwidth, u8 Offset); void (*set_bwmode_handler)(struct adapter *padapter, enum ht_channel_width Bandwidth, u8 Offset);
void (*set_channel_handler)(_adapter *padapter, u8 channel); 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 (*SetHwRegHandler)(struct adapter *padapter, u8 variable,u8* val);
void (*GetHwRegHandler)(_adapter *padapter, u8 variable,u8* val); void (*GetHwRegHandler)(struct adapter *padapter, u8 variable,u8* val);
u8 (*GetHalDefVarHandler)(_adapter *padapter, enum hal_def_variable eVariable, void * pValue); u8 (*GetHalDefVarHandler)(struct adapter *padapter, enum hal_def_variable eVariable, void * pValue);
u8 (*SetHalDefVarHandler)(_adapter *padapter, enum hal_def_variable eVariable, void * pValue); u8 (*SetHalDefVarHandler)(struct adapter *padapter, enum hal_def_variable eVariable, void * pValue);
void (*GetHalODMVarHandler)(_adapter *padapter, enum hal_odm_variable eVariable, void * pValue1,bool bSet); void (*GetHalODMVarHandler)(struct adapter *padapter, enum hal_odm_variable eVariable, void * pValue1,bool bSet);
void (*SetHalODMVarHandler)(_adapter *padapter, enum hal_odm_variable eVariable, void * pValue1,bool bSet); void (*SetHalODMVarHandler)(struct adapter *padapter, enum hal_odm_variable eVariable, void * pValue1,bool bSet);
void (*UpdateRAMaskHandler)(_adapter *padapter, u32 mac_id, u8 rssi_level); void (*UpdateRAMaskHandler)(struct adapter *padapter, u32 mac_id, u8 rssi_level);
void (*SetBeaconRelatedRegistersHandler)(_adapter *padapter); 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 (*run_thread)(struct adapter *padapter);
void (*cancel_thread)(_adapter *padapter); void (*cancel_thread)(struct adapter *padapter);
u8 (*AntDivBeforeLinkHandler)(_adapter *padapter); u8 (*AntDivBeforeLinkHandler)(struct adapter *padapter);
void (*AntDivCompareHandler)(_adapter *padapter, struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src); void (*AntDivCompareHandler)(struct adapter *padapter, struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src);
u8 (*interface_ps_func)(_adapter *padapter,enum hal_intf_ps_func efunc_id, u8* val); u8 (*interface_ps_func)(struct adapter *padapter,enum hal_intf_ps_func efunc_id, u8* val);
s32 (*hal_xmit)(_adapter *padapter, struct xmit_frame *pxmitframe); s32 (*hal_xmit)(struct adapter *padapter, struct xmit_frame *pxmitframe);
s32 (*mgnt_xmit)(_adapter *padapter, struct xmit_frame *pmgntframe); s32 (*mgnt_xmit)(struct adapter *padapter, struct xmit_frame *pmgntframe);
u32 (*read_bbreg)(_adapter *padapter, u32 RegAddr, u32 BitMask); u32 (*read_bbreg)(struct adapter *padapter, u32 RegAddr, u32 BitMask);
void (*write_bbreg)(_adapter *padapter, u32 RegAddr, u32 BitMask, u32 Data); void (*write_bbreg)(struct adapter *padapter, u32 RegAddr, u32 BitMask, u32 Data);
u32 (*read_rfreg)(_adapter *padapter, enum rf_radio_path eRFPath, u32 RegAddr, u32 BitMask); u32 (*read_rfreg)(struct adapter *padapter, enum rf_radio_path eRFPath, u32 RegAddr, u32 BitMask);
void (*write_rfreg)(_adapter *padapter, enum rf_radio_path eRFPath, u32 RegAddr, u32 BitMask, u32 Data); void (*write_rfreg)(struct adapter *padapter, enum rf_radio_path eRFPath, u32 RegAddr, u32 BitMask, u32 Data);
void (*EfusePowerSwitch)(_adapter *padapter, u8 bWrite, u8 PwrState); void (*EfusePowerSwitch)(struct adapter *padapter, u8 bWrite, u8 PwrState);
void (*ReadEFuse)(_adapter *padapter, u8 efuseType, u16 _offset, u16 _size_byte, u8 *pbuf, bool bPseudoTest); void (*ReadEFuse)(struct adapter *padapter, u8 efuseType, u16 _offset, u16 _size_byte, u8 *pbuf, bool bPseudoTest);
void (*EFUSEGetEfuseDefinition)(_adapter *padapter, u8 efuseType, u8 type, void *pOut, bool bPseudoTest); void (*EFUSEGetEfuseDefinition)(struct adapter *padapter, u8 efuseType, u8 type, void *pOut, bool bPseudoTest);
u16 (*EfuseGetCurrentSize)(_adapter *padapter, u8 efuseType, bool bPseudoTest); u16 (*EfuseGetCurrentSize)(struct adapter *padapter, u8 efuseType, bool bPseudoTest);
int (*Efuse_PgPacketRead)(_adapter *padapter, u8 offset, u8 *data, bool bPseudoTest); int (*Efuse_PgPacketRead)(struct adapter *padapter, u8 offset, u8 *data, bool bPseudoTest);
int (*Efuse_PgPacketWrite)(_adapter *padapter, u8 offset, u8 word_en, u8 *data, bool bPseudoTest); int (*Efuse_PgPacketWrite)(struct adapter *padapter, u8 offset, u8 word_en, u8 *data, bool bPseudoTest);
u8 (*Efuse_WordEnableDataWrite)(_adapter *padapter, u16 efuse_addr, u8 word_en, u8 *data, bool bPseudoTest); u8 (*Efuse_WordEnableDataWrite)(struct adapter *padapter, u16 efuse_addr, u8 word_en, u8 *data, bool bPseudoTest);
bool (*Efuse_PgPacketWrite_BT)(_adapter *padapter, u8 offset, u8 word_en, u8 *data, bool bPseudoTest); bool (*Efuse_PgPacketWrite_BT)(struct adapter *padapter, u8 offset, u8 word_en, u8 *data, bool bPseudoTest);
void (*sreset_init_value)(_adapter *padapter); void (*sreset_init_value)(struct adapter *padapter);
void (*sreset_reset_value)(_adapter *padapter); void (*sreset_reset_value)(struct adapter *padapter);
void (*silentreset)(_adapter *padapter); void (*silentreset)(struct adapter *padapter);
void (*sreset_xmit_status_check)(_adapter *padapter); void (*sreset_xmit_status_check)(struct adapter *padapter);
void (*sreset_linked_status_check) (_adapter *padapter); void (*sreset_linked_status_check) (struct adapter *padapter);
u8 (*sreset_get_wifi_status)(_adapter *padapter); u8 (*sreset_get_wifi_status)(struct adapter *padapter);
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);
void (*hal_notch_filter)(_adapter * adapter, bool enable); void (*hal_notch_filter)(struct adapter * adapter, bool enable);
void (*hal_reset_security_engine)(_adapter * adapter); void (*hal_reset_security_engine)(struct adapter * adapter);
s32 (*c2h_handler)(_adapter *padapter, struct c2h_evt_hdr *c2h_evt); s32 (*c2h_handler)(struct adapter *padapter, struct c2h_evt_hdr *c2h_evt);
c2h_id_filter c2h_id_filter_ccx; c2h_id_filter c2h_id_filter_ccx;
#if defined(CONFIG_CHECK_BT_HANG) && defined(CONFIG_BT_COEXIST) #if defined(CONFIG_CHECK_BT_HANG) && defined(CONFIG_BT_COEXIST)
void (*hal_init_checkbthang_workqueue)(_adapter * padapter); void (*hal_init_checkbthang_workqueue)(struct adapter * padapter);
void (*hal_free_checkbthang_workqueue)(_adapter * padapter); void (*hal_free_checkbthang_workqueue)(struct adapter * padapter);
void (*hal_cancel_checkbthang_workqueue)(_adapter * padapter); void (*hal_cancel_checkbthang_workqueue)(struct adapter * padapter);
void (*hal_checke_bt_hang)(_adapter * padapter); void (*hal_checke_bt_hang)(struct adapter * padapter);
#endif #endif
}; };
@ -283,34 +283,34 @@ enum hardware_type {
// //
// RTL8192C Series // RTL8192C Series
// //
#define IS_HARDWARE_TYPE_8192CE(_Adapter) (((PADAPTER)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8192CE) #define IS_HARDWARE_TYPE_8192CE(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8192CE)
#define IS_HARDWARE_TYPE_8192CU(_Adapter) (((PADAPTER)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8192CU) #define IS_HARDWARE_TYPE_8192CU(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8192CU)
#define IS_HARDWARE_TYPE_8192C(_Adapter) \ #define IS_HARDWARE_TYPE_8192C(_Adapter) \
(IS_HARDWARE_TYPE_8192CE(_Adapter) || IS_HARDWARE_TYPE_8192CU(_Adapter)) (IS_HARDWARE_TYPE_8192CE(_Adapter) || IS_HARDWARE_TYPE_8192CU(_Adapter))
// //
// RTL8192D Series // RTL8192D Series
// //
#define IS_HARDWARE_TYPE_8192DE(_Adapter) (((PADAPTER)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8192DE) #define IS_HARDWARE_TYPE_8192DE(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8192DE)
#define IS_HARDWARE_TYPE_8192DU(_Adapter) (((PADAPTER)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8192DU) #define IS_HARDWARE_TYPE_8192DU(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8192DU)
#define IS_HARDWARE_TYPE_8192D(_Adapter) \ #define IS_HARDWARE_TYPE_8192D(_Adapter) \
(IS_HARDWARE_TYPE_8192DE(_Adapter) || IS_HARDWARE_TYPE_8192DU(_Adapter)) (IS_HARDWARE_TYPE_8192DE(_Adapter) || IS_HARDWARE_TYPE_8192DU(_Adapter))
// //
// RTL8723A Series // RTL8723A Series
// //
#define IS_HARDWARE_TYPE_8723AE(_Adapter) (((PADAPTER)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8723AE) #define IS_HARDWARE_TYPE_8723AE(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8723AE)
#define IS_HARDWARE_TYPE_8723AU(_Adapter) (((PADAPTER)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8723AU) #define IS_HARDWARE_TYPE_8723AU(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8723AU)
#define IS_HARDWARE_TYPE_8723AS(_Adapter) (((PADAPTER)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8723AS) #define IS_HARDWARE_TYPE_8723AS(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8723AS)
#define IS_HARDWARE_TYPE_8723A(_Adapter) \ #define IS_HARDWARE_TYPE_8723A(_Adapter) \
(IS_HARDWARE_TYPE_8723AE(_Adapter) || IS_HARDWARE_TYPE_8723AU(_Adapter) || IS_HARDWARE_TYPE_8723AS(_Adapter)) (IS_HARDWARE_TYPE_8723AE(_Adapter) || IS_HARDWARE_TYPE_8723AU(_Adapter) || IS_HARDWARE_TYPE_8723AS(_Adapter))
// //
// RTL8188E Series // RTL8188E Series
// //
#define IS_HARDWARE_TYPE_8188EE(_Adapter) (((PADAPTER)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8188EE) #define IS_HARDWARE_TYPE_8188EE(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8188EE)
#define IS_HARDWARE_TYPE_8188EU(_Adapter) (((PADAPTER)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8188EU) #define IS_HARDWARE_TYPE_8188EU(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8188EU)
#define IS_HARDWARE_TYPE_8188ES(_Adapter) (((PADAPTER)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8188ES) #define IS_HARDWARE_TYPE_8188ES(_Adapter) (((struct adapter *)_Adapter)->HardwareType==HARDWARE_TYPE_RTL8188ES)
#define IS_HARDWARE_TYPE_8188E(_Adapter) \ #define IS_HARDWARE_TYPE_8188E(_Adapter) \
(IS_HARDWARE_TYPE_8188EE(_Adapter) || IS_HARDWARE_TYPE_8188EU(_Adapter) || IS_HARDWARE_TYPE_8188ES(_Adapter)) (IS_HARDWARE_TYPE_8188EE(_Adapter) || IS_HARDWARE_TYPE_8188EU(_Adapter) || IS_HARDWARE_TYPE_8188ES(_Adapter))
@ -351,84 +351,84 @@ struct wowlan_ioctl_param{
#define Rx_PatternPkt 0x23 #define Rx_PatternPkt 0x23
#endif // CONFIG_WOWLAN #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_init(struct adapter *padapter);
void rtw_hal_dm_deinit(_adapter *padapter); void rtw_hal_dm_deinit(struct adapter *padapter);
void rtw_hal_sw_led_init(_adapter *padapter); void rtw_hal_sw_led_init(struct adapter *padapter);
void rtw_hal_sw_led_deinit(_adapter *padapter); void rtw_hal_sw_led_deinit(struct adapter *padapter);
u32 rtw_hal_power_on(_adapter *padapter); u32 rtw_hal_power_on(struct adapter *padapter);
uint rtw_hal_init(_adapter *padapter); uint rtw_hal_init(struct adapter *padapter);
uint rtw_hal_deinit(_adapter *padapter); uint rtw_hal_deinit(struct adapter *padapter);
void rtw_hal_stop(_adapter *padapter); void rtw_hal_stop(struct adapter *padapter);
void rtw_hal_set_hwreg(PADAPTER padapter, u8 variable, u8 *val); void rtw_hal_set_hwreg(struct adapter * padapter, u8 variable, u8 *val);
void rtw_hal_get_hwreg(PADAPTER 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_chip_configure(struct adapter *padapter);
void rtw_hal_read_chip_info(_adapter *padapter); void rtw_hal_read_chip_info(struct adapter *padapter);
void rtw_hal_read_chip_version(_adapter *padapter); void rtw_hal_read_chip_version(struct adapter *padapter);
u8 rtw_hal_set_def_var(_adapter *padapter, enum hal_def_variable eVariable, void * pValue); u8 rtw_hal_set_def_var(struct adapter *padapter, enum hal_def_variable eVariable, void * pValue);
u8 rtw_hal_get_def_var(_adapter *padapter, enum hal_def_variable eVariable, void * pValue); u8 rtw_hal_get_def_var(struct adapter *padapter, enum hal_def_variable eVariable, void * pValue);
void rtw_hal_set_odm_var(_adapter *padapter, enum hal_odm_variable eVariable, void * pValue1,bool bSet); void rtw_hal_set_odm_var(struct adapter *padapter, enum hal_odm_variable eVariable, void * pValue1,bool bSet);
void rtw_hal_get_odm_var(_adapter *padapter, enum hal_odm_variable eVariable, void * pValue1,bool bSet); void rtw_hal_get_odm_var(struct adapter *padapter, enum hal_odm_variable eVariable, void * pValue1,bool bSet);
void rtw_hal_enable_interrupt(_adapter *padapter); void rtw_hal_enable_interrupt(struct adapter *padapter);
void rtw_hal_disable_interrupt(_adapter *padapter); void rtw_hal_disable_interrupt(struct adapter *padapter);
u32 rtw_hal_inirp_init(_adapter *padapter); u32 rtw_hal_inirp_init(struct adapter *padapter);
u32 rtw_hal_inirp_deinit(_adapter *padapter); u32 rtw_hal_inirp_deinit(struct adapter *padapter);
u8 rtw_hal_intf_ps_func(_adapter *padapter,enum hal_intf_ps_func efunc_id, u8* val); u8 rtw_hal_intf_ps_func(struct adapter *padapter,enum hal_intf_ps_func efunc_id, u8* val);
s32 rtw_hal_xmit(_adapter *padapter, struct xmit_frame *pxmitframe); s32 rtw_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe);
s32 rtw_hal_mgnt_xmit(_adapter *padapter, struct xmit_frame *pmgntframe); s32 rtw_hal_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe);
s32 rtw_hal_init_xmit_priv(_adapter *padapter); s32 rtw_hal_init_xmit_priv(struct adapter *padapter);
void rtw_hal_free_xmit_priv(_adapter *padapter); void rtw_hal_free_xmit_priv(struct adapter *padapter);
s32 rtw_hal_init_recv_priv(_adapter *padapter); s32 rtw_hal_init_recv_priv(struct adapter *padapter);
void rtw_hal_free_recv_priv(_adapter *padapter); void rtw_hal_free_recv_priv(struct adapter *padapter);
void rtw_hal_update_ra_mask(_adapter *padapter, u32 mac_id, u8 rssi_level); void rtw_hal_update_ra_mask(struct adapter *padapter, u32 mac_id, 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_clone_data(_adapter *dst_padapter, _adapter *src_padapter); void rtw_hal_clone_data(struct adapter *dst_padapter, struct adapter *src_padapter);
void rtw_hal_start_thread(_adapter *padapter); void rtw_hal_start_thread(struct adapter *padapter);
void rtw_hal_stop_thread(_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); u32 rtw_hal_read_bbreg(struct adapter *padapter, u32 RegAddr, u32 BitMask);
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);
u32 rtw_hal_read_rfreg(_adapter *padapter, enum rf_radio_path eRFPath, u32 RegAddr, u32 BitMask); u32 rtw_hal_read_rfreg(struct adapter *padapter, enum rf_radio_path eRFPath, u32 RegAddr, u32 BitMask);
void rtw_hal_write_rfreg(_adapter *padapter, enum rf_radio_path eRFPath, u32 RegAddr, u32 BitMask, u32 Data); void rtw_hal_write_rfreg(struct adapter *padapter, enum rf_radio_path 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, enum ht_channel_width Bandwidth, u8 Offset); void rtw_hal_set_bwmode(struct adapter *padapter, enum ht_channel_width Bandwidth, u8 Offset);
void rtw_hal_set_chan(_adapter *padapter, u8 channel); void rtw_hal_set_chan(struct adapter *padapter, u8 channel);
void rtw_hal_dm_watchdog(_adapter *padapter); void rtw_hal_dm_watchdog(struct adapter *padapter);
u8 rtw_hal_antdiv_before_linked(_adapter *padapter); u8 rtw_hal_antdiv_before_linked(struct adapter *padapter);
void rtw_hal_antdiv_rssi_compared(_adapter *padapter, struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src); void rtw_hal_antdiv_rssi_compared(struct adapter *padapter, struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src);
void rtw_hal_sreset_init(_adapter *padapter); void rtw_hal_sreset_init(struct adapter *padapter);
void rtw_hal_sreset_reset(_adapter *padapter); void rtw_hal_sreset_reset(struct adapter *padapter);
void rtw_hal_sreset_reset_value(_adapter *padapter); void rtw_hal_sreset_reset_value(struct adapter *padapter);
void rtw_hal_sreset_xmit_status_check(_adapter *padapter); void rtw_hal_sreset_xmit_status_check(struct adapter *padapter);
void rtw_hal_sreset_linked_status_check (_adapter *padapter); void rtw_hal_sreset_linked_status_check (struct adapter *padapter);
u8 rtw_hal_sreset_get_wifi_status(_adapter *padapter); u8 rtw_hal_sreset_get_wifi_status(struct adapter *padapter);
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);
void rtw_hal_notch_filter(_adapter * adapter, bool enable); void rtw_hal_notch_filter(struct adapter * adapter, bool enable);
void rtw_hal_reset_security_engine(_adapter * adapter); void rtw_hal_reset_security_engine(struct adapter * 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);
c2h_id_filter rtw_hal_c2h_id_filter_ccx(_adapter *adapter); c2h_id_filter rtw_hal_c2h_id_filter_ccx(struct adapter *adapter);
#endif //__HAL_INTF_H__ #endif //__HAL_INTF_H__

28
include/ioctl_cfg80211.h
View file

@ -41,7 +41,7 @@ struct rtw_wdev_priv
{ {
struct wireless_dev *rtw_wdev; struct wireless_dev *rtw_wdev;
_adapter *padapter; struct adapter *padapter;
struct cfg80211_scan_request *scan_request; struct cfg80211_scan_request *scan_request;
spinlock_t scan_req_lock; spinlock_t scan_req_lock;
@ -62,35 +62,35 @@ struct rtw_wdev_priv
#define wdev_to_priv(w) ((struct rtw_wdev_priv *)(wdev_priv(w))) #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_tostruct 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) #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_free(struct wireless_dev *wdev);
void rtw_wdev_unregister(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); void rtw_cfg80211_surveydone_event_callback(struct adapter *padapter);
void rtw_cfg80211_indicate_connect(_adapter *padapter); void rtw_cfg80211_indicate_connect(struct adapter *padapter);
void rtw_cfg80211_indicate_disconnect(_adapter *padapter); void rtw_cfg80211_indicate_disconnect(struct adapter *padapter);
void rtw_cfg80211_indicate_scan_done(struct rtw_wdev_priv *pwdev_priv, bool aborted); void rtw_cfg80211_indicate_scan_done(struct rtw_wdev_priv *pwdev_priv, bool aborted);
#ifdef CONFIG_AP_MODE #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);
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);
#endif //CONFIG_AP_MODE #endif //CONFIG_AP_MODE
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);
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);
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);
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);
int rtw_cfg80211_set_mgnt_wpsp2pie(struct net_device *net, char *buf, int len, int type); 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) #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)) && !defined(COMPAT_KERNEL_RELEASE)
#define rtw_cfg80211_rx_mgmt(dev, freq, sig_dbm, buf, len, gfp) cfg80211_rx_mgmt(dev, freq, buf, len, gfp) #define rtw_cfg80211_rx_mgmt(dev, freq, sig_dbm, buf, len, gfp) cfg80211_rx_mgmt(dev, freq, buf, len, gfp)

12
include/mlme_osdep.h
View file

@ -23,12 +23,12 @@
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
extern void rtw_init_mlme_timer(_adapter *padapter); extern void rtw_init_mlme_timer(struct adapter *padapter);
extern void rtw_os_indicate_disconnect( _adapter *adapter ); extern void rtw_os_indicate_disconnect( struct adapter *adapter );
extern void rtw_os_indicate_connect( _adapter *adapter ); extern void rtw_os_indicate_connect( struct adapter *adapter );
void rtw_os_indicate_scan_done( _adapter *padapter, bool aborted); void rtw_os_indicate_scan_done( struct adapter *padapter, bool aborted);
extern void rtw_report_sec_ie(_adapter *adapter,u8 authmode,u8 *sec_ie); 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_ #endif //_MLME_OSDEP_H_

6
include/odm.h
View file

@ -817,7 +817,7 @@ enum ant_div_type {
// 2011/09/22 MH Copy from SD4 defined structure. We use to support PHY DM integration. // 2011/09/22 MH Copy from SD4 defined structure. We use to support PHY DM integration.
struct odm_dm_struct { struct odm_dm_struct {
// Add for different team use temporarily // Add for different team use temporarily
PADAPTER Adapter; // For CE/NIC team struct adapter * Adapter; // For CE/NIC team
struct rtl8192cd_priv *priv; // For AP/ADSL team struct rtl8192cd_priv *priv; // For AP/ADSL team
// WHen you use Adapter or priv pointer, you must make sure the pointer is ready. // WHen you use Adapter or priv pointer, you must make sure the pointer is ready.
bool odm_ready; bool odm_ready;
@ -873,7 +873,7 @@ struct odm_dm_struct {
u1Byte u1Byte_temp; u1Byte u1Byte_temp;
bool bool_temp; bool bool_temp;
PADAPTER PADAPTER_temp; struct adapter *adapter_temp;
// MAC PHY Mode SMSP/DMSP/DMDP = 0/1/2 // MAC PHY Mode SMSP/DMSP/DMDP = 0/1/2
u1Byte *pMacPhyMode; u1Byte *pMacPhyMode;
@ -896,7 +896,7 @@ struct odm_dm_struct {
// Common info for 92D DMSP // Common info for 92D DMSP
bool *pbGetValueFromOtherMac; bool *pbGetValueFromOtherMac;
PADAPTER *pBuddyAdapter; struct adapter **pBuddyAdapter;
bool *pbMasterOfDMSP; //MAC0: master, MAC1: slave bool *pbMasterOfDMSP; //MAC0: master, MAC1: slave
// Common info for Status // Common info for Status
bool *pbScanInProcess; bool *pbScanInProcess;

26
include/osdep_intf.h
View file

@ -58,21 +58,21 @@ The protection mechanism is through the pending queue.
u8 bio_timer_cancel; u8 bio_timer_cancel;
}; };
u8 rtw_init_drv_sw(_adapter *padapter); u8 rtw_init_drv_sw(struct adapter *padapter);
u8 rtw_free_drv_sw(_adapter *padapter); u8 rtw_free_drv_sw(struct adapter *padapter);
u8 rtw_reset_drv_sw(_adapter *padapter); u8 rtw_reset_drv_sw(struct adapter *padapter);
u32 rtw_start_drv_threads(_adapter *padapter); u32 rtw_start_drv_threads(struct adapter *padapter);
void rtw_stop_drv_threads (_adapter *padapter); void rtw_stop_drv_threads (struct adapter *padapter);
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
void rtw_cancel_dynamic_chk_timer(_adapter *padapter); void rtw_cancel_dynamic_chk_timer(struct adapter *padapter);
#endif #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_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
int rtw_init_netdev_name(struct net_device *pnetdev, const char *ifname); 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)) #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,35))
u16 rtw_recv_select_queue(struct sk_buff *skb); u16 rtw_recv_select_queue(struct sk_buff *skb);
@ -81,11 +81,11 @@ u16 rtw_recv_select_queue(struct sk_buff *skb);
void rtw_proc_init_one(struct net_device *dev); void rtw_proc_init_one(struct net_device *dev);
void rtw_proc_remove_one(struct net_device *dev); void rtw_proc_remove_one(struct net_device *dev);
void rtw_ips_dev_unload(_adapter *padapter); void rtw_ips_dev_unload(struct adapter *padapter);
int rtw_ips_pwr_up(_adapter *padapter); int rtw_ips_pwr_up(struct adapter *padapter);
void rtw_ips_pwr_down(_adapter *padapter); void rtw_ips_pwr_down(struct adapter *padapter);
int rtw_hw_suspend(_adapter *padapter ); int rtw_hw_suspend(struct adapter *padapter );
int rtw_hw_resume(_adapter *padapter); int rtw_hw_resume(struct adapter *padapter);
#endif //_OSDEP_INTF_H_ #endif //_OSDEP_INTF_H_

22
include/recv_osdep.h
View file

@ -24,34 +24,34 @@
#include <drv_types.h> #include <drv_types.h>
extern int _rtw_init_recv_priv(struct recv_priv *precvpriv, _adapter *padapter); extern int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter);
extern void _rtw_free_recv_priv (struct recv_priv *precvpriv); extern void _rtw_free_recv_priv (struct recv_priv *precvpriv);
extern s32 rtw_recv_entry(union recv_frame *precv_frame); 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(struct net_device *cnxt, struct sk_buff *preturnedpkt); extern void rtw_recv_returnpacket(struct net_device *cnxt, struct sk_buff *preturnedpkt);
extern void rtw_hostapd_mlme_rx(_adapter *padapter, union recv_frame *precv_frame); extern void rtw_hostapd_mlme_rx(struct adapter *padapter, union recv_frame *precv_frame);
extern void rtw_handle_tkip_mic_err(_adapter *padapter,u8 bgroup); 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); 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_init(struct recv_priv *precvpriv, struct adapter *padapter);
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);
void rtw_os_recv_resource_free(struct recv_priv *precvpriv); 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_alloc(struct adapter *padapter, struct recv_buf *precvbuf);
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);
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); void rtw_init_recv_timer(struct recv_reorder_ctrl *preorder_ctrl);
int nat25_handle_frame(_adapter *priv, struct sk_buff *skb); int nat25_handle_frame(struct adapter *priv, struct sk_buff *skb);
#endif // #endif //

23
include/rtl8188e_cmd.h
View file

@ -119,20 +119,20 @@ struct P2P_PS_CTWPeriod_t {
// host message to firmware cmd // host message to firmware cmd
void rtl8188e_set_FwPwrMode_cmd(PADAPTER padapter, u8 Mode); void rtl8188e_set_FwPwrMode_cmd(struct adapter * padapter, u8 Mode);
void rtl8188e_set_FwJoinBssReport_cmd(PADAPTER padapter, u8 mstatus); void rtl8188e_set_FwJoinBssReport_cmd(struct adapter * padapter, u8 mstatus);
u8 rtl8188e_set_rssi_cmd(PADAPTER padapter, u8 *param); u8 rtl8188e_set_rssi_cmd(struct adapter * padapter, u8 *param);
u8 rtl8188e_set_raid_cmd(PADAPTER padapter, u32 mask); u8 rtl8188e_set_raid_cmd(struct adapter * padapter, u32 mask);
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);
//u8 rtl8192c_set_FwSelectSuspend_cmd(PADAPTER padapter, u8 bfwpoll, u16 period); //u8 rtl8192c_set_FwSelectSuspend_cmd(struct adapter * padapter, u8 bfwpoll, u16 period);
#ifdef CONFIG_P2P #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 #endif //CONFIG_P2P
void CheckFwRsvdPageContent(PADAPTER padapter); void CheckFwRsvdPageContent(struct adapter * padapter);
void rtl8188e_set_FwMediaStatus_cmd(PADAPTER padapter, __le16 mstatus_rpt); void rtl8188e_set_FwMediaStatus_cmd(struct adapter * padapter, __le16 mstatus_rpt);
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
struct setwowlan_parm { struct setwowlan_parm {
@ -162,7 +162,8 @@ struct setaoac_glocal_info {
#define FW_REMOTE_WAKE_CTRL_EN BIT(0) #define FW_REMOTE_WAKE_CTRL_EN BIT(0)
#define FW_REALWOWLAN_EN BIT(5) #define FW_REALWOWLAN_EN BIT(5)
void rtl8188es_set_wowlan_cmd(_adapter* padapter, u8 enable); void rtl8188es_set_wowlan_cmd(struct adapter* padapter, u8 enable);
void SetFwRelatedForWoWLAN8188ES(_adapter* padapter, u8 bHostIsGoingtoSleep); void SetFwRelatedForWoWLAN8188ES(struct adapter* padapter, u8 bHostIsGoingtoSleep);
#endif//CONFIG_WOWLAN #endif//CONFIG_WOWLAN
#endif//__RTL8188E_CMD_H__ #endif//__RTL8188E_CMD_H__

12
include/rtl8188e_dm.h
View file

@ -51,12 +51,12 @@ struct dm_priv
u8 PowerIndex_backup[6]; u8 PowerIndex_backup[6];
}; };
void rtl8188e_init_dm_priv(PADAPTER Adapter); void rtl8188e_init_dm_priv(struct adapter * Adapter);
void rtl8188e_deinit_dm_priv(PADAPTER Adapter); void rtl8188e_deinit_dm_priv(struct adapter * Adapter);
void rtl8188e_InitHalDm(PADAPTER Adapter); void rtl8188e_InitHalDm(struct adapter * Adapter);
void rtl8188e_HalDmWatchDog(PADAPTER Adapter); void rtl8188e_HalDmWatchDog(struct adapter * Adapter);
void AntDivCompare8188E(PADAPTER Adapter, struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src); void AntDivCompare8188E(struct adapter * Adapter, struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src);
u8 AntDivBeforeLink8188E(PADAPTER Adapter ); u8 AntDivBeforeLink8188E(struct adapter * Adapter );
#endif #endif

52
include/rtl8188e_hal.h
View file

@ -453,48 +453,48 @@ struct hal_data_8188e {
// rtl8188e_hal_init.c // rtl8188e_hal_init.c
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
s32 rtl8188e_FirmwareDownload(PADAPTER padapter, bool bUsedWoWLANFw); s32 rtl8188e_FirmwareDownload(struct adapter * padapter, bool bUsedWoWLANFw);
#else #else
s32 rtl8188e_FirmwareDownload(PADAPTER padapter); s32 rtl8188e_FirmwareDownload(struct adapter * padapter);
#endif #endif
void _8051Reset88E(PADAPTER padapter); void _8051Reset88E(struct adapter * padapter);
void rtl8188e_InitializeFirmwareVars(PADAPTER padapter); void rtl8188e_InitializeFirmwareVars(struct adapter * padapter);
s32 InitLLTTable(PADAPTER padapter, u8 txpktbuf_bndy); s32 InitLLTTable(struct adapter * padapter, u8 txpktbuf_bndy);
// EFuse // EFuse
u8 GetEEPROMSize8188E(PADAPTER padapter); u8 GetEEPROMSize8188E(struct adapter * padapter);
void Hal_InitPGData88E(PADAPTER padapter); void Hal_InitPGData88E(struct adapter * padapter);
void Hal_EfuseParseIDCode88E(PADAPTER padapter, u8 *hwinfo); void Hal_EfuseParseIDCode88E(struct adapter * padapter, u8 *hwinfo);
void Hal_ReadTxPowerInfo88E(PADAPTER padapter,u8* hwinfo,bool AutoLoadFail); void Hal_ReadTxPowerInfo88E(struct adapter * padapter,u8* hwinfo,bool AutoLoadFail);
void Hal_EfuseParseEEPROMVer88E(PADAPTER padapter, u8 *hwinfo, bool AutoLoadFail); void Hal_EfuseParseEEPROMVer88E(struct adapter * padapter, u8 *hwinfo, bool AutoLoadFail);
void rtl8188e_EfuseParseChnlPlan(PADAPTER padapter, u8 *hwinfo, bool AutoLoadFail); void rtl8188e_EfuseParseChnlPlan(struct adapter * padapter, u8 *hwinfo, bool AutoLoadFail);
void Hal_EfuseParseCustomerID88E(PADAPTER padapter, u8 *hwinfo, bool AutoLoadFail); void Hal_EfuseParseCustomerID88E(struct adapter * padapter, u8 *hwinfo, bool AutoLoadFail);
void Hal_ReadAntennaDiversity88E (PADAPTER pAdapter,u8*PROMContent,bool AutoLoadFail); void Hal_ReadAntennaDiversity88E (struct adapter * pAdapter,u8*PROMContent,bool AutoLoadFail);
void Hal_ReadThermalMeter_88E(PADAPTER Adapter,u8* PROMContent,bool AutoloadFail); void Hal_ReadThermalMeter_88E(struct adapter * Adapter,u8* PROMContent,bool AutoloadFail);
void Hal_EfuseParseXtal_8188E(PADAPTER pAdapter,u8* hwinfo,bool AutoLoadFail); void Hal_EfuseParseXtal_8188E(struct adapter * pAdapter,u8* hwinfo,bool AutoLoadFail);
void Hal_EfuseParseBoardType88E(PADAPTER pAdapter,u8* hwinfo,bool AutoLoadFail); void Hal_EfuseParseBoardType88E(struct adapter * pAdapter,u8* hwinfo,bool AutoLoadFail);
void Hal_ReadPowerSavingMode88E(PADAPTER pAdapter,u8* hwinfo,bool AutoLoadFail); void Hal_ReadPowerSavingMode88E(struct adapter * pAdapter,u8* hwinfo,bool AutoLoadFail);
bool HalDetectPwrDownMode88E(PADAPTER Adapter); bool HalDetectPwrDownMode88E(struct adapter * Adapter);
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
void Hal_DetectWoWMode(PADAPTER pAdapter); void Hal_DetectWoWMode(struct adapter * pAdapter);
#endif //CONFIG_WOWLAN #endif //CONFIG_WOWLAN
void Hal_InitChannelPlan(PADAPTER padapter); void Hal_InitChannelPlan(struct adapter * padapter);
void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc); void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc);
// register // register
void SetBcnCtrlReg(PADAPTER padapter, u8 SetBits, u8 ClearBits); void SetBcnCtrlReg(struct adapter * padapter, u8 SetBits, u8 ClearBits);
void rtl8188e_clone_haldata(_adapter *dst_adapter, _adapter *src_adapter); void rtl8188e_clone_haldata(struct adapter *dst_adapter, struct adapter *src_adapter);
void rtl8188e_start_thread(_adapter *padapter); void rtl8188e_start_thread(struct adapter *padapter);
void rtl8188e_stop_thread(_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);
s32 rtl8188e_iol_efuse_patch(PADAPTER padapter); s32 rtl8188e_iol_efuse_patch(struct adapter * padapter);
#endif //__RTL8188E_HAL_H__ #endif //__RTL8188E_HAL_H__

8
include/rtl8188e_led.h
View file

@ -27,9 +27,9 @@
//================================================================================ //================================================================================
// Interface to manipulate LED objects. // Interface to manipulate LED objects.
//================================================================================ //================================================================================
void rtl8188eu_InitSwLeds(PADAPTER padapter); void rtl8188eu_InitSwLeds(struct adapter * padapter);
void rtl8188eu_DeInitSwLeds(PADAPTER padapter); void rtl8188eu_DeInitSwLeds(struct adapter * padapter);
void SwLedOn(_adapter *padapter, struct LED_871x * pLed); void SwLedOn(struct adapter *padapter, struct LED_871x * pLed);
void SwLedOff(_adapter *padapter, struct LED_871x * pLed); void SwLedOff(struct adapter *padapter, struct LED_871x * pLed);
#endif #endif

10
include/rtl8188e_recv.h
View file

@ -56,13 +56,13 @@ enum rx_packet_type {
}; };
#define INTERRUPT_MSG_FORMAT_LEN 60 #define INTERRUPT_MSG_FORMAT_LEN 60
void rtl8188eu_init_recvbuf(_adapter *padapter, struct recv_buf *precvbuf); void rtl8188eu_init_recvbuf(struct adapter *padapter, struct recv_buf *precvbuf);
s32 rtl8188eu_init_recv_priv(PADAPTER padapter); s32 rtl8188eu_init_recv_priv(struct adapter * padapter);
void rtl8188eu_free_recv_priv(PADAPTER padapter); void rtl8188eu_free_recv_priv(struct adapter * padapter);
void rtl8188eu_recv_hdl(PADAPTER padapter, struct recv_buf *precvbuf); void rtl8188eu_recv_hdl(struct adapter * padapter, struct recv_buf *precvbuf);
void rtl8188eu_recv_tasklet(void *priv); void rtl8188eu_recv_tasklet(void *priv);
void rtl8188e_query_rx_phy_status(union recv_frame *prframe, struct phy_stat *pphy_stat); 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_phyinfo_88e(union recv_frame *precvframe,struct phy_stat *pphy_status);
void update_recvframe_attrib_88e( union recv_frame *precvframe, struct recv_stat *prxstat); void update_recvframe_attrib_88e( union recv_frame *precvframe, struct recv_stat *prxstat);

10
include/rtl8188e_rf.h
View file

@ -25,17 +25,17 @@
#define RF6052_MAX_PATH 2 #define RF6052_MAX_PATH 2
int PHY_RF6052_Config8188E( PADAPTER Adapter ); int PHY_RF6052_Config8188E( struct adapter * Adapter );
void rtl8188e_RF_ChangeTxPath( PADAPTER Adapter, void rtl8188e_RF_ChangeTxPath( struct adapter * Adapter,
u16 DataRate); u16 DataRate);
void rtl8188e_PHY_RF6052SetBandwidth( void rtl8188e_PHY_RF6052SetBandwidth(
PADAPTER Adapter, struct adapter * Adapter,
enum ht_channel_width Bandwidth); enum ht_channel_width Bandwidth);
void rtl8188e_PHY_RF6052SetCckTxPower( void rtl8188e_PHY_RF6052SetCckTxPower(
PADAPTER Adapter, struct adapter * Adapter,
u8* pPowerlevel); u8* pPowerlevel);
void rtl8188e_PHY_RF6052SetOFDMTxPower( void rtl8188e_PHY_RF6052SetOFDMTxPower(
PADAPTER Adapter, struct adapter * Adapter,
u8* pPowerLevelOFDM, u8* pPowerLevelOFDM,
u8* pPowerLevelBW20, u8* pPowerLevelBW20,
u8* pPowerLevelBW40, u8* pPowerLevelBW40,

6
include/rtl8188e_sreset.h
View file

@ -24,8 +24,8 @@
#include <drv_types.h> #include <drv_types.h>
#include <rtw_sreset.h> #include <rtw_sreset.h>
extern void rtl8188e_silentreset_for_specific_platform(_adapter *padapter); extern void rtl8188e_silentreset_for_specific_platform(struct adapter *padapter);
extern void rtl8188e_sreset_xmit_status_check(_adapter *padapter); extern void rtl8188e_sreset_xmit_status_check(struct adapter *padapter);
extern void rtl8188e_sreset_linked_status_check(_adapter *padapter); extern void rtl8188e_sreset_linked_status_check(struct adapter *padapter);
#endif #endif

18
include/rtl8188e_xmit.h
View file

@ -148,19 +148,19 @@ struct txrpt_ccx_88e {
#define txrpt_ccx_sw_88e(txrpt_ccx) ((txrpt_ccx)->sw0 + ((txrpt_ccx)->sw1<<8)) #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)) #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);
s32 rtl8188eu_init_xmit_priv(PADAPTER padapter); s32 rtl8188eu_init_xmit_priv(struct adapter * padapter);
void rtl8188eu_free_xmit_priv(PADAPTER padapter); void rtl8188eu_free_xmit_priv(struct adapter * padapter);
s32 rtl8188eu_hal_xmit(PADAPTER padapter, struct xmit_frame *pxmitframe); s32 rtl8188eu_hal_xmit(struct adapter * padapter, struct xmit_frame *pxmitframe);
s32 rtl8188eu_mgnt_xmit(PADAPTER padapter, struct xmit_frame *pmgntframe); s32 rtl8188eu_mgnt_xmit(struct adapter * padapter, struct xmit_frame *pmgntframe);
s32 rtl8188eu_xmit_buf_handler(PADAPTER padapter); s32 rtl8188eu_xmit_buf_handler(struct adapter * padapter);
#define hal_xmit_handler rtl8188eu_xmit_buf_handler #define hal_xmit_handler rtl8188eu_xmit_buf_handler
void rtl8188eu_xmit_tasklet(void *priv); 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);
void dump_txrpt_ccx_88e(void *buf); 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);
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__ #endif //__RTL8188E_XMIT_H__

50
include/rtw_ap.h
View file

@ -26,35 +26,35 @@
#ifdef CONFIG_AP_MODE #ifdef CONFIG_AP_MODE
//external function //external function
extern void rtw_indicate_sta_assoc_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(_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 init_mlme_ap_info(struct adapter *padapter);
void free_mlme_ap_info(_adapter *padapter); void free_mlme_ap_info(struct adapter *padapter);
//void update_BCNTIM(_adapter *padapter); //void update_BCNTIM(struct adapter *padapter);
void rtw_add_bcn_ie(_adapter *padapter, struct wlan_bssid_ex *pnetwork, u8 index, u8 *data, u8 len); void rtw_add_bcn_ie(struct adapter *padapter, struct wlan_bssid_ex *pnetwork, u8 index, u8 *data, u8 len);
void rtw_remove_bcn_ie(_adapter *padapter, struct wlan_bssid_ex *pnetwork, u8 index); void rtw_remove_bcn_ie(struct adapter *padapter, struct wlan_bssid_ex *pnetwork, u8 index);
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);
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);
void expire_timeout_chk(_adapter *padapter); void expire_timeout_chk(struct adapter *padapter);
void update_sta_info_apmode(_adapter *padapter, struct sta_info *psta); void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta);
int rtw_check_beacon_data(_adapter *padapter, u8 *pbuf, int len); int rtw_check_beacon_data(struct 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);
int rtw_acl_add_sta(_adapter *padapter, u8 *addr); int rtw_acl_add_sta(struct adapter *padapter, u8 *addr);
int rtw_acl_remove_sta(_adapter *padapter, u8 *addr); int rtw_acl_remove_sta(struct adapter *padapter, u8 *addr);
#ifdef CONFIG_AP_MODE #ifdef CONFIG_AP_MODE
void associated_clients_update(_adapter *padapter, u8 updated); void associated_clients_update(struct adapter *padapter, u8 updated);
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 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);
void sta_info_update(_adapter *padapter, struct sta_info *psta); void sta_info_update(struct adapter *padapter, struct sta_info *psta);
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);
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);
int rtw_sta_flush(_adapter *padapter); int rtw_sta_flush(struct adapter *padapter);
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);
void start_ap_mode(_adapter *padapter); void start_ap_mode(struct adapter *padapter);
void stop_ap_mode(_adapter *padapter); void stop_ap_mode(struct adapter *padapter);
#endif #endif
#endif //end of CONFIG_AP_MODE #endif //end of CONFIG_AP_MODE

2
include/rtw_br_ext.h
View file

@ -61,6 +61,6 @@ struct br_ext_info {
unsigned int nat25sc_disable; unsigned int nat25sc_disable;
}; };
void nat25_db_cleanup(_adapter *priv); void nat25_db_cleanup(struct adapter *priv);
#endif // _RTW_BR_EXT_H_ #endif // _RTW_BR_EXT_H_

101
include/rtw_cmd.h
View file

@ -39,7 +39,7 @@
#define CMDBUFF_ALIGN_SZ 512 #define CMDBUFF_ALIGN_SZ 512
struct cmd_obj { struct cmd_obj {
_adapter *padapter; struct adapter *padapter;
u16 cmdcode; u16 cmdcode;
u8 res; u8 res;
u8 *parmbuf; u8 *parmbuf;
@ -62,7 +62,7 @@ struct cmd_priv {
u32 cmd_done_cnt; u32 cmd_done_cnt;
u32 rsp_cnt; u32 rsp_cnt;
u8 cmdthd_running; u8 cmdthd_running;
_adapter *padapter; struct adapter *padapter;
}; };
struct evt_priv { struct evt_priv {
@ -109,7 +109,7 @@ extern void rtw_free_evt_priv (struct evt_priv *pevtpriv);
extern void rtw_cmd_clr_isr(struct cmd_priv *pcmdpriv); extern void rtw_cmd_clr_isr(struct cmd_priv *pcmdpriv);
extern void rtw_evt_notify_isr(struct evt_priv *pevtpriv); extern void rtw_evt_notify_isr(struct evt_priv *pevtpriv);
#ifdef CONFIG_P2P #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 #endif //CONFIG_P2P
enum rtw_drvextra_cmd_id enum rtw_drvextra_cmd_id
@ -786,72 +786,71 @@ Result:
#define H2C_CMD_OVERFLOW 0x06 #define H2C_CMD_OVERFLOW 0x06
#define H2C_RESERVED 0x07 #define H2C_RESERVED 0x07
extern u8 rtw_setassocsta_cmd(_adapter *padapter, u8 *mac_addr); extern u8 rtw_setassocsta_cmd(struct adapter *padapter, u8 *mac_addr);
extern u8 rtw_setstandby_cmd(_adapter *padapter, uint action); extern u8 rtw_setstandby_cmd(struct adapter *padapter, uint action);
u8 rtw_sitesurvey_cmd(_adapter *padapter, struct ndis_802_11_ssid *ssid, int ssid_num, struct rtw_ieee80211_channel *ch, int ch_num); u8 rtw_sitesurvey_cmd(struct adapter *padapter, struct 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(struct adapter *padapter);
extern u8 rtw_createbss_cmd_ex(_adapter *padapter, unsigned char *pbss, unsigned int sz); extern u8 rtw_createbss_cmd_ex(struct adapter *padapter, unsigned char *pbss, unsigned int sz);
extern u8 rtw_setphy_cmd(_adapter *padapter, u8 modem, u8 ch); extern u8 rtw_setphy_cmd(struct adapter *padapter, u8 modem, u8 ch);
extern u8 rtw_setstakey_cmd(_adapter *padapter, u8 *psta, u8 unicast_key); extern u8 rtw_setstakey_cmd(struct adapter *padapter, u8 *psta, u8 unicast_key);
extern u8 rtw_clearstakey_cmd(_adapter *padapter, u8 *psta, u8 entry, u8 enqueue); extern u8 rtw_clearstakey_cmd(struct adapter *padapter, u8 *psta, u8 entry, u8 enqueue);
extern u8 rtw_joinbss_cmd(_adapter *padapter, struct wlan_network* pnetwork); extern u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network* pnetwork);
u8 rtw_disassoc_cmd(_adapter *padapter, u32 deauth_timeout_ms, bool enqueue); u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deauth_timeout_ms, bool enqueue);
extern u8 rtw_setopmode_cmd(_adapter *padapter, enum ndis_802_11_network_infra networktype); extern u8 rtw_setopmode_cmd(struct adapter *padapter, enum ndis_802_11_network_infra networktype);
extern u8 rtw_setdatarate_cmd(_adapter *padapter, u8 *rateset); extern u8 rtw_setdatarate_cmd(struct adapter *padapter, u8 *rateset);
extern u8 rtw_setbasicrate_cmd(_adapter *padapter, u8 *rateset); extern u8 rtw_setbasicrate_cmd(struct adapter *padapter, u8 *rateset);
extern u8 rtw_setbbreg_cmd(_adapter * padapter, u8 offset, u8 val); extern u8 rtw_setbbreg_cmd(struct adapter * padapter, u8 offset, u8 val);
extern u8 rtw_setrfreg_cmd(_adapter * padapter, u8 offset, u32 val); extern u8 rtw_setrfreg_cmd(struct adapter * padapter, u8 offset, u32 val);
extern u8 rtw_getbbreg_cmd(_adapter * padapter, u8 offset, u8 * pval); extern u8 rtw_getbbreg_cmd(struct adapter * padapter, u8 offset, u8 * pval);
extern u8 rtw_getrfreg_cmd(_adapter * padapter, u8 offset, u8 * pval); extern u8 rtw_getrfreg_cmd(struct adapter * padapter, u8 offset, u8 * pval);
extern u8 rtw_setrfintfs_cmd(_adapter *padapter, u8 mode); extern u8 rtw_setrfintfs_cmd(struct adapter *padapter, u8 mode);
extern u8 rtw_setrttbl_cmd(_adapter *padapter, struct setratable_parm *prate_table); extern u8 rtw_setrttbl_cmd(struct adapter *padapter, struct setratable_parm *prate_table);
extern u8 rtw_getrttbl_cmd(_adapter *padapter, struct getratable_rsp *pval); 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_gettssi_cmd(struct adapter *padapter, u8 offset,u8 *pval);
extern u8 rtw_setfwdig_cmd(_adapter*padapter, u8 type); extern u8 rtw_setfwdig_cmd(struct adapter*padapter, u8 type);
extern u8 rtw_setfwra_cmd(_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);
extern u8 rtw_dynamic_chk_wk_cmd(_adapter *adapter); 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) #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 #endif
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);
extern u8 rtw_ps_cmd(_adapter*padapter); extern u8 rtw_ps_cmd(struct adapter*padapter);
#ifdef CONFIG_AP_MODE #ifdef CONFIG_AP_MODE
u8 rtw_chk_hi_queue_cmd(_adapter*padapter); u8 rtw_chk_hi_queue_cmd(struct adapter*padapter);
#endif #endif
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);
extern u8 rtw_set_chplan_cmd(_adapter*padapter, u8 chplan, u8 enqueue); extern u8 rtw_set_chplan_cmd(struct adapter*padapter, u8 chplan, u8 enqueue);
extern u8 rtw_led_blink_cmd(_adapter*padapter, struct LED_871x * pLed); extern u8 rtw_led_blink_cmd(struct adapter*padapter, struct LED_871x * pLed);
extern u8 rtw_set_csa_cmd(_adapter*padapter, u8 new_ch_no); extern u8 rtw_set_csa_cmd(struct adapter*padapter, u8 new_ch_no);
extern u8 rtw_tdls_cmd(_adapter*padapter, u8 *addr, u8 option); 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);
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_survey_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd);
extern void rtw_disassoc_cmd_callback(_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(_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(_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(_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(_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 { struct _cmd_callback {
u32 cmd_code; u32 cmd_code;
void (*callback)(_adapter *padapter, struct cmd_obj *cmd); void (*callback)(struct adapter *padapter, struct cmd_obj *cmd);
}; };
enum rtw_h2c_cmd enum rtw_h2c_cmd

10
include/rtw_eeprom.h
View file

@ -120,10 +120,10 @@ struct eeprom_priv {
u8 efuse_eeprom_data[HWSET_MAX_SIZE_512]; u8 efuse_eeprom_data[HWSET_MAX_SIZE_512];
}; };
extern void eeprom_write16(_adapter *padapter, u16 reg, u16 data); extern void eeprom_write16(struct adapter *padapter, u16 reg, u16 data);
extern u16 eeprom_read16(_adapter *padapter, u16 reg); extern u16 eeprom_read16(struct adapter *padapter, u16 reg);
extern void read_eeprom_content(_adapter *padapter); extern void read_eeprom_content(struct adapter *padapter);
extern void eeprom_read_sz(_adapter * padapter, u16 reg,u8* data, u32 sz); 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 );
#endif //__RTL871X_EEPROM_H__ #endif //__RTL871X_EEPROM_H__

38
include/rtw_efuse.h
View file

@ -120,29 +120,29 @@ extern u8 fakeBTEfuseInitMap[];
extern u8 fakeBTEfuseModifiedMap[]; extern u8 fakeBTEfuseModifiedMap[];
/*------------------------Export global variable----------------------------*/ /*------------------------Export global variable----------------------------*/
u8 efuse_GetCurrentSize(PADAPTER padapter, u16 *size); u8 efuse_GetCurrentSize(struct adapter * padapter, u16 *size);
u16 efuse_GetMaxSize(PADAPTER padapter); u16 efuse_GetMaxSize(struct adapter * padapter);
u8 rtw_efuse_access(PADAPTER padapter, u8 bRead, u16 start_addr, u16 cnts, u8 *data); u8 rtw_efuse_access(struct adapter * 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_read(struct adapter * padapter, u16 addr, u16 cnts, u8 *data);
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 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);
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);
u16 Efuse_GetCurrentSize(PADAPTER pAdapter, u8 efuseType, bool bPseudoTest); u16 Efuse_GetCurrentSize(struct adapter * pAdapter, u8 efuseType, bool bPseudoTest);
u8 Efuse_CalculateWordCnts(u8 word_en); u8 Efuse_CalculateWordCnts(u8 word_en);
void ReadEFuseByte(PADAPTER Adapter, u16 _offset, u8 *pbuf, bool bPseudoTest) ; void ReadEFuseByte(struct adapter * Adapter, u16 _offset, u8 *pbuf, bool bPseudoTest) ;
void EFUSE_GetEfuseDefinition(PADAPTER pAdapter, u8 efuseType, u8 type, void *pOut, bool bPseudoTest); void EFUSE_GetEfuseDefinition(struct adapter * pAdapter, u8 efuseType, u8 type, void *pOut, bool bPseudoTest);
u8 efuse_OneByteRead(PADAPTER pAdapter, u16 addr, u8 *data, bool bPseudoTest); u8 efuse_OneByteRead(struct adapter * pAdapter, u16 addr, u8 *data, bool bPseudoTest);
u8 efuse_OneByteWrite(PADAPTER pAdapter, u16 addr, u8 data, bool bPseudoTest); u8 efuse_OneByteWrite(struct adapter * pAdapter, u16 addr, u8 data, bool bPseudoTest);
void Efuse_PowerSwitch(PADAPTER pAdapter,u8 bWrite,u8 PwrState); void Efuse_PowerSwitch(struct adapter * pAdapter,u8 bWrite,u8 PwrState);
int Efuse_PgPacketRead(PADAPTER pAdapter, u8 offset, u8 *data, bool bPseudoTest); int Efuse_PgPacketRead(struct adapter * pAdapter, u8 offset, u8 *data, bool bPseudoTest);
int Efuse_PgPacketWrite(PADAPTER pAdapter, u8 offset, u8 word_en, u8 *data, bool bPseudoTest); int Efuse_PgPacketWrite(struct adapter * pAdapter, u8 offset, u8 word_en, u8 *data, bool bPseudoTest);
void efuse_WordEnableDataRead(u8 word_en, u8 *sourdata, u8 *targetdata); void efuse_WordEnableDataRead(u8 word_en, u8 *sourdata, u8 *targetdata);
u8 Efuse_WordEnableDataWrite(PADAPTER pAdapter, u16 efuse_addr, u8 word_en, u8 *data, bool bPseudoTest); u8 Efuse_WordEnableDataWrite(struct adapter * pAdapter, u16 efuse_addr, u8 word_en, u8 *data, bool bPseudoTest);
u8 EFUSE_Read1Byte(PADAPTER pAdapter, u16 Address); u8 EFUSE_Read1Byte(struct adapter * pAdapter, u16 Address);
void EFUSE_ShadowMapUpdate(PADAPTER pAdapter, u8 efuseType, bool bPseudoTest); void EFUSE_ShadowMapUpdate(struct adapter * pAdapter, u8 efuseType, bool bPseudoTest);
void EFUSE_ShadowRead(PADAPTER pAdapter, u8 Type, u16 Offset, u32 *Value); void EFUSE_ShadowRead(struct adapter * pAdapter, u8 Type, u16 Offset, u32 *Value);
#endif #endif

2
include/rtw_event.h
View file

@ -91,7 +91,7 @@ struct addba_event
struct fwevent { struct fwevent {
u32 parmsize; u32 parmsize;
void (*event_callback)(_adapter *dev, u8 *pbuf); void (*event_callback)(struct adapter *dev, u8 *pbuf);
}; };
#define C2HEVENT_SZ 32 #define C2HEVENT_SZ 32

102
include/rtw_io.h
View file

@ -156,13 +156,13 @@ struct io_req {
u8 *pbuf; u8 *pbuf;
struct semaphore sema; struct semaphore sema;
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; u8 *cnxt;
}; };
struct intf_hdl { struct intf_hdl {
_adapter *padapter; struct adapter *padapter;
struct dvobj_priv *pintf_dev;// pointer to &(padapter->dvobjpriv); struct dvobj_priv *pintf_dev;// pointer to &(padapter->dvobjpriv);
struct _io_ops io_ops; struct _io_ops io_ops;
@ -300,15 +300,15 @@ struct io_queue {
struct io_priv{ struct io_priv{
_adapter *padapter; struct adapter *padapter;
struct intf_hdl intf; 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 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); extern uint free_ioreq(struct io_req *preq, struct io_queue *pio_queue);
@ -317,30 +317,30 @@ extern struct io_req *alloc_ioreq(struct io_queue *pio_q);
extern uint register_intf_hdl(u8 *dev, struct intf_hdl *pintfhdl); extern uint register_intf_hdl(u8 *dev, struct intf_hdl *pintfhdl);
extern void unregister_intf_hdl(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_read(struct 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_write(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem);
extern u8 _rtw_read8(_adapter *adapter, u32 addr); extern u8 _rtw_read8(struct adapter *adapter, u32 addr);
extern u16 _rtw_read16(_adapter *adapter, u32 addr); extern u16 _rtw_read16(struct adapter *adapter, u32 addr);
extern u32 _rtw_read32(_adapter *adapter, u32 addr); extern u32 _rtw_read32(struct adapter *adapter, u32 addr);
extern void _rtw_read_mem(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem); extern void _rtw_read_mem(struct 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(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem);
extern void _rtw_read_port_cancel(_adapter *adapter); extern void _rtw_read_port_cancel(struct adapter *adapter);
extern int _rtw_write8(_adapter *adapter, u32 addr, u8 val); extern int _rtw_write8(struct adapter *adapter, u32 addr, u8 val);
extern int _rtw_write16(_adapter *adapter, u32 addr, u16 val); extern int _rtw_write16(struct adapter *adapter, u32 addr, u16 val);
extern int _rtw_write32(_adapter *adapter, u32 addr, u32 val); extern int _rtw_write32(struct adapter *adapter, u32 addr, u32 val);
extern int _rtw_writeN(_adapter *adapter, u32 addr, u32 length, u8 *pdata); 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_write8_async(struct adapter *adapter, u32 addr, u8 val);
extern int _rtw_write16_async(_adapter *adapter, u32 addr, u16 val); extern int _rtw_write16_async(struct adapter *adapter, u32 addr, u16 val);
extern int _rtw_write32_async(_adapter *adapter, u32 addr, u32 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 void _rtw_write_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem);
extern u32 _rtw_write_port(_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(_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);
extern void _rtw_write_port_cancel(_adapter *adapter); extern void _rtw_write_port_cancel(struct adapter *adapter);
#define rtw_read8(adapter, addr) _rtw_read8((adapter), (addr)) #define rtw_read8(adapter, addr) _rtw_read8((adapter), (addr))
#define rtw_read16(adapter, addr) _rtw_read16((adapter), (addr)) #define rtw_read16(adapter, addr) _rtw_read16((adapter), (addr))
@ -363,47 +363,47 @@ extern void _rtw_write_port_cancel(_adapter *adapter);
#define rtw_write_port_and_wait(adapter, addr, cnt, mem, timeout_ms) _rtw_write_port_and_wait((adapter), (addr), (cnt), (mem), (timeout_ms)) #define rtw_write_port_and_wait(adapter, addr, cnt, mem, timeout_ms) _rtw_write_port_and_wait((adapter), (addr), (cnt), (mem), (timeout_ms))
#define rtw_write_port_cancel(adapter) _rtw_write_port_cancel((adapter)) #define rtw_write_port_cancel(adapter) _rtw_write_port_cancel((adapter))
extern void rtw_write_scsi(_adapter *adapter, u32 cnt, u8 *pmem); extern void rtw_write_scsi(struct adapter *adapter, u32 cnt, u8 *pmem);
//ioreq //ioreq
extern void ioreq_read8(_adapter *adapter, u32 addr, u8 *pval); extern void ioreq_read8(struct adapter *adapter, u32 addr, u8 *pval);
extern void ioreq_read16(_adapter *adapter, u32 addr, u16 *pval); extern void ioreq_read16(struct adapter *adapter, u32 addr, u16 *pval);
extern void ioreq_read32(_adapter *adapter, u32 addr, u32 *pval); extern void ioreq_read32(struct adapter *adapter, u32 addr, u32 *pval);
extern void ioreq_write8(_adapter *adapter, u32 addr, u8 val); extern void ioreq_write8(struct adapter *adapter, u32 addr, u8 val);
extern void ioreq_write16(_adapter *adapter, u32 addr, u16 val); extern void ioreq_write16(struct adapter *adapter, u32 addr, u16 val);
extern void ioreq_write32(_adapter *adapter, u32 addr, u32 val); extern void ioreq_write32(struct adapter *adapter, u32 addr, u32 val);
extern uint async_read8(_adapter *adapter, u32 addr, u8 *pbuff, extern uint async_read8(struct adapter *adapter, u32 addr, u8 *pbuff,
void (*_async_io_callback)(_adapter *padater, struct io_req *pio_req, u8 *cnxt), u8 *cnxt); void (*_async_io_callback)(struct adapter *padater, struct io_req *pio_req, u8 *cnxt), u8 *cnxt);
extern uint async_read16(_adapter *adapter, u32 addr, u8 *pbuff, extern uint async_read16(struct adapter *adapter, u32 addr, u8 *pbuff,
void (*_async_io_callback)(_adapter *padater, struct io_req *pio_req, u8 *cnxt), u8 *cnxt); void (*_async_io_callback)(struct adapter *padater, struct io_req *pio_req, u8 *cnxt), u8 *cnxt);
extern uint async_read32(_adapter *adapter, u32 addr, u8 *pbuff, extern uint async_read32(struct adapter *adapter, u32 addr, u8 *pbuff,
void (*_async_io_callback)(_adapter *padater, struct io_req *pio_req, u8 *cnxt), u8 *cnxt); 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_mem(struct 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_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem);
extern void async_write8(_adapter *adapter, u32 addr, u8 val, extern void async_write8(struct adapter *adapter, u32 addr, u8 val,
void (*_async_io_callback)(_adapter *padater, struct io_req *pio_req, u8 *cnxt), u8 *cnxt); void (*_async_io_callback)(struct adapter *padater, struct io_req *pio_req, u8 *cnxt), u8 *cnxt);
extern void async_write16(_adapter *adapter, u32 addr, u16 val, extern void async_write16(struct adapter *adapter, u32 addr, u16 val,
void (*_async_io_callback)(_adapter *padater, struct io_req *pio_req, u8 *cnxt), u8 *cnxt); void (*_async_io_callback)(struct adapter *padater, struct io_req *pio_req, u8 *cnxt), u8 *cnxt);
extern void async_write32(_adapter *adapter, u32 addr, u32 val, extern void async_write32(struct adapter *adapter, u32 addr, u32 val,
void (*_async_io_callback)(_adapter *padater, struct io_req *pio_req, u8 *cnxt), u8 *cnxt); 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_mem(struct 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_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 uint alloc_io_queue(struct adapter *adapter);
extern void free_io_queue(_adapter *adapter); extern void free_io_queue(struct adapter *adapter);
extern void async_bus_io(struct io_queue *pio_q); extern void async_bus_io(struct io_queue *pio_q);
extern void bus_sync_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 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) #define RTL_R8(reg) rtw_read8(padapter, reg)

30
include/rtw_ioctl_set.h
View file

@ -25,24 +25,24 @@
typedef u8 NDIS_802_11_PMKID_VALUE[16]; typedef u8 NDIS_802_11_PMKID_VALUE[16];
u8 rtw_set_802_11_add_key(_adapter * padapter, struct ndis_802_11_key * key); u8 rtw_set_802_11_add_key(struct adapter * padapter, struct ndis_802_11_key * key);
u8 rtw_set_802_11_authentication_mode(_adapter *pdapter, enum ndis_802_11_auth_mode authmode); u8 rtw_set_802_11_authentication_mode(struct adapter *pdapter, enum ndis_802_11_auth_mode authmode);
u8 rtw_set_802_11_bssid(_adapter* padapter, u8 *bssid); u8 rtw_set_802_11_bssid(struct adapter* padapter, u8 *bssid);
u8 rtw_set_802_11_add_wep(_adapter * padapter, struct ndis_802_11_wep * wep); u8 rtw_set_802_11_add_wep(struct adapter * padapter, struct ndis_802_11_wep * wep);
u8 rtw_set_802_11_disassociate(_adapter * padapter); u8 rtw_set_802_11_disassociate(struct adapter * padapter);
u8 rtw_set_802_11_bssid_list_scan(_adapter* padapter, struct ndis_802_11_ssid *pssid, int ssid_max_num); u8 rtw_set_802_11_bssid_list_scan(struct adapter* padapter, struct ndis_802_11_ssid *pssid, int ssid_max_num);
u8 rtw_set_802_11_infrastructure_mode(_adapter * padapter, enum ndis_802_11_network_infra networktype); u8 rtw_set_802_11_infrastructure_mode(struct adapter * padapter, enum ndis_802_11_network_infra networktype);
u8 rtw_set_802_11_remove_wep(_adapter * padapter, u32 keyindex); u8 rtw_set_802_11_remove_wep(struct adapter * padapter, u32 keyindex);
u8 rtw_set_802_11_ssid(_adapter * padapter, struct ndis_802_11_ssid * ssid); u8 rtw_set_802_11_ssid(struct adapter * padapter, struct ndis_802_11_ssid * ssid);
u8 rtw_set_802_11_remove_key(_adapter * padapter, struct ndis_802_11_remove_key * key); u8 rtw_set_802_11_remove_key(struct adapter * padapter, struct ndis_802_11_remove_key * key);
u8 rtw_validate_ssid(struct ndis_802_11_ssid *ssid); u8 rtw_validate_ssid(struct ndis_802_11_ssid *ssid);
u16 rtw_get_cur_max_rate(_adapter *adapter); u16 rtw_get_cur_max_rate(struct adapter *adapter);
int rtw_set_scan_mode(_adapter *adapter, enum rt_scan_type scan_mode); int rtw_set_scan_mode(struct adapter *adapter, enum rt_scan_type scan_mode);
int rtw_set_channel_plan(_adapter *adapter, u8 channel_plan); int rtw_set_channel_plan(struct adapter *adapter, u8 channel_plan);
int rtw_set_country(_adapter *adapter, const char *country_code); int rtw_set_country(struct adapter *adapter, const char *country_code);
int rtw_change_ifname(_adapter *padapter, const char *ifname); int rtw_change_ifname(struct adapter *padapter, const char *ifname);
#endif #endif

10
include/rtw_iol.h
View file

@ -22,11 +22,11 @@
#include <osdep_service.h> #include <osdep_service.h>
#include <drv_types.h> #include <drv_types.h>
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_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_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); 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(ADAPTER *adapter); 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_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_DELAY_MS_cmd(struct xmit_frame *xmit_frame, u16 ms);
int rtw_IOL_append_END_cmd(struct xmit_frame *xmit_frame); int rtw_IOL_append_END_cmd(struct xmit_frame *xmit_frame);
@ -53,7 +53,7 @@ enum ioreg_cmd{
IOREG_CMD_DELAY_MS = 0x11, IOREG_CMD_DELAY_MS = 0x11,
IOREG_CMD_END = 0xFF, 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_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); int _rtw_IOL_append_WW_cmd(struct xmit_frame *xmit_frame, u16 addr, u16 value, u16 mask);
@ -65,6 +65,6 @@ 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)) #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); 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);
#endif //__RTW_IOL_H_ #endif //__RTW_IOL_H_

8
include/rtw_led.h
View file

@ -102,7 +102,7 @@ enum LED_PIN_871x {
}; };
struct LED_871x { struct LED_871x {
_adapter *padapter; struct adapter *padapter;
enum LED_PIN_871x LedPin; // Identify how to implement this SW led. enum LED_PIN_871x LedPin; // Identify how to implement this SW led.
enum LED_STATE_871x CurrLedState; // Current LED state. enum LED_STATE_871x CurrLedState; // Current LED state.
@ -153,7 +153,7 @@ enum LED_STRATEGY_871x {
void void
LedControl871x( LedControl871x(
_adapter *padapter, struct adapter *padapter,
enum LED_CTL_MODE LedAction enum LED_CTL_MODE LedAction
); );
@ -163,7 +163,7 @@ struct led_priv{
struct LED_871x SwLed1; struct LED_871x SwLed1;
enum LED_STRATEGY_871x LedStrategy; enum LED_STRATEGY_871x LedStrategy;
u8 bRegUseLed; u8 bRegUseLed;
void (*LedControlHandler)(_adapter *padapter, enum LED_CTL_MODE LedAction); void (*LedControlHandler)(struct adapter *padapter, enum LED_CTL_MODE LedAction);
/* add for led controll */ /* add for led controll */
}; };
@ -180,7 +180,7 @@ void ResetLedStatus(struct LED_871x * pLed);
void void
InitLed871x( InitLed871x(
_adapter *padapter, struct adapter *padapter,
struct LED_871x *pLed, struct LED_871x *pLed,
enum LED_PIN_871x LedPin enum LED_PIN_871x LedPin
); );

90
include/rtw_mlme.h
View file

@ -182,7 +182,7 @@ struct scan_limit_info{
}; };
struct wifidirect_info{ struct wifidirect_info{
_adapter* padapter; struct adapter* padapter;
struct timer_list find_phase_timer; struct timer_list find_phase_timer;
struct timer_list restore_p2p_state_timer; struct timer_list restore_p2p_state_timer;
@ -414,11 +414,11 @@ struct mlme_priv {
struct hostapd_priv struct hostapd_priv
{ {
_adapter *padapter; struct adapter *padapter;
}; };
extern int hostapd_mode_init(_adapter *padapter); extern int hostapd_mode_init(struct adapter *padapter);
extern void hostapd_mode_unload(_adapter *padapter); extern void hostapd_mode_unload(struct adapter *padapter);
#endif #endif
@ -430,26 +430,26 @@ extern unsigned char REALTEK_96B_IE[];
extern unsigned char MCS_rate_2R[16]; extern unsigned char MCS_rate_2R[16];
extern unsigned char MCS_rate_1R[16]; extern unsigned char MCS_rate_1R[16];
extern void rtw_joinbss_event_prehandle(_adapter *adapter, u8 *pbuf); extern void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf);
extern void rtw_survey_event_callback(_adapter *adapter, u8 *pbuf); extern void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf);
extern void rtw_surveydone_event_callback(_adapter *adapter, u8 *pbuf); extern void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf);
extern void rtw_joinbss_event_callback(_adapter *adapter, u8 *pbuf); extern void rtw_joinbss_event_callback(struct adapter *adapter, u8 *pbuf);
extern void rtw_stassoc_event_callback(_adapter *adapter, u8 *pbuf); extern void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf);
extern void rtw_stadel_event_callback(_adapter *adapter, u8 *pbuf); extern void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf);
extern void rtw_atimdone_event_callback(_adapter *adapter, u8 *pbuf); extern void rtw_atimdone_event_callback(struct adapter *adapter, u8 *pbuf);
extern void rtw_cpwm_event_callback(_adapter *adapter, u8 *pbuf); extern void rtw_cpwm_event_callback(struct adapter *adapter, u8 *pbuf);
void indicate_wx_scan_complete_event(_adapter *padapter); void indicate_wx_scan_complete_event(struct adapter *padapter);
void rtw_indicate_wx_assoc_event(_adapter *padapter); void rtw_indicate_wx_assoc_event(struct adapter *padapter);
void rtw_indicate_wx_disassoc_event(_adapter *padapter); void rtw_indicate_wx_disassoc_event(struct adapter *padapter);
extern int event_thread(void *context); extern int event_thread(void *context);
extern void rtw_join_timeout_handler(void* FunctionContext); extern void rtw_join_timeout_handler(void* FunctionContext);
extern void _rtw_scan_timeout_handler(void* FunctionContext); extern void _rtw_scan_timeout_handler(void* FunctionContext);
extern void rtw_free_network_queue(_adapter *adapter,u8 isfreeall); extern void rtw_free_network_queue(struct adapter *adapter,u8 isfreeall);
extern int rtw_init_mlme_priv(_adapter *adapter);// (struct mlme_priv *pmlmepriv); extern int rtw_init_mlme_priv(struct adapter *adapter);// (struct mlme_priv *pmlmepriv);
extern void rtw_free_mlme_priv (struct mlme_priv *pmlmepriv); extern void rtw_free_mlme_priv (struct mlme_priv *pmlmepriv);
extern int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv); extern int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv);
extern int rtw_set_key(_adapter *adapter, struct security_priv *psecuritypriv, int keyid, u8 set_tx); extern int rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, int keyid, u8 set_tx);
extern int rtw_set_auth(_adapter *adapter, struct security_priv *psecuritypriv); extern int rtw_set_auth(struct adapter *adapter, struct security_priv *psecuritypriv);
__inline static u8 *get_bssid(struct mlme_priv *pmlmepriv) __inline static u8 *get_bssid(struct mlme_priv *pmlmepriv)
{ //if sta_mode:pmlmepriv->cur_network.network.MacAddress=> bssid { //if sta_mode:pmlmepriv->cur_network.network.MacAddress=> bssid
@ -546,37 +546,37 @@ __inline static void set_scanned_network_val(struct mlme_priv *pmlmepriv, int va
} }
extern u16 rtw_get_capability(struct wlan_bssid_ex *bss); extern u16 rtw_get_capability(struct wlan_bssid_ex *bss);
extern void rtw_update_scanned_network(_adapter *adapter, struct wlan_bssid_ex *target); extern void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *target);
extern void rtw_disconnect_hdl_under_linked(_adapter* adapter, struct sta_info *psta, u8 free_assoc); 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 void rtw_generate_random_ibss(u8 *pibss);
extern struct wlan_network* rtw_find_network(struct __queue *scanned_queue, u8 *addr); extern struct wlan_network* rtw_find_network(struct __queue *scanned_queue, u8 *addr);
extern struct wlan_network* rtw_get_oldest_wlan_network(struct __queue *scanned_queue); extern struct wlan_network* rtw_get_oldest_wlan_network(struct __queue *scanned_queue);
extern void rtw_free_assoc_resources(_adapter* adapter, int lock_scanned_queue); extern void rtw_free_assoc_resources(struct adapter* adapter, int lock_scanned_queue);
extern void rtw_indicate_disconnect(_adapter* adapter); extern void rtw_indicate_disconnect(struct adapter* adapter);
extern void rtw_indicate_connect(_adapter* adapter); extern void rtw_indicate_connect(struct adapter* adapter);
void rtw_indicate_scan_done( _adapter *padapter, bool aborted); void rtw_indicate_scan_done( struct adapter *padapter, bool aborted);
void rtw_scan_abort(_adapter *adapter); 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_sec_ie(struct 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 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(_adapter *adapter); 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_join_timeout_handler(struct adapter *adapter);
extern void rtw_scan_timeout_handler(_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);
#define rtw_is_scan_deny(adapter) false #define rtw_is_scan_deny(adapter) false
#define rtw_clear_scan_deny(adapter) do {} while (0) #define rtw_clear_scan_deny(adapter) do {} while (0)
#define rtw_set_scan_deny_timer_hdl(adapter) do {} while (0) #define rtw_set_scan_deny_timer_hdl(adapter) do {} while (0)
#define rtw_set_scan_deny(adapter, ms) do {} while (0) #define rtw_set_scan_deny(adapter, ms) do {} while (0)
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); void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv);
@ -595,9 +595,9 @@ extern void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_ne
extern struct wlan_network* _rtw_find_network(struct __queue *scanned_queue, u8 *addr); extern struct wlan_network* _rtw_find_network(struct __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 int rtw_if_up(_adapter *padapter); extern int rtw_if_up(struct adapter *padapter);
u8 *rtw_get_capability_from_ie(u8 *ie); u8 *rtw_get_capability_from_ie(u8 *ie);
@ -605,19 +605,19 @@ u8 *rtw_get_timestampe_from_ie(u8 *ie);
u8 *rtw_get_beacon_interval_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 #ifdef CONFIG_80211N_HT
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);
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);
void rtw_issue_addbareq_cmd(_adapter *padapter, struct xmit_frame *pxmitframe); void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitframe);
#endif #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(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst); int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst);
void rtw_roaming(_adapter *padapter, struct wlan_network *tgt_network); void rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_network);
void _rtw_roaming(_adapter *padapter, struct wlan_network *tgt_network); void _rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_network);
void rtw_stassoc_hw_rpt(_adapter *adapter,struct sta_info *psta); void rtw_stassoc_hw_rpt(struct adapter *adapter,struct sta_info *psta);
#endif //__RTL871X_MLME_H_ #endif //__RTL871X_MLME_H_

310
include/rtw_mlme_ext.h
View file

@ -262,13 +262,13 @@ enum SCAN_STATE {
struct mlme_handler { struct mlme_handler {
unsigned int num; unsigned int num;
char* str; 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 { struct action_handler {
unsigned int num; unsigned int num;
char* str; 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 struct ss_res
@ -418,7 +418,7 @@ struct p2p_oper_class_map {
struct mlme_ext_priv struct mlme_ext_priv
{ {
_adapter *padapter; struct adapter *padapter;
u8 mlmeext_init; u8 mlmeext_init;
ATOMIC_T event_seq; ATOMIC_T event_seq;
u16 mgnt_seq; u16 mgnt_seq;
@ -465,175 +465,175 @@ struct mlme_ext_priv
u8 active_keep_alive_check; u8 active_keep_alive_check;
}; };
int init_mlme_ext_priv(_adapter* padapter); int init_mlme_ext_priv(struct adapter* padapter);
int init_hw_mlme_ext(_adapter *padapter); int init_hw_mlme_ext(struct adapter *padapter);
void free_mlme_ext_priv (struct mlme_ext_priv *pmlmeext); void free_mlme_ext_priv (struct mlme_ext_priv *pmlmeext);
extern void init_mlme_ext_timer(_adapter *padapter); extern void init_mlme_ext_timer(struct adapter *padapter);
extern void init_addba_retry_timer(_adapter *padapter, struct sta_info *psta); extern void init_addba_retry_timer(struct adapter *padapter, struct sta_info *psta);
extern struct xmit_frame *alloc_mgtxmitframe(struct xmit_priv *pxmitpriv); extern struct xmit_frame *alloc_mgtxmitframe(struct xmit_priv *pxmitpriv);
unsigned char networktype_to_raid(unsigned char network_type); 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);
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);
void UpdateBrateTbl(_adapter *padapter,u8 *mBratesOS); void UpdateBrateTbl(struct adapter *padapter,u8 *mBratesOS);
void UpdateBrateTblForSoftAP(u8 *bssrateset, u32 bssratelen); void UpdateBrateTblForSoftAP(u8 *bssrateset, u32 bssratelen);
void Save_DM_Func_Flag(_adapter *padapter); void Save_DM_Func_Flag(struct adapter *padapter);
void Restore_DM_Func_Flag(_adapter *padapter); void Restore_DM_Func_Flag(struct adapter *padapter);
void Switch_DM_Func(_adapter *padapter, u32 mode, u8 enable); void Switch_DM_Func(struct adapter *padapter, u32 mode, u8 enable);
void Set_MSR(_adapter *padapter, u8 type); void Set_MSR(struct adapter *padapter, u8 type);
u8 rtw_get_oper_ch(_adapter *adapter); u8 rtw_get_oper_ch(struct adapter *adapter);
void rtw_set_oper_ch(_adapter *adapter, u8 ch); void rtw_set_oper_ch(struct adapter *adapter, u8 ch);
u8 rtw_get_oper_bw(_adapter *adapter); u8 rtw_get_oper_bw(struct adapter *adapter);
void rtw_set_oper_bw(_adapter *adapter, u8 bw); void rtw_set_oper_bw(struct adapter *adapter, u8 bw);
u8 rtw_get_oper_choffset(_adapter *adapter); u8 rtw_get_oper_choffset(struct adapter *adapter);
void rtw_set_oper_choffset(_adapter *adapter, u8 offset); void rtw_set_oper_choffset(struct adapter *adapter, u8 offset);
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);
void SelectChannel(_adapter *padapter, unsigned char channel); void SelectChannel(struct adapter *padapter, unsigned char channel);
void SetBWMode(_adapter *padapter, unsigned short bwmode, unsigned char channel_offset); void SetBWMode(struct adapter *padapter, unsigned short bwmode, unsigned char channel_offset);
unsigned int decide_wait_for_beacon_timeout(unsigned int bcn_interval); unsigned int decide_wait_for_beacon_timeout(unsigned int bcn_interval);
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);
void clear_cam_entry(_adapter *padapter, u8 entry); void clear_cam_entry(struct adapter *padapter, u8 entry);
void invalidate_cam_all(_adapter *padapter); void invalidate_cam_all(struct adapter *padapter);
void CAM_empty_entry(PADAPTER Adapter, u8 ucIndex); void CAM_empty_entry(struct adapter * Adapter, u8 ucIndex);
int allocate_fw_sta_entry(_adapter *padapter); int allocate_fw_sta_entry(struct adapter *padapter);
void flush_all_cam_entry(_adapter *padapter); void flush_all_cam_entry(struct adapter *padapter);
bool IsLegal5GChannel(PADAPTER Adapter, u8 channel); bool IsLegal5GChannel(struct adapter * Adapter, u8 channel);
void site_survey(_adapter *padapter); void site_survey(struct adapter *padapter);
u8 collect_bss_info(_adapter *padapter, union recv_frame *precv_frame, struct wlan_bssid_ex *bssid); u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, struct wlan_bssid_ex *bssid);
void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src, _adapter * padapter, bool update_ie); void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src, struct adapter * padapter, bool update_ie);
int get_bsstype(unsigned short capability); int get_bsstype(unsigned short capability);
u8* get_my_bssid(struct wlan_bssid_ex *pnetwork); u8* get_my_bssid(struct wlan_bssid_ex *pnetwork);
u16 get_beacon_interval(struct wlan_bssid_ex *bss); u16 get_beacon_interval(struct wlan_bssid_ex *bss);
int is_client_associated_to_ap(_adapter *padapter); int is_client_associated_to_ap(struct adapter *padapter);
int is_client_associated_to_ibss(_adapter *padapter); int is_client_associated_to_ibss(struct adapter *padapter);
int is_IBSS_empty(_adapter *padapter); int is_IBSS_empty(struct adapter *padapter);
unsigned char check_assoc_AP(u8 *pframe, uint len); unsigned char check_assoc_AP(u8 *pframe, uint len);
int WMM_param_handler(_adapter *padapter, struct ndis_802_11_var_ie * pIE); int WMM_param_handler(struct adapter *padapter, struct ndis_802_11_var_ie * pIE);
void WMMOnAssocRsp(_adapter *padapter); void WMMOnAssocRsp(struct adapter *padapter);
void HT_caps_handler(_adapter *padapter, struct ndis_802_11_var_ie * pIE); void HT_caps_handler(struct adapter *padapter, struct ndis_802_11_var_ie * pIE);
void HT_info_handler(_adapter *padapter, struct ndis_802_11_var_ie * pIE); void HT_info_handler(struct adapter *padapter, struct ndis_802_11_var_ie * pIE);
void HTOnAssocRsp(_adapter *padapter); void HTOnAssocRsp(struct adapter *padapter);
void ERP_IE_handler(_adapter *padapter, struct ndis_802_11_var_ie * pIE); void ERP_IE_handler(struct adapter *padapter, struct ndis_802_11_var_ie * pIE);
void VCS_update(_adapter *padapter, struct sta_info *psta); void VCS_update(struct adapter *padapter, struct sta_info *psta);
void update_beacon_info(_adapter *padapter, u8 *pframe, uint len, struct sta_info *psta); void update_beacon_info(struct adapter *padapter, u8 *pframe, uint len, struct sta_info *psta);
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);
void update_IOT_info(_adapter *padapter); void update_IOT_info(struct adapter *padapter);
void update_capinfo(PADAPTER Adapter, u16 updateCap); void update_capinfo(struct adapter * Adapter, u16 updateCap);
void update_wireless_mode(_adapter * padapter); void update_wireless_mode(struct adapter * padapter);
void update_tx_basic_rate(_adapter *padapter, u8 modulation); void update_tx_basic_rate(struct adapter *padapter, u8 modulation);
void update_bmc_sta_support_rate(_adapter *padapter, u32 mac_id); void update_bmc_sta_support_rate(struct 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);
//for sta/adhoc mode //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_basic_rate(unsigned char *ptn, unsigned int ptn_sz);
unsigned int update_supported_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); unsigned int update_MSC_rate(struct HT_caps_element *pHT_caps);
void Update_RA_Entry(_adapter *padapter, u32 mac_id); void Update_RA_Entry(struct adapter *padapter, u32 mac_id);
void set_sta_rate(_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); unsigned char get_highest_rate_idx(u32 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 int is_ap_in_tkip(_adapter *padapter); unsigned int is_ap_in_tkip(struct adapter *padapter);
unsigned int is_ap_in_wep(_adapter *padapter); unsigned int is_ap_in_wep(struct adapter *padapter);
unsigned int should_forbid_n_rate(_adapter * padapter); unsigned int should_forbid_n_rate(struct adapter * padapter);
void report_join_res(_adapter *padapter, int res); void report_join_res(struct adapter *padapter, int res);
void report_survey_event(_adapter *padapter, union recv_frame *precv_frame); void report_survey_event(struct adapter *padapter, union recv_frame *precv_frame);
void report_surveydone_event(_adapter *padapter); void report_surveydone_event(struct adapter *padapter);
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);
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);
void beacon_timing_control(_adapter *padapter); void beacon_timing_control(struct adapter *padapter);
extern u8 set_tx_beacon_cmd(_adapter*padapter); extern u8 set_tx_beacon_cmd(struct adapter*padapter);
unsigned int setup_beacon_frame(_adapter *padapter, unsigned char *beacon_frame); unsigned int setup_beacon_frame(struct adapter *padapter, unsigned char *beacon_frame);
void update_mgnt_tx_rate(_adapter *padapter, u8 rate); void update_mgnt_tx_rate(struct adapter *padapter, u8 rate);
void update_mgntframe_attrib(_adapter *padapter, struct pkt_attrib *pattrib); void update_mgntframe_attrib(struct 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);
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 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_P2P #ifdef CONFIG_P2P
void issue_probersp_p2p(_adapter *padapter, unsigned char *da); void issue_probersp_p2p(struct adapter *padapter, unsigned char *da);
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);
void issue_p2p_GO_request(_adapter *padapter, u8* raddr); void issue_p2p_GO_request(struct adapter *padapter, u8* raddr);
void issue_probereq_p2p(_adapter *padapter, u8 *da); void issue_probereq_p2p(struct adapter *padapter, u8 *da);
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);
void issue_p2p_invitation_response(_adapter *padapter, u8* raddr, u8 dialogToken, u8 success); void issue_p2p_invitation_response(struct adapter *padapter, u8* raddr, u8 dialogToken, u8 success);
void issue_p2p_invitation_request(_adapter *padapter, u8* raddr ); void issue_p2p_invitation_request(struct adapter *padapter, u8* raddr );
#endif //CONFIG_P2P #endif //CONFIG_P2P
void issue_beacon(_adapter *padapter, int timeout_ms); void issue_beacon(struct adapter *padapter, int timeout_ms);
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);
void issue_assocreq(_adapter *padapter); void issue_assocreq(struct adapter *padapter);
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);
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);
void issue_probereq(_adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da); void issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da);
s32 issue_probereq_ex(_adapter *padapter, struct ndis_802_11_ssid *pssid, u8* da, int try_cnt, int wait_ms); s32 issue_probereq_ex(struct adapter *padapter, struct 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_nulldata(struct 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_qos_nulldata(struct 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(struct 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); int issue_deauth_ex(struct 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_spct_ch_switch (struct 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_action_BA(struct adapter *padapter, unsigned char *raddr, unsigned char action, unsigned short status);
unsigned int send_delba(_adapter *padapter, u8 initiator, u8 *addr); unsigned int send_delba(struct adapter *padapter, u8 initiator, u8 *addr);
unsigned int send_beacon(_adapter *padapter); unsigned int send_beacon(struct adapter *padapter);
void start_clnt_assoc(_adapter *padapter); void start_clnt_assoc(struct adapter *padapter);
void start_clnt_auth(_adapter* padapter); void start_clnt_auth(struct adapter* padapter);
void start_clnt_join(_adapter* padapter); void start_clnt_join(struct adapter* padapter);
void start_create_ibss(_adapter* padapter); void start_create_ibss(struct adapter* padapter);
unsigned int OnAssocReq(_adapter *padapter, union recv_frame *precv_frame); unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame);
unsigned int OnAssocRsp(_adapter *padapter, union recv_frame *precv_frame); unsigned int OnAssocRsp(struct adapter *padapter, union recv_frame *precv_frame);
unsigned int OnProbeReq(_adapter *padapter, union recv_frame *precv_frame); unsigned int OnProbeReq(struct adapter *padapter, union recv_frame *precv_frame);
unsigned int OnProbeRsp(_adapter *padapter, union recv_frame *precv_frame); unsigned int OnProbeRsp(struct 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);
unsigned int OnBeacon(_adapter *padapter, union recv_frame *precv_frame); unsigned int OnBeacon(struct 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);
unsigned int OnDisassoc(_adapter *padapter, union recv_frame *precv_frame); unsigned int OnDisassoc(struct adapter *padapter, union recv_frame *precv_frame);
unsigned int OnAuth(_adapter *padapter, union recv_frame *precv_frame); unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame);
unsigned int OnAuthClient(_adapter *padapter, union recv_frame *precv_frame); unsigned int OnAuthClient(struct adapter *padapter, union recv_frame *precv_frame);
unsigned int OnDeAuth(_adapter *padapter, union recv_frame *precv_frame); unsigned int OnDeAuth(struct 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);
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 OnAction_qos(_adapter *padapter, union recv_frame *precv_frame); unsigned int OnAction_qos(struct adapter *padapter, union recv_frame *precv_frame);
unsigned int OnAction_dls(_adapter *padapter, union recv_frame *precv_frame); unsigned int OnAction_dls(struct adapter *padapter, union recv_frame *precv_frame);
unsigned int OnAction_back(_adapter *padapter, union recv_frame *precv_frame); unsigned int OnAction_back(struct adapter *padapter, union recv_frame *precv_frame);
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 OnAction_ht(_adapter *padapter, union recv_frame *precv_frame); unsigned int OnAction_ht(struct adapter *padapter, union recv_frame *precv_frame);
unsigned int OnAction_wmm(_adapter *padapter, union recv_frame *precv_frame); unsigned int OnAction_wmm(struct adapter *padapter, union recv_frame *precv_frame);
unsigned int OnAction_p2p(_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_joinbss_event_callback(struct adapter *padapter, int join_res);
void mlmeext_sta_del_event_callback(_adapter *padapter); void mlmeext_sta_del_event_callback(struct adapter *padapter);
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);
void linked_status_chk(_adapter *padapter); void linked_status_chk(struct adapter *padapter);
void survey_timer_hdl (_adapter *padapter); void survey_timer_hdl (struct adapter *padapter);
void link_timer_hdl (_adapter *padapter); void link_timer_hdl (struct adapter *padapter);
void addba_timer_hdl(struct sta_info *psta); void addba_timer_hdl(struct sta_info *psta);
#define set_survey_timer(mlmeext, ms) \ #define set_survey_timer(mlmeext, ms) \
@ -649,44 +649,44 @@ void addba_timer_hdl(struct sta_info *psta);
extern int cckrates_included(unsigned char *rate, int ratelen); extern int cckrates_included(unsigned char *rate, int ratelen);
extern int cckratesonly_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 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);
struct cmd_hdl { struct cmd_hdl {
uint parmsize; 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 read_macreg_hdl(struct adapter *padapter, u8 *pbuf);
u8 write_macreg_hdl(_adapter *padapter, u8 *pbuf); u8 write_macreg_hdl(struct adapter *padapter, u8 *pbuf);
u8 read_bbreg_hdl(_adapter *padapter, u8 *pbuf); u8 read_bbreg_hdl(struct adapter *padapter, u8 *pbuf);
u8 write_bbreg_hdl(_adapter *padapter, u8 *pbuf); u8 write_bbreg_hdl(struct adapter *padapter, u8 *pbuf);
u8 read_rfreg_hdl(_adapter *padapter, u8 *pbuf); u8 read_rfreg_hdl(struct adapter *padapter, u8 *pbuf);
u8 write_rfreg_hdl(_adapter *padapter, u8 *pbuf); u8 write_rfreg_hdl(struct adapter *padapter, u8 *pbuf);
u8 NULL_hdl(_adapter *padapter, u8 *pbuf); u8 NULL_hdl(struct adapter *padapter, u8 *pbuf);
u8 join_cmd_hdl(_adapter *padapter, u8 *pbuf); u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf);
u8 disconnect_hdl(_adapter *padapter, u8 *pbuf); u8 disconnect_hdl(struct adapter *padapter, u8 *pbuf);
u8 createbss_hdl(_adapter *padapter, u8 *pbuf); u8 createbss_hdl(struct adapter *padapter, u8 *pbuf);
u8 setopmode_hdl(_adapter *padapter, u8 *pbuf); u8 setopmode_hdl(struct adapter *padapter, u8 *pbuf);
u8 sitesurvey_cmd_hdl(_adapter *padapter, u8 *pbuf); u8 sitesurvey_cmd_hdl(struct adapter *padapter, u8 *pbuf);
u8 setauth_hdl(_adapter *padapter, u8 *pbuf); u8 setauth_hdl(struct adapter *padapter, u8 *pbuf);
u8 setkey_hdl(_adapter *padapter, u8 *pbuf); u8 setkey_hdl(struct adapter *padapter, u8 *pbuf);
u8 set_stakey_hdl(_adapter *padapter, u8 *pbuf); u8 set_stakey_hdl(struct adapter *padapter, u8 *pbuf);
u8 set_assocsta_hdl(_adapter *padapter, u8 *pbuf); u8 set_assocsta_hdl(struct adapter *padapter, u8 *pbuf);
u8 del_assocsta_hdl(_adapter *padapter, u8 *pbuf); u8 del_assocsta_hdl(struct adapter *padapter, u8 *pbuf);
u8 add_ba_hdl(_adapter *padapter, unsigned char *pbuf); u8 add_ba_hdl(struct adapter *padapter, unsigned char *pbuf);
u8 mlme_evt_hdl(_adapter *padapter, unsigned char *pbuf); u8 mlme_evt_hdl(struct adapter *padapter, unsigned char *pbuf);
u8 h2c_msg_hdl(_adapter *padapter, unsigned char *pbuf); u8 h2c_msg_hdl(struct adapter *padapter, unsigned char *pbuf);
u8 tx_beacon_hdl(_adapter *padapter, unsigned char *pbuf); u8 tx_beacon_hdl(struct adapter *padapter, unsigned char *pbuf);
u8 set_ch_hdl(_adapter *padapter, u8 *pbuf); u8 set_ch_hdl(struct adapter *padapter, u8 *pbuf);
u8 set_chplan_hdl(_adapter *padapter, unsigned char *pbuf); u8 set_chplan_hdl(struct adapter *padapter, unsigned char *pbuf);
u8 led_blink_hdl(_adapter *padapter, unsigned char *pbuf); u8 led_blink_hdl(struct adapter *padapter, unsigned char *pbuf);
u8 set_csa_hdl(_adapter *padapter, unsigned char *pbuf); //Kurt: Handling DFS channel switch announcement ie. u8 set_csa_hdl(struct adapter *padapter, unsigned char *pbuf); //Kurt: Handling DFS channel switch announcement ie.
u8 tdls_hdl(_adapter *padapter, unsigned char *pbuf); u8 tdls_hdl(struct adapter *padapter, unsigned char *pbuf);
#define GEN_DRV_CMD_HANDLER(size, cmd) {size, &cmd ## _hdl}, #define GEN_DRV_CMD_HANDLER(size, cmd) {size, &cmd ## _hdl},
@ -791,8 +791,8 @@ struct C2HEvent_Header
}; };
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);
enum rtw_c2h_event enum rtw_c2h_event
{ {

129
include/rtw_mp.h
View file

@ -113,7 +113,7 @@ struct mp_xmit_frame
int frame_tag; int frame_tag;
_adapter *padapter; struct adapter *padapter;
//insert urb, irp, and irpcnt info below... //insert urb, irp, and irpcnt info below...
u8 *mem_addr; u8 *mem_addr;
@ -319,7 +319,7 @@ enum {
struct mp_priv struct mp_priv
{ {
_adapter *papdater; struct adapter *papdater;
//Testing Flag //Testing Flag
u32 mode;//0 for normal type packet, 1 for loopback packet (16bytes TXCMD) u32 mode;//0 for normal type packet, 1 for loopback packet (16bytes TXCMD)
@ -471,87 +471,84 @@ enum encry_ctrl_state {
//extern struct mp_xmit_frame *alloc_mp_xmitframe(struct mp_priv *pmp_priv); //extern struct mp_xmit_frame *alloc_mp_xmitframe(struct mp_priv *pmp_priv);
//extern int free_mp_xmitframe(struct xmit_priv *pxmitpriv, struct mp_xmit_frame *pmp_xmitframe); //extern int free_mp_xmitframe(struct xmit_priv *pxmitpriv, struct mp_xmit_frame *pmp_xmitframe);
extern s32 init_mp_priv(PADAPTER padapter); extern s32 init_mp_priv(struct adapter * padapter);
extern void free_mp_priv(struct mp_priv *pmp_priv); extern void free_mp_priv(struct mp_priv *pmp_priv);
extern s32 MPT_InitializeAdapter(PADAPTER padapter, u8 Channel); extern s32 MPT_InitializeAdapter(struct adapter * padapter, u8 Channel);
extern void MPT_DeInitAdapter(PADAPTER padapter); extern void MPT_DeInitAdapter(struct adapter * padapter);
extern s32 mp_start_test(PADAPTER padapter); extern s32 mp_start_test(struct adapter * padapter);
extern void mp_stop_test(PADAPTER padapter); extern void mp_stop_test(struct adapter * padapter);
//======================================================================= //=======================================================================
extern u32 _read_rfreg(PADAPTER padapter, u8 rfpath, u32 addr, u32 bitmask); extern u32 _read_rfreg(struct adapter * padapter, u8 rfpath, u32 addr, u32 bitmask);
extern void _write_rfreg(PADAPTER padapter, u8 rfpath, u32 addr, u32 bitmask, u32 val); extern void _write_rfreg(struct adapter * padapter, u8 rfpath, u32 addr, u32 bitmask, u32 val);
extern u32 read_macreg(_adapter *padapter, u32 addr, u32 sz); extern u32 read_macreg(struct adapter *padapter, u32 addr, u32 sz);
extern void write_macreg(_adapter *padapter, u32 addr, u32 val, u32 sz); extern void write_macreg(struct adapter *padapter, u32 addr, u32 val, u32 sz);
extern u32 read_bbreg(_adapter *padapter, u32 addr, u32 bitmask); extern u32 read_bbreg(struct adapter *padapter, u32 addr, u32 bitmask);
extern void write_bbreg(_adapter *padapter, u32 addr, u32 bitmask, u32 val); extern void write_bbreg(struct adapter *padapter, u32 addr, u32 bitmask, u32 val);
extern u32 read_rfreg(PADAPTER padapter, u8 rfpath, u32 addr); extern u32 read_rfreg(struct adapter * padapter, u8 rfpath, u32 addr);
extern void write_rfreg(PADAPTER padapter, u8 rfpath, u32 addr, u32 val); extern void write_rfreg(struct adapter * padapter, u8 rfpath, u32 addr, u32 val);
extern void SetChannel(PADAPTER pAdapter); extern void SetChannel(struct adapter * pAdapter);
extern void SetBandwidth(PADAPTER pAdapter); extern void SetBandwidth(struct adapter * pAdapter);
extern void SetTxPower(PADAPTER pAdapter); extern void SetTxPower(struct adapter * pAdapter);
extern void SetAntennaPathPower(PADAPTER pAdapter); extern void SetAntennaPathPower(struct adapter * pAdapter);
//extern void SetTxAGCOffset(PADAPTER pAdapter, u32 ulTxAGCOffset); extern void SetDataRate(struct adapter * pAdapter);
extern void SetDataRate(PADAPTER pAdapter);
extern void SetAntenna(PADAPTER pAdapter); extern void SetAntenna(struct adapter * pAdapter);
//extern void SetCrystalCap(PADAPTER pAdapter); extern s32 SetThermalMeter(struct adapter * pAdapter, u8 target_ther);
extern void GetThermalMeter(struct adapter * pAdapter, u8 *value);
extern s32 SetThermalMeter(PADAPTER pAdapter, u8 target_ther); extern void SetContinuousTx(struct adapter * pAdapter, u8 bStart);
extern void GetThermalMeter(PADAPTER pAdapter, u8 *value); extern void SetSingleCarrierTx(struct adapter * pAdapter, u8 bStart);
extern void SetSingleToneTx(struct adapter * pAdapter, u8 bStart);
extern void SetCarrierSuppressionTx(struct adapter * pAdapter, u8 bStart);
extern void PhySetTxPowerLevel(struct adapter * pAdapter);
extern void SetContinuousTx(PADAPTER pAdapter, u8 bStart); extern void fill_txdesc_for_mp(struct adapter * padapter, struct tx_desc *ptxdesc);
extern void SetSingleCarrierTx(PADAPTER pAdapter, u8 bStart); extern void SetPacketTx(struct adapter * padapter);
extern void SetSingleToneTx(PADAPTER pAdapter, u8 bStart); extern void SetPacketRx(struct adapter * pAdapter, u8 bStartRx);
extern void SetCarrierSuppressionTx(PADAPTER pAdapter, u8 bStart);
extern void PhySetTxPowerLevel(PADAPTER pAdapter);
extern void fill_txdesc_for_mp(PADAPTER padapter, struct tx_desc *ptxdesc); extern void ResetPhyRxPktCount(struct adapter * pAdapter);
extern void SetPacketTx(PADAPTER padapter); extern u32 GetPhyRxPktReceived(struct adapter * pAdapter);
extern void SetPacketRx(PADAPTER pAdapter, u8 bStartRx); extern u32 GetPhyRxPktCRC32Error(struct adapter * pAdapter);
extern void ResetPhyRxPktCount(PADAPTER pAdapter); extern s32 SetPowerTracking(struct adapter * padapter, u8 enable);
extern u32 GetPhyRxPktReceived(PADAPTER pAdapter); extern void GetPowerTracking(struct adapter * padapter, u8 *enable);
extern u32 GetPhyRxPktCRC32Error(PADAPTER pAdapter);
extern s32 SetPowerTracking(PADAPTER padapter, u8 enable); extern u32 mp_query_psd(struct adapter * pAdapter, u8 *data);
extern void GetPowerTracking(PADAPTER padapter, u8 *enable);
extern u32 mp_query_psd(PADAPTER pAdapter, u8 *data);
extern void Hal_SetAntenna(PADAPTER pAdapter); extern void Hal_SetAntenna(struct adapter * pAdapter);
extern void Hal_SetBandwidth(PADAPTER pAdapter); extern void Hal_SetBandwidth(struct adapter * pAdapter);
extern void Hal_SetTxPower(PADAPTER pAdapter); extern void Hal_SetTxPower(struct adapter * pAdapter);
extern void Hal_SetCarrierSuppressionTx(PADAPTER pAdapter, u8 bStart); extern void Hal_SetCarrierSuppressionTx(struct adapter * pAdapter, u8 bStart);
extern void Hal_SetSingleToneTx ( PADAPTER pAdapter , u8 bStart ); extern void Hal_SetSingleToneTx ( struct adapter * pAdapter , u8 bStart );
extern void Hal_SetSingleCarrierTx (PADAPTER pAdapter, u8 bStart); extern void Hal_SetSingleCarrierTx (struct adapter * pAdapter, u8 bStart);
extern void Hal_SetContinuousTx (PADAPTER pAdapter, u8 bStart); extern void Hal_SetContinuousTx (struct adapter * pAdapter, u8 bStart);
extern void Hal_SetBandwidth(PADAPTER pAdapter); extern void Hal_SetBandwidth(struct adapter * pAdapter);
extern void Hal_SetDataRate(PADAPTER pAdapter); extern void Hal_SetDataRate(struct adapter * pAdapter);
extern void Hal_SetChannel(PADAPTER pAdapter); extern void Hal_SetChannel(struct adapter * pAdapter);
extern void Hal_SetAntennaPathPower(PADAPTER pAdapter); extern void Hal_SetAntennaPathPower(struct adapter * pAdapter);
extern s32 Hal_SetThermalMeter(PADAPTER pAdapter, u8 target_ther); extern s32 Hal_SetThermalMeter(struct adapter * pAdapter, u8 target_ther);
extern s32 Hal_SetPowerTracking(PADAPTER padapter, u8 enable); extern s32 Hal_SetPowerTracking(struct adapter * padapter, u8 enable);
extern void Hal_GetPowerTracking(PADAPTER padapter, u8 * enable); extern void Hal_GetPowerTracking(struct adapter * padapter, u8 * enable);
extern void Hal_GetThermalMeter(PADAPTER pAdapter, u8 *value); extern void Hal_GetThermalMeter(struct adapter * pAdapter, u8 *value);
extern void Hal_mpt_SwitchRfSetting(PADAPTER pAdapter); extern void Hal_mpt_SwitchRfSetting(struct adapter * pAdapter);
extern void Hal_MPT_CCKTxPowerAdjust(PADAPTER Adapter, bool bInCH14); extern void Hal_MPT_CCKTxPowerAdjust(struct adapter * Adapter, bool bInCH14);
extern void Hal_MPT_CCKTxPowerAdjustbyIndex(PADAPTER pAdapter, bool beven); extern void Hal_MPT_CCKTxPowerAdjustbyIndex(struct adapter * pAdapter, bool beven);
extern void Hal_SetCCKTxPower(PADAPTER pAdapter, u8 * TxPower); extern void Hal_SetCCKTxPower(struct adapter * pAdapter, u8 * TxPower);
extern void Hal_SetOFDMTxPower(PADAPTER pAdapter, u8 * TxPower); extern void Hal_SetOFDMTxPower(struct adapter * pAdapter, u8 * TxPower);
extern void Hal_TriggerRFThermalMeter(PADAPTER pAdapter); extern void Hal_TriggerRFThermalMeter(struct adapter * pAdapter);
extern u8 Hal_ReadRFThermalMeter(PADAPTER pAdapter); extern u8 Hal_ReadRFThermalMeter(struct adapter * pAdapter);
extern void Hal_SetCCKContinuousTx(PADAPTER pAdapter, u8 bStart); extern void Hal_SetCCKContinuousTx(struct adapter * pAdapter, u8 bStart);
extern void Hal_SetOFDMContinuousTx(PADAPTER pAdapter, u8 bStart); extern void Hal_SetOFDMContinuousTx(struct adapter * pAdapter, u8 bStart);
extern void Hal_ProSetCrystalCap (PADAPTER pAdapter , u32 CrystalCapVal); extern void Hal_ProSetCrystalCap (struct adapter * pAdapter , u32 CrystalCapVal);
extern void _rtw_mp_xmit_priv(struct xmit_priv *pxmitpriv); extern void _rtw_mp_xmit_priv(struct xmit_priv *pxmitpriv);
extern void MP_PHY_SetRFPathSwitch(PADAPTER pAdapter ,bool bMain); extern void MP_PHY_SetRFPathSwitch(struct adapter * pAdapter ,bool bMain);
#endif //_RTW_MP_H_ #endif //_RTW_MP_H_

20
include/rtw_p2p.h
View file

@ -38,18 +38,18 @@ 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_group_negotation_confirm( struct wifidirect_info *pwdinfo, u8 *pframe, uint len );
u8 process_p2p_presence_req(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);
void process_p2p_ps_ie(PADAPTER padapter, u8 *IEs, u32 IELength); void process_p2p_ps_ie(struct adapter * padapter, u8 *IEs, u32 IELength);
void p2p_ps_wk_hdl(_adapter *padapter, u8 p2p_ps_state); void p2p_ps_wk_hdl(struct adapter *padapter, u8 p2p_ps_state);
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);
void reset_global_wifidirect_info( _adapter* padapter ); void reset_global_wifidirect_info( struct adapter* padapter );
int rtw_init_wifi_display_info(_adapter* padapter); int rtw_init_wifi_display_info(struct adapter* padapter);
void rtw_init_wifidirect_timers(_adapter* padapter); void rtw_init_wifidirect_timers(struct adapter* padapter);
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);
void init_wifidirect_info( _adapter* padapter, enum P2P_ROLE role); void init_wifidirect_info( struct adapter* padapter, enum P2P_ROLE role);
int rtw_p2p_enable(_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) static inline void _rtw_p2p_set_state(struct wifidirect_info *wdinfo, enum P2P_STATE state)
{ {

34
include/rtw_pwrctrl.h
View file

@ -263,29 +263,29 @@ struct pwrctrl_priv
#define rtw_set_pwr_state_check_timer(pwrctrlpriv) \ #define rtw_set_pwr_state_check_timer(pwrctrlpriv) \
_rtw_set_pwr_state_check_timer((pwrctrlpriv), (pwrctrlpriv)->pwr_state_check_interval) _rtw_set_pwr_state_check_timer((pwrctrlpriv), (pwrctrlpriv)->pwr_state_check_interval)
extern void rtw_init_pwrctrl_priv(_adapter *adapter); extern void rtw_init_pwrctrl_priv(struct adapter *adapter);
extern void rtw_free_pwrctrl_priv(_adapter * adapter); extern void rtw_free_pwrctrl_priv(struct adapter * adapter);
extern void rtw_set_ps_mode(PADAPTER padapter, u8 ps_mode, u8 smart_ps, u8 bcn_ant_mode); extern void rtw_set_ps_mode(struct adapter * padapter, u8 ps_mode, u8 smart_ps, u8 bcn_ant_mode);
extern void rtw_set_rpwm(_adapter * padapter, u8 val8); extern void rtw_set_rpwm(struct adapter * padapter, u8 val8);
extern void LeaveAllPowerSaveMode(PADAPTER Adapter); extern void LeaveAllPowerSaveMode(struct adapter * Adapter);
void ips_enter(_adapter * padapter); void ips_enter(struct adapter * padapter);
int ips_leave(_adapter * padapter); int ips_leave(struct adapter * padapter);
void rtw_ps_processor(_adapter*padapter); void rtw_ps_processor(struct adapter*padapter);
enum rt_rf_power_state RfOnOffDetect(PADAPTER pAdapter ); enum rt_rf_power_state RfOnOffDetect(struct adapter * pAdapter );
s32 LPS_RF_ON_check(PADAPTER padapter, u32 delay_ms); s32 LPS_RF_ON_check(struct adapter * padapter, u32 delay_ms);
void LPS_Enter(PADAPTER padapter); void LPS_Enter(struct adapter * padapter);
void LPS_Leave(PADAPTER padapter); void LPS_Leave(struct adapter * padapter);
u8 rtw_interface_ps_func(_adapter *padapter,enum hal_intf_ps_func efunc_id,u8* val); u8 rtw_interface_ps_func(struct adapter *padapter,enum hal_intf_ps_func efunc_id,u8* val);
void rtw_set_ips_deny(_adapter *padapter, u32 ms); void rtw_set_ips_deny(struct adapter *padapter, u32 ms);
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);
#define rtw_pwr_wakeup(adapter) _rtw_pwr_wakeup(adapter, RTW_PWR_STATE_CHK_INTERVAL, __func__) #define rtw_pwr_wakeup(adapter) _rtw_pwr_wakeup(adapter, RTW_PWR_STATE_CHK_INTERVAL, __func__)
#define rtw_pwr_wakeup_ex(adapter, ips_deffer_ms) _rtw_pwr_wakeup(adapter, ips_deffer_ms, __func__) #define rtw_pwr_wakeup_ex(adapter, ips_deffer_ms) _rtw_pwr_wakeup(adapter, ips_deffer_ms, __func__)
int rtw_pm_set_ips(_adapter *padapter, u8 mode); int rtw_pm_set_ips(struct adapter *padapter, u8 mode);
int rtw_pm_set_lps(_adapter *padapter, u8 mode); int rtw_pm_set_lps(struct adapter *padapter, u8 mode);
#endif //__RTL871X_PWRCTRL_H_ #endif //__RTL871X_PWRCTRL_H_

12
include/rtw_recv.h
View file

@ -55,7 +55,7 @@ static u8 rtw_bridge_tunnel_header[] =
//for Rx reordering buffer control //for Rx reordering buffer control
struct recv_reorder_ctrl struct recv_reorder_ctrl
{ {
_adapter *padapter; struct adapter *padapter;
u8 enable; u8 enable;
u16 indicate_seq;//=wstart_b, init_value=0xffff u16 indicate_seq;//=wstart_b, init_value=0xffff
u16 wend_b; u16 wend_b;
@ -198,7 +198,7 @@ struct recv_priv
u8 *pallocated_frame_buf; u8 *pallocated_frame_buf;
u8 *precv_frame_buf; u8 *precv_frame_buf;
uint free_recvframe_cnt; uint free_recvframe_cnt;
_adapter *adapter; struct adapter *adapter;
u32 bIsAnyNonBEPkts; u32 bIsAnyNonBEPkts;
u64 rx_bytes; u64 rx_bytes;
u64 rx_pkts; u64 rx_pkts;
@ -257,7 +257,7 @@ struct recv_buf
u32 ref_cnt; u32 ref_cnt;
PADAPTER adapter; struct adapter * adapter;
u8 *pbuf; u8 *pbuf;
u8 *pallocated_buf; u8 *pallocated_buf;
@ -299,7 +299,7 @@ struct recv_frame_hdr
struct sk_buff *pkt; struct sk_buff *pkt;
struct sk_buff *pkt_newalloc; struct sk_buff *pkt_newalloc;
_adapter *adapter; struct adapter *adapter;
u8 fragcnt; u8 fragcnt;
@ -346,7 +346,7 @@ extern int _rtw_enqueue_recvframe(union recv_frame *precvframe, struct __queue *
extern int rtw_enqueue_recvframe(union recv_frame *precvframe, struct __queue *queue); extern int rtw_enqueue_recvframe(union recv_frame *precvframe, struct __queue *queue);
extern void rtw_free_recvframe_queue(struct __queue *pframequeue, struct __queue *pfree_recv_queue); extern void rtw_free_recvframe_queue(struct __queue *pframequeue, struct __queue *pfree_recv_queue);
u32 rtw_free_uc_swdec_pending_queue(_adapter *adapter); u32 rtw_free_uc_swdec_pending_queue(struct adapter *adapter);
int rtw_enqueue_recvbuf_to_head(struct recv_buf *precvbuf, struct __queue *queue); int rtw_enqueue_recvbuf_to_head(struct recv_buf *precvbuf, struct __queue *queue);
int rtw_enqueue_recvbuf(struct recv_buf *precvbuf, struct __queue *queue); int rtw_enqueue_recvbuf(struct recv_buf *precvbuf, struct __queue *queue);
@ -551,6 +551,6 @@ struct sta_info;
extern void _rtw_init_sta_recv_priv(struct sta_recv_priv *psta_recvpriv); 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 #endif

12
include/rtw_security.h
View file

@ -383,13 +383,13 @@ void rtw_seccalctkipmic(
u8 *Miccode, u8 *Miccode,
u8 priority); u8 priority);
u32 rtw_aes_encrypt(_adapter *padapter, u8 *pxmitframe); u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe);
u32 rtw_tkip_encrypt(_adapter *padapter, u8 *pxmitframe); u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe);
void rtw_wep_encrypt(_adapter *padapter, u8 *pxmitframe); void rtw_wep_encrypt(struct adapter *padapter, u8 *pxmitframe);
u32 rtw_aes_decrypt(_adapter *padapter, u8 *precvframe); u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe);
u32 rtw_tkip_decrypt(_adapter *padapter, u8 *precvframe); u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe);
void rtw_wep_decrypt(_adapter *padapter, u8 *precvframe); void rtw_wep_decrypt(struct adapter *padapter, u8 *precvframe);
void rtw_use_tkipkey_handler(void* FunctionContext); void rtw_use_tkipkey_handler(void* FunctionContext);
#endif //__RTL871X_SECURITY_H_ #endif //__RTL871X_SECURITY_H_

8
include/rtw_sreset.h
View file

@ -42,9 +42,9 @@ struct sreset_priv {
#define WIFI_RX_HANG BIT5 #define WIFI_RX_HANG BIT5
#define WIFI_IF_NOT_EXIST BIT6 #define WIFI_IF_NOT_EXIST BIT6
void sreset_init_value(_adapter *padapter); void sreset_init_value(struct adapter *padapter);
void sreset_reset_value(_adapter *padapter); void sreset_reset_value(struct adapter *padapter);
u8 sreset_get_wifi_status(_adapter *padapter); u8 sreset_get_wifi_status(struct adapter *padapter);
void sreset_set_wifi_error_status(_adapter *padapter, u32 status); void sreset_set_wifi_error_status(struct adapter *padapter, u32 status);
#endif #endif

40
include/rtw_xmit.h
View file

@ -208,7 +208,7 @@ void rtw_sctx_done(struct submit_ctx **sctx);
struct xmit_buf struct xmit_buf
{ {
struct list_head list; struct list_head list;
_adapter *padapter; struct adapter *padapter;
u8 *pallocated_buf; u8 *pallocated_buf;
u8 *pbuf; u8 *pbuf;
void *priv_data; void *priv_data;
@ -231,7 +231,7 @@ struct xmit_frame
struct pkt_attrib attrib; struct pkt_attrib attrib;
struct sk_buff *pkt; struct sk_buff *pkt;
int frame_tag; int frame_tag;
_adapter *padapter; struct adapter *padapter;
u8 *buf_addr; u8 *buf_addr;
struct xmit_buf *pxmitbuf; struct xmit_buf *pxmitbuf;
@ -303,7 +303,7 @@ struct xmit_priv {
uint frag_len; uint frag_len;
_adapter *adapter; struct adapter *adapter;
u8 vcs_setting; u8 vcs_setting;
u8 vcs; u8 vcs;
@ -350,46 +350,46 @@ 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 struct xmit_buf *rtw_alloc_xmitbuf(struct xmit_priv *pxmitpriv);
extern s32 rtw_free_xmitbuf(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf); 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); void rtw_count_tx_stats(struct adapter *padapter, struct xmit_frame *pxmitframe, int sz);
extern void rtw_update_protection(_adapter *padapter, u8 *ie, uint ie_len); extern void rtw_update_protection(struct adapter *padapter, u8 *ie, uint ie_len);
extern s32 rtw_make_wlanhdr(_adapter *padapter, u8 *hdr, struct pkt_attrib *pattrib); 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 s32 rtw_put_snap(u8 *data, u16 h_proto);
extern struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv); extern struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv);
extern s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitframe); extern s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitframe);
extern void rtw_free_xmitframe_queue(struct xmit_priv *pxmitpriv, struct __queue *pframequeue); extern void rtw_free_xmitframe_queue(struct xmit_priv *pxmitpriv, struct __queue *pframequeue);
struct tx_servq *rtw_get_sta_pending(_adapter *padapter, struct sta_info *psta, int up, u8 *ac); struct tx_servq *rtw_get_sta_pending(struct adapter *padapter, struct sta_info *psta, int up, u8 *ac);
extern s32 rtw_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe); 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, int entry); extern struct xmit_frame* rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmit *phwxmit_i, int 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); 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) #define rtw_wlan_pkt_size(f) rtw_calculate_wlan_pkt_size_by_attribue(&f->attrib)
extern s32 rtw_xmitframe_coalesce(_adapter *padapter, struct sk_buff *pkt, struct xmit_frame *pxmitframe); extern s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct xmit_frame *pxmitframe);
s32 _rtw_init_hw_txqueue(struct hw_txqueue* phw_txqueue, u8 ac_tag); 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); void _rtw_init_sta_xmit_priv(struct sta_xmit_priv *psta_xmitpriv);
s32 rtw_txframes_pending(_adapter *padapter); s32 rtw_txframes_pending(struct adapter *padapter);
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);
void rtw_init_hwxmits(struct hw_xmit *phwxmit, int entry); void rtw_init_hwxmits(struct hw_xmit *phwxmit, int 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_free_xmit_priv (struct xmit_priv *pxmitpriv);
void rtw_alloc_hwxmits(_adapter *padapter); void rtw_alloc_hwxmits(struct adapter *padapter);
void rtw_free_hwxmits(_adapter *padapter); void rtw_free_hwxmits(struct adapter *padapter);
s32 rtw_xmit(_adapter *padapter, struct sk_buff **pkt); s32 rtw_xmit(struct adapter *padapter, struct sk_buff **pkt);
#if defined(CONFIG_AP_MODE) #if defined(CONFIG_AP_MODE)
int xmitframe_enqueue_for_sleeping_sta(_adapter *padapter, struct xmit_frame *pxmitframe); int xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_frame *pxmitframe);
void stop_sta_xmit(_adapter *padapter, struct sta_info *psta); void stop_sta_xmit(struct 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);
void xmit_delivery_enabled_frames(_adapter *padapter, struct sta_info *psta); void xmit_delivery_enabled_frames(struct adapter *padapter, struct sta_info *psta);
#endif #endif
u8 qos_acm(u8 acm_mask, u8 priority); u8 qos_acm(u8 acm_mask, u8 priority);

13
include/sta_info.h
View file

@ -342,7 +342,7 @@ struct sta_priv {
struct __queue sleep_q; struct __queue sleep_q;
struct __queue wakeup_q; struct __queue wakeup_q;
_adapter *padapter; struct adapter *padapter;
#ifdef CONFIG_AP_MODE #ifdef CONFIG_AP_MODE
@ -391,7 +391,6 @@ __inline static u32 wifi_mac_hash(u8 *mac)
return x; return x;
} }
extern u32 _rtw_init_sta_priv(struct sta_priv *pstapriv); extern u32 _rtw_init_sta_priv(struct sta_priv *pstapriv);
extern u32 _rtw_free_sta_priv(struct sta_priv *pstapriv); extern u32 _rtw_free_sta_priv(struct sta_priv *pstapriv);
@ -400,11 +399,11 @@ 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); 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 struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr);
extern u32 rtw_free_stainfo(_adapter *padapter , struct sta_info *psta); extern u32 rtw_free_stainfo(struct adapter *padapter , struct sta_info *psta);
extern void rtw_free_all_stainfo(_adapter *padapter); extern void rtw_free_all_stainfo(struct adapter *padapter);
extern struct sta_info *rtw_get_stainfo(struct sta_priv *pstapriv, u8 *hwaddr); extern struct sta_info *rtw_get_stainfo(struct sta_priv *pstapriv, u8 *hwaddr);
extern u32 rtw_init_bcmc_stainfo(_adapter* padapter); extern u32 rtw_init_bcmc_stainfo(struct adapter* padapter);
extern struct sta_info* rtw_get_bcmc_stainfo(_adapter* padapter); extern struct sta_info* rtw_get_bcmc_stainfo(struct adapter* padapter);
extern u8 rtw_access_ctrl(_adapter *padapter, u8 *mac_addr); extern u8 rtw_access_ctrl(struct adapter *padapter, u8 *mac_addr);
#endif //_STA_INFO_H_ #endif //_STA_INFO_H_

2
include/usb_hal.h
View file

@ -20,7 +20,7 @@
#ifndef __USB_HAL_H__ #ifndef __USB_HAL_H__
#define __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 #define hal_set_hal_ops rtl8188eu_set_hal_ops
#endif //__USB_HAL_H__ #endif //__USB_HAL_H__

4
include/usb_ops.h
View file

@ -52,7 +52,7 @@ enum{
#endif #endif
#include <usb_ops_linux.h> #include <usb_ops_linux.h>
void rtl8188eu_set_hw_type(_adapter *padapter); void rtl8188eu_set_hw_type(struct adapter *padapter);
#define hal_set_hw_type rtl8188eu_set_hw_type #define hal_set_hw_type rtl8188eu_set_hw_type
void rtl8188eu_set_intf_ops(struct _io_ops *pops); void rtl8188eu_set_intf_ops(struct _io_ops *pops);
#define usb_set_intf_ops rtl8188eu_set_intf_ops #define usb_set_intf_ops rtl8188eu_set_intf_ops
@ -86,7 +86,7 @@ static inline void rtw_reset_continual_urb_error(struct dvobj_priv *dvobj)
#define USB_HIGH_SPEED_BULK_SIZE 512 #define USB_HIGH_SPEED_BULK_SIZE 512
#define USB_FULL_SPEED_BULK_SIZE 64 #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; u8 rst = true;
struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter); struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);

8
include/usb_osintf.h
View file

@ -32,9 +32,9 @@ extern int rtw_mc2u_disable;
u8 usbvendorrequest(struct dvobj_priv *pdvobjpriv, enum bt_usb_request brequest, enum rt_usb_wvalue wvalue, u8 windex, void* data, u8 datalen, u8 isdirectionin); u8 usbvendorrequest(struct dvobj_priv *pdvobjpriv, enum bt_usb_request brequest, enum rt_usb_wvalue wvalue, u8 windex, void* data, u8 datalen, u8 isdirectionin);
int pm_netdev_open(struct net_device *pnetdev,u8 bnormal); int pm_netdev_open(struct net_device *pnetdev,u8 bnormal);
void netdev_br_init(struct net_device *netdev); void netdev_br_init(struct net_device *netdev);
void dhcp_flag_bcast(_adapter *priv, struct sk_buff *skb); void dhcp_flag_bcast(struct adapter *priv, struct sk_buff *skb);
void *scdb_findEntry(_adapter *priv, unsigned char *macAddr, unsigned char *ipAddr); void *scdb_findEntry(struct adapter *priv, unsigned char *macAddr, unsigned char *ipAddr);
void nat25_db_expire(_adapter *priv); void nat25_db_expire(struct adapter *priv);
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);
#endif #endif

10
include/xmit_osdep.h
View file

@ -48,10 +48,10 @@ struct xmit_buf;
extern int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev); extern int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *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); int rtw_os_xmit_resource_alloc(struct adapter *padapter, struct xmit_buf *pxmitbuf,u32 alloc_sz);
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);
extern void rtw_set_tx_chksum_offload(struct sk_buff *pkt, struct pkt_attrib *pattrib); extern void rtw_set_tx_chksum_offload(struct sk_buff *pkt, struct pkt_attrib *pattrib);
@ -60,7 +60,7 @@ extern void _rtw_open_pktfile(struct sk_buff *pkt, struct pkt_file *pfile);
extern uint _rtw_pktfile_read (struct pkt_file *pfile, u8 *rmem, uint rlen); extern uint _rtw_pktfile_read (struct pkt_file *pfile, u8 *rmem, uint rlen);
extern int rtw_endofpktfile (struct pkt_file *pfile); extern int rtw_endofpktfile (struct pkt_file *pfile);
extern void rtw_os_pkt_complete(_adapter *padapter, struct sk_buff *pkt); extern void rtw_os_pkt_complete(struct adapter *padapter, struct sk_buff *pkt);
extern void rtw_os_xmit_complete(_adapter *padapter, struct xmit_frame *pxframe); extern void rtw_os_xmit_complete(struct adapter *padapter, struct xmit_frame *pxframe);
#endif //__XMIT_OSDEP_H_ #endif //__XMIT_OSDEP_H_

266
os_dep/ioctl_linux.c
View file

File diff suppressed because it is too large Load diff

32
os_dep/mlme_linux.c
View file

@ -27,21 +27,21 @@
void rtw_join_timeout_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); _rtw_join_timeout_handler(adapter);
} }
void _rtw_scan_timeout_handler (void *FunctionContext) void _rtw_scan_timeout_handler (void *FunctionContext)
{ {
_adapter *adapter = (_adapter *)FunctionContext; struct adapter *adapter = (struct adapter *)FunctionContext;
rtw_scan_timeout_handler(adapter); rtw_scan_timeout_handler(adapter);
} }
static void _dynamic_check_timer_handlder (void *FunctionContext) static void _dynamic_check_timer_handlder (void *FunctionContext)
{ {
_adapter *adapter = (_adapter *)FunctionContext; struct adapter *adapter = (struct adapter *)FunctionContext;
#if (MP_DRIVER == 1) #if (MP_DRIVER == 1)
if (adapter->registrypriv.mp_mode == 1) if (adapter->registrypriv.mp_mode == 1)
@ -52,7 +52,7 @@ if (adapter->registrypriv.mp_mode == 1)
_set_timer(&adapter->mlmepriv.dynamic_chk_timer, 2000); _set_timer(&adapter->mlmepriv.dynamic_chk_timer, 2000);
} }
void rtw_init_mlme_timer(_adapter *padapter) void rtw_init_mlme_timer(struct adapter *padapter)
{ {
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -68,7 +68,7 @@ void rtw_init_mlme_timer(_adapter *padapter)
#endif #endif
} }
void rtw_os_indicate_connect(_adapter *adapter) void rtw_os_indicate_connect(struct adapter *adapter)
{ {
_func_enter_; _func_enter_;
@ -84,15 +84,15 @@ _func_exit_;
} }
extern void indicate_wx_scan_complete_event(_adapter *padapter); extern void indicate_wx_scan_complete_event(struct adapter *padapter);
void rtw_os_indicate_scan_done( _adapter *padapter, bool aborted) void rtw_os_indicate_scan_done( struct adapter *padapter, bool aborted)
{ {
indicate_wx_scan_complete_event(padapter); indicate_wx_scan_complete_event(padapter);
} }
static struct rt_pmkid_list backupPMKIDList[ NUM_PMKID_CACHE ]; static struct rt_pmkid_list backupPMKIDList[ NUM_PMKID_CACHE ];
void rtw_reset_securitypriv( _adapter *adapter ) void rtw_reset_securitypriv( struct adapter *adapter )
{ {
u8 backupPMKIDIndex = 0; u8 backupPMKIDIndex = 0;
u8 backupTKIPCountermeasure = 0x00; u8 backupTKIPCountermeasure = 0x00;
@ -146,7 +146,7 @@ void rtw_reset_securitypriv( _adapter *adapter )
} }
} }
void rtw_os_indicate_disconnect( _adapter *adapter ) void rtw_os_indicate_disconnect( struct adapter *adapter )
{ {
_func_enter_; _func_enter_;
@ -160,7 +160,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; uint len;
u8 *buff,*p,i; u8 *buff,*p,i;
@ -210,14 +210,14 @@ _func_exit_;
static void _survey_timer_hdl (void *FunctionContext) static void _survey_timer_hdl (void *FunctionContext)
{ {
_adapter *padapter = (_adapter *)FunctionContext; struct adapter *padapter = (struct adapter *)FunctionContext;
survey_timer_hdl(padapter); survey_timer_hdl(padapter);
} }
static void _link_timer_hdl (void *FunctionContext) static void _link_timer_hdl (void *FunctionContext)
{ {
_adapter *padapter = (_adapter *)FunctionContext; struct adapter *padapter = (struct adapter *)FunctionContext;
link_timer_hdl(padapter); link_timer_hdl(padapter);
} }
@ -227,13 +227,13 @@ static void _addba_timer_hdl(void *FunctionContext)
addba_timer_hdl(psta); addba_timer_hdl(psta);
} }
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); _init_timer(&psta->addba_retry_timer, padapter->pnetdev, _addba_timer_hdl, psta);
} }
void init_mlme_ext_timer(_adapter *padapter) void init_mlme_ext_timer(struct adapter *padapter)
{ {
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -243,7 +243,7 @@ void init_mlme_ext_timer(_adapter *padapter)
#ifdef CONFIG_AP_MODE #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; union iwreq_data wrqu;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
@ -267,7 +267,7 @@ void rtw_indicate_sta_assoc_event(_adapter *padapter, struct sta_info *psta)
wireless_send_event(padapter->pnetdev, IWEVREGISTERED, &wrqu, NULL); wireless_send_event(padapter->pnetdev, IWEVREGISTERED, &wrqu, NULL);
} }
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; union iwreq_data wrqu;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;

63
os_dep/os_intfs.c
View file

@ -219,7 +219,7 @@ void rtw_proc_init_one(struct net_device *dev)
{ {
struct proc_dir_entry *dir_dev = NULL; struct proc_dir_entry *dir_dev = NULL;
struct proc_dir_entry *entry=NULL; struct proc_dir_entry *entry=NULL;
_adapter *padapter = rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
u8 rf_type; u8 rf_type;
if (rtw_proc == NULL) { if (rtw_proc == NULL) {
@ -335,7 +335,7 @@ void rtw_proc_init_one(struct net_device *dev)
} }
entry = create_proc_read_entry("adapter_state", S_IFREG | S_IRUGO, entry = create_proc_read_entry("adapter_state", S_IFREG | S_IRUGO,
dir_dev, proc_get_adapter_state, dev); dir_dev, proc_getstruct adapter_state, dev);
if (!entry) { if (!entry) {
pr_info("Unable to create_proc_read_entry!\n"); pr_info("Unable to create_proc_read_entry!\n");
return; return;
@ -506,7 +506,7 @@ void rtw_proc_init_one(struct net_device *dev)
void rtw_proc_remove_one(struct net_device *dev) void rtw_proc_remove_one(struct net_device *dev)
{ {
struct proc_dir_entry *dir_dev = NULL; struct proc_dir_entry *dir_dev = NULL;
_adapter *padapter = rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
u8 rf_type; u8 rf_type;
dir_dev = padapter->dir_dev; dir_dev = padapter->dir_dev;
@ -576,7 +576,7 @@ void rtw_proc_remove_one(struct net_device *dev)
} }
#endif #endif
static uint loadparam( _adapter *padapter, struct net_device *pnetdev) static uint loadparam( struct adapter *padapter, struct net_device *pnetdev)
{ {
uint status = _SUCCESS; uint status = _SUCCESS;
@ -664,7 +664,7 @@ _func_exit_;
static int rtw_net_set_mac_address(struct net_device *pnetdev, void *p) 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; struct sockaddr *addr = p;
if (padapter->bup == false) if (padapter->bup == false)
@ -675,7 +675,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) 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 xmit_priv *pxmitpriv = &(padapter->xmitpriv);
struct recv_priv *precvpriv = &(padapter->recvpriv); struct recv_priv *precvpriv = &(padapter->recvpriv);
@ -725,7 +725,7 @@ static unsigned int rtw_classify8021d(struct sk_buff *skb)
static u16 rtw_select_queue(struct net_device *dev, 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; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
skb->priority = rtw_classify8021d(skb); skb->priority = rtw_classify8021d(skb);
@ -777,7 +777,7 @@ static const struct net_device_ops rtw_netdev_ops = {
int rtw_init_netdev_name(struct net_device *pnetdev, const char *ifname) 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);
if (dev_alloc_name(pnetdev, ifname) < 0) if (dev_alloc_name(pnetdev, ifname) < 0)
RT_TRACE(_module_os_intfs_c_,_drv_err_,("dev_alloc_name, fail!\n")); RT_TRACE(_module_os_intfs_c_,_drv_err_,("dev_alloc_name, fail!\n"));
@ -786,17 +786,17 @@ int rtw_init_netdev_name(struct net_device *pnetdev, const char *ifname)
return 0; 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; struct net_device *pnetdev;
RT_TRACE(_module_os_intfs_c_,_drv_info_,("+init_net_dev\n")); RT_TRACE(_module_os_intfs_c_,_drv_info_,("+init_net_dev\n"));
if (old_padapter != NULL) 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 else
pnetdev = rtw_alloc_etherdev(sizeof(_adapter)); pnetdev = rtw_alloc_etherdev(sizeof(struct adapter));
if (!pnetdev) if (!pnetdev)
return NULL; return NULL;
@ -830,7 +830,7 @@ struct net_device *rtw_init_netdev(_adapter *old_padapter)
return pnetdev; return pnetdev;
} }
u32 rtw_start_drv_threads(_adapter *padapter) u32 rtw_start_drv_threads(struct adapter *padapter)
{ {
u32 _status = _SUCCESS; u32 _status = _SUCCESS;
@ -846,7 +846,7 @@ u32 rtw_start_drv_threads(_adapter *padapter)
return _status; return _status;
} }
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")); RT_TRACE(_module_os_intfs_c_,_drv_info_,("+rtw_stop_drv_threads\n"));
@ -858,7 +858,7 @@ void rtw_stop_drv_threads (_adapter *padapter)
rtw_hal_stop_thread(padapter); rtw_hal_stop_thread(padapter);
} }
static u8 rtw_init_default_value(_adapter *padapter) static u8 rtw_init_default_value(struct adapter *padapter)
{ {
u8 ret = _SUCCESS; u8 ret = _SUCCESS;
struct registry_priv* pregistrypriv = &padapter->registrypriv; struct registry_priv* pregistrypriv = &padapter->registrypriv;
@ -911,7 +911,7 @@ static u8 rtw_init_default_value(_adapter *padapter)
return ret; return ret;
} }
u8 rtw_reset_drv_sw(_adapter *padapter) u8 rtw_reset_drv_sw(struct adapter *padapter)
{ {
u8 ret8=_SUCCESS; u8 ret8=_SUCCESS;
struct mlme_priv *pmlmepriv= &padapter->mlmepriv; struct mlme_priv *pmlmepriv= &padapter->mlmepriv;
@ -942,7 +942,7 @@ u8 rtw_reset_drv_sw(_adapter *padapter)
return ret8; return ret8;
} }
u8 rtw_init_drv_sw(_adapter *padapter) u8 rtw_init_drv_sw(struct adapter *padapter)
{ {
u8 ret8=_SUCCESS; u8 ret8=_SUCCESS;
@ -1027,14 +1027,14 @@ exit:
} }
#ifdef CONFIG_WOWLAN #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); _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")); RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel dynamic_chk_timer!\n"));
} }
#endif #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")); RT_TRACE(_module_os_intfs_c_,_drv_info_,("+rtw_cancel_all_timer\n"));
@ -1062,7 +1062,7 @@ void rtw_cancel_all_timer(_adapter *padapter)
rtw_hal_dm_deinit(padapter); rtw_hal_dm_deinit(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; struct net_device *pnetdev = (struct net_device*)padapter->pnetdev;
@ -1115,10 +1115,9 @@ u8 rtw_free_drv_sw(_adapter *padapter)
padapter->rereg_nd_name_priv.old_pnetdev = NULL; padapter->rereg_nd_name_priv.old_pnetdev = NULL;
} }
// clear pbuddy_adapter to avoid access wrong pointer. // clear pbuddystruct adapter to avoid access wrong pointer.
if (padapter->pbuddy_adapter != NULL) { if (padapter->pbuddy_adapter != NULL)
padapter->pbuddy_adapter->pbuddy_adapter = NULL; padapter->pbuddy_adapter->pbuddy_adapter = NULL;
}
RT_TRACE(_module_os_intfs_c_,_drv_info_,("-rtw_free_drv_sw\n")); RT_TRACE(_module_os_intfs_c_,_drv_info_,("-rtw_free_drv_sw\n"));
@ -1127,7 +1126,7 @@ u8 rtw_free_drv_sw(_adapter *padapter)
void netdev_br_init(struct net_device *netdev) 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)) #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35))
rcu_read_lock(); rcu_read_lock();
@ -1173,7 +1172,7 @@ void netdev_br_init(struct net_device *netdev)
int _netdev_open(struct net_device *pnetdev) int _netdev_open(struct net_device *pnetdev)
{ {
uint status; uint status;
_adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev); struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv;
RT_TRACE(_module_os_intfs_c_,_drv_info_,("+88eu_drv - dev_open\n")); RT_TRACE(_module_os_intfs_c_,_drv_info_,("+88eu_drv - dev_open\n"));
@ -1252,7 +1251,7 @@ netdev_open_error:
int netdev_open(struct net_device *pnetdev) int netdev_open(struct net_device *pnetdev)
{ {
int ret; int ret;
_adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev); struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
_enter_critical_mutex(padapter->hw_init_mutex, NULL); _enter_critical_mutex(padapter->hw_init_mutex, NULL);
ret = _netdev_open(pnetdev); ret = _netdev_open(pnetdev);
@ -1261,7 +1260,7 @@ int netdev_open(struct net_device *pnetdev)
return ret; return ret;
} }
static int ips_netdrv_open(_adapter *padapter) static int ips_netdrv_open(struct adapter *padapter)
{ {
int status = _SUCCESS; int status = _SUCCESS;
padapter->net_closed = false; padapter->net_closed = false;
@ -1292,7 +1291,7 @@ netdev_open_error:
} }
int rtw_ips_pwr_up(_adapter *padapter) int rtw_ips_pwr_up(struct adapter *padapter)
{ {
int result; int result;
u32 start_time = rtw_get_current_time(); u32 start_time = rtw_get_current_time();
@ -1307,7 +1306,7 @@ int rtw_ips_pwr_up(_adapter *padapter)
return result; return result;
} }
void rtw_ips_pwr_down(_adapter *padapter) void rtw_ips_pwr_down(struct adapter *padapter)
{ {
u32 start_time = rtw_get_current_time(); u32 start_time = rtw_get_current_time();
DBG_88E("===> rtw_ips_pwr_down...................\n"); DBG_88E("===> rtw_ips_pwr_down...................\n");
@ -1322,7 +1321,7 @@ void rtw_ips_pwr_down(_adapter *padapter)
DBG_88E("<=== rtw_ips_pwr_down..................... in %dms\n", rtw_get_passing_time_ms(start_time)); DBG_88E("<=== rtw_ips_pwr_down..................... in %dms\n", rtw_get_passing_time_ms(start_time));
} }
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 net_device *pnetdev= (struct net_device*)padapter->pnetdev;
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
@ -1345,13 +1344,13 @@ int pm_netdev_open(struct net_device *pnetdev,u8 bnormal)
if (true == bnormal) if (true == bnormal)
status = netdev_open(pnetdev); status = netdev_open(pnetdev);
else 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);
return status; return status;
} }
static int netdev_close(struct net_device *pnetdev) 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_,("+88eu_drv - drv_close\n")); RT_TRACE(_module_os_intfs_c_,_drv_info_,("+88eu_drv - drv_close\n"));

2
os_dep/osdep_service.c
View file

@ -667,7 +667,7 @@ RETURN:
* Jeff: this function should be called under ioctl (rtnl_lock is accquired) while * Jeff: this function should be called under ioctl (rtnl_lock is accquired) while
* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) * 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 *pnetdev;
struct net_device *cur_pnetdev = padapter->pnetdev; struct net_device *cur_pnetdev = padapter->pnetdev;

18
os_dep/recv_linux.c
View file

@ -30,7 +30,7 @@
#include <usb_ops.h> #include <usb_ops.h>
//init os related resource in struct recv_priv //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; int res=_SUCCESS;
@ -38,7 +38,7 @@ int rtw_os_recv_resource_init(struct recv_priv *precvpriv, _adapter *padapter)
} }
//alloc os related resource in union recv_frame //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; int res=_SUCCESS;
@ -56,7 +56,7 @@ void rtw_os_recv_resource_free(struct recv_priv *precvpriv)
//alloc os related resource in struct recv_buf //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; int res=_SUCCESS;
struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter); struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);
@ -84,7 +84,7 @@ int rtw_os_recvbuf_resource_alloc(_adapter *padapter, struct recv_buf *precvbuf)
} }
//free os related resource in struct recv_buf //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)
{ {
if (precvbuf->purb) if (precvbuf->purb)
usb_free_urb(precvbuf->purb); usb_free_urb(precvbuf->purb);
@ -95,7 +95,7 @@ int rtw_os_recvbuf_resource_free(_adapter *padapter, struct recv_buf *precvbuf)
return _SUCCESS; return _SUCCESS;
} }
void rtw_handle_tkip_mic_err(_adapter *padapter,u8 bgroup) void rtw_handle_tkip_mic_err(struct adapter *padapter,u8 bgroup)
{ {
union iwreq_data wrqu; union iwreq_data wrqu;
struct iw_michaelmicfailure ev; struct iw_michaelmicfailure ev;
@ -138,11 +138,11 @@ void rtw_handle_tkip_mic_err(_adapter *padapter,u8 bgroup)
wireless_send_event( padapter->pnetdev, IWEVMICHAELMICFAILURE, &wrqu, (char*) &ev ); wireless_send_event( padapter->pnetdev, IWEVMICHAELMICFAILURE, &wrqu, (char*) &ev );
} }
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)
{ {
} }
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; struct recv_priv *precvpriv;
struct __queue *pfree_recv_queue; struct __queue *pfree_recv_queue;
@ -258,7 +258,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; struct recv_priv *precvpriv = &padapter->recvpriv;
@ -284,7 +284,7 @@ void _rtw_reordering_ctrl_timeout_handler(void *FunctionContext)
void rtw_init_recv_timer(struct recv_reorder_ctrl *preorder_ctrl) 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); _init_timer(&(preorder_ctrl->reordering_ctrl_timer), padapter->pnetdev, _rtw_reordering_ctrl_timeout_handler, preorder_ctrl);

10
os_dep/rtw_android.c
View file

@ -98,7 +98,7 @@ int rtw_android_cmdstr_to_num(char *cmdstr)
static int rtw_android_get_rssi(struct net_device *net, char *command, int total_len) 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 mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct wlan_network *pcur_network = &pmlmepriv->cur_network; struct wlan_network *pcur_network = &pmlmepriv->cur_network;
int bytes_written = 0; int bytes_written = 0;
@ -113,7 +113,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) 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 mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct wlan_network *pcur_network = &pmlmepriv->cur_network; struct wlan_network *pcur_network = &pmlmepriv->cur_network;
int bytes_written = 0; int bytes_written = 0;
@ -127,7 +127,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) 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; int bytes_written = 0;
bytes_written = snprintf(command, total_len, "Macaddr = %pM", net->dev_addr); bytes_written = snprintf(command, total_len, "Macaddr = %pM", net->dev_addr);
@ -136,7 +136,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) 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; char *country_code = command + strlen(android_wifi_cmd_str[ANDROID_WIFI_CMD_COUNTRY]) + 1;
int ret; int ret;
@ -160,7 +160,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) static int rtw_android_set_block(struct net_device *net, char *command, int total_len)
{ {
int ret; int ret;
_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; char *block_value = command + strlen(android_wifi_cmd_str[ANDROID_WIFI_CMD_BLOCK]) + 1;
return 0; return 0;

36
os_dep/usb_intf.c
View file

@ -38,7 +38,7 @@ int ui_pid[3] = {0, 0, 0};
static int rtw_suspend(struct usb_interface *intf, pm_message_t message); static int rtw_suspend(struct usb_interface *intf, pm_message_t message);
static int rtw_resume(struct usb_interface *intf); 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); static int rtw_drv_init(struct usb_interface *pusb_intf,const struct usb_device_id *pdid);
@ -356,13 +356,13 @@ _func_enter_;
_func_exit_; _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; padapter->chip_type = NULL_CHIP_TYPE;
hal_set_hw_type(padapter); 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")); RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+usb_intf_start\n"));
@ -373,7 +373,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")); RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+usb_intf_stop\n"));
@ -398,7 +398,7 @@ static void usb_intf_stop(_adapter *padapter)
} }
static void rtw_dev_unload(_adapter *padapter) static void rtw_dev_unload(struct adapter *padapter)
{ {
struct net_device *pnetdev= (struct net_device*)padapter->pnetdev; struct net_device *pnetdev= (struct net_device*)padapter->pnetdev;
u8 val8; u8 val8;
@ -480,7 +480,7 @@ static void process_spec_devid(const struct usb_device_id *pdid)
} }
} }
int rtw_hw_suspend(_adapter *padapter ) int rtw_hw_suspend(struct adapter *padapter )
{ {
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
struct usb_interface *pusb_intf = adapter_to_dvobj(padapter)->pusbintf; struct usb_interface *pusb_intf = adapter_to_dvobj(padapter)->pusbintf;
@ -554,7 +554,7 @@ error_exit:
} }
int rtw_hw_resume(_adapter *padapter) int rtw_hw_resume(struct adapter *padapter)
{ {
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
struct usb_interface *pusb_intf = adapter_to_dvobj(padapter)->pusbintf; struct usb_interface *pusb_intf = adapter_to_dvobj(padapter)->pusbintf;
@ -607,7 +607,7 @@ error_exit:
static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message) static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
{ {
struct dvobj_priv *dvobj = usb_get_intfdata(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 net_device *pnetdev = padapter->pnetdev;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
@ -700,7 +700,7 @@ exit:
static int rtw_resume(struct usb_interface *pusb_intf) static int rtw_resume(struct usb_interface *pusb_intf)
{ {
struct dvobj_priv *dvobj = usb_get_intfdata(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 net_device *pnetdev = padapter->pnetdev;
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
int ret = 0; int ret = 0;
@ -712,7 +712,7 @@ static int rtw_resume(struct usb_interface *pusb_intf)
return ret; return ret;
} }
int rtw_resume_process(_adapter *padapter) int rtw_resume_process(struct adapter *padapter)
{ {
struct net_device *pnetdev; struct net_device *pnetdev;
struct pwrctrl_priv *pwrpriv; struct pwrctrl_priv *pwrpriv;
@ -770,16 +770,16 @@ exit:
* We accept the new device by returning 0. * We accept the new device by returning 0.
*/ */
static _adapter *rtw_sw_export = NULL; static struct adapter *rtw_sw_export = NULL;
static _adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj, static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
struct usb_interface *pusb_intf, const struct usb_device_id *pdid) struct usb_interface *pusb_intf, const struct usb_device_id *pdid)
{ {
_adapter *padapter = NULL; struct adapter *padapter = NULL;
struct net_device *pnetdev = NULL; struct net_device *pnetdev = NULL;
int status = _FAIL; int status = _FAIL;
if ((padapter = (_adapter *)rtw_zvmalloc(sizeof(*padapter))) == NULL) { if ((padapter = (struct adapter *)rtw_zvmalloc(sizeof(*padapter))) == NULL) {
goto exit; goto exit;
} }
padapter->dvobj = dvobj; padapter->dvobj = dvobj;
@ -891,7 +891,7 @@ exit:
return padapter; 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 net_device *pnetdev = if1->pnetdev;
struct mlme_priv *pmlmepriv= &if1->mlmepriv; struct mlme_priv *pmlmepriv= &if1->mlmepriv;
@ -1063,7 +1063,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) static int rtw_drv_init(struct usb_interface *pusb_intf, const struct usb_device_id *pdid)
{ {
int i; int i;
_adapter *if1 = NULL, *if2 = NULL; struct adapter *if1 = NULL, *if2 = NULL;
int status; int status;
struct dvobj_priv *dvobj; struct dvobj_priv *dvobj;
@ -1080,7 +1080,7 @@ static int rtw_drv_init(struct usb_interface *pusb_intf, const struct usb_device
} }
if ((if1 = rtw_usb_if1_init(dvobj, pusb_intf, pdid)) == NULL) { if ((if1 = rtw_usb_if1_init(dvobj, pusb_intf, pdid)) == NULL) {
DBG_88E("rtw_init_primary_adapter Failed!\n"); DBG_88E("rtw_init_primarystruct adapter Failed!\n");
goto free_dvobj; goto free_dvobj;
} }
@ -1111,7 +1111,7 @@ exit:
static void rtw_dev_remove(struct usb_interface *pusb_intf) static void rtw_dev_remove(struct usb_interface *pusb_intf)
{ {
struct dvobj_priv *dvobj = usb_get_intfdata(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 net_device *pnetdev = padapter->pnetdev;
struct mlme_priv *pmlmepriv= &padapter->mlmepriv; struct mlme_priv *pmlmepriv= &padapter->mlmepriv;

10
os_dep/usb_ops_linux.c
View file

@ -80,7 +80,7 @@ static u32 usb_bulkout_zero(struct intf_hdl *pintfhdl, u32 addr)
unsigned char *pbuf; unsigned char *pbuf;
struct zero_bulkout_context *pcontext; struct zero_bulkout_context *pcontext;
struct urb * purb = NULL; struct urb * purb = NULL;
_adapter *padapter = (_adapter *)pintfhdl->padapter; struct adapter *padapter = (struct adapter *)pintfhdl->padapter;
struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter); struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter);
struct usb_device *pusbd = pdvobj->pusbdev; struct usb_device *pusbd = pdvobj->pusbdev;
@ -135,7 +135,7 @@ void usb_read_port_cancel(struct intf_hdl *pintfhdl)
{ {
int i; int i;
struct recv_buf *precvbuf; struct recv_buf *precvbuf;
_adapter *padapter = pintfhdl->padapter; struct adapter *padapter = pintfhdl->padapter;
precvbuf = (struct recv_buf *)padapter->recvpriv.precv_buf; precvbuf = (struct recv_buf *)padapter->recvpriv.precv_buf;
DBG_88E("%s\n", __func__); DBG_88E("%s\n", __func__);
@ -158,7 +158,7 @@ static void usb_write_port_complete(struct urb *purb, struct pt_regs *regs)
unsigned long irqL; unsigned long irqL;
int i; int i;
struct xmit_buf *pxmitbuf = (struct xmit_buf *)purb->context; struct xmit_buf *pxmitbuf = (struct xmit_buf *)purb->context;
_adapter *padapter = pxmitbuf->padapter; struct adapter *padapter = pxmitbuf->padapter;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
_func_enter_; _func_enter_;
@ -256,7 +256,7 @@ u32 usb_write_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem)
int status; int status;
u32 ret = _FAIL, bwritezero = false; u32 ret = _FAIL, bwritezero = false;
struct urb * purb = NULL; struct urb * purb = NULL;
_adapter *padapter = (_adapter *)pintfhdl->padapter; struct adapter *padapter = (struct adapter *)pintfhdl->padapter;
struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter); struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter);
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
struct xmit_buf *pxmitbuf = (struct xmit_buf *)wmem; struct xmit_buf *pxmitbuf = (struct xmit_buf *)wmem;
@ -360,7 +360,7 @@ _func_exit_;
void usb_write_port_cancel(struct intf_hdl *pintfhdl) void usb_write_port_cancel(struct intf_hdl *pintfhdl)
{ {
int i, j; int i, j;
_adapter *padapter = pintfhdl->padapter; struct adapter *padapter = pintfhdl->padapter;
struct xmit_buf *pxmitbuf = (struct xmit_buf *)padapter->xmitpriv.pxmitbuf; struct xmit_buf *pxmitbuf = (struct xmit_buf *)padapter->xmitpriv.pxmitbuf;
DBG_88E("%s\n", __func__); DBG_88E("%s\n", __func__);

18
os_dep/xmit_linux.c
View file

@ -87,7 +87,7 @@ void rtw_set_tx_chksum_offload(struct sk_buff *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)
{ {
int i; int i;
struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter); struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);
@ -112,7 +112,7 @@ int rtw_os_xmit_resource_alloc(_adapter *padapter, struct xmit_buf *pxmitbuf,u32
return _SUCCESS; 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)
{ {
int i; int i;
struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter); struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);
@ -134,7 +134,7 @@ void rtw_os_xmit_resource_free(_adapter *padapter, struct xmit_buf *pxmitbuf,u32
#define WMM_XMIT_THRESHOLD (NR_XMITFRAME*2/5) #define WMM_XMIT_THRESHOLD (NR_XMITFRAME*2/5)
void rtw_os_pkt_complete(_adapter *padapter, struct sk_buff *pkt) void rtw_os_pkt_complete(struct adapter *padapter, struct sk_buff *pkt)
{ {
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
u16 queue; u16 queue;
@ -159,7 +159,7 @@ void rtw_os_pkt_complete(_adapter *padapter, struct sk_buff *pkt)
dev_kfree_skb_any(pkt); dev_kfree_skb_any(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) if (pxframe->pkt)
{ {
@ -173,9 +173,9 @@ void rtw_os_xmit_complete(_adapter *padapter, struct xmit_frame *pxframe)
pxframe->pkt = NULL; 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;
unsigned long irqL; unsigned long irqL;
struct xmit_priv *pxmitpriv; struct xmit_priv *pxmitpriv;
@ -193,7 +193,7 @@ void rtw_os_xmit_schedule(_adapter *padapter)
_exit_critical_bh(&pxmitpriv->lock, &irqL); _exit_critical_bh(&pxmitpriv->lock, &irqL);
} }
static void rtw_check_xmit_resource(_adapter *padapter, struct sk_buff *pkt) static void rtw_check_xmit_resource(struct adapter *padapter, struct sk_buff *pkt)
{ {
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,35)) #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,35))
@ -221,7 +221,7 @@ static void rtw_check_xmit_resource(_adapter *padapter, struct sk_buff *pkt)
#endif #endif
} }
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 sta_priv *pstapriv = &padapter->stapriv;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@ -275,7 +275,7 @@ static int rtw_mlcst2unicst(_adapter *padapter, struct sk_buff *skb)
int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev) int rtw_xmit_entry(struct sk_buff *pkt, 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 xmit_priv *pxmitpriv = &padapter->xmitpriv;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
s32 res = 0; s32 res = 0;