skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2024-11-26 14:23:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8192eu: Replace typedefs for struct adapter

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2014-12-17 17:13:53 -06:00
parent a8b7b4d54c
commit 202d20077c
140 changed files with 3132 additions and 7948 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
core/rtw_ap.c
View file

@ -33,7 +33,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);
@ -51,7 +51,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)
{ {
_irqL irqL; _irqL irqL;
struct sta_info *psta=NULL; struct sta_info *psta=NULL;
@ -81,7 +81,7 @@ void free_mlme_ap_info(_adapter *padapter)
} }
static void update_BCNTIM(_adapter *padapter) static void update_BCNTIM(struct adapter *padapter)
{ {
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
@ -203,7 +203,7 @@ static void update_BCNTIM(_adapter *padapter)
} }
void rtw_add_bcn_ie(_adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index, u8 *data, u8 len) void rtw_add_bcn_ie(struct adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index, u8 *data, u8 len)
{ {
PNDIS_802_11_VARIABLE_IEs pIE; PNDIS_802_11_VARIABLE_IEs pIE;
u8 bmatch = _FALSE; u8 bmatch = _FALSE;
@ -273,7 +273,7 @@ void rtw_add_bcn_ie(_adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index, u8 *d
pnetwork->IELength = offset + remainder_ielen; pnetwork->IELength = offset + remainder_ielen;
} }
void rtw_remove_bcn_ie(_adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index) void rtw_remove_bcn_ie(struct adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index)
{ {
u8 *p, *dst_ie, *premainder_ie=NULL, *pbackup_remainder_ie=NULL; 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;
@ -351,7 +351,7 @@ 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)
{ {
_irqL irqL; _irqL irqL;
_list *phead, *plist; _list *phead, *plist;
@ -603,7 +603,7 @@ if (chk_alive_num) {
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;
@ -832,7 +832,7 @@ void add_RATid(_adapter *padapter, struct sta_info *psta, u8 rssi_level)
} }
void update_bmc_sta(_adapter *padapter) void update_bmc_sta(struct adapter *padapter)
{ {
_irqL irqL; _irqL irqL;
u32 init_rate=0; u32 init_rate=0;
@ -943,7 +943,7 @@ 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)
{ {
_irqL irqL; _irqL irqL;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@ -1032,7 +1032,7 @@ void update_sta_info_apmode(_adapter *padapter, struct sta_info *psta)
} }
static void update_hw_ht_param(_adapter *padapter) static void update_hw_ht_param(struct adapter *padapter)
{ {
unsigned char max_AMPDU_len; unsigned char max_AMPDU_len;
unsigned char min_MPDU_spacing; unsigned char min_MPDU_spacing;
@ -1078,7 +1078,7 @@ static void update_hw_ht_param(_adapter *padapter)
} }
static void start_bss_network(_adapter *padapter, u8 *pbuf) static void start_bss_network(struct adapter *padapter, u8 *pbuf)
{ {
u8 *p; u8 *p;
u8 val8, cur_channel, cur_bwmode, cur_ch_offset; u8 val8, cur_channel, cur_bwmode, cur_ch_offset;
@ -1186,7 +1186,7 @@ static void start_bss_network(_adapter *padapter, u8 *pbuf)
{ {
if(rtw_buddy_adapter_up(padapter)) if(rtw_buddy_adapter_up(padapter))
{ {
_adapter *pbuddy_adapter = padapter->pbuddy_adapter; struct adapter *pbuddy_adapter = padapter->pbuddy_adapter;
//turn on all dynamic functions on PRIMARY_ADAPTER, dynamic functions only runs at PRIMARY_ADAPTER //turn on all dynamic functions on PRIMARY_ADAPTER, dynamic functions only runs at PRIMARY_ADAPTER
Switch_DM_Func(pbuddy_adapter, DYNAMIC_ALL_FUNC_ENABLE, _TRUE); Switch_DM_Func(pbuddy_adapter, DYNAMIC_ALL_FUNC_ENABLE, _TRUE);
@ -1250,7 +1250,7 @@ static void start_bss_network(_adapter *padapter, u8 *pbuf)
} }
else if(check_buddy_fwstate(padapter, _FW_LINKED)==_TRUE)//only second adapter can enter AP Mode else if(check_buddy_fwstate(padapter, _FW_LINKED)==_TRUE)//only second adapter can enter AP Mode
{ {
_adapter *pbuddy_adapter = padapter->pbuddy_adapter; struct adapter *pbuddy_adapter = padapter->pbuddy_adapter;
struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv;
//To sync cur_channel/cur_bwmode/cur_ch_offset with primary adapter //To sync cur_channel/cur_bwmode/cur_ch_offset with primary adapter
@ -1374,7 +1374,7 @@ static void start_bss_network(_adapter *padapter, u8 *pbuf)
} }
int rtw_check_beacon_data(_adapter *padapter, u8 *pbuf, int len) int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)
{ {
int ret=_SUCCESS; int ret=_SUCCESS;
u8 *p; u8 *p;
@ -1783,7 +1783,7 @@ int rtw_check_beacon_data(_adapter *padapter, u8 *pbuf, int len)
} }
void rtw_set_macaddr_acl(_adapter *padapter, int mode) void rtw_set_macaddr_acl(struct adapter *padapter, int mode)
{ {
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
struct wlan_acl_pool *pacl_list = &pstapriv->acl_list; struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;
@ -1793,7 +1793,7 @@ void rtw_set_macaddr_acl(_adapter *padapter, int mode)
pacl_list->mode = mode; pacl_list->mode = mode;
} }
int rtw_acl_add_sta(_adapter *padapter, u8 *addr) int rtw_acl_add_sta(struct adapter *padapter, u8 *addr)
{ {
_irqL irqL; _irqL irqL;
_list *plist, *phead; _list *plist, *phead;
@ -1867,7 +1867,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)
{ {
_irqL irqL; _irqL irqL;
_list *plist, *phead; _list *plist, *phead;
@ -1912,13 +1912,13 @@ int rtw_acl_remove_sta(_adapter *padapter, u8 *addr)
#ifdef CONFIG_NATIVEAP_MLME #ifdef CONFIG_NATIVEAP_MLME
static void update_bcn_fixed_ie(_adapter *padapter) static void update_bcn_fixed_ie(struct adapter *padapter)
{ {
DBG_871X("%s\n", __FUNCTION__); DBG_871X("%s\n", __FUNCTION__);
} }
static void update_bcn_erpinfo_ie(_adapter *padapter) static void update_bcn_erpinfo_ie(struct adapter *padapter)
{ {
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
@ -1953,37 +1953,37 @@ static void update_bcn_erpinfo_ie(_adapter *padapter)
} }
static void update_bcn_htcap_ie(_adapter *padapter) static void update_bcn_htcap_ie(struct adapter *padapter)
{ {
DBG_871X("%s\n", __FUNCTION__); DBG_871X("%s\n", __FUNCTION__);
} }
static void update_bcn_htinfo_ie(_adapter *padapter) static void update_bcn_htinfo_ie(struct adapter *padapter)
{ {
DBG_871X("%s\n", __FUNCTION__); DBG_871X("%s\n", __FUNCTION__);
} }
static void update_bcn_rsn_ie(_adapter *padapter) static void update_bcn_rsn_ie(struct adapter *padapter)
{ {
DBG_871X("%s\n", __FUNCTION__); DBG_871X("%s\n", __FUNCTION__);
} }
static void update_bcn_wpa_ie(_adapter *padapter) static void update_bcn_wpa_ie(struct adapter *padapter)
{ {
DBG_871X("%s\n", __FUNCTION__); DBG_871X("%s\n", __FUNCTION__);
} }
static void update_bcn_wmm_ie(_adapter *padapter) static void update_bcn_wmm_ie(struct adapter *padapter)
{ {
DBG_871X("%s\n", __FUNCTION__); DBG_871X("%s\n", __FUNCTION__);
} }
static void update_bcn_wps_ie(_adapter *padapter) static void update_bcn_wps_ie(struct adapter *padapter)
{ {
u8 *pwps_ie=NULL, *pwps_ie_src, *premainder_ie, *pbackup_remainder_ie=NULL; 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;
@ -2039,12 +2039,12 @@ static void update_bcn_wps_ie(_adapter *padapter)
} }
static void update_bcn_p2p_ie(_adapter *padapter) static void update_bcn_p2p_ie(struct adapter *padapter)
{ {
} }
static void update_bcn_vendor_spec_ie(_adapter *padapter, u8*oui) static void update_bcn_vendor_spec_ie(struct adapter *padapter, u8*oui)
{ {
DBG_871X("%s\n", __FUNCTION__); DBG_871X("%s\n", __FUNCTION__);
@ -2072,7 +2072,7 @@ static void update_bcn_vendor_spec_ie(_adapter *padapter, u8*oui)
} }
void update_beacon(_adapter *padapter, u8 ie_id, u8 *oui, u8 tx) void update_beacon(struct adapter *padapter, u8 ie_id, u8 *oui, u8 tx)
{ {
_irqL irqL; _irqL irqL;
struct mlme_priv *pmlmepriv; struct mlme_priv *pmlmepriv;
@ -2175,7 +2175,7 @@ Set to 2 if only HT STAs are associated in BSS,
Set to 3 (HT mixed mode) when one or more non-HT STAs are associated 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;
@ -2248,7 +2248,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)
@ -2280,7 +2280,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);
@ -2488,7 +2488,7 @@ void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta)
} }
u8 bss_cap_update_on_sta_leave(_adapter *padapter, struct sta_info *psta) u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta)
{ {
u8 beacon_updated = _FALSE; u8 beacon_updated = _FALSE;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@ -2563,7 +2563,7 @@ u8 bss_cap_update_on_sta_leave(_adapter *padapter, struct sta_info *psta)
} }
u8 ap_free_sta(_adapter *padapter, struct sta_info *psta, bool active, u16 reason) u8 ap_free_sta(struct adapter *padapter, struct sta_info *psta, bool active, u16 reason)
{ {
_irqL irqL; _irqL irqL;
u8 beacon_updated = _FALSE; u8 beacon_updated = _FALSE;
@ -2631,7 +2631,7 @@ u8 ap_free_sta(_adapter *padapter, struct sta_info *psta, bool active, u16 reaso
} }
int rtw_ap_inform_ch_switch(_adapter *padapter, u8 new_ch, u8 ch_offset) int rtw_ap_inform_ch_switch(struct adapter *padapter, u8 new_ch, u8 ch_offset)
{ {
_irqL irqL; _irqL irqL;
_list *phead, *plist; _list *phead, *plist;
@ -2668,7 +2668,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)
{ {
_irqL irqL; _irqL irqL;
_list *phead, *plist; _list *phead, *plist;
@ -2725,7 +2725,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);
@ -2764,7 +2764,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)
{ {
@ -2773,7 +2773,7 @@ void ap_sta_info_defer_update(_adapter *padapter, struct sta_info *psta)
} }
} }
/* restore hw setting from sw data structures */ /* restore hw setting from sw data structures */
void rtw_ap_restore_network(_adapter *padapter) void rtw_ap_restore_network(struct adapter *padapter)
{ {
struct mlme_priv *mlmepriv = &padapter->mlmepriv; struct mlme_priv *mlmepriv = &padapter->mlmepriv;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -2840,7 +2840,7 @@ void rtw_ap_restore_network(_adapter *padapter)
} }
void start_ap_mode(_adapter *padapter) void start_ap_mode(struct adapter *padapter)
{ {
int i; int i;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@ -2896,7 +2896,7 @@ void start_ap_mode(_adapter *padapter)
} }
void stop_ap_mode(_adapter *padapter) void stop_ap_mode(struct adapter *padapter)
{ {
_irqL irqL; _irqL irqL;
_list *phead, *plist; _list *phead, *plist;

58
core/rtw_br_ext.c
View file

@ -142,7 +142,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;
@ -152,7 +152,7 @@ static __inline__ unsigned long __nat25_timeout(_adapter *priv)
} }
static __inline__ int __nat25_has_expired(_adapter *priv, static __inline__ int __nat25_has_expired(struct adapter *priv,
struct nat25_network_db_entry *fdb) 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)))
@ -389,7 +389,7 @@ static __inline__ int __nat25_network_hash(unsigned char *networkAddr)
} }
static __inline__ void __network_hash_link(_adapter *priv, static __inline__ void __network_hash_link(struct adapter *priv,
struct nat25_network_db_entry *ent, int hash) struct nat25_network_db_entry *ent, int hash)
{ {
// Caller must _enter_critical_bh already! // Caller must _enter_critical_bh already!
@ -422,7 +422,7 @@ static __inline__ void __network_hash_unlink(struct nat25_network_db_entry *ent)
} }
static int __nat25_db_network_lookup_and_replace(_adapter *priv, static int __nat25_db_network_lookup_and_replace(struct adapter *priv,
struct sk_buff *skb, unsigned char *networkAddr) struct sk_buff *skb, unsigned char *networkAddr)
{ {
struct nat25_network_db_entry *db; struct nat25_network_db_entry *db;
@ -499,7 +499,7 @@ static int __nat25_db_network_lookup_and_replace(_adapter *priv,
} }
static void __nat25_db_network_insert(_adapter *priv, static void __nat25_db_network_insert(struct adapter *priv,
unsigned char *macAddr, unsigned char *networkAddr) unsigned char *macAddr, unsigned char *networkAddr)
{ {
struct nat25_network_db_entry *db; struct nat25_network_db_entry *db;
@ -539,7 +539,7 @@ static void __nat25_db_network_insert(_adapter *priv,
} }
static void __nat25_db_print(_adapter *priv) static void __nat25_db_print(struct adapter *priv)
{ {
_irqL irqL; _irqL irqL;
_enter_critical_bh(&priv->br_ext_lock, &irqL); _enter_critical_bh(&priv->br_ext_lock, &irqL);
@ -628,7 +628,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;
_irqL irqL; _irqL irqL;
@ -659,7 +659,7 @@ void nat25_db_cleanup(_adapter *priv)
} }
void nat25_db_expire(_adapter *priv) void nat25_db_expire(struct adapter *priv)
{ {
int i; int i;
_irqL irqL; _irqL irqL;
@ -753,7 +753,7 @@ void nat25_db_expire(_adapter *priv)
#ifdef SUPPORT_TX_MCAST2UNI #ifdef SUPPORT_TX_MCAST2UNI
static int checkIPMcAndReplace(_adapter *priv, struct sk_buff *skb, unsigned int *dst_ip) static int checkIPMcAndReplace(struct adapter *priv, struct sk_buff *skb, unsigned int *dst_ip)
{ {
struct stat_info *pstat; struct stat_info *pstat;
struct list_head *phead, *plist; struct list_head *phead, *plist;
@ -780,7 +780,7 @@ static int checkIPMcAndReplace(_adapter *priv, struct sk_buff *skb, unsigned int
} }
#endif #endif
int nat25_db_handle(_adapter *priv, struct sk_buff *skb, int method) int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)
{ {
unsigned short protocol; unsigned short protocol;
unsigned char networkAddr[MAX_NETWORK_ADDR_LEN]; unsigned char networkAddr[MAX_NETWORK_ADDR_LEN];
@ -1484,7 +1484,7 @@ int nat25_db_handle(_adapter *priv, struct sk_buff *skb, int method)
} }
int nat25_handle_frame(_adapter *priv, struct sk_buff *skb) int nat25_handle_frame(struct adapter *priv, struct sk_buff *skb)
{ {
#ifdef BR_EXT_DEBUG #ifdef BR_EXT_DEBUG
if((!priv->ethBrExtInfo.nat25_disable) && (!(skb->data[0] & 1))) if((!priv->ethBrExtInfo.nat25_disable) && (!(skb->data[0] & 1)))
@ -1567,38 +1567,6 @@ int nat25_handle_frame(_adapter *priv, struct sk_buff *skb)
return 0; return 0;
} }
#if 0
void mac_clone(_adapter *priv, unsigned char *addr)
{
struct sockaddr sa;
memcpy(sa.sa_data, addr, ETH_ALEN);
DEBUG_INFO("MAC Clone: Addr=%02x%02x%02x%02x%02x%02x\n",
addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
rtl8192cd_set_hwaddr(priv->dev, &sa);
}
int mac_clone_handle_frame(_adapter *priv, struct sk_buff *skb)
{
if(priv->ethBrExtInfo.macclone_enable && !priv->macclone_completed)
{
if(!(skb->data[ETH_ALEN] & 1)) //// check any other particular MAC add
{
if(memcmp(skb->data+ETH_ALEN, GET_MY_HWADDR(priv), ETH_ALEN) &&
((priv->dev->br_port) &&
memcmp(skb->data+ETH_ALEN, priv->br_mac, ETH_ALEN)))
{
mac_clone(priv, skb->data+ETH_ALEN);
priv->macclone_completed = 1;
}
}
}
return 0;
}
#endif // 0
#define SERVER_PORT 67 #define SERVER_PORT 67
#define CLIENT_PORT 68 #define CLIENT_PORT 68
#define DHCP_MAGIC 0x63825363 #define DHCP_MAGIC 0x63825363
@ -1623,7 +1591,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;
@ -1670,7 +1638,7 @@ void dhcp_flag_bcast(_adapter *priv, struct sk_buff *skb)
} }
void *scdb_findEntry(_adapter *priv, unsigned char *macAddr, void *scdb_findEntry(struct adapter *priv, unsigned char *macAddr,
unsigned char *ipAddr) unsigned char *ipAddr)
{ {
unsigned char networkAddr[MAX_NETWORK_ADDR_LEN]; unsigned char networkAddr[MAX_NETWORK_ADDR_LEN];

136
core/rtw_cmd.c
View file

@ -349,7 +349,7 @@ int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)
u32 rtw_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj) 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_;
@ -428,7 +428,7 @@ _func_exit_;
} }
void rtw_stop_cmd_thread(_adapter *adapter) void rtw_stop_cmd_thread(struct adapter *adapter)
{ {
if(adapter->cmdThread && adapter->cmdpriv.cmdthd_running == _TRUE if(adapter->cmdThread && adapter->cmdpriv.cmdthd_running == _TRUE
&& adapter->cmdpriv.stop_req == 0) && adapter->cmdpriv.stop_req == 0)
@ -444,9 +444,9 @@ thread_return rtw_cmd_thread(thread_context context)
u8 ret; u8 ret;
struct cmd_obj *pcmd; struct cmd_obj *pcmd;
u8 *pcmdbuf, *prspbuf; u8 *pcmdbuf, *prspbuf;
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_;
@ -677,7 +677,7 @@ _func_exit_;
/* /*
u8 rtw_setstandby_cmd(unsigned char *adapter) u8 rtw_setstandby_cmd(unsigned char *adapter)
*/ */
u8 rtw_setstandby_cmd(_adapter *padapter, uint action) u8 rtw_setstandby_cmd(struct adapter *padapter, uint action)
{ {
struct cmd_obj* ph2c; struct cmd_obj* ph2c;
struct usb_suspend_parm* psetusbsuspend; struct usb_suspend_parm* psetusbsuspend;
@ -718,7 +718,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, NDIS_802_11_SSID *ssid, int ssid_num, u8 rtw_sitesurvey_cmd(struct adapter *padapter, NDIS_802_11_SSID *ssid, int ssid_num,
struct rtw_ieee80211_channel *ch, int ch_num) struct rtw_ieee80211_channel *ch, int ch_num)
{ {
u8 res = _FAIL; u8 res = _FAIL;
@ -818,7 +818,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;
@ -856,7 +856,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;
@ -898,7 +898,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;
@ -935,7 +935,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;
@ -966,7 +966,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;
@ -1001,7 +1001,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;
@ -1032,7 +1032,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;
@ -1072,7 +1072,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_;
@ -1083,7 +1083,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_;
@ -1093,7 +1093,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;
@ -1135,7 +1135,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;
@ -1165,7 +1165,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 *auth, res = _SUCCESS; u8 *auth, res = _SUCCESS;
uint t_len = 0; uint t_len = 0;
@ -1349,7 +1349,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;
@ -1392,7 +1392,7 @@ _func_exit_;
return res; return res;
} }
u8 rtw_setopmode_cmd(_adapter *padapter, NDIS_802_11_NETWORK_INFRASTRUCTURE networktype, bool enqueue) u8 rtw_setopmode_cmd(struct adapter *padapter, NDIS_802_11_NETWORK_INFRASTRUCTURE networktype, bool enqueue)
{ {
struct cmd_obj* ph2c; struct cmd_obj* ph2c;
struct setopmode_parm* psetop; struct setopmode_parm* psetop;
@ -1431,7 +1431,7 @@ _func_exit_;
return res; return res;
} }
u8 rtw_setstakey_cmd(_adapter *padapter, u8 *psta, u8 unicast_key, bool enqueue) u8 rtw_setstakey_cmd(struct adapter *padapter, u8 *psta, u8 unicast_key, bool enqueue)
{ {
struct cmd_obj* ph2c; struct cmd_obj* ph2c;
struct set_stakey_parm *psetstakey_para; struct set_stakey_parm *psetstakey_para;
@ -1512,7 +1512,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;
@ -1573,7 +1573,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;
@ -1605,7 +1605,7 @@ _func_exit_;
} }
u8 rtw_getrttbl_cmd(_adapter *padapter, struct getratable_rsp *pval) u8 rtw_getrttbl_cmd(struct adapter *padapter, struct getratable_rsp *pval)
{ {
struct cmd_obj* ph2c; struct cmd_obj* ph2c;
struct getratable_parm * pgetrttblparm; struct getratable_parm * pgetrttblparm;
@ -1644,7 +1644,7 @@ _func_exit_;
} }
u8 rtw_setassocsta_cmd(_adapter *padapter, u8 *mac_addr) u8 rtw_setassocsta_cmd(struct adapter *padapter, u8 *mac_addr)
{ {
struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
struct cmd_obj* ph2c; struct cmd_obj* ph2c;
@ -1690,7 +1690,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;
@ -1730,7 +1730,7 @@ _func_exit_;
return res; return res;
} }
//add for CONFIG_IEEE80211W, none 11w can use it //add for CONFIG_IEEE80211W, none 11w can use it
u8 rtw_reset_securitypriv_cmd(_adapter*padapter) u8 rtw_reset_securitypriv_cmd(struct adapter*padapter)
{ {
struct cmd_obj* ph2c; struct cmd_obj* ph2c;
struct drvextra_cmd_parm *pdrvextra_cmd_parm; struct drvextra_cmd_parm *pdrvextra_cmd_parm;
@ -1770,7 +1770,7 @@ _func_exit_;
} }
u8 rtw_free_assoc_resources_cmd(_adapter*padapter) u8 rtw_free_assoc_resources_cmd(struct adapter*padapter)
{ {
struct cmd_obj* ph2c; struct cmd_obj* ph2c;
struct drvextra_cmd_parm *pdrvextra_cmd_parm; struct drvextra_cmd_parm *pdrvextra_cmd_parm;
@ -1810,7 +1810,7 @@ _func_exit_;
} }
u8 rtw_dynamic_chk_wk_cmd(_adapter*padapter) u8 rtw_dynamic_chk_wk_cmd(struct adapter*padapter)
{ {
struct cmd_obj* ph2c; struct cmd_obj* ph2c;
struct drvextra_cmd_parm *pdrvextra_cmd_parm; struct drvextra_cmd_parm *pdrvextra_cmd_parm;
@ -1855,7 +1855,7 @@ _func_exit_;
} }
u8 rtw_set_ch_cmd(_adapter*padapter, u8 ch, u8 bw, u8 ch_offset, u8 enqueue) u8 rtw_set_ch_cmd(struct adapter*padapter, u8 ch, u8 bw, u8 ch_offset, u8 enqueue)
{ {
struct cmd_obj *pcmdobj; struct cmd_obj *pcmdobj;
struct set_ch_parm *set_ch_parm; struct set_ch_parm *set_ch_parm;
@ -1910,7 +1910,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;
@ -1969,7 +1969,7 @@ _func_exit_;
return res; return res;
} }
u8 rtw_led_blink_cmd(_adapter*padapter, PLED_871x pLed) u8 rtw_led_blink_cmd(struct adapter*padapter, PLED_871x pLed)
{ {
struct cmd_obj* pcmdobj; struct cmd_obj* pcmdobj;
struct LedBlink_param *ledBlink_param; struct LedBlink_param *ledBlink_param;
@ -2006,7 +2006,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;
@ -2044,7 +2044,7 @@ _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)
{ {
struct cmd_obj* pcmdobj; struct cmd_obj* pcmdobj;
struct TDLSoption_param *TDLSoption; struct TDLSoption_param *TDLSoption;
@ -2090,7 +2090,7 @@ _func_exit_;
} }
#ifdef CONFIG_DETECT_C2H_BY_POLLING #ifdef CONFIG_DETECT_C2H_BY_POLLING
u8 rtw_event_polling_cmd(_adapter*padapter) u8 rtw_event_polling_cmd(struct adapter*padapter)
{ {
struct cmd_obj* ph2c; struct cmd_obj* ph2c;
struct drvextra_cmd_parm *pdrvextra_cmd_parm; struct drvextra_cmd_parm *pdrvextra_cmd_parm;
@ -2137,7 +2137,7 @@ exit:
} }
#endif #endif
static void traffic_status_watchdog(_adapter *padapter) static void traffic_status_watchdog(struct adapter *padapter)
{ {
#ifdef CONFIG_LPS #ifdef CONFIG_LPS
u8 bEnterPS; u8 bEnterPS;
@ -2276,12 +2276,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_ACTIVE_KEEP_ALIVE_CHECK #ifdef CONFIG_ACTIVE_KEEP_ALIVE_CHECK
@ -2317,8 +2317,8 @@ void dynamic_chk_wk_hdl(_adapter *padapter, u8 *pbuf, int sz)
#ifdef CONFIG_LPS #ifdef CONFIG_LPS
void lps_ctrl_wk_hdl(_adapter *padapter, u8 lps_ctrl_type); void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type);
void lps_ctrl_wk_hdl(_adapter *padapter, u8 lps_ctrl_type) void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type)
{ {
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@ -2402,7 +2402,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;
@ -2459,12 +2459,12 @@ _func_exit_;
#endif #endif
#if (RATE_ADAPTIVE_SUPPORT==1) #if (RATE_ADAPTIVE_SUPPORT==1)
void rpt_timer_setting_wk_hdl(_adapter *padapter, u16 minRptTime) void rpt_timer_setting_wk_hdl(struct adapter *padapter, u16 minRptTime)
{ {
rtw_hal_set_hwreg(padapter, HW_VAR_RPT_TIMER_SETTING, (u8 *)(&minRptTime)); 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;
@ -2502,12 +2502,12 @@ _func_exit_;
#endif #endif
#ifdef CONFIG_ANTENNA_DIVERSITY #ifdef CONFIG_ANTENNA_DIVERSITY
void antenna_select_wk_hdl(_adapter *padapter, u8 antenna) void antenna_select_wk_hdl(struct adapter *padapter, u8 antenna)
{ {
rtw_hal_set_hwreg(padapter, HW_VAR_ANTENNA_DIVERSITY_SELECT, (u8 *)(&antenna)); 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;
@ -2553,25 +2553,25 @@ _func_exit_;
} }
#endif #endif
void power_saving_wk_hdl(_adapter *padapter, u8 *pbuf, int sz); void power_saving_wk_hdl(struct adapter *padapter, u8 *pbuf, int sz);
void power_saving_wk_hdl(_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);
} }
//add for CONFIG_IEEE80211W, none 11w can use it //add for CONFIG_IEEE80211W, none 11w can use it
void reset_securitypriv_hdl(_adapter *padapter) void reset_securitypriv_hdl(struct adapter *padapter)
{ {
rtw_reset_securitypriv(padapter); rtw_reset_securitypriv(padapter);
} }
void free_assoc_resources_hdl(_adapter *padapter) void free_assoc_resources_hdl(struct adapter *padapter)
{ {
rtw_free_assoc_resources(padapter, 1); rtw_free_assoc_resources(padapter, 1);
} }
#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;
@ -2616,7 +2616,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;
@ -2659,7 +2659,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;
@ -2706,7 +2706,7 @@ static void rtw_chk_hi_queue_hdl(_adapter *padapter)
} }
u8 rtw_chk_hi_queue_cmd(_adapter*padapter) u8 rtw_chk_hi_queue_cmd(struct adapter*padapter)
{ {
struct cmd_obj *ph2c; struct cmd_obj *ph2c;
struct drvextra_cmd_parm *pdrvextra_cmd_parm; struct drvextra_cmd_parm *pdrvextra_cmd_parm;
@ -2741,7 +2741,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;
@ -2774,7 +2774,7 @@ exit:
return res; return res;
} }
s32 c2h_evt_hdl(_adapter *adapter, struct c2h_evt_hdr *c2h_evt, c2h_id_filter filter) s32 c2h_evt_hdl(struct adapter *adapter, struct c2h_evt_hdr *c2h_evt, c2h_id_filter filter)
{ {
s32 ret = _FAIL; s32 ret = _FAIL;
u8 buf[16]; u8 buf[16];
@ -2804,7 +2804,7 @@ exit:
static void c2h_wk_callback(_workitem *work) static void c2h_wk_callback(_workitem *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);
@ -2844,7 +2844,7 @@ static void c2h_wk_callback(_workitem *work)
#endif #endif
#ifdef CONFIG_DETECT_C2H_BY_POLLING #ifdef CONFIG_DETECT_C2H_BY_POLLING
void event_polling_hdl(_adapter *padapter, u8 *pbuf, int sz) void event_polling_hdl(struct adapter *padapter, u8 *pbuf, int sz)
{ {
c2h_id_filter ccx_id_filter = rtw_hal_c2h_id_filter_ccx(padapter); c2h_id_filter ccx_id_filter = rtw_hal_c2h_id_filter_ccx(padapter);
u8 check_c2hcmd, check_ccx; u8 check_c2hcmd, check_ccx;
@ -2888,7 +2888,7 @@ void event_polling_hdl(_adapter *padapter, u8 *pbuf, int sz)
} }
#endif #endif
u8 rtw_drvextra_cmd_hdl(_adapter *padapter, unsigned char *pbuf) u8 rtw_drvextra_cmd_hdl(struct adapter *padapter, unsigned char *pbuf)
{ {
struct drvextra_cmd_parm *pdrvextra_cmd; struct drvextra_cmd_parm *pdrvextra_cmd;
@ -2967,7 +2967,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;
@ -2989,7 +2989,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)
{ {
_irqL irqL; _irqL irqL;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -3020,7 +3020,7 @@ _func_exit_;
} }
void rtw_joinbss_cmd_callback(_adapter* padapter, struct cmd_obj *pcmd) void rtw_joinbss_cmd_callback(struct adapter* padapter, struct cmd_obj *pcmd)
{ {
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -3043,7 +3043,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)
{ {
_irqL irqL; _irqL irqL;
u8 timer_cancelled; u8 timer_cancelled;
@ -3170,7 +3170,7 @@ _func_exit_;
void rtw_setstaKey_cmdrsp_callback(_adapter* padapter , struct cmd_obj *pcmd) void rtw_setstaKey_cmdrsp_callback(struct adapter* padapter , struct cmd_obj *pcmd)
{ {
struct sta_priv * pstapriv = &padapter->stapriv; struct sta_priv * pstapriv = &padapter->stapriv;
@ -3194,7 +3194,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)
{ {
_irqL irqL; _irqL irqL;
struct sta_priv * pstapriv = &padapter->stapriv; struct sta_priv * pstapriv = &padapter->stapriv;
@ -3227,8 +3227,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_;

92
core/rtw_debug.c
View file

@ -102,7 +102,7 @@ int proc_set_write_reg(struct file *file, const char *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;
@ -151,7 +151,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;
@ -217,7 +217,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;
@ -233,7 +233,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;
@ -251,7 +251,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);
@ -268,7 +268,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;
@ -285,7 +285,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;
@ -301,7 +301,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;
@ -320,7 +320,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);
@ -370,7 +370,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",
@ -387,7 +387,7 @@ int proc_get_trx_info(char *page, char **start,
{ {
int i; int i;
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;
struct hw_xmit *phwxmit; struct hw_xmit *phwxmit;
@ -420,7 +420,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;
@ -443,7 +443,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;
@ -466,7 +466,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;
@ -489,7 +489,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;
@ -509,7 +509,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;
@ -529,7 +529,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;
@ -549,7 +549,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;
@ -576,7 +576,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;
@ -602,7 +602,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;
@ -629,7 +629,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;
@ -656,7 +656,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;
@ -682,7 +682,7 @@ int proc_set_rx_signal(struct file *file, const char *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, signal_strength; u32 is_signal_dbg, signal_strength;
@ -721,7 +721,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;
@ -740,7 +740,7 @@ int proc_set_ht_enable(struct file *file, const char *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;
@ -768,7 +768,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;
@ -787,7 +787,7 @@ int proc_set_cbw40_enable(struct file *file, const char *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;
@ -817,7 +817,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;
@ -836,7 +836,7 @@ int proc_set_ampdu_enable(struct file *file, const char *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;
@ -866,7 +866,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;
@ -886,7 +886,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;
@ -905,7 +905,7 @@ int proc_set_rx_stbc(struct file *file, const char *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;
@ -942,7 +942,7 @@ int proc_set_rssi_disp(struct file *file, const char *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;
@ -988,7 +988,7 @@ int proc_get_all_sta_info(char *page, char **start,
_irqL irqL; _irqL 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;
_list *plist, *phead; _list *plist, *phead;
@ -1081,7 +1081,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;
@ -1140,7 +1140,7 @@ int proc_set_best_channel(struct file *file, const char *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 mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
char tmp[32]; char tmp[32];
@ -1171,7 +1171,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;
@ -1190,7 +1190,7 @@ int proc_set_btcoex_dbg(struct file *file, const char *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;
@ -1219,7 +1219,7 @@ int proc_set_btcoex_dbg(struct file *file, const char *buffer,
int proc_get_sreset(char *page, char **start, off_t offset, int count, int *eof, void *data) int proc_get_sreset(char *page, char **start, off_t offset, int count, 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;
@ -1231,7 +1231,7 @@ int proc_get_sreset(char *page, char **start, off_t offset, int count, int *eof,
int proc_set_sreset(struct file *file, const char *buffer, unsigned long count, void *data) int proc_set_sreset(struct file *file, const char *buffer, 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];
s32 trigger_point; s32 trigger_point;
@ -1256,7 +1256,7 @@ int proc_set_sreset(struct file *file, const char *buffer, unsigned long count,
int proc_get_odm_dbg_comp(char *page, char **start, off_t offset, int count, int *eof, void *data) int proc_get_odm_dbg_comp(char *page, char **start, off_t offset, int count, int *eof, void *data)
{ {
struct net_device *dev = data; struct net_device *dev = data;
_adapter *adapter = (_adapter *)rtw_netdev_priv(dev); struct adapter *adapter = (struct adapter *)rtw_netdev_priv(dev);
int len = 0; int len = 0;
len += _rtw_odm_dbg_comp_msg(adapter, page, count); len += _rtw_odm_dbg_comp_msg(adapter, page, count);
@ -1268,7 +1268,7 @@ int proc_get_odm_dbg_comp(char *page, char **start, off_t offset, int count, int
int proc_set_odm_dbg_comp(struct file *file, const char *buffer, unsigned long count, void *data) int proc_set_odm_dbg_comp(struct file *file, const char *buffer, unsigned long count, void *data)
{ {
struct net_device *dev = (struct net_device *)data; struct net_device *dev = (struct net_device *)data;
_adapter *adapter = (_adapter *)rtw_netdev_priv(dev); struct adapter *adapter = (struct adapter *)rtw_netdev_priv(dev);
char tmp[32]; char tmp[32];
u64 dbg_comp; u64 dbg_comp;
@ -1292,7 +1292,7 @@ int proc_set_odm_dbg_comp(struct file *file, const char *buffer, unsigned long c
int proc_get_odm_dbg_level(char *page, char **start, off_t offset, int count, int *eof, void *data) int proc_get_odm_dbg_level(char *page, char **start, off_t offset, int count, int *eof, void *data)
{ {
struct net_device *dev = data; struct net_device *dev = data;
_adapter *adapter = (_adapter *)rtw_netdev_priv(dev); struct adapter *adapter = (struct adapter *)rtw_netdev_priv(dev);
int len = 0; int len = 0;
len += _rtw_odm_dbg_level_msg(adapter, page, count); len += _rtw_odm_dbg_level_msg(adapter, page, count);
@ -1304,7 +1304,7 @@ int proc_get_odm_dbg_level(char *page, char **start, off_t offset, int count, in
int proc_set_odm_dbg_level(struct file *file, const char *buffer, unsigned long count, void *data) int proc_set_odm_dbg_level(struct file *file, const char *buffer, unsigned long count, void *data)
{ {
struct net_device *dev = (struct net_device *)data; struct net_device *dev = (struct net_device *)data;
_adapter *adapter = (_adapter *)rtw_netdev_priv(dev); struct adapter *adapter = (struct adapter *)rtw_netdev_priv(dev);
char tmp[32]; char tmp[32];
u32 dbg_level; u32 dbg_level;
@ -1328,7 +1328,7 @@ int proc_set_odm_dbg_level(struct file *file, const char *buffer, unsigned long
int proc_get_odm_adaptivity(char *page, char **start, off_t offset, int count, int *eof, void *data) int proc_get_odm_adaptivity(char *page, char **start, off_t offset, int count, 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 += _rtw_odm_adaptivity_parm_msg(padapter, page, count); len += _rtw_odm_adaptivity_parm_msg(padapter, page, count);
@ -1340,7 +1340,7 @@ int proc_get_odm_adaptivity(char *page, char **start, off_t offset, int count, i
int proc_set_odm_adaptivity(struct file *file, const char *buffer, unsigned long count, void *data) int proc_set_odm_adaptivity(struct file *file, const char *buffer, 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 TH_L2H_ini; u32 TH_L2H_ini;
s8 TH_EDCCA_HL_diff; s8 TH_EDCCA_HL_diff;

88
core/rtw_efuse.c
View file

@ -52,12 +52,12 @@ u8 fakeBTEfuseModifiedMap[EFUSE_BT_MAX_MAP_LEN]={0};
BOOLEAN BOOLEAN
Efuse_Read1ByteFromFakeContent( Efuse_Read1ByteFromFakeContent(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN u16 Offset, IN u16 Offset,
IN OUT u8 *Value ); IN OUT u8 *Value );
BOOLEAN BOOLEAN
Efuse_Read1ByteFromFakeContent( Efuse_Read1ByteFromFakeContent(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN u16 Offset, IN u16 Offset,
IN OUT u8 *Value ) IN OUT u8 *Value )
{ {
@ -75,12 +75,12 @@ Efuse_Read1ByteFromFakeContent(
BOOLEAN BOOLEAN
Efuse_Write1ByteToFakeContent( Efuse_Write1ByteToFakeContent(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN u16 Offset, IN u16 Offset,
IN u8 Value ); IN u8 Value );
BOOLEAN BOOLEAN
Efuse_Write1ByteToFakeContent( Efuse_Write1ByteToFakeContent(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN u16 Offset, IN u16 Offset,
IN u8 Value ) IN u8 Value )
{ {
@ -117,7 +117,7 @@ Efuse_Write1ByteToFakeContent(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
VOID VOID
Efuse_PowerSwitch( Efuse_PowerSwitch(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN u8 bWrite, IN u8 bWrite,
IN u8 PwrState) IN u8 PwrState)
{ {
@ -142,7 +142,7 @@ Efuse_PowerSwitch(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
u16 u16
Efuse_GetCurrentSize( Efuse_GetCurrentSize(
IN PADAPTER pAdapter, IN struct adapter * pAdapter,
IN u8 efuseType, IN u8 efuseType,
IN BOOLEAN bPseudoTest) IN BOOLEAN bPseudoTest)
{ {
@ -178,7 +178,7 @@ Efuse_CalculateWordCnts(IN u8 word_en)
// //
VOID VOID
ReadEFuseByte( ReadEFuseByte(
PADAPTER Adapter, struct adapter *Adapter,
u16 _offset, u16 _offset,
u8 *pbuf, u8 *pbuf,
IN BOOLEAN bPseudoTest) IN BOOLEAN bPseudoTest)
@ -246,7 +246,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,
@ -255,7 +255,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,
@ -268,7 +268,7 @@ efuse_ReadEFuse(
VOID VOID
EFUSE_GetEfuseDefinition( EFUSE_GetEfuseDefinition(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN u8 efuseType, IN u8 efuseType,
IN u8 type, IN u8 type,
OUT void *pOut, OUT void *pOut,
@ -296,7 +296,7 @@ EFUSE_GetEfuseDefinition(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
u8 u8
EFUSE_Read1Byte( EFUSE_Read1Byte(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u16 Address) IN u16 Address)
{ {
u8 data; u8 data;
@ -361,12 +361,12 @@ EFUSE_Read1Byte(
void void
EFUSE_Write1Byte( EFUSE_Write1Byte(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u16 Address, IN u16 Address,
IN u8 Value); IN u8 Value);
void void
EFUSE_Write1Byte( EFUSE_Write1Byte(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u16 Address, IN u16 Address,
IN u8 Value) IN u8 Value)
{ {
@ -414,7 +414,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(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN u16 addr, IN u16 addr,
IN u8 *data, IN u8 *data,
IN BOOLEAN bPseudoTest) IN BOOLEAN bPseudoTest)
@ -455,7 +455,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(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN u16 addr, IN u16 addr,
IN u8 data, IN u8 data,
IN BOOLEAN bPseudoTest) IN BOOLEAN bPseudoTest)
@ -498,7 +498,7 @@ efuse_OneByteWrite(
} }
int int
Efuse_PgPacketRead( IN PADAPTER pAdapter, Efuse_PgPacketRead( IN struct adapter *pAdapter,
IN u8 offset, IN u8 offset,
IN u8 *data, IN u8 *data,
IN BOOLEAN bPseudoTest) IN BOOLEAN bPseudoTest)
@ -511,7 +511,7 @@ Efuse_PgPacketRead( IN PADAPTER pAdapter,
} }
int int
Efuse_PgPacketWrite(IN PADAPTER pAdapter, Efuse_PgPacketWrite(IN struct adapter *pAdapter,
IN u8 offset, IN u8 offset,
IN u8 word_en, IN u8 word_en,
IN u8 *data, IN u8 *data,
@ -526,7 +526,7 @@ Efuse_PgPacketWrite(IN PADAPTER pAdapter,
int int
Efuse_PgPacketWrite_BT(IN PADAPTER pAdapter, Efuse_PgPacketWrite_BT(IN struct adapter *pAdapter,
IN u8 offset, IN u8 offset,
IN u8 word_en, IN u8 word_en,
IN u8 *data, IN u8 *data,
@ -585,7 +585,7 @@ efuse_WordEnableDataRead(IN u8 word_en,
u8 u8
Efuse_WordEnableDataWrite( IN PADAPTER pAdapter, Efuse_WordEnableDataWrite( IN struct adapter *pAdapter,
IN u16 efuse_addr, IN u16 efuse_addr,
IN u8 word_en, IN u8 word_en,
IN u8 *data, IN u8 *data,
@ -598,12 +598,12 @@ Efuse_WordEnableDataWrite( IN 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);
} }
@ -611,12 +611,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, (PVOID)&real_content_len, _FALSE); EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_REAL_CONTENT_LEN, (PVOID)&real_content_len, _FALSE);
EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (PVOID)&max_available_size, _FALSE); EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (PVOID)&max_available_size, _FALSE);
@ -649,14 +649,14 @@ u8 rtw_efuse_access(PADAPTER padapter, u8 bWrite, u16 start_addr, u16 cnts, u8 *
return res; 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, (PVOID)&max_size, _FALSE); EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI , TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (PVOID)&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);
@ -665,7 +665,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;
@ -683,7 +683,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;
@ -701,7 +701,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;
@ -799,7 +799,7 @@ exit:
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
u8 rtw_BT_efuse_map_write(PADAPTER padapter, u16 addr, u16 cnts, u8 *data) u8 rtw_BT_efuse_map_write(struct adapter *padapter, u16 addr, u16 cnts, u8 *data)
{ {
u8 offset, word_en; u8 offset, word_en;
u8 *map; u8 *map;
@ -916,13 +916,13 @@ exit:
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
VOID VOID
Efuse_ReadAllMap( Efuse_ReadAllMap(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN u8 efuseType, IN u8 efuseType,
IN OUT u8 *Efuse, IN OUT u8 *Efuse,
IN BOOLEAN bPseudoTest); IN BOOLEAN bPseudoTest);
VOID VOID
Efuse_ReadAllMap( Efuse_ReadAllMap(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN u8 efuseType, IN u8 efuseType,
IN OUT u8 *Efuse, IN OUT u8 *Efuse,
IN BOOLEAN bPseudoTest) IN BOOLEAN bPseudoTest)
@ -958,7 +958,7 @@ Efuse_ReadAllMap(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
static VOID static VOID
efuse_ShadowRead1Byte( efuse_ShadowRead1Byte(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN u16 Offset, IN u16 Offset,
IN OUT u8 *Value) IN OUT u8 *Value)
{ {
@ -971,7 +971,7 @@ efuse_ShadowRead1Byte(
//---------------Read Two Bytes //---------------Read Two Bytes
static VOID static VOID
efuse_ShadowRead2Byte( efuse_ShadowRead2Byte(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN u16 Offset, IN u16 Offset,
IN OUT u16 *Value) IN OUT u16 *Value)
{ {
@ -985,7 +985,7 @@ efuse_ShadowRead2Byte(
//---------------Read Four Bytes //---------------Read Four Bytes
static VOID static VOID
efuse_ShadowRead4Byte( efuse_ShadowRead4Byte(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN u16 Offset, IN u16 Offset,
IN OUT u32 *Value) IN OUT u32 *Value)
{ {
@ -1020,13 +1020,13 @@ efuse_ShadowRead4Byte(
#ifdef PLATFORM #ifdef PLATFORM
static VOID static VOID
efuse_ShadowWrite1Byte( efuse_ShadowWrite1Byte(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN u16 Offset, IN u16 Offset,
IN u8 Value); IN u8 Value);
#endif //PLATFORM #endif //PLATFORM
static VOID static VOID
efuse_ShadowWrite1Byte( efuse_ShadowWrite1Byte(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN u16 Offset, IN u16 Offset,
IN u8 Value) IN u8 Value)
{ {
@ -1039,7 +1039,7 @@ efuse_ShadowWrite1Byte(
//---------------Write Two Bytes //---------------Write Two Bytes
static VOID static VOID
efuse_ShadowWrite2Byte( efuse_ShadowWrite2Byte(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN u16 Offset, IN u16 Offset,
IN u16 Value) IN u16 Value)
{ {
@ -1053,7 +1053,7 @@ efuse_ShadowWrite2Byte(
//---------------Write Four Bytes //---------------Write Four Bytes
static VOID static VOID
efuse_ShadowWrite4Byte( efuse_ShadowWrite4Byte(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN u16 Offset, IN u16 Offset,
IN u32 Value) IN u32 Value)
{ {
@ -1083,7 +1083,7 @@ efuse_ShadowWrite4Byte(
* *
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
void EFUSE_ShadowMapUpdate( void EFUSE_ShadowMapUpdate(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN u8 efuseType, IN u8 efuseType,
IN BOOLEAN bPseudoTest) IN BOOLEAN bPseudoTest)
{ {
@ -1133,7 +1133,7 @@ void EFUSE_ShadowMapUpdate(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
void void
EFUSE_ShadowRead( EFUSE_ShadowRead(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN u8 Type, IN u8 Type,
IN u16 Offset, IN u16 Offset,
IN OUT u32 *Value ) IN OUT u32 *Value )
@ -1165,13 +1165,13 @@ EFUSE_ShadowRead(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
VOID VOID
EFUSE_ShadowWrite( EFUSE_ShadowWrite(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN u8 Type, IN u8 Type,
IN u16 Offset, IN u16 Offset,
IN OUT u32 Value); IN OUT u32 Value);
VOID VOID
EFUSE_ShadowWrite( EFUSE_ShadowWrite(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN u8 Type, IN u8 Type,
IN u16 Offset, IN u16 Offset,
IN OUT u32 Value) IN OUT u32 Value)
@ -1194,11 +1194,11 @@ EFUSE_ShadowWrite(
VOID VOID
Efuse_InitSomeVar( Efuse_InitSomeVar(
IN PADAPTER pAdapter IN struct adapter *pAdapter
); );
VOID VOID
Efuse_InitSomeVar( Efuse_InitSomeVar(
IN PADAPTER pAdapter IN struct adapter *pAdapter
) )
{ {
u8 i; u8 i;

50
core/rtw_io.c
View file

@ -83,7 +83,7 @@ jackson@realtek.com.tw
#endif #endif
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;
@ -98,7 +98,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_queue *pio_queue = (struct io_queue *)adapter->pio_queue; //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
@ -113,7 +113,7 @@ u16 _rtw_read16(_adapter *adapter, u32 addr)
return rtw_le16_to_cpu(r_val); return rtw_le16_to_cpu(r_val);
} }
u32 _rtw_read32(_adapter *adapter, u32 addr) u32 _rtw_read32(struct adapter *adapter, u32 addr)
{ {
u32 r_val; u32 r_val;
//struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
@ -129,7 +129,7 @@ u32 _rtw_read32(_adapter *adapter, u32 addr)
} }
int _rtw_write8(_adapter *adapter, u32 addr, u8 val) int _rtw_write8(struct adapter *adapter, u32 addr, u8 val)
{ {
//struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
struct io_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
@ -144,7 +144,7 @@ int _rtw_write8(_adapter *adapter, u32 addr, u8 val)
return RTW_STATUS_CODE(ret); return RTW_STATUS_CODE(ret);
} }
int _rtw_write16(_adapter *adapter, u32 addr, u16 val) int _rtw_write16(struct adapter *adapter, u32 addr, u16 val)
{ {
//struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
struct io_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
@ -160,7 +160,7 @@ int _rtw_write16(_adapter *adapter, u32 addr, u16 val)
return RTW_STATUS_CODE(ret); return RTW_STATUS_CODE(ret);
} }
int _rtw_write32(_adapter *adapter, u32 addr, u32 val) int _rtw_write32(struct adapter *adapter, u32 addr, u32 val)
{ {
//struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
struct io_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
@ -177,7 +177,7 @@ int _rtw_write32(_adapter *adapter, u32 addr, u32 val)
return RTW_STATUS_CODE(ret); return RTW_STATUS_CODE(ret);
} }
int _rtw_writeN(_adapter *adapter, u32 addr ,u32 length , u8 *pdata) int _rtw_writeN(struct adapter *adapter, u32 addr ,u32 length , u8 *pdata)
{ {
//struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
struct io_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
@ -192,7 +192,7 @@ int _rtw_writeN(_adapter *adapter, u32 addr ,u32 length , u8 *pdata)
return RTW_STATUS_CODE(ret); return RTW_STATUS_CODE(ret);
} }
int _rtw_write8_async(_adapter *adapter, u32 addr, u8 val) int _rtw_write8_async(struct adapter *adapter, u32 addr, u8 val)
{ {
//struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
struct io_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
@ -207,7 +207,7 @@ int _rtw_write8_async(_adapter *adapter, u32 addr, u8 val)
return RTW_STATUS_CODE(ret); return RTW_STATUS_CODE(ret);
} }
int _rtw_write16_async(_adapter *adapter, u32 addr, u16 val) int _rtw_write16_async(struct adapter *adapter, u32 addr, u16 val)
{ {
//struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
struct io_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
@ -222,7 +222,7 @@ int _rtw_write16_async(_adapter *adapter, u32 addr, u16 val)
return RTW_STATUS_CODE(ret); return RTW_STATUS_CODE(ret);
} }
int _rtw_write32_async(_adapter *adapter, u32 addr, u32 val) int _rtw_write32_async(struct adapter *adapter, u32 addr, u32 val)
{ {
//struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
struct io_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
@ -238,7 +238,7 @@ int _rtw_write32_async(_adapter *adapter, u32 addr, u32 val)
return RTW_STATUS_CODE(ret); 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_queue *pio_queue = (struct io_queue *)adapter->pio_queue; //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
@ -261,7 +261,7 @@ void _rtw_read_mem(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
} }
void _rtw_write_mem(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem) void _rtw_write_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
{ {
void (*_write_mem)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem); void (*_write_mem)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem);
//struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
@ -278,7 +278,7 @@ void _rtw_write_mem(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
} }
void _rtw_read_port(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem) void _rtw_read_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
{ {
u32 (*_read_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem); u32 (*_read_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem);
//struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
@ -301,7 +301,7 @@ void _rtw_read_port(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
} }
void _rtw_read_port_cancel(_adapter *adapter) void _rtw_read_port_cancel(struct adapter *adapter)
{ {
void (*_read_port_cancel)(struct intf_hdl *pintfhdl); void (*_read_port_cancel)(struct intf_hdl *pintfhdl);
struct io_priv *pio_priv = &adapter->iopriv; struct io_priv *pio_priv = &adapter->iopriv;
@ -314,7 +314,7 @@ void _rtw_read_port_cancel(_adapter *adapter)
} }
u32 _rtw_write_port(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem) u32 _rtw_write_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
{ {
u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem); u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem);
//struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue; //struct io_queue *pio_queue = (struct io_queue *)adapter->pio_queue;
@ -333,7 +333,7 @@ u32 _rtw_write_port(_adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
return ret; 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;
@ -350,7 +350,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;
@ -363,7 +363,7 @@ void _rtw_write_port_cancel(_adapter *adapter)
} }
int rtw_init_io_priv(_adapter *padapter, void (*set_intf_ops)(struct _io_ops *pops)) int rtw_init_io_priv(struct adapter *padapter, void (*set_intf_ops)(struct _io_ops *pops))
{ {
struct io_priv *piopriv = &padapter->iopriv; struct io_priv *piopriv = &padapter->iopriv;
struct intf_hdl *pintf = &piopriv->intf; struct intf_hdl *pintf = &piopriv->intf;
@ -442,7 +442,7 @@ bool match_write_sniff_ranges(u16 addr, u16 len)
return _FALSE; return _FALSE;
} }
u8 dbg_rtw_read8(_adapter *adapter, u32 addr, const char *caller, const int line) u8 dbg_rtw_read8(struct adapter *adapter, u32 addr, const char *caller, const int line)
{ {
u8 val = _rtw_read8(adapter, addr); u8 val = _rtw_read8(adapter, addr);
@ -452,7 +452,7 @@ u8 dbg_rtw_read8(_adapter *adapter, u32 addr, const char *caller, const int line
return val; return val;
} }
u16 dbg_rtw_read16(_adapter *adapter, u32 addr, const char *caller, const int line) u16 dbg_rtw_read16(struct adapter *adapter, u32 addr, const char *caller, const int line)
{ {
u16 val = _rtw_read16(adapter, addr); u16 val = _rtw_read16(adapter, addr);
@ -462,7 +462,7 @@ u16 dbg_rtw_read16(_adapter *adapter, u32 addr, const char *caller, const int li
return val; return val;
} }
u32 dbg_rtw_read32(_adapter *adapter, u32 addr, const char *caller, const int line) u32 dbg_rtw_read32(struct adapter *adapter, u32 addr, const char *caller, const int line)
{ {
u32 val = _rtw_read32(adapter, addr); u32 val = _rtw_read32(adapter, addr);
@ -472,28 +472,28 @@ u32 dbg_rtw_read32(_adapter *adapter, u32 addr, const char *caller, const int li
return val; return val;
} }
int dbg_rtw_write8(_adapter *adapter, u32 addr, u8 val, const char *caller, const int line) int dbg_rtw_write8(struct adapter *adapter, u32 addr, u8 val, const char *caller, const int line)
{ {
if (match_write_sniff_ranges(addr, 1)) if (match_write_sniff_ranges(addr, 1))
DBG_871X("DBG_IO %s:%d rtw_write8(0x%04x, 0x%02x)\n", caller, line, addr, val); DBG_871X("DBG_IO %s:%d rtw_write8(0x%04x, 0x%02x)\n", caller, line, addr, val);
return _rtw_write8(adapter, addr, val); return _rtw_write8(adapter, addr, val);
} }
int dbg_rtw_write16(_adapter *adapter, u32 addr, u16 val, const char *caller, const int line) int dbg_rtw_write16(struct adapter *adapter, u32 addr, u16 val, const char *caller, const int line)
{ {
if (match_write_sniff_ranges(addr, 2)) if (match_write_sniff_ranges(addr, 2))
DBG_871X("DBG_IO %s:%d rtw_write16(0x%04x, 0x%04x)\n", caller, line, addr, val); DBG_871X("DBG_IO %s:%d rtw_write16(0x%04x, 0x%04x)\n", caller, line, addr, val);
return _rtw_write16(adapter, addr, val); return _rtw_write16(adapter, addr, val);
} }
int dbg_rtw_write32(_adapter *adapter, u32 addr, u32 val, const char *caller, const int line) int dbg_rtw_write32(struct adapter *adapter, u32 addr, u32 val, const char *caller, const int line)
{ {
if (match_write_sniff_ranges(addr, 4)) if (match_write_sniff_ranges(addr, 4))
DBG_871X("DBG_IO %s:%d rtw_write32(0x%04x, 0x%08x)\n", caller, line, addr, val); DBG_871X("DBG_IO %s:%d rtw_write32(0x%04x, 0x%08x)\n", caller, line, addr, val);
return _rtw_write32(adapter, addr, val); return _rtw_write32(adapter, addr, val);
} }
int dbg_rtw_writeN(_adapter *adapter, u32 addr ,u32 length , u8 *data, const char *caller, const int line) int dbg_rtw_writeN(struct adapter *adapter, u32 addr ,u32 length , u8 *data, const char *caller, const int line)
{ {
if (match_write_sniff_ranges(addr, length)) if (match_write_sniff_ranges(addr, length))
DBG_871X("DBG_IO %s:%d rtw_writeN(0x%04x, %u)\n", caller, line, addr, length); DBG_871X("DBG_IO %s:%d rtw_writeN(0x%04x, %u)\n", caller, line, addr, length);

44
core/rtw_ioctl_set.c
View file

@ -38,7 +38,7 @@
#include <gspi_osintf.h> #include <gspi_osintf.h>
#endif #endif
extern void indicate_wx_scan_complete_event(_adapter *padapter); extern void indicate_wx_scan_complete_event(struct adapter *padapter);
#define IS_MAC_ADDRESS_BROADCAST(addr) \ #define IS_MAC_ADDRESS_BROADCAST(addr) \
( \ ( \
@ -93,8 +93,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)
{ {
_irqL irqL; _irqL irqL;
_list *plist, *phead; _list *plist, *phead;
@ -237,7 +237,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)
{ {
_irqL irqL; _irqL irqL;
u8 status=_SUCCESS; u8 status=_SUCCESS;
@ -321,7 +321,7 @@ _func_exit_;
return status; return status;
} }
u8 rtw_set_802_11_ssid(_adapter* padapter, NDIS_802_11_SSID *ssid) u8 rtw_set_802_11_ssid(struct adapter* padapter, NDIS_802_11_SSID *ssid)
{ {
_irqL irqL; _irqL irqL;
u8 status = _SUCCESS; u8 status = _SUCCESS;
@ -445,7 +445,7 @@ _func_exit_;
} }
u8 rtw_set_802_11_connect(_adapter* padapter, u8 *bssid, NDIS_802_11_SSID *ssid) u8 rtw_set_802_11_connect(struct adapter* padapter, u8 *bssid, NDIS_802_11_SSID *ssid)
{ {
_irqL irqL; _irqL irqL;
u8 status = _SUCCESS; u8 status = _SUCCESS;
@ -518,7 +518,7 @@ _func_exit_;
return status; return status;
} }
u8 rtw_set_802_11_infrastructure_mode(_adapter* padapter, u8 rtw_set_802_11_infrastructure_mode(struct adapter* padapter,
NDIS_802_11_NETWORK_INFRASTRUCTURE networktype) NDIS_802_11_NETWORK_INFRASTRUCTURE networktype)
{ {
_irqL irqL; _irqL irqL;
@ -606,7 +606,7 @@ _func_exit_;
} }
u8 rtw_set_802_11_disassociate(_adapter *padapter) u8 rtw_set_802_11_disassociate(struct adapter *padapter)
{ {
_irqL irqL; _irqL irqL;
struct mlme_priv * pmlmepriv = &padapter->mlmepriv; struct mlme_priv * pmlmepriv = &padapter->mlmepriv;
@ -633,7 +633,7 @@ _func_exit_;
return _TRUE; return _TRUE;
} }
u8 rtw_set_802_11_bssid_list_scan(_adapter* padapter, NDIS_802_11_SSID *pssid, int ssid_max_num) u8 rtw_set_802_11_bssid_list_scan(struct adapter* padapter, NDIS_802_11_SSID *pssid, int ssid_max_num)
{ {
_irqL irqL; _irqL irqL;
struct mlme_priv *pmlmepriv= &padapter->mlmepriv; struct mlme_priv *pmlmepriv= &padapter->mlmepriv;
@ -685,7 +685,7 @@ _func_exit_;
return res; return res;
} }
u8 rtw_set_802_11_authentication_mode(_adapter* padapter, NDIS_802_11_AUTHENTICATION_MODE authmode) u8 rtw_set_802_11_authentication_mode(struct adapter* padapter, NDIS_802_11_AUTHENTICATION_MODE authmode)
{ {
struct security_priv *psecuritypriv = &padapter->securitypriv; struct security_priv *psecuritypriv = &padapter->securitypriv;
int res; int res;
@ -719,7 +719,7 @@ _func_exit_;
return ret; return ret;
} }
u8 rtw_set_802_11_add_wep(_adapter* padapter, NDIS_802_11_WEP *wep){ u8 rtw_set_802_11_add_wep(struct adapter* padapter, NDIS_802_11_WEP *wep){
u8 bdefaultkey; u8 bdefaultkey;
u8 btransmitkey; u8 btransmitkey;
@ -783,7 +783,7 @@ _func_exit_;
} }
u8 rtw_set_802_11_remove_wep(_adapter* padapter, u32 keyindex){ u8 rtw_set_802_11_remove_wep(struct adapter* padapter, u32 keyindex){
u8 ret=_SUCCESS; u8 ret=_SUCCESS;
@ -826,7 +826,7 @@ _func_exit_;
} }
u8 rtw_set_802_11_add_key(_adapter* padapter, NDIS_802_11_KEY *key){ u8 rtw_set_802_11_add_key(struct adapter* padapter, NDIS_802_11_KEY *key){
uint encryptionalgo; uint encryptionalgo;
u8 * pbssid; u8 * pbssid;
@ -1191,7 +1191,7 @@ _func_exit_;
return ret; return ret;
} }
u8 rtw_set_802_11_remove_key(_adapter* padapter, NDIS_802_11_REMOVE_KEY *key){ u8 rtw_set_802_11_remove_key(struct adapter* padapter, NDIS_802_11_REMOVE_KEY *key){
uint encryptionalgo; uint encryptionalgo;
u8 * pbssid; u8 * pbssid;
@ -1246,11 +1246,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;
@ -1318,12 +1318,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, RT_SCAN_TYPE scan_mode) int rtw_set_scan_mode(struct adapter *adapter, RT_SCAN_TYPE scan_mode)
{ {
if(scan_mode != SCAN_ACTIVE && scan_mode != SCAN_PASSIVE) if(scan_mode != SCAN_ACTIVE && scan_mode != SCAN_PASSIVE)
return _FAIL; return _FAIL;
@ -1335,12 +1335,12 @@ int rtw_set_scan_mode(_adapter *adapter, 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;
@ -1351,12 +1351,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;

14
core/rtw_iol.c
View file

@ -21,7 +21,7 @@
#include<rtw_iol.h> #include<rtw_iol.h>
#ifdef CONFIG_IOL #ifdef CONFIG_IOL
struct xmit_frame *rtw_IOL_accquire_xmit_frame(ADAPTER *adapter) struct xmit_frame *rtw_IOL_accquire_xmit_frame(struct adapter *adapter)
{ {
struct xmit_frame *xmit_frame; struct xmit_frame *xmit_frame;
struct xmit_buf *xmitbuf; struct xmit_buf *xmitbuf;
@ -96,7 +96,7 @@ int rtw_IOL_append_cmds(struct xmit_frame *xmit_frame, u8 *IOL_cmds, u32 cmd_len
return _SUCCESS; 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;
@ -109,7 +109,7 @@ bool rtw_IOL_applied(ADAPTER *adapter)
return _FALSE; return _FALSE;
} }
/* /*
bool rtw_IOL_applied(ADAPTER *adapter) bool rtw_IOL_applied(struct adapter *adapter)
{ {
if(adapter->registrypriv.fw_iol) if(adapter->registrypriv.fw_iol)
return _TRUE; return _TRUE;
@ -123,7 +123,7 @@ bool rtw_IOL_applied(ADAPTER *adapter)
} }
*/ */
int rtw_IOL_exec_cmds_sync(ADAPTER *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt) int rtw_IOL_exec_cmds_sync(struct adapter *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt)
{ {
return rtw_hal_iol_cmd(adapter, xmit_frame, max_wating_ms,bndy_cnt); return rtw_hal_iol_cmd(adapter, xmit_frame, max_wating_ms,bndy_cnt);
} }
@ -262,7 +262,7 @@ u8 rtw_IOL_cmd_boundary_handle(struct xmit_frame *pxmit_frame)
return is_cmd_bndy; 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;
@ -376,7 +376,7 @@ int rtw_IOL_append_END_cmd(struct xmit_frame *xmit_frame)
} }
int rtw_IOL_exec_cmd_array_sync(PADAPTER adapter, u8 *IOL_cmds, u32 cmd_num, u32 max_wating_ms) int rtw_IOL_exec_cmd_array_sync(Pstruct adapter adapter, u8 *IOL_cmds, u32 cmd_num, u32 max_wating_ms)
{ {
struct xmit_frame *xmit_frame; struct xmit_frame *xmit_frame;
@ -389,7 +389,7 @@ int rtw_IOL_exec_cmd_array_sync(PADAPTER adapter, u8 *IOL_cmds, u32 cmd_num, u32
return rtw_IOL_exec_cmds_sync(adapter, xmit_frame, max_wating_ms,0); return rtw_IOL_exec_cmds_sync(adapter, xmit_frame, max_wating_ms,0);
} }
int rtw_IOL_exec_empty_cmds_sync(ADAPTER *adapter, u32 max_wating_ms) int rtw_IOL_exec_empty_cmds_sync(struct adapter *adapter, u32 max_wating_ms)
{ {
IOL_CMD end_cmd = {0x0, IOL_CMD_END, 0x0, 0x0}; IOL_CMD end_cmd = {0x0, IOL_CMD_END, 0x0, 0x0};
return rtw_IOL_exec_cmd_array_sync(adapter, (u8*)&end_cmd, 1, max_wating_ms); return rtw_IOL_exec_cmd_array_sync(adapter, (u8*)&end_cmd, 1, max_wating_ms);

40
core/rtw_led.c
View file

@ -28,7 +28,7 @@
void BlinkTimerCallback(void *data) void BlinkTimerCallback(void *data)
{ {
PLED_871x pLed = (PLED_871x)data; PLED_871x pLed = (PLED_871x)data;
_adapter *padapter = pLed->padapter; struct adapter *padapter = pLed->padapter;
//DBG_871X("%s\n", __FUNCTION__); //DBG_871X("%s\n", __FUNCTION__);
@ -92,7 +92,7 @@ void ResetLedStatus(PLED_871x pLed) {
// //
void void
InitLed871x( InitLed871x(
_adapter *padapter, struct adapter *padapter,
PLED_871x pLed, PLED_871x pLed,
LED_PIN_871x LedPin LED_PIN_871x LedPin
) )
@ -134,8 +134,8 @@ DeInitLed871x(
// //
#if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI) #if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI)
void SwLedOn(_adapter *padapter, PLED_871x pLed); void SwLedOn(struct adapter *padapter, PLED_871x pLed);
void SwLedOff(_adapter *padapter, PLED_871x pLed); void SwLedOff(struct adapter *padapter, PLED_871x pLed);
#define CONFIG_LED_REMOVE_HAL #define CONFIG_LED_REMOVE_HAL
@ -144,7 +144,7 @@ SwLedBlink(
PLED_871x pLed PLED_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;
@ -262,7 +262,7 @@ SwLedBlink1(
PLED_871x pLed PLED_871x pLed
) )
{ {
_adapter *padapter = pLed->padapter; struct adapter *padapter = pLed->padapter;
#ifndef CONFIG_LED_REMOVE_HAL #ifndef CONFIG_LED_REMOVE_HAL
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
#endif #endif
@ -474,7 +474,7 @@ SwLedBlink2(
PLED_871x pLed PLED_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;
@ -596,7 +596,7 @@ SwLedBlink3(
PLED_871x pLed PLED_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;
@ -767,7 +767,7 @@ SwLedBlink4(
PLED_871x pLed PLED_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);
PLED_871x pLed1 = &(ledpriv->SwLed1); PLED_871x pLed1 = &(ledpriv->SwLed1);
@ -966,7 +966,7 @@ SwLedBlink5(
PLED_871x pLed PLED_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;
@ -1084,7 +1084,7 @@ SwLedBlink6(
PLED_871x pLed PLED_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;
@ -1105,7 +1105,7 @@ SwLedBlink6(
static void static void
SwLedControlMode0( SwLedControlMode0(
_adapter *padapter, struct adapter *padapter,
LED_CTL_MODE LedAction LED_CTL_MODE LedAction
) )
{ {
@ -1220,7 +1220,7 @@ SwLedControlMode0(
//ALPHA, added by chiyoko, 20090106 //ALPHA, added by chiyoko, 20090106
static void static void
SwLedControlMode1( SwLedControlMode1(
_adapter *padapter, struct adapter *padapter,
LED_CTL_MODE LedAction LED_CTL_MODE LedAction
) )
{ {
@ -1495,7 +1495,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,
LED_CTL_MODE LedAction LED_CTL_MODE LedAction
) )
{ {
@ -1660,7 +1660,7 @@ SwLedControlMode2(
//COREGA, added by chiyoko, 20090316 //COREGA, added by chiyoko, 20090316
static void static void
SwLedControlMode3( SwLedControlMode3(
_adapter *padapter, struct adapter *padapter,
LED_CTL_MODE LedAction LED_CTL_MODE LedAction
) )
{ {
@ -1839,7 +1839,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,
LED_CTL_MODE LedAction LED_CTL_MODE LedAction
) )
{ {
@ -2171,7 +2171,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,
LED_CTL_MODE LedAction LED_CTL_MODE LedAction
) )
{ {
@ -2262,7 +2262,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,
LED_CTL_MODE LedAction LED_CTL_MODE LedAction
) )
{ {
@ -2299,7 +2299,7 @@ SwLedControlMode6(
// //
void BlinkHandler(PLED_871x pLed) void BlinkHandler(PLED_871x pLed)
{ {
_adapter *padapter = pLed->padapter; struct adapter *padapter = pLed->padapter;
struct led_priv *ledpriv = &(padapter->ledpriv); struct led_priv *ledpriv = &(padapter->ledpriv);
//DBG_871X("%s (%s:%d)\n",__FUNCTION__, current->comm, current->pid); //DBG_871X("%s (%s:%d)\n",__FUNCTION__, current->comm, current->pid);
@ -2349,7 +2349,7 @@ void BlinkHandler(PLED_871x pLed)
void void
LedControl871x( LedControl871x(
_adapter *padapter, struct adapter *padapter,
LED_CTL_MODE LedAction LED_CTL_MODE LedAction
) )
{ {

144
core/rtw_mlme.c
View file

@ -32,8 +32,8 @@
#include <wlan_bssdef.h> #include <wlan_bssdef.h>
#include <rtw_ioctl_set.h> #include <rtw_ioctl_set.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);
#ifdef CONFIG_DISABLE_MCS13TO15 #ifdef CONFIG_DISABLE_MCS13TO15
extern unsigned char MCS_rate_2R_MCS13TO15_OFF[16]; extern unsigned char MCS_rate_2R_MCS13TO15_OFF[16];
@ -43,7 +43,7 @@ extern unsigned char MCS_rate_2R[16];
#endif //CONFIG_DISABLE_MCS13TO15 #endif //CONFIG_DISABLE_MCS13TO15
extern unsigned char MCS_rate_1R[16]; extern unsigned char MCS_rate_1R[16];
sint _rtw_init_mlme_priv (_adapter* padapter) sint _rtw_init_mlme_priv (struct adapter* padapter)
{ {
sint i; sint i;
u8 *pbuf; u8 *pbuf;
@ -382,7 +382,7 @@ _func_exit_;
} }
void _rtw_free_network_queue(_adapter *padapter, u8 isfreeall) void _rtw_free_network_queue(struct adapter *padapter, u8 isfreeall)
{ {
_irqL irqL; _irqL irqL;
_list *phead, *plist; _list *phead, *plist;
@ -418,7 +418,7 @@ _func_exit_;
sint rtw_if_up(_adapter *padapter) { sint rtw_if_up(struct adapter *padapter) {
sint res; sint res;
_func_enter_; _func_enter_;
@ -479,7 +479,7 @@ u8 *rtw_get_beacon_interval_from_ie(u8 *ie)
} }
int rtw_init_mlme_priv (_adapter *padapter)//(struct mlme_priv *pmlmepriv) int rtw_init_mlme_priv (struct adapter *padapter)//(struct mlme_priv *pmlmepriv)
{ {
int res; int res;
_func_enter_; _func_enter_;
@ -545,7 +545,7 @@ _func_exit_;
} }
void rtw_free_network_queue(_adapter* dev, u8 isfreeall) void rtw_free_network_queue(struct adapter* dev, u8 isfreeall)
{ {
_func_enter_; _func_enter_;
_rtw_free_network_queue(dev, isfreeall); _rtw_free_network_queue(dev, isfreeall);
@ -564,7 +564,7 @@ struct wlan_network *rtw_find_network(_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;
@ -680,7 +680,7 @@ _func_exit_;
} }
void update_network(WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src, void update_network(WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src,
_adapter * padapter, bool update_ie) struct adapter * padapter, bool update_ie)
{ {
u8 ss_ori = dst->PhyInfo.SignalStrength; u8 ss_ori = dst->PhyInfo.SignalStrength;
u8 sq_ori = dst->PhyInfo.SignalQuality; u8 sq_ori = dst->PhyInfo.SignalQuality;
@ -792,7 +792,7 @@ _func_enter_;
_func_exit_; _func_exit_;
} }
static void update_current_network(_adapter *adapter, WLAN_BSSID_EX *pnetwork) static void update_current_network(struct adapter *adapter, WLAN_BSSID_EX *pnetwork)
{ {
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
@ -828,7 +828,7 @@ Caller must hold pmlmepriv->lock first.
*/ */
void rtw_update_scanned_network(_adapter *adapter, WLAN_BSSID_EX *target) void rtw_update_scanned_network(struct adapter *adapter, WLAN_BSSID_EX *target)
{ {
_irqL irqL; _irqL irqL;
_list *plist, *phead; _list *plist, *phead;
@ -966,11 +966,11 @@ exit:
_func_exit_; _func_exit_;
} }
void rtw_add_network(_adapter *adapter, WLAN_BSSID_EX *pnetwork); void rtw_add_network(struct adapter *adapter, WLAN_BSSID_EX *pnetwork);
void rtw_add_network(_adapter *adapter, WLAN_BSSID_EX *pnetwork) void rtw_add_network(struct adapter *adapter, WLAN_BSSID_EX *pnetwork)
{ {
_irqL irqL; _irqL irqL;
struct mlme_priv *pmlmepriv = &(((_adapter *)adapter)->mlmepriv); struct mlme_priv *pmlmepriv = &(((struct adapter *)adapter)->mlmepriv);
//_queue *queue = &(pmlmepriv->scanned_queue); //_queue *queue = &(pmlmepriv->scanned_queue);
_func_enter_; _func_enter_;
@ -996,8 +996,8 @@ _func_exit_;
// (3) WMM // (3) WMM
// (4) HT // (4) HT
// (5) others // (5) others
int rtw_is_desired_network(_adapter *adapter, struct wlan_network *pnetwork); int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *pnetwork);
int rtw_is_desired_network(_adapter *adapter, struct wlan_network *pnetwork) int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *pnetwork)
{ {
struct security_priv *psecuritypriv = &adapter->securitypriv; struct security_priv *psecuritypriv = &adapter->securitypriv;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv; struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
@ -1058,7 +1058,7 @@ int rtw_is_desired_network(_adapter *adapter, struct wlan_network *pnetwork)
} }
/* TODO: Perry : For Power Management */ /* 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_;
@ -1068,7 +1068,7 @@ _func_exit_;
} }
void rtw_survey_event_callback(_adapter *adapter, u8 *pbuf) void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf)
{ {
_irqL irqL; _irqL irqL;
u32 len; u32 len;
@ -1134,7 +1134,7 @@ _func_exit_;
void rtw_surveydone_event_callback(_adapter *adapter, u8 *pbuf) void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)
{ {
_irqL irqL; _irqL irqL;
u8 timer_cancelled = _FALSE; u8 timer_cancelled = _FALSE;
@ -1310,12 +1310,12 @@ _func_exit_;
} }
void rtw_dummy_event_callback(_adapter *adapter , u8 *pbuf) void rtw_dummy_event_callback(struct adapter *adapter , u8 *pbuf)
{ {
} }
void rtw_fwdbg_event_callback(_adapter *adapter , u8 *pbuf) void rtw_fwdbg_event_callback(struct adapter *adapter , u8 *pbuf)
{ {
} }
@ -1354,7 +1354,7 @@ _func_exit_;
/* /*
*rtw_free_assoc_resources: the caller has to lock pmlmepriv->lock *rtw_free_assoc_resources: the caller has to lock pmlmepriv->lock
*/ */
void rtw_free_assoc_resources(_adapter *adapter, int lock_scanned_queue) void rtw_free_assoc_resources(struct adapter *adapter, int lock_scanned_queue)
{ {
_irqL irqL; _irqL irqL;
struct wlan_network* pwlan = NULL; struct wlan_network* pwlan = NULL;
@ -1468,7 +1468,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;
@ -1526,7 +1526,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);
@ -1587,12 +1587,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;
@ -1624,7 +1624,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;
@ -1734,7 +1734,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);
@ -1812,7 +1812,7 @@ static void rtw_joinbss_update_network(_adapter *padapter, struct wlan_network *
//if join_res > 0, update "cur_network->network" from "pnetwork->network" if (ptarget_wlan !=NULL). //if join_res > 0, update "cur_network->network" from "pnetwork->network" if (ptarget_wlan !=NULL).
// //
//#define REJOIN //#define REJOIN
void rtw_joinbss_event_prehandle(_adapter *adapter, u8 *pbuf) void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)
{ {
_irqL irqL,irqL2; _irqL irqL,irqL2;
static u8 retry=0; static u8 retry=0;
@ -2004,7 +2004,7 @@ ignore_joinbss_callback:
_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;
@ -2025,7 +2025,7 @@ _func_enter_;
_func_exit_; _func_exit_;
} }
u8 search_max_mac_id(_adapter *padapter) 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
@ -2068,7 +2068,7 @@ u8 search_max_mac_id(_adapter *padapter)
} }
//FOR STA, AP ,AD-HOC mode //FOR STA, AP ,AD-HOC mode
void rtw_sta_media_status_rpt(_adapter *adapter,struct sta_info *psta, u32 mstatus) void rtw_sta_media_status_rpt(struct adapter *adapter,struct sta_info *psta, u32 mstatus)
{ {
u16 media_status_rpt; u16 media_status_rpt;
@ -2084,7 +2084,7 @@ void rtw_sta_media_status_rpt(_adapter *adapter,struct sta_info *psta, u32 mstat
rtw_hal_set_hwreg(adapter,HW_VAR_H2C_MEDIA_STATUS_RPT,(u8 *)&media_status_rpt); rtw_hal_set_hwreg(adapter,HW_VAR_H2C_MEDIA_STATUS_RPT,(u8 *)&media_status_rpt);
} }
void rtw_stassoc_event_callback(_adapter *adapter, u8 *pbuf) void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)
{ {
_irqL irqL; _irqL irqL;
struct sta_info *psta; struct sta_info *psta;
@ -2207,7 +2207,7 @@ _func_exit_;
} }
void rtw_stadel_event_callback(_adapter *adapter, u8 *pbuf) void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)
{ {
_irqL irqL,irqL2; _irqL irqL,irqL2;
int mac_id=-1; int mac_id=-1;
@ -2353,7 +2353,7 @@ _func_exit_;
} }
void rtw_cpwm_event_callback(PADAPTER padapter, u8 *pbuf) void rtw_cpwm_event_callback(struct adapter *padapter, u8 *pbuf)
{ {
#ifdef CONFIG_LPS_LCLK #ifdef CONFIG_LPS_LCLK
struct reportpwrstate_parm *preportpwrstate; struct reportpwrstate_parm *preportpwrstate;
@ -2374,9 +2374,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)
{ {
_irqL irqL; _irqL irqL;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv; struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
@ -2452,9 +2452,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)
{ {
_irqL irqL; _irqL irqL;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv; struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
@ -2471,7 +2471,7 @@ void rtw_scan_timeout_handler (_adapter *adapter)
} }
static void rtw_auto_scan_handler(_adapter *padapter) static void rtw_auto_scan_handler(struct adapter *padapter)
{ {
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct pwrctrl_priv *pwrctrlpriv = adapter_to_pwrctl(padapter); struct pwrctrl_priv *pwrctrlpriv = adapter_to_pwrctl(padapter);
@ -2520,14 +2520,14 @@ static void rtw_auto_scan_handler(_adapter *padapter)
} }
void rtw_dynamic_check_timer_handlder(_adapter *adapter) void rtw_dynamic_check_timer_handlder(struct adapter *adapter)
{ {
#ifdef CONFIG_AP_MODE #ifdef CONFIG_AP_MODE
struct mlme_priv *pmlmepriv = &adapter->mlmepriv; struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
#endif //CONFIG_AP_MODE #endif //CONFIG_AP_MODE
struct registry_priv *pregistrypriv = &adapter->registrypriv; struct registry_priv *pregistrypriv = &adapter->registrypriv;
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
PADAPTER pbuddy_adapter = adapter->pbuddy_adapter; struct adapter *pbuddy_adapter = adapter->pbuddy_adapter;
#endif #endif
if(!adapter) if(!adapter)
@ -2600,7 +2600,7 @@ void rtw_dynamic_check_timer_handlder(_adapter *adapter)
&& (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == _TRUE) ) && (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == _TRUE) )
{ {
// expire NAT2.5 entry // expire NAT2.5 entry
void nat25_db_expire(_adapter *priv); void nat25_db_expire(struct adapter *priv);
nat25_db_expire(adapter); nat25_db_expire(adapter);
if (adapter->pppoe_connection_in_progress > 0) { if (adapter->pppoe_connection_in_progress > 0) {
@ -2623,13 +2623,13 @@ void rtw_dynamic_check_timer_handlder(_adapter *adapter)
#ifdef CONFIG_SET_SCAN_DENY_TIMER #ifdef CONFIG_SET_SCAN_DENY_TIMER
inline bool rtw_is_scan_deny(_adapter *adapter) inline bool rtw_is_scan_deny(struct adapter *adapter)
{ {
struct mlme_priv *mlmepriv = &adapter->mlmepriv; struct mlme_priv *mlmepriv = &adapter->mlmepriv;
return (ATOMIC_READ(&mlmepriv->set_scan_deny) != 0) ? _TRUE : _FALSE; return (ATOMIC_READ(&mlmepriv->set_scan_deny) != 0) ? _TRUE : _FALSE;
} }
inline void rtw_clear_scan_deny(_adapter *adapter) inline void rtw_clear_scan_deny(struct adapter *adapter)
{ {
struct mlme_priv *mlmepriv = &adapter->mlmepriv; struct mlme_priv *mlmepriv = &adapter->mlmepriv;
ATOMIC_SET(&mlmepriv->set_scan_deny, 0); ATOMIC_SET(&mlmepriv->set_scan_deny, 0);
@ -2637,12 +2637,12 @@ inline void rtw_clear_scan_deny(_adapter *adapter)
DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(adapter)); DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(adapter));
} }
void rtw_set_scan_deny_timer_hdl(_adapter *adapter) void rtw_set_scan_deny_timer_hdl(struct adapter *adapter)
{ {
rtw_clear_scan_deny(adapter); rtw_clear_scan_deny(adapter);
} }
void rtw_set_scan_deny(_adapter *adapter, u32 ms) void rtw_set_scan_deny(struct adapter *adapter, u32 ms)
{ {
struct mlme_priv *mlmepriv = &adapter->mlmepriv; struct mlme_priv *mlmepriv = &adapter->mlmepriv;
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
@ -2669,7 +2669,7 @@ void rtw_set_scan_deny(_adapter *adapter, u32 ms)
#endif #endif
#ifdef CONFIG_DETECT_C2H_BY_POLLING #ifdef CONFIG_DETECT_C2H_BY_POLLING
void rtw_event_polling_timer_hdl(_adapter *adapter) void rtw_event_polling_timer_hdl(struct adapter *adapter)
{ {
rtw_event_polling_cmd(adapter); rtw_event_polling_cmd(adapter);
} }
@ -2690,7 +2690,7 @@ static int rtw_check_join_candidate(struct mlme_priv *pmlmepriv
, struct wlan_network **candidate, struct wlan_network *competitor) , 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
@ -2762,7 +2762,7 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv )
_irqL irqL; _irqL irqL;
int ret; int ret;
_list *phead; _list *phead;
_adapter *adapter; struct adapter *adapter;
_queue *queue = &(pmlmepriv->scanned_queue); _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;
@ -2772,7 +2772,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 );
@ -2856,7 +2856,7 @@ _func_exit_;
return ret; return ret;
} }
sint rtw_set_auth(_adapter * adapter,struct security_priv *psecuritypriv) sint rtw_set_auth(struct adapter * adapter,struct security_priv *psecuritypriv)
{ {
struct cmd_obj* pcmd; struct cmd_obj* pcmd;
struct setauth_parm *psetauthparm; struct setauth_parm *psetauthparm;
@ -2903,7 +2903,7 @@ _func_exit_;
} }
sint rtw_set_key(_adapter * adapter,struct security_priv *psecuritypriv,sint keyid, u8 set_tx, bool enqueue) sint rtw_set_key(struct adapter * adapter,struct security_priv *psecuritypriv,sint keyid, u8 set_tx, bool enqueue)
{ {
u8 keylen; u8 keylen;
struct cmd_obj *pcmd; struct cmd_obj *pcmd;
@ -2998,7 +2998,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;
@ -3052,7 +3052,7 @@ int rtw_restruct_wmm_ie(_adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_len, u
// //
// //
static int SecIsInPMKIDList(_adapter *Adapter, u8 *bssid) static int SecIsInPMKIDList(struct adapter *Adapter, u8 *bssid)
{ {
struct security_priv *psecuritypriv=&Adapter->securitypriv; struct security_priv *psecuritypriv=&Adapter->securitypriv;
int i=0; int i=0;
@ -3093,7 +3093,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;
@ -3112,7 +3112,7 @@ static int rtw_append_pmkid(_adapter *Adapter,int iEntry, u8 *ie, uint ie_len)
return (ie_len); return (ie_len);
} }
sint rtw_restruct_sec_ie(_adapter *adapter,u8 *in_ie, u8 *out_ie, uint in_len) sint rtw_restruct_sec_ie(struct adapter *adapter,u8 *in_ie, u8 *out_ie, uint in_len)
{ {
u8 authmode, securitytype, match; u8 authmode, securitytype, match;
u8 sec_ie[255], uncst_oui[4], bkup_ie[255]; u8 sec_ie[255], uncst_oui[4], bkup_ie[255];
@ -3183,7 +3183,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;
@ -3208,7 +3208,7 @@ _func_exit_;
} }
void rtw_update_registrypriv_dev_network(_adapter* adapter) void rtw_update_registrypriv_dev_network(struct adapter* adapter)
{ {
int sz=0; int sz=0;
struct registry_priv* pregistrypriv = &adapter->registrypriv; struct registry_priv* pregistrypriv = &adapter->registrypriv;
@ -3285,7 +3285,7 @@ _func_exit_;
} }
void rtw_get_encrypt_decrypt_from_registrypriv(_adapter* adapter) void rtw_get_encrypt_decrypt_from_registrypriv(struct adapter* adapter)
{ {
_func_enter_; _func_enter_;
@ -3295,7 +3295,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;
@ -3343,7 +3343,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;
@ -3413,7 +3413,7 @@ unsigned int rtw_restructure_ht_ie(_adapter *padapter, u8 *in_ie, u8 *out_ie, ui
} }
//the fucntion is > passive_level (in critical_section) //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;
@ -3599,7 +3599,7 @@ void rtw_update_ht_cap(_adapter *padapter, u8 *pie, uint ie_len)
} }
void rtw_issue_addbareq_cmd(_adapter *padapter, struct xmit_frame *pxmitframe) void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitframe)
{ {
u8 issued; u8 issued;
int priority; int priority;
@ -3655,19 +3655,19 @@ void rtw_issue_addbareq_cmd(_adapter *padapter, struct xmit_frame *pxmitframe)
#endif #endif
#ifdef CONFIG_LAYER2_ROAMING #ifdef CONFIG_LAYER2_ROAMING
inline void rtw_set_roaming(_adapter *adapter, u8 to_roaming) inline void rtw_set_roaming(struct adapter *adapter, u8 to_roaming)
{ {
if (to_roaming == 0) if (to_roaming == 0)
adapter->mlmepriv.to_join = _FALSE; adapter->mlmepriv.to_join = _FALSE;
adapter->mlmepriv.to_roaming = to_roaming; adapter->mlmepriv.to_roaming = to_roaming;
} }
inline u8 rtw_to_roaming(_adapter *adapter) inline u8 rtw_to_roaming(struct adapter *adapter)
{ {
return adapter->mlmepriv.to_roaming; return adapter->mlmepriv.to_roaming;
} }
void rtw_roaming(_adapter *padapter, struct wlan_network *tgt_network) void rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_network)
{ {
_irqL irqL; _irqL irqL;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -3676,7 +3676,7 @@ void rtw_roaming(_adapter *padapter, struct wlan_network *tgt_network)
_rtw_roaming(padapter, tgt_network); _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;
@ -3721,7 +3721,7 @@ void _rtw_roaming(_adapter *padapter, struct wlan_network *tgt_network)
} }
#endif #endif
sint rtw_linked_check(_adapter *padapter) sint rtw_linked_check(struct adapter *padapter)
{ {
if( (check_fwstate(&padapter->mlmepriv, WIFI_AP_STATE) == _TRUE) || if( (check_fwstate(&padapter->mlmepriv, WIFI_AP_STATE) == _TRUE) ||
(check_fwstate(&padapter->mlmepriv, WIFI_ADHOC_STATE|WIFI_ADHOC_MASTER_STATE) == _TRUE)) (check_fwstate(&padapter->mlmepriv, WIFI_ADHOC_STATE|WIFI_ADHOC_MASTER_STATE) == _TRUE))
@ -3738,7 +3738,7 @@ sint rtw_linked_check(_adapter *padapter)
} }
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
sint rtw_buddy_adapter_up(_adapter *padapter) sint rtw_buddy_adapter_up(struct adapter *padapter)
{ {
sint res = _FALSE; sint res = _FALSE;
@ -3764,7 +3764,7 @@ sint rtw_buddy_adapter_up(_adapter *padapter)
} }
sint check_buddy_fwstate(_adapter *padapter, sint state) sint check_buddy_fwstate(struct adapter *padapter, sint state)
{ {
if(padapter == NULL) if(padapter == NULL)
return _FALSE; return _FALSE;
@ -3782,7 +3782,7 @@ sint check_buddy_fwstate(_adapter *padapter, sint state)
return _FALSE; return _FALSE;
} }
u8 rtw_get_buddy_bBusyTraffic(_adapter *padapter) u8 rtw_get_buddy_bBusyTraffic(struct adapter *padapter)
{ {
if(padapter == NULL) if(padapter == NULL)
return _FALSE; return _FALSE;

310
core/rtw_mlme_ext.c
View file

File diff suppressed because it is too large Load diff

18
core/rtw_odm.c
View file

@ -101,7 +101,7 @@ const char *odm_dbg_level_str[] = {
#define RTW_ODM_DBG_LEVEL_NUM 6 #define RTW_ODM_DBG_LEVEL_NUM 6
int _rtw_odm_dbg_comp_msg(_adapter *adapter, char *buf, int len) int _rtw_odm_dbg_comp_msg(struct adapter *adapter, char *buf, int len)
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(adapter);
DM_ODM_T *odm = &pHalData->odmpriv; DM_ODM_T *odm = &pHalData->odmpriv;
@ -120,7 +120,7 @@ int _rtw_odm_dbg_comp_msg(_adapter *adapter, char *buf, int len)
return cnt; return cnt;
} }
void rtw_odm_dbg_comp_msg(_adapter *adapter) void rtw_odm_dbg_comp_msg(struct adapter *adapter)
{ {
char buf[768] = {0}; char buf[768] = {0};
@ -128,12 +128,12 @@ void rtw_odm_dbg_comp_msg(_adapter *adapter)
DBG_871X_LEVEL(_drv_always_, "\n%s", buf); DBG_871X_LEVEL(_drv_always_, "\n%s", buf);
} }
inline void rtw_odm_dbg_comp_set(_adapter *adapter, u64 comps) inline void rtw_odm_dbg_comp_set(struct adapter *adapter, u64 comps)
{ {
rtw_hal_set_def_var(adapter, HW_DEF_ODM_DBG_FLAG, &comps); rtw_hal_set_def_var(adapter, HW_DEF_ODM_DBG_FLAG, &comps);
} }
int _rtw_odm_dbg_level_msg(_adapter *adapter, char *buf, int len) int _rtw_odm_dbg_level_msg(struct adapter *adapter, char *buf, int len)
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(adapter);
DM_ODM_T *odm = &pHalData->odmpriv; DM_ODM_T *odm = &pHalData->odmpriv;
@ -151,7 +151,7 @@ int _rtw_odm_dbg_level_msg(_adapter *adapter, char *buf, int len)
return cnt; return cnt;
} }
void rtw_odm_dbg_level_msg(_adapter *adapter) void rtw_odm_dbg_level_msg(struct adapter *adapter)
{ {
char buf[100] = {0}; char buf[100] = {0};
@ -159,12 +159,12 @@ void rtw_odm_dbg_level_msg(_adapter *adapter)
DBG_871X_LEVEL(_drv_always_, "\n%s", buf); DBG_871X_LEVEL(_drv_always_, "\n%s", buf);
} }
inline void rtw_odm_dbg_level_set(_adapter *adapter, u32 level) inline void rtw_odm_dbg_level_set(struct adapter *adapter, u32 level)
{ {
rtw_hal_set_def_var(adapter, HW_DEF_ODM_DBG_LEVEL, &level); rtw_hal_set_def_var(adapter, HW_DEF_ODM_DBG_LEVEL, &level);
} }
int _rtw_odm_adaptivity_parm_msg(_adapter *adapter, char *buf, int len) int _rtw_odm_adaptivity_parm_msg(struct adapter *adapter, char *buf, int len)
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(adapter);
DM_ODM_T *odm = &pHalData->odmpriv; DM_ODM_T *odm = &pHalData->odmpriv;
@ -182,7 +182,7 @@ int _rtw_odm_adaptivity_parm_msg(_adapter *adapter, char *buf, int len)
); );
} }
void rtw_odm_adaptivity_parm_msg(_adapter *adapter) void rtw_odm_adaptivity_parm_msg(struct adapter *adapter)
{ {
char buf[256] = {0}; char buf[256] = {0};
@ -190,7 +190,7 @@ void rtw_odm_adaptivity_parm_msg(_adapter *adapter)
DBG_871X_LEVEL(_drv_always_, "\n%s", buf); DBG_871X_LEVEL(_drv_always_, "\n%s", buf);
} }
void rtw_odm_adaptivity_parm_set(_adapter *adapter, s8 TH_L2H_ini, s8 TH_EDCCA_HL_diff, void rtw_odm_adaptivity_parm_set(struct adapter *adapter, s8 TH_L2H_ini, s8 TH_EDCCA_HL_diff,
s8 IGI_Base, bool ForceEDCCA, u8 AdapEn_RSSI, u8 IGI_LowerBound) s8 IGI_Base, bool ForceEDCCA, u8 AdapEn_RSSI, u8 IGI_LowerBound)
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(adapter);

128
core/rtw_p2p.c
View file

@ -40,7 +40,7 @@ int rtw_p2p_is_channel_list_ok( u8 desired_ch, u8* ch_list, u8 ch_cnt )
return( found ); return( found );
} }
int is_any_client_associated(_adapter *padapter) int is_any_client_associated(struct adapter *padapter)
{ {
return padapter->stapriv.asoc_list_cnt ? _TRUE : _FALSE; return padapter->stapriv.asoc_list_cnt ? _TRUE : _FALSE;
} }
@ -53,7 +53,7 @@ static u32 go_add_group_info_attr(struct wifidirect_info *pwdinfo, u8 *pbuf)
u16 attr_len = 0; 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_871X("%s\n", __FUNCTION__); DBG_871X("%s\n", __FUNCTION__);
@ -153,7 +153,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
@ -212,7 +212,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;
@ -281,7 +281,7 @@ static void issue_p2p_devdisc_resp(struct wifidirect_info *pwdinfo, u8 *da, u8 s
static void issue_p2p_provision_resp(struct wifidirect_info *pwdinfo, u8* raddr, u8* frame_body, u16 config_method) 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.
@ -396,7 +396,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
@ -535,7 +535,7 @@ u32 build_beacon_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
{ {
u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 }; u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 };
u32 len=0, wfdielen = 0; u32 len=0, wfdielen = 0;
_adapter *padapter = pwdinfo->padapter; struct adapter *padapter = pwdinfo->padapter;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info; struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info;
@ -652,7 +652,7 @@ u32 build_probe_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
{ {
u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 }; u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 };
u32 len=0, wfdielen = 0; u32 len=0, wfdielen = 0;
_adapter *padapter = pwdinfo->padapter; struct adapter *padapter = pwdinfo->padapter;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info; struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info;
@ -765,7 +765,7 @@ u32 build_probe_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf, u8 tunnel
{ {
u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 }; u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 };
u32 len=0, wfdielen = 0; u32 len=0, wfdielen = 0;
_adapter *padapter = pwdinfo->padapter; struct adapter *padapter = pwdinfo->padapter;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info; struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info;
@ -960,7 +960,7 @@ u32 build_assoc_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
{ {
u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 }; u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 };
u32 len=0, wfdielen = 0; u32 len=0, wfdielen = 0;
_adapter *padapter = NULL; struct adapter *padapter = NULL;
struct mlme_priv *pmlmepriv = NULL; struct mlme_priv *pmlmepriv = NULL;
struct wifi_display_info *pwfd_info = NULL; struct wifi_display_info *pwfd_info = NULL;
@ -1067,7 +1067,7 @@ u32 build_assoc_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
{ {
u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 }; u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 };
u32 len=0, wfdielen = 0; u32 len=0, wfdielen = 0;
_adapter *padapter = pwdinfo->padapter; struct adapter *padapter = pwdinfo->padapter;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info; struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info;
@ -1165,7 +1165,7 @@ u32 build_nego_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
{ {
u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 }; u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 };
u32 len=0, wfdielen = 0; u32 len=0, wfdielen = 0;
_adapter *padapter = pwdinfo->padapter; struct adapter *padapter = pwdinfo->padapter;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info; struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info;
@ -1263,7 +1263,7 @@ u32 build_nego_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
{ {
u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 }; u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 };
u32 len=0, wfdielen = 0; u32 len=0, wfdielen = 0;
_adapter *padapter = pwdinfo->padapter; struct adapter *padapter = pwdinfo->padapter;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info; struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info;
@ -1362,7 +1362,7 @@ u32 build_nego_confirm_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
{ {
u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 }; u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 };
u32 len=0, wfdielen = 0; u32 len=0, wfdielen = 0;
_adapter *padapter = pwdinfo->padapter; struct adapter *padapter = pwdinfo->padapter;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info; struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info;
@ -1461,7 +1461,7 @@ u32 build_invitation_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
{ {
u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 }; u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 };
u32 len=0, wfdielen = 0; u32 len=0, wfdielen = 0;
_adapter *padapter = pwdinfo->padapter; struct adapter *padapter = pwdinfo->padapter;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info; struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info;
@ -1574,7 +1574,7 @@ u32 build_invitation_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
{ {
u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 }; u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 };
u32 len=0, wfdielen = 0; u32 len=0, wfdielen = 0;
_adapter *padapter = pwdinfo->padapter; struct adapter *padapter = pwdinfo->padapter;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info; struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info;
@ -1687,7 +1687,7 @@ u32 build_provdisc_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
{ {
u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 }; u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 };
u32 len=0, wfdielen = 0; u32 len=0, wfdielen = 0;
_adapter *padapter = pwdinfo->padapter; struct adapter *padapter = pwdinfo->padapter;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info; struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info;
@ -1786,7 +1786,7 @@ u32 build_provdisc_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
{ {
u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 }; u8 wfdie[ MAX_WFD_IE_LEN] = { 0x00 };
u32 len=0, wfdielen = 0; u32 len=0, wfdielen = 0;
_adapter *padapter = pwdinfo->padapter; struct adapter *padapter = pwdinfo->padapter;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info; struct wifi_display_info* pwfd_info = padapter->wdinfo.wfd_info;
@ -2503,7 +2503,7 @@ u32 process_p2p_devdisc_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint le
u8 *frame_body; u8 *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;
@ -2707,7 +2707,7 @@ u8 rtw_p2p_ch_inclusion(struct mlme_ext_priv *pmlmeext, u8 *peer_ch_list, u8 pee
u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe, uint len ) 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;
@ -2724,7 +2724,7 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe
#endif // CONFIG_TDLS #endif // CONFIG_TDLS
#endif // CONFIG_WFD #endif // CONFIG_WFD
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
_adapter *pbuddy_adapter = pwdinfo->padapter->pbuddy_adapter; struct adapter *pbuddy_adapter = pwdinfo->padapter->pbuddy_adapter;
struct wifidirect_info *pbuddy_wdinfo = &pbuddy_adapter->wdinfo; struct wifidirect_info *pbuddy_wdinfo = &pbuddy_adapter->wdinfo;
struct mlme_priv *pbuddy_mlmepriv = &pbuddy_adapter->mlmepriv; struct mlme_priv *pbuddy_mlmepriv = &pbuddy_adapter->mlmepriv;
struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv;
@ -2943,7 +2943,7 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe
u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pframe, uint len ) 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;
@ -3317,7 +3317,7 @@ u8 process_p2p_presence_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint le
return _TRUE; return _TRUE;
} }
void find_phase_handler( _adapter* padapter ) 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;
@ -3341,9 +3341,9 @@ _func_enter_;
_func_exit_; _func_exit_;
} }
void p2p_concurrent_handler( _adapter* padapter ); void p2p_concurrent_handler( struct adapter* padapter );
void restore_p2p_state_handler( _adapter* padapter ) void restore_p2p_state_handler( struct adapter* padapter )
{ {
struct wifidirect_info *pwdinfo = &padapter->wdinfo; struct wifidirect_info *pwdinfo = &padapter->wdinfo;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -3358,7 +3358,7 @@ _func_enter_;
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
if ( check_buddy_fwstate(padapter, _FW_LINKED ) ) if ( check_buddy_fwstate(padapter, _FW_LINKED ) )
{ {
_adapter *pbuddy_adapter = padapter->pbuddy_adapter; struct adapter *pbuddy_adapter = padapter->pbuddy_adapter;
struct mlme_priv *pbuddy_mlmepriv = &pbuddy_adapter->mlmepriv; struct mlme_priv *pbuddy_mlmepriv = &pbuddy_adapter->mlmepriv;
struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv;
@ -3386,7 +3386,7 @@ _func_enter_;
_func_exit_; _func_exit_;
} }
void pre_tx_invitereq_handler( _adapter* padapter ) 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;
@ -3400,7 +3400,7 @@ _func_enter_;
_func_exit_; _func_exit_;
} }
void pre_tx_provdisc_handler( _adapter* padapter ) 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;
@ -3414,7 +3414,7 @@ _func_enter_;
_func_exit_; _func_exit_;
} }
void pre_tx_negoreq_handler( _adapter* padapter ) 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;
@ -3429,10 +3429,10 @@ _func_exit_;
} }
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
void p2p_concurrent_handler( _adapter* padapter ) void p2p_concurrent_handler( struct adapter* padapter )
{ {
struct wifidirect_info *pwdinfo = &padapter->wdinfo; struct wifidirect_info *pwdinfo = &padapter->wdinfo;
//_adapter *pbuddy_adapter = padapter->pbuddy_adapter; //struct adapter *pbuddy_adapter = padapter->pbuddy_adapter;
//struct wifidirect_info *pbuddy_wdinfo = &pbuddy_adapter->wdinfo; //struct wifidirect_info *pbuddy_wdinfo = &pbuddy_adapter->wdinfo;
//struct mlme_priv *pbuddy_mlmepriv = &pbuddy_adapter->mlmepriv; //struct mlme_priv *pbuddy_mlmepriv = &pbuddy_adapter->mlmepriv;
//struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; //struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv;
@ -3441,7 +3441,7 @@ _func_enter_;
if ( check_buddy_fwstate(padapter, _FW_LINKED ) ) if ( check_buddy_fwstate(padapter, _FW_LINKED ) )
{ {
PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; struct adapter *pbuddy_adapter = padapter->pbuddy_adapter;
struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv;
pwdinfo->operating_channel = pbuddy_mlmeext->cur_channel; pwdinfo->operating_channel = pbuddy_mlmeext->cur_channel;
@ -3549,7 +3549,7 @@ _func_exit_;
#endif #endif
#ifdef CONFIG_IOCTL_CFG80211 #ifdef CONFIG_IOCTL_CFG80211
static void ro_ch_handler(_adapter *padapter) static void ro_ch_handler(struct adapter *padapter)
{ {
struct cfg80211_wifidirect_info *pcfg80211_wdinfo = &padapter->cfg80211_wdinfo; struct cfg80211_wifidirect_info *pcfg80211_wdinfo = &padapter->cfg80211_wdinfo;
struct wifidirect_info *pwdinfo = &padapter->wdinfo; struct wifidirect_info *pwdinfo = &padapter->wdinfo;
@ -3600,7 +3600,7 @@ _func_exit_;
static void ro_ch_timer_process (void *FunctionContext) static void ro_ch_timer_process (void *FunctionContext)
{ {
_adapter *adapter = (_adapter *)FunctionContext; struct adapter *adapter = (struct adapter *)FunctionContext;
struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(adapter->rtw_wdev); struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(adapter->rtw_wdev);
//printk("%s \n", __FUNCTION__); //printk("%s \n", __FUNCTION__);
@ -3612,11 +3612,11 @@ static void ro_ch_timer_process (void *FunctionContext)
p2p_protocol_wk_cmd( adapter, P2P_RO_CH_WK); p2p_protocol_wk_cmd( adapter, P2P_RO_CH_WK);
} }
static void rtw_change_p2pie_op_ch(_adapter *padapter, const u8 *frame_body, u32 len, u8 ch) static void rtw_change_p2pie_op_ch(struct adapter *padapter, const u8 *frame_body, u32 len, u8 ch)
{ {
u8 *ies, *p2p_ie; u8 *ies, *p2p_ie;
u32 ies_len, p2p_ielen; u32 ies_len, p2p_ielen;
PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; struct adapter *pbuddy_adapter = padapter->pbuddy_adapter;
struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv;
ies = (u8*)(frame_body + _PUBLIC_ACTION_IE_OFFSET_); ies = (u8*)(frame_body + _PUBLIC_ACTION_IE_OFFSET_);
@ -3641,11 +3641,11 @@ static void rtw_change_p2pie_op_ch(_adapter *padapter, const u8 *frame_body, u32
} }
} }
static void rtw_change_p2pie_ch_list(_adapter *padapter, const u8 *frame_body, u32 len, u8 ch) static void rtw_change_p2pie_ch_list(struct adapter *padapter, const u8 *frame_body, u32 len, u8 ch)
{ {
u8 *ies, *p2p_ie; u8 *ies, *p2p_ie;
u32 ies_len, p2p_ielen; u32 ies_len, p2p_ielen;
PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; struct adapter *pbuddy_adapter = padapter->pbuddy_adapter;
struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv;
ies = (u8*)(frame_body + _PUBLIC_ACTION_IE_OFFSET_); ies = (u8*)(frame_body + _PUBLIC_ACTION_IE_OFFSET_);
@ -3681,13 +3681,13 @@ static void rtw_change_p2pie_ch_list(_adapter *padapter, const u8 *frame_body, u
} }
} }
static bool rtw_chk_p2pie_ch_list_with_buddy(_adapter *padapter, const u8 *frame_body, u32 len) static bool rtw_chk_p2pie_ch_list_with_buddy(struct adapter *padapter, const u8 *frame_body, u32 len)
{ {
bool fit = _FALSE; bool fit = _FALSE;
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
u8 *ies, *p2p_ie; u8 *ies, *p2p_ie;
u32 ies_len, p2p_ielen; u32 ies_len, p2p_ielen;
PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; struct adapter *pbuddy_adapter = padapter->pbuddy_adapter;
struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv;
u8 buddy_ch = pbuddy_mlmeext->cur_channel; u8 buddy_ch = pbuddy_mlmeext->cur_channel;
@ -3731,13 +3731,13 @@ static bool rtw_chk_p2pie_ch_list_with_buddy(_adapter *padapter, const u8 *frame
return fit; return fit;
} }
static bool rtw_chk_p2pie_op_ch_with_buddy(_adapter *padapter, const u8 *frame_body, u32 len) static bool rtw_chk_p2pie_op_ch_with_buddy(struct adapter *padapter, const u8 *frame_body, u32 len)
{ {
bool fit = _FALSE; bool fit = _FALSE;
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
u8 *ies, *p2p_ie; u8 *ies, *p2p_ie;
u32 ies_len, p2p_ielen; u32 ies_len, p2p_ielen;
PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; struct adapter *pbuddy_adapter = padapter->pbuddy_adapter;
struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv;
u8 buddy_ch = pbuddy_mlmeext->cur_channel; u8 buddy_ch = pbuddy_mlmeext->cur_channel;
@ -3773,7 +3773,7 @@ static void rtw_cfg80211_adjust_p2pie_channel(_adapter *padapter, const u8 *fram
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
u8 *ies, *p2p_ie; u8 *ies, *p2p_ie;
u32 ies_len, p2p_ielen; u32 ies_len, p2p_ielen;
PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; struct adapter *pbuddy_adapter = padapter->pbuddy_adapter;
struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv;
ies = (u8*)(frame_body + _PUBLIC_ACTION_IE_OFFSET_); ies = (u8*)(frame_body + _PUBLIC_ACTION_IE_OFFSET_);
@ -3824,7 +3824,7 @@ static void rtw_cfg80211_adjust_p2pie_channel(_adapter *padapter, const u8 *fram
} }
#ifdef CONFIG_WFD #ifdef CONFIG_WFD
void rtw_append_wfd_ie(_adapter *padapter, u8 *buf, u32* len) void rtw_append_wfd_ie(struct adapter *padapter, u8 *buf, u32* len)
{ {
unsigned char *frame_body; unsigned char *frame_body;
u8 category, action, OUI_Subtype, dialogToken=0; u8 category, action, OUI_Subtype, dialogToken=0;
@ -4003,7 +4003,7 @@ bool rtw_p2p_nego_intent_compare(u8 req, u8 resp)
return _FALSE; return _FALSE;
} }
int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx) int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx)
{ {
int is_p2p_frame = (-1); int is_p2p_frame = (-1);
unsigned char *frame_body; unsigned char *frame_body;
@ -4373,7 +4373,7 @@ int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx)
return is_p2p_frame; return is_p2p_frame;
} }
void rtw_init_cfg80211_wifidirect_info( _adapter* padapter) void rtw_init_cfg80211_wifidirect_info( struct adapter* padapter)
{ {
struct cfg80211_wifidirect_info *pcfg80211_wdinfo = &padapter->cfg80211_wdinfo; struct cfg80211_wifidirect_info *pcfg80211_wdinfo = &padapter->cfg80211_wdinfo;
@ -4383,7 +4383,7 @@ void rtw_init_cfg80211_wifidirect_info( _adapter* padapter)
} }
#endif //CONFIG_IOCTL_CFG80211 #endif //CONFIG_IOCTL_CFG80211
void p2p_protocol_wk_hdl(_adapter *padapter, int intCmdType) void p2p_protocol_wk_hdl(struct adapter *padapter, int intCmdType)
{ {
struct wifidirect_info *pwdinfo= &(padapter->wdinfo); struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
@ -4472,7 +4472,7 @@ _func_exit_;
} }
#ifdef CONFIG_P2P_PS #ifdef CONFIG_P2P_PS
void process_p2p_ps_ie(PADAPTER padapter, u8 *IEs, u32 IELength) void process_p2p_ps_ie(struct adapter *padapter, u8 *IEs, u32 IELength)
{ {
u8 * ies; u8 * ies;
u32 ies_len; u32 ies_len;
@ -4583,7 +4583,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 = adapter_to_pwrctl(padapter); struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
struct wifidirect_info *pwdinfo= &(padapter->wdinfo); struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
@ -4643,7 +4643,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;
@ -4701,7 +4701,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))
@ -4720,7 +4720,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))
@ -4739,7 +4739,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))
@ -4750,7 +4750,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;
_irqL irqL; _irqL irqL;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv; struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
@ -4795,7 +4795,7 @@ static void pre_tx_scan_timer_process (void *FunctionContext)
static void find_phase_timer_process (void *FunctionContext) 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))
@ -4809,7 +4809,7 @@ static void find_phase_timer_process (void *FunctionContext)
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
void ap_p2p_switch_timer_process (void *FunctionContext) void ap_p2p_switch_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;
#ifdef CONFIG_IOCTL_CFG80211 #ifdef CONFIG_IOCTL_CFG80211
struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(adapter->rtw_wdev); struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(adapter->rtw_wdev);
@ -4826,7 +4826,7 @@ void ap_p2p_switch_timer_process (void *FunctionContext)
} }
#endif #endif
void reset_global_wifidirect_info( _adapter* padapter ) void reset_global_wifidirect_info( struct adapter* padapter )
{ {
struct wifidirect_info *pwdinfo; struct wifidirect_info *pwdinfo;
@ -4838,7 +4838,7 @@ void reset_global_wifidirect_info( _adapter* padapter )
} }
#ifdef CONFIG_WFD #ifdef CONFIG_WFD
int rtw_init_wifi_display_info(_adapter* padapter) int rtw_init_wifi_display_info(struct adapter* padapter)
{ {
int res = _SUCCESS; int res = _SUCCESS;
struct wifi_display_info *pwfd_info = &padapter->wfd_info; struct wifi_display_info *pwfd_info = &padapter->wfd_info;
@ -4862,7 +4862,7 @@ int rtw_init_wifi_display_info(_adapter* padapter)
} }
#endif //CONFIG_WFD #endif //CONFIG_WFD
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;
@ -4876,7 +4876,7 @@ void rtw_init_wifidirect_timers(_adapter* padapter)
#endif #endif
} }
void rtw_init_wifidirect_addrs(_adapter* padapter, u8 *dev_addr, u8 *iface_addr) void rtw_init_wifidirect_addrs(struct adapter* padapter, u8 *dev_addr, u8 *iface_addr)
{ {
#ifdef CONFIG_P2P #ifdef CONFIG_P2P
struct wifidirect_info *pwdinfo = &padapter->wdinfo; struct wifidirect_info *pwdinfo = &padapter->wdinfo;
@ -4891,14 +4891,14 @@ 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;
#ifdef CONFIG_WFD #ifdef CONFIG_WFD
struct wifi_display_info *pwfd_info = &padapter->wfd_info; struct wifi_display_info *pwfd_info = &padapter->wfd_info;
#endif #endif
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
_adapter *pbuddy_adapter = padapter->pbuddy_adapter; struct adapter *pbuddy_adapter = padapter->pbuddy_adapter;
struct wifidirect_info *pbuddy_wdinfo; struct wifidirect_info *pbuddy_wdinfo;
struct mlme_priv *pbuddy_mlmepriv; struct mlme_priv *pbuddy_mlmepriv;
struct mlme_ext_priv *pbuddy_mlmeext; struct mlme_ext_priv *pbuddy_mlmeext;
@ -5204,7 +5204,7 @@ void dbg_rtw_p2p_set_role(struct wifidirect_info *wdinfo, enum P2P_ROLE role, co
#endif //CONFIG_DBG_P2P #endif //CONFIG_DBG_P2P
int rtw_p2p_enable(_adapter *padapter, enum P2P_ROLE role) int rtw_p2p_enable(struct adapter *padapter, enum P2P_ROLE role)
{ {
int ret = _SUCCESS; int ret = _SUCCESS;
struct wifidirect_info *pwdinfo= &(padapter->wdinfo); struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
@ -5215,7 +5215,7 @@ int rtw_p2p_enable(_adapter *padapter, enum P2P_ROLE role)
u16 bwmode; u16 bwmode;
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
_adapter *pbuddy_adapter = padapter->pbuddy_adapter; struct adapter *pbuddy_adapter = padapter->pbuddy_adapter;
struct wifidirect_info *pbuddy_wdinfo = &pbuddy_adapter->wdinfo; struct wifidirect_info *pbuddy_wdinfo = &pbuddy_adapter->wdinfo;
// Commented by Albert 2011/12/30 // Commented by Albert 2011/12/30
// The driver just supports 1 P2P group operation. // The driver just supports 1 P2P group operation.

96
core/rtw_pwrctrl.c
View file

@ -29,7 +29,7 @@
#endif #endif
#ifdef CONFIG_IPS #ifdef CONFIG_IPS
void _ips_enter(_adapter * padapter) void _ips_enter(struct adapter * padapter)
{ {
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
@ -64,7 +64,7 @@ void _ips_enter(_adapter * padapter)
} }
void ips_enter(_adapter * padapter) void ips_enter(struct adapter * padapter)
{ {
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
@ -73,7 +73,7 @@ void ips_enter(_adapter * padapter)
_exit_pwrlock(&pwrpriv->lock); _exit_pwrlock(&pwrpriv->lock);
} }
int _ips_leave(_adapter * padapter) int _ips_leave(struct adapter * padapter)
{ {
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
int result = _SUCCESS; int result = _SUCCESS;
@ -100,7 +100,7 @@ int _ips_leave(_adapter * padapter)
return result; return result;
} }
int ips_leave(_adapter * padapter) int ips_leave(struct adapter * padapter)
{ {
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
int ret; int ret;
@ -114,18 +114,18 @@ int ips_leave(_adapter * padapter)
#endif /* CONFIG_IPS */ #endif /* CONFIG_IPS */
#ifdef CONFIG_AUTOSUSPEND #ifdef CONFIG_AUTOSUSPEND
extern void autosuspend_enter(_adapter* padapter); extern void autosuspend_enter(struct adapter* padapter);
extern int autoresume_enter(_adapter* padapter); extern int autoresume_enter(struct adapter* padapter);
#endif #endif
#ifdef SUPPORT_HW_RFOFF_DETECTED #ifdef SUPPORT_HW_RFOFF_DETECTED
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 #endif
bool rtw_pwr_unassociated_idle(_adapter *adapter) bool rtw_pwr_unassociated_idle(struct adapter *adapter)
{ {
_adapter *buddy = adapter->pbuddy_adapter; struct adapter *buddy = adapter->pbuddy_adapter;
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
struct xmit_priv *pxmit_priv = &adapter->xmitpriv; struct xmit_priv *pxmit_priv = &adapter->xmitpriv;
#ifdef CONFIG_P2P #ifdef CONFIG_P2P
@ -204,7 +204,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 );
@ -334,7 +334,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);
} }
@ -346,7 +346,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 = adapter_to_pwrctl(padapter); struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
@ -477,8 +477,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 = adapter_to_pwrctl(padapter); struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
@ -524,7 +524,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 = adapter_to_pwrctl(padapter); struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
#ifdef CONFIG_P2P #ifdef CONFIG_P2P
@ -688,7 +688,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;
@ -725,11 +725,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 = adapter_to_pwrctl(padapter); struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
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_;
@ -794,7 +794,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
@ -834,7 +834,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(IN PADAPTER Adapter) void LeaveAllPowerSaveMode(IN struct adapter *Adapter)
{ {
struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv); struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv);
u8 enqueue = 0; u8 enqueue = 0;
@ -893,7 +893,7 @@ _func_exit_;
#ifdef CONFIG_LPS_LCLK #ifdef CONFIG_LPS_LCLK
void LPS_Leave_check( void LPS_Leave_check(
PADAPTER padapter) struct adapter *padapter)
{ {
struct pwrctrl_priv *pwrpriv; struct pwrctrl_priv *pwrpriv;
u32 start_time; u32 start_time;
@ -947,7 +947,7 @@ _func_exit_;
* using to update cpwn of drv; and drv willl make a decision to up or down pwr level * using to update cpwn of drv; and drv willl make a decision to up or down pwr level
*/ */
void cpwm_int_hdl( void cpwm_int_hdl(
PADAPTER padapter, struct adapter *padapter,
struct reportpwrstate_parm *preportpwrstate) struct reportpwrstate_parm *preportpwrstate)
{ {
struct pwrctrl_priv *pwrpriv; struct pwrctrl_priv *pwrpriv;
@ -1000,7 +1000,7 @@ static void cpwm_event_callback(struct work_struct *work)
{ {
struct pwrctrl_priv *pwrpriv = container_of(work, struct pwrctrl_priv, cpwm_event); struct pwrctrl_priv *pwrpriv = container_of(work, struct pwrctrl_priv, cpwm_event);
struct dvobj_priv *dvobj = pwrctl_to_dvobj(pwrpriv); struct dvobj_priv *dvobj = pwrctl_to_dvobj(pwrpriv);
_adapter *adapter = dvobj->if1; struct adapter *adapter = dvobj->if1;
struct reportpwrstate_parm report; struct reportpwrstate_parm report;
//DBG_871X("%s\n",__FUNCTION__); //DBG_871X("%s\n",__FUNCTION__);
@ -1012,7 +1012,7 @@ static void cpwm_event_callback(struct work_struct *work)
#ifdef CONFIG_LPS_RPWM_TIMER #ifdef CONFIG_LPS_RPWM_TIMER
static void rpwmtimeout_workitem_callback(struct work_struct *work) static void rpwmtimeout_workitem_callback(struct work_struct *work)
{ {
PADAPTER padapter; struct adapter *padapter;
struct dvobj_priv *dvobj; struct dvobj_priv *dvobj;
struct pwrctrl_priv *pwrpriv; struct pwrctrl_priv *pwrpriv;
@ -1065,7 +1065,7 @@ exit:
*/ */
static void pwr_rpwm_timeout_handler(void *FunctionContext) static void pwr_rpwm_timeout_handler(void *FunctionContext)
{ {
PADAPTER padapter; struct adapter *padapter;
struct pwrctrl_priv *pwrpriv; struct pwrctrl_priv *pwrpriv;
@ -1106,7 +1106,7 @@ __inline static void unregister_task_alive(struct pwrctrl_priv *pwrctrl, u32 tag
* _SUCCESS rtw_xmit_thread can write fifo/txcmd afterwards. * _SUCCESS rtw_xmit_thread can write fifo/txcmd afterwards.
* _FAIL rtw_xmit_thread can not do anything. * _FAIL rtw_xmit_thread can not do anything.
*/ */
s32 rtw_register_tx_alive(PADAPTER padapter) s32 rtw_register_tx_alive(struct adapter *padapter)
{ {
s32 res; s32 res;
struct pwrctrl_priv *pwrctrl; struct pwrctrl_priv *pwrctrl;
@ -1172,7 +1172,7 @@ _func_exit_;
* _SUCCESS rtw_cmd_thread can issue cmds to firmware afterwards. * _SUCCESS rtw_cmd_thread can issue cmds to firmware afterwards.
* _FAIL rtw_cmd_thread can not do anything. * _FAIL rtw_cmd_thread can not do anything.
*/ */
s32 rtw_register_cmd_alive(PADAPTER padapter) s32 rtw_register_cmd_alive(struct adapter *padapter)
{ {
s32 res; s32 res;
struct pwrctrl_priv *pwrctrl; struct pwrctrl_priv *pwrctrl;
@ -1234,7 +1234,7 @@ _func_exit_;
* _SUCCESS * _SUCCESS
* _FAIL * _FAIL
*/ */
s32 rtw_register_rx_alive(PADAPTER padapter) s32 rtw_register_rx_alive(struct adapter *padapter)
{ {
struct pwrctrl_priv *pwrctrl; struct pwrctrl_priv *pwrctrl;
@ -1265,7 +1265,7 @@ _func_exit_;
* _SUCCESS * _SUCCESS
* _FAIL * _FAIL
*/ */
s32 rtw_register_evt_alive(PADAPTER padapter) s32 rtw_register_evt_alive(struct adapter *padapter)
{ {
struct pwrctrl_priv *pwrctrl; struct pwrctrl_priv *pwrctrl;
@ -1294,7 +1294,7 @@ _func_exit_;
* No more pkts for TX, * No more pkts for TX,
* Then driver shall call this fun. to power down firmware again. * Then driver shall call this fun. to power down firmware again.
*/ */
void rtw_unregister_tx_alive(PADAPTER padapter) void rtw_unregister_tx_alive(struct adapter *padapter)
{ {
struct pwrctrl_priv *pwrctrl; struct pwrctrl_priv *pwrctrl;
@ -1332,7 +1332,7 @@ _func_exit_;
* and no more command to do, * and no more command to do,
* then driver shall call this fun. to power down firmware again. * then driver shall call this fun. to power down firmware again.
*/ */
void rtw_unregister_cmd_alive(PADAPTER padapter) void rtw_unregister_cmd_alive(struct adapter *padapter)
{ {
struct pwrctrl_priv *pwrctrl; struct pwrctrl_priv *pwrctrl;
@ -1366,7 +1366,7 @@ _func_exit_;
/* /*
* Caller: ISR * Caller: ISR
*/ */
void rtw_unregister_rx_alive(PADAPTER padapter) void rtw_unregister_rx_alive(struct adapter *padapter)
{ {
struct pwrctrl_priv *pwrctrl; struct pwrctrl_priv *pwrctrl;
@ -1387,7 +1387,7 @@ _func_enter_;
_func_exit_; _func_exit_;
} }
void rtw_unregister_evt_alive(PADAPTER padapter) void rtw_unregister_evt_alive(struct adapter *padapter)
{ {
struct pwrctrl_priv *pwrctrl; struct pwrctrl_priv *pwrctrl;
@ -1411,7 +1411,7 @@ _func_exit_;
static void resume_workitem_callback(struct work_struct *work); static void resume_workitem_callback(struct work_struct *work);
#endif //CONFIG_RESUME_IN_WORKQUEUE #endif //CONFIG_RESUME_IN_WORKQUEUE
void rtw_init_pwrctrl_priv(PADAPTER padapter) void rtw_init_pwrctrl_priv(struct adapter *padapter)
{ {
struct pwrctrl_priv *pwrctrlpriv = adapter_to_pwrctl(padapter); struct pwrctrl_priv *pwrctrlpriv = adapter_to_pwrctl(padapter);
@ -1494,7 +1494,7 @@ _func_exit_;
} }
void rtw_free_pwrctrl_priv(PADAPTER adapter) void rtw_free_pwrctrl_priv(struct adapter *adapter)
{ {
struct pwrctrl_priv *pwrctrlpriv = adapter_to_pwrctl(adapter); struct pwrctrl_priv *pwrctrlpriv = adapter_to_pwrctl(adapter);
@ -1527,13 +1527,13 @@ _func_exit_;
#ifdef CONFIG_RESUME_IN_WORKQUEUE #ifdef CONFIG_RESUME_IN_WORKQUEUE
#if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI) #if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI)
extern int rtw_resume_process(_adapter *padapter); extern int rtw_resume_process(struct adapter *padapter);
#endif #endif
static void resume_workitem_callback(struct work_struct *work) static void resume_workitem_callback(struct work_struct *work)
{ {
struct pwrctrl_priv *pwrpriv = container_of(work, struct pwrctrl_priv, resume_work); struct pwrctrl_priv *pwrpriv = container_of(work, struct pwrctrl_priv, resume_work);
struct dvobj_priv *dvobj = pwrctl_to_dvobj(pwrpriv); struct dvobj_priv *dvobj = pwrctl_to_dvobj(pwrpriv);
_adapter *adapter = dvobj->if1; struct adapter *adapter = dvobj->if1;
DBG_871X("%s\n",__FUNCTION__); DBG_871X("%s\n",__FUNCTION__);
@ -1575,7 +1575,7 @@ inline void rtw_set_do_late_resume(struct pwrctrl_priv *pwrpriv, bool enable)
#ifdef CONFIG_HAS_EARLYSUSPEND #ifdef CONFIG_HAS_EARLYSUSPEND
#if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI) #if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI)
extern int rtw_resume_process(_adapter *padapter); extern int rtw_resume_process(struct adapter *padapter);
#endif #endif
static void rtw_early_suspend(struct early_suspend *h) static void rtw_early_suspend(struct early_suspend *h)
{ {
@ -1589,7 +1589,7 @@ static void rtw_late_resume(struct early_suspend *h)
{ {
struct pwrctrl_priv *pwrpriv = container_of(h, struct pwrctrl_priv, early_suspend); struct pwrctrl_priv *pwrpriv = container_of(h, struct pwrctrl_priv, early_suspend);
struct dvobj_priv *dvobj = pwrctl_to_dvobj(pwrpriv); struct dvobj_priv *dvobj = pwrctl_to_dvobj(pwrpriv);
_adapter *adapter = dvobj->if1; struct adapter *adapter = dvobj->if1;
DBG_871X("%s\n",__FUNCTION__); DBG_871X("%s\n",__FUNCTION__);
if(pwrpriv->do_late_resume) { if(pwrpriv->do_late_resume) {
@ -1627,7 +1627,7 @@ void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv)
#ifdef CONFIG_ANDROID_POWER #ifdef CONFIG_ANDROID_POWER
#if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI) #if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI)
extern int rtw_resume_process(PADAPTER padapter); extern int rtw_resume_process(struct adapter *padapter);
#endif #endif
static void rtw_early_suspend(android_early_suspend_t *h) static void rtw_early_suspend(android_early_suspend_t *h)
{ {
@ -1641,7 +1641,7 @@ static void rtw_late_resume(android_early_suspend_t *h)
{ {
struct pwrctrl_priv *pwrpriv = container_of(h, struct pwrctrl_priv, early_suspend); struct pwrctrl_priv *pwrpriv = container_of(h, struct pwrctrl_priv, early_suspend);
struct dvobj_priv *dvobj = pwrctl_to_dvobj(pwrpriv); struct dvobj_priv *dvobj = pwrctl_to_dvobj(pwrpriv);
_adapter *adapter = dvobj->if1; struct adapter *adapter = dvobj->if1;
DBG_871X("%s\n",__FUNCTION__); DBG_871X("%s\n",__FUNCTION__);
if(pwrpriv->do_late_resume) { if(pwrpriv->do_late_resume) {
@ -1677,7 +1677,7 @@ void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv)
} }
#endif //CONFIG_ANDROID_POWER #endif //CONFIG_ANDROID_POWER
u8 rtw_interface_ps_func(_adapter *padapter,HAL_INTF_PS_FUNC efunc_id,u8* val) u8 rtw_interface_ps_func(struct adapter *padapter,HAL_INTF_PS_FUNC efunc_id,u8* val)
{ {
u8 bResult = _TRUE; u8 bResult = _TRUE;
rtw_hal_intf_ps_func(padapter,efunc_id,val); rtw_hal_intf_ps_func(padapter,efunc_id,val);
@ -1686,7 +1686,7 @@ u8 rtw_interface_ps_func(_adapter *padapter,HAL_INTF_PS_FUNC efunc_id,u8* val)
} }
inline void rtw_set_ips_deny(_adapter *padapter, u32 ms) inline void rtw_set_ips_deny(struct adapter *padapter, u32 ms)
{ {
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
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);
@ -1694,12 +1694,12 @@ inline void rtw_set_ips_deny(_adapter *padapter, u32 ms)
/* /*
* rtw_pwr_wakeup - Wake the NIC up from: 1)IPS. 2)USB autosuspend * 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 = adapter_to_pwrctl(padapter); struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -1851,7 +1851,7 @@ exit:
} }
int rtw_pm_set_lps(_adapter *padapter, u8 mode) int rtw_pm_set_lps(struct adapter *padapter, u8 mode)
{ {
int ret = 0; int ret = 0;
struct pwrctrl_priv *pwrctrlpriv = adapter_to_pwrctl(padapter); struct pwrctrl_priv *pwrctrlpriv = adapter_to_pwrctl(padapter);
@ -1880,7 +1880,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 = adapter_to_pwrctl(padapter); struct pwrctrl_priv *pwrctrlpriv = adapter_to_pwrctl(padapter);

114
core/rtw_recv.c
View file

@ -62,7 +62,7 @@ _func_exit_;
} }
sint _rtw_init_recv_priv(struct recv_priv *precvpriv, _adapter *padapter) sint _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter)
{ {
sint i; sint i;
@ -165,7 +165,7 @@ void rtw_mfree_recv_priv_lock(struct recv_priv *precvpriv)
void _rtw_free_recv_priv (struct recv_priv *precvpriv) void _rtw_free_recv_priv (struct recv_priv *precvpriv)
{ {
_adapter *padapter = precvpriv->adapter; struct adapter *padapter = precvpriv->adapter;
_func_enter_; _func_enter_;
@ -190,7 +190,7 @@ union recv_frame *_rtw_alloc_recvframe (_queue *pfree_recv_queue)
union recv_frame *precvframe; union recv_frame *precvframe;
_list *plist, *phead; _list *plist, *phead;
_adapter *padapter; struct adapter *padapter;
struct recv_priv *precvpriv; struct recv_priv *precvpriv;
_func_enter_; _func_enter_;
@ -246,7 +246,7 @@ void rtw_init_recvframe(union recv_frame *precvframe, struct recv_priv *precvpri
int rtw_free_recvframe(union recv_frame *precvframe, _queue *pfree_recv_queue) int rtw_free_recvframe(union recv_frame *precvframe, _queue *pfree_recv_queue)
{ {
_irqL irqL; _irqL 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_;
@ -299,7 +299,7 @@ _func_exit_;
sint _rtw_enqueue_recvframe(union recv_frame *precvframe, _queue *queue) sint _rtw_enqueue_recvframe(union recv_frame *precvframe, _queue *queue)
{ {
_adapter *padapter=precvframe->u.hdr.adapter; struct adapter *padapter=precvframe->u.hdr.adapter;
struct recv_priv *precvpriv = &padapter->recvpriv; struct recv_priv *precvpriv = &padapter->recvpriv;
_func_enter_; _func_enter_;
@ -380,7 +380,7 @@ _func_exit_;
} }
u32 rtw_free_uc_swdec_pending_queue(_adapter *adapter) u32 rtw_free_uc_swdec_pending_queue(struct adapter *adapter)
{ {
u32 cnt = 0; u32 cnt = 0;
union recv_frame *pending_frame; union recv_frame *pending_frame;
@ -469,8 +469,8 @@ struct recv_buf *rtw_dequeue_recvbuf (_queue *queue)
} }
sint recvframe_chkmic(_adapter *adapter, union recv_frame *precvframe); sint recvframe_chkmic(struct adapter *adapter, union recv_frame *precvframe);
sint recvframe_chkmic(_adapter *adapter, union recv_frame *precvframe){ sint recvframe_chkmic(struct adapter *adapter, union recv_frame *precvframe){
sint i,res=_SUCCESS; sint i,res=_SUCCESS;
u32 datalen; u32 datalen;
@ -616,8 +616,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;
@ -736,8 +736,8 @@ _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);
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;
@ -862,8 +862,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;
@ -908,8 +908,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;
@ -982,7 +982,7 @@ void process_wmmps_data(_adapter *padapter, union recv_frame *precv_frame)
} }
#ifdef CONFIG_TDLS #ifdef CONFIG_TDLS
sint OnTDLS(_adapter *adapter, union recv_frame *precv_frame) sint OnTDLS(struct adapter *adapter, union recv_frame *precv_frame)
{ {
struct rx_pkt_attrib *pattrib = & precv_frame->u.hdr.attrib; struct rx_pkt_attrib *pattrib = & precv_frame->u.hdr.attrib;
sint ret = _SUCCESS; sint ret = _SUCCESS;
@ -1074,8 +1074,8 @@ exit:
} }
#endif #endif
void count_rx_stats(_adapter *padapter, union recv_frame *prframe, struct sta_info*sta); void count_rx_stats(struct adapter *padapter, union recv_frame *prframe, struct sta_info*sta);
void count_rx_stats(_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;
@ -1108,12 +1108,12 @@ void count_rx_stats(_adapter *padapter, union recv_frame *prframe, struct sta_in
} }
sint sta2sta_data_frame( sint 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
); );
sint sta2sta_data_frame( sint 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
) )
@ -1324,11 +1324,11 @@ _func_exit_;
} }
sint ap2sta_data_frame( sint 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 );
sint ap2sta_data_frame( sint 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 )
{ {
@ -1481,11 +1481,11 @@ _func_exit_;
} }
sint sta2ap_data_frame( sint 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 );
sint sta2ap_data_frame( sint 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 )
{ {
@ -1552,8 +1552,8 @@ _func_exit_;
} }
sint validate_recv_ctrl_frame(_adapter *padapter, union recv_frame *precv_frame); sint validate_recv_ctrl_frame(struct adapter *padapter, union recv_frame *precv_frame);
sint validate_recv_ctrl_frame(_adapter *padapter, union recv_frame *precv_frame) sint 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;
@ -1720,9 +1720,9 @@ sint validate_recv_ctrl_frame(_adapter *padapter, union recv_frame *precv_frame)
} }
union recv_frame* recvframe_chk_defrag(PADAPTER padapter, union recv_frame *precv_frame); union recv_frame* recvframe_chk_defrag(struct adapter *padapter, union recv_frame *precv_frame);
sint validate_recv_mgnt_frame(PADAPTER padapter, union recv_frame *precv_frame); sint validate_recv_mgnt_frame(struct adapter *padapter, union recv_frame *precv_frame);
sint validate_recv_mgnt_frame(PADAPTER padapter, union recv_frame *precv_frame) sint validate_recv_mgnt_frame(struct adapter *padapter, union recv_frame *precv_frame)
{ {
//struct mlme_priv *pmlmepriv = &padapter->mlmepriv; //struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -1826,8 +1826,8 @@ sint validate_recv_mgnt_frame(PADAPTER padapter, union recv_frame *precv_frame)
} }
sint validate_recv_data_frame(_adapter *adapter, union recv_frame *precv_frame); sint validate_recv_data_frame(struct adapter *adapter, union recv_frame *precv_frame);
sint validate_recv_data_frame(_adapter *adapter, union recv_frame *precv_frame) sint validate_recv_data_frame(struct adapter *adapter, union recv_frame *precv_frame)
{ {
u8 bretry; u8 bretry;
u8 *psa, *pda, *pbssid; u8 *psa, *pda, *pbssid;
@ -1998,7 +1998,7 @@ _func_exit_;
} }
#ifdef CONFIG_IEEE80211W #ifdef CONFIG_IEEE80211W
static sint validate_80211w_mgmt(_adapter *adapter, union recv_frame *precv_frame) static sint validate_80211w_mgmt(struct adapter *adapter, union recv_frame *precv_frame)
{ {
struct mlme_priv *pmlmepriv = &adapter->mlmepriv; struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
struct rx_pkt_attrib *pattrib = & precv_frame->u.hdr.attrib; struct rx_pkt_attrib *pattrib = & precv_frame->u.hdr.attrib;
@ -2118,8 +2118,8 @@ validate_80211w_fail:
} }
#endif //CONFIG_IEEE80211W #endif //CONFIG_IEEE80211W
sint validate_recv_frame(_adapter *adapter, union recv_frame *precv_frame); sint validate_recv_frame(struct adapter *adapter, union recv_frame *precv_frame);
sint validate_recv_frame(_adapter *adapter, union recv_frame *precv_frame) sint validate_recv_frame(struct adapter *adapter, union recv_frame *precv_frame)
{ {
//shall check frame subtype, to / from ds, da, bssid //shall check frame subtype, to / from ds, da, bssid
@ -2339,7 +2339,7 @@ sint wlanhdr_to_ethhdr ( union recv_frame *precvframe)
struct ieee80211_snap_hdr *psnap; struct ieee80211_snap_hdr *psnap;
sint ret=_SUCCESS; sint 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
@ -2417,7 +2417,7 @@ sint wlanhdr_to_ethhdr ( union recv_frame *precvframe)
struct ieee80211_snap_hdr *psnap; struct ieee80211_snap_hdr *psnap;
sint ret=_SUCCESS; sint 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
@ -2541,7 +2541,7 @@ _func_exit_;
#if defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI) #if defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI)
static void recvframe_expand_pkt( static void recvframe_expand_pkt(
PADAPTER padapter, struct adapter *padapter,
union recv_frame *prframe) union recv_frame *prframe)
{ {
struct recv_frame_hdr *pfhdr; struct recv_frame_hdr *pfhdr;
@ -2591,8 +2591,8 @@ static void recvframe_expand_pkt(
#endif #endif
//perform defrag //perform defrag
union recv_frame * recvframe_defrag(_adapter *adapter,_queue *defrag_q); union recv_frame * recvframe_defrag(struct adapter *adapter,_queue *defrag_q);
union recv_frame * recvframe_defrag(_adapter *adapter,_queue *defrag_q) union recv_frame * recvframe_defrag(struct adapter *adapter,_queue *defrag_q)
{ {
_list *plist, *phead; _list *plist, *phead;
u8 *data,wlanhdr_offset; u8 *data,wlanhdr_offset;
@ -2686,7 +2686,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;
@ -2815,8 +2815,8 @@ _func_exit_;
#define ENDIAN_FREE 1 #define ENDIAN_FREE 1
int amsdu_to_msdu(_adapter *padapter, union recv_frame *prframe); int amsdu_to_msdu(struct adapter *padapter, union recv_frame *prframe);
int amsdu_to_msdu(_adapter *padapter, union recv_frame *prframe) 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;
@ -2961,7 +2961,7 @@ int amsdu_to_msdu(_adapter *padapter, union recv_frame *prframe)
if( br_port && (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == _TRUE) ) if( br_port && (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == _TRUE) )
{ {
int nat25_handle_frame(_adapter *priv, struct sk_buff *skb); int nat25_handle_frame(struct adapter *priv, struct sk_buff *skb);
if (nat25_handle_frame(padapter, sub_skb) == -1) { if (nat25_handle_frame(padapter, sub_skb) == -1) {
//priv->ext_stats.rx_data_drops++; //priv->ext_stats.rx_data_drops++;
//DEBUG_ERR("RX DROP: nat25_handle_frame fail!\n"); //DEBUG_ERR("RX DROP: nat25_handle_frame fail!\n");
@ -3133,8 +3133,8 @@ int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, union rec
} }
int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ctrl *preorder_ctrl, int bforced); int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reorder_ctrl *preorder_ctrl, int bforced);
int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ctrl *preorder_ctrl, int bforced) int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reorder_ctrl *preorder_ctrl, int bforced)
{ {
//_irqL irql; //_irqL irql;
//u8 bcancelled; //u8 bcancelled;
@ -3302,8 +3302,8 @@ int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ctrl *pre
} }
int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe); int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *prframe);
int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe) int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *prframe)
{ {
_irqL irql; _irqL irql;
int retval = _SUCCESS; int retval = _SUCCESS;
@ -3479,7 +3479,7 @@ void rtw_reordering_ctrl_timeout_handler(void *pcontext)
{ {
_irqL irql; _irqL 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;
_queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue; _queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue;
@ -3501,8 +3501,8 @@ void rtw_reordering_ctrl_timeout_handler(void *pcontext)
} }
int process_recv_indicatepkts(_adapter *padapter, union recv_frame *prframe); int process_recv_indicatepkts(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;
@ -3577,7 +3577,7 @@ int process_recv_indicatepkts(_adapter *padapter, union recv_frame *prframe)
} }
int recv_func_prehandle(_adapter *padapter, union recv_frame *rframe) int recv_func_prehandle(struct adapter *padapter, union recv_frame *rframe)
{ {
int ret = _SUCCESS; int ret = _SUCCESS;
struct rx_pkt_attrib *pattrib = &rframe->u.hdr.attrib; struct rx_pkt_attrib *pattrib = &rframe->u.hdr.attrib;
@ -3598,7 +3598,7 @@ exit:
return ret; return ret;
} }
int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe) int recv_func_posthandle(struct adapter *padapter, union recv_frame *prframe)
{ {
int ret = _SUCCESS; int ret = _SUCCESS;
union recv_frame *orig_prframe = prframe; union recv_frame *orig_prframe = prframe;
@ -3768,8 +3768,8 @@ _recv_data_drop:
} }
int recv_func(_adapter *padapter, union recv_frame *rframe); int recv_func(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;
@ -3827,7 +3827,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;
@ -3862,7 +3862,7 @@ _func_exit_;
#ifdef CONFIG_NEW_SIGNAL_STAT_PROCESS #ifdef CONFIG_NEW_SIGNAL_STAT_PROCESS
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;

22
core/rtw_security.c
View file

@ -160,7 +160,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];
@ -240,7 +240,7 @@ _func_exit_;
} }
void rtw_wep_decrypt(_adapter *padapter, u8 *precvframe) void rtw_wep_decrypt(struct adapter *padapter, u8 *precvframe)
{ {
// exclude ICV // exclude ICV
u8 crc[4]; u8 crc[4];
@ -648,7 +648,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;
@ -770,7 +770,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;
@ -1579,7 +1579,7 @@ _func_exit_;
u32 rtw_aes_encrypt(_adapter *padapter, u8 *pxmitframe) u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe)
{ // exclude ICV { // exclude ICV
@ -1969,7 +1969,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
@ -2092,7 +2092,7 @@ exit:
} }
#ifdef CONFIG_IEEE80211W #ifdef CONFIG_IEEE80211W
u32 rtw_BIP_verify(_adapter *padapter, u8 *precvframe) u32 rtw_BIP_verify(struct adapter *padapter, u8 *precvframe)
{ {
struct rx_pkt_attrib *pattrib = &((union recv_frame *)precvframe)->u.hdr.attrib; struct rx_pkt_attrib *pattrib = &((union recv_frame *)precvframe)->u.hdr.attrib;
u8 *pframe; u8 *pframe;
@ -2902,7 +2902,7 @@ int omac1_aes_128(u8 *key, u8 *data, size_t data_len, u8 *mac)
} }
#ifdef CONFIG_TDLS #ifdef CONFIG_TDLS
void wpa_tdls_generate_tpk(_adapter *padapter, struct sta_info *psta) void wpa_tdls_generate_tpk(struct adapter *padapter, struct sta_info *psta)
{ {
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
u8 *SNonce = psta->SNonce; u8 *SNonce = psta->SNonce;
@ -3073,7 +3073,7 @@ int tdls_verify_mic(u8 *kck, u8 trans_seq,
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_;
@ -3089,7 +3089,7 @@ _func_exit_;
} }
/* Restore HW wep key setting according to key_mask */ /* Restore HW wep key setting according to key_mask */
void rtw_sec_restore_wep_key(_adapter *adapter) void rtw_sec_restore_wep_key(struct adapter *adapter)
{ {
struct security_priv* securitypriv=&(adapter->securitypriv); struct security_priv* securitypriv=&(adapter->securitypriv);
sint keyid; sint keyid;
@ -3106,7 +3106,7 @@ void rtw_sec_restore_wep_key(_adapter *adapter)
} }
} }
u8 rtw_handle_tkip_countermeasure(_adapter* adapter, const char *caller) u8 rtw_handle_tkip_countermeasure(struct adapter* adapter, const char *caller)
{ {
struct security_priv* securitypriv=&(adapter->securitypriv); struct security_priv* securitypriv=&(adapter->securitypriv);
u8 status = _SUCCESS; u8 status = _SUCCESS;

24
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)
{ {
#if defined(DBG_CONFIG_ERROR_DETECT) #if defined(DBG_CONFIG_ERROR_DETECT)
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
@ -33,7 +33,7 @@ void sreset_init_value(_adapter *padapter)
psrtpriv->last_tx_complete_time =0; psrtpriv->last_tx_complete_time =0;
#endif #endif
} }
void sreset_reset_value(_adapter *padapter) void sreset_reset_value(struct adapter *padapter)
{ {
#if defined(DBG_CONFIG_ERROR_DETECT) #if defined(DBG_CONFIG_ERROR_DETECT)
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
@ -46,7 +46,7 @@ void sreset_reset_value(_adapter *padapter)
#endif #endif
} }
u8 sreset_get_wifi_status(_adapter *padapter) u8 sreset_get_wifi_status(struct adapter *padapter)
{ {
#if defined(DBG_CONFIG_ERROR_DETECT) #if defined(DBG_CONFIG_ERROR_DETECT)
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
@ -84,7 +84,7 @@ u8 sreset_get_wifi_status(_adapter *padapter)
#endif #endif
} }
void sreset_set_wifi_error_status(_adapter *padapter, u32 status) void sreset_set_wifi_error_status(struct adapter *padapter, u32 status)
{ {
#if defined(DBG_CONFIG_ERROR_DETECT) #if defined(DBG_CONFIG_ERROR_DETECT)
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
@ -92,7 +92,7 @@ void sreset_set_wifi_error_status(_adapter *padapter, u32 status)
#endif #endif
} }
void sreset_set_trigger_point(_adapter *padapter, s32 tgp) void sreset_set_trigger_point(struct adapter *padapter, s32 tgp)
{ {
#if defined(DBG_CONFIG_ERROR_DETECT) #if defined(DBG_CONFIG_ERROR_DETECT)
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
@ -100,7 +100,7 @@ void sreset_set_trigger_point(_adapter *padapter, s32 tgp)
#endif #endif
} }
bool sreset_inprogress(_adapter *padapter) bool sreset_inprogress(struct adapter *padapter)
{ {
#if defined(DBG_CONFIG_ERROR_RESET) #if defined(DBG_CONFIG_ERROR_RESET)
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
@ -110,7 +110,7 @@ bool sreset_inprogress(_adapter *padapter)
#endif #endif
} }
void sreset_restore_security_station(_adapter *padapter) void sreset_restore_security_station(struct adapter *padapter)
{ {
u8 EntryId = 0; u8 EntryId = 0;
struct mlme_priv *mlmepriv = &padapter->mlmepriv; struct mlme_priv *mlmepriv = &padapter->mlmepriv;
@ -168,7 +168,7 @@ void sreset_restore_security_station(_adapter *padapter)
} }
} }
void sreset_restore_network_station(_adapter *padapter) void sreset_restore_network_station(struct adapter *padapter)
{ {
struct mlme_priv *mlmepriv = &padapter->mlmepriv; struct mlme_priv *mlmepriv = &padapter->mlmepriv;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -235,7 +235,7 @@ void sreset_restore_network_station(_adapter *padapter)
} }
void sreset_restore_network_status(_adapter *padapter) void sreset_restore_network_status(struct adapter *padapter)
{ {
struct mlme_priv *mlmepriv = &padapter->mlmepriv; struct mlme_priv *mlmepriv = &padapter->mlmepriv;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -254,7 +254,7 @@ void sreset_restore_network_status(_adapter *padapter)
} }
} }
void sreset_stop_adapter(_adapter *padapter) void sreset_stop_adapter(struct adapter *padapter)
{ {
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@ -285,7 +285,7 @@ void sreset_stop_adapter(_adapter *padapter)
} }
void sreset_start_adapter(_adapter *padapter) void sreset_start_adapter(struct adapter *padapter)
{ {
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@ -311,7 +311,7 @@ void sreset_start_adapter(_adapter *padapter)
} }
void sreset_reset(_adapter *padapter) void sreset_reset(struct adapter *padapter)
{ {
#ifdef DBG_CONFIG_ERROR_RESET #ifdef DBG_CONFIG_ERROR_RESET
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);

10
core/rtw_sta_mgt.c
View file

@ -461,7 +461,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;
_irqL irqL0; _irqL irqL0;
@ -659,7 +659,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)
{ {
_irqL irqL; _irqL irqL;
_list *plist, *phead; _list *plist, *phead;
@ -757,7 +757,7 @@ _func_exit_;
} }
u32 rtw_init_bcmc_stainfo(_adapter* padapter) u32 rtw_init_bcmc_stainfo(struct adapter* padapter)
{ {
struct sta_info *psta; struct sta_info *psta;
@ -799,7 +799,7 @@ _func_exit_;
} }
struct sta_info* rtw_get_bcmc_stainfo(_adapter* padapter) struct sta_info* rtw_get_bcmc_stainfo(struct adapter* padapter)
{ {
struct sta_info *psta; struct sta_info *psta;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
@ -811,7 +811,7 @@ _func_exit_;
} }
u8 rtw_access_ctrl(_adapter *padapter, u8 *mac_addr) u8 rtw_access_ctrl(struct adapter *padapter, u8 *mac_addr)
{ {
u8 res = _TRUE; u8 res = _TRUE;
#ifdef CONFIG_AP_MODE #ifdef CONFIG_AP_MODE

152
core/rtw_wlan_util.c
View file

@ -144,7 +144,7 @@ unsigned char networktype_to_raid(unsigned char network_type)
} }
u8 judge_network_type(_adapter *padapter, unsigned char *rate, int ratelen) u8 judge_network_type(struct adapter *padapter, unsigned char *rate, int ratelen)
{ {
u8 network_type = 0; u8 network_type = 0;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -245,8 +245,8 @@ unsigned char ratetbl_val_2wifirate(unsigned char rate)
} }
int is_basicrate(_adapter *padapter, unsigned char rate); int is_basicrate(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;
@ -268,8 +268,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;
@ -304,7 +304,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];
@ -314,7 +314,7 @@ void get_rate_set(_adapter *padapter, unsigned char *pbssrate, int *bssrate_len)
} }
void UpdateBrateTbl( void UpdateBrateTbl(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN u8 *mBratesOS IN u8 *mBratesOS
) )
{ {
@ -362,19 +362,19 @@ void UpdateBrateTblForSoftAP(u8 *bssrateset, u32 bssratelen)
} }
void Save_DM_Func_Flag(_adapter *padapter) void Save_DM_Func_Flag(struct adapter *padapter)
{ {
u8 bSaveFlag = _TRUE; 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));
@ -382,17 +382,17 @@ void Switch_DM_Func(_adapter *padapter, u32 mode, u8 enable)
rtw_hal_set_hwreg(padapter, HW_VAR_DM_FUNC_CLR, (u8 *)(&mode)); 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)
{ {
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
if(padapter->iface_type == IFACE_PORT1) if(padapter->iface_type == IFACE_PORT1)
@ -406,12 +406,12 @@ void Set_MSR(_adapter *padapter, u8 type)
} }
} }
inline u8 rtw_get_oper_ch(_adapter *adapter) inline u8 rtw_get_oper_ch(struct adapter *adapter)
{ {
return adapter_to_dvobj(adapter)->oper_channel; return adapter_to_dvobj(adapter)->oper_channel;
} }
inline void rtw_set_oper_ch(_adapter *adapter, u8 ch) inline void rtw_set_oper_ch(struct adapter *adapter, u8 ch)
{ {
if (adapter_to_dvobj(adapter)->oper_channel != ch) if (adapter_to_dvobj(adapter)->oper_channel != ch)
adapter_to_dvobj(adapter)->on_oper_ch_time = rtw_get_current_time(); adapter_to_dvobj(adapter)->on_oper_ch_time = rtw_get_current_time();
@ -419,32 +419,32 @@ inline void rtw_set_oper_ch(_adapter *adapter, u8 ch)
adapter_to_dvobj(adapter)->oper_channel = ch; adapter_to_dvobj(adapter)->oper_channel = ch;
} }
inline u8 rtw_get_oper_bw(_adapter *adapter) inline u8 rtw_get_oper_bw(struct adapter *adapter)
{ {
return adapter_to_dvobj(adapter)->oper_bwmode; return adapter_to_dvobj(adapter)->oper_bwmode;
} }
inline void rtw_set_oper_bw(_adapter *adapter, u8 bw) inline void rtw_set_oper_bw(struct adapter *adapter, u8 bw)
{ {
adapter_to_dvobj(adapter)->oper_bwmode = bw; adapter_to_dvobj(adapter)->oper_bwmode = bw;
} }
inline u8 rtw_get_oper_choffset(_adapter *adapter) inline u8 rtw_get_oper_choffset(struct adapter *adapter)
{ {
return adapter_to_dvobj(adapter)->oper_ch_offset; return adapter_to_dvobj(adapter)->oper_ch_offset;
} }
inline void rtw_set_oper_choffset(_adapter *adapter, u8 offset) inline void rtw_set_oper_choffset(struct adapter *adapter, u8 offset)
{ {
adapter_to_dvobj(adapter)->oper_ch_offset = offset; adapter_to_dvobj(adapter)->oper_ch_offset = offset;
} }
inline u32 rtw_get_on_oper_ch_time(_adapter *adapter) inline u32 rtw_get_on_oper_ch_time(struct adapter *adapter)
{ {
return adapter_to_dvobj(adapter)->on_oper_ch_time; return adapter_to_dvobj(adapter)->on_oper_ch_time;
} }
inline u32 rtw_get_on_cur_ch_time(_adapter *adapter) inline u32 rtw_get_on_cur_ch_time(struct adapter *adapter)
{ {
if (adapter->mlmeextpriv.cur_channel == adapter_to_dvobj(adapter)->oper_channel) if (adapter->mlmeextpriv.cur_channel == adapter_to_dvobj(adapter)->oper_channel)
return adapter_to_dvobj(adapter)->on_oper_ch_time; return adapter_to_dvobj(adapter)->on_oper_ch_time;
@ -452,7 +452,7 @@ inline u32 rtw_get_on_cur_ch_time(_adapter *adapter)
return 0; return 0;
} }
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;
@ -474,7 +474,7 @@ void SelectChannel(_adapter *padapter, unsigned char channel)
#endif // CONFIG_DUALMAC_CONCURRENT #endif // CONFIG_DUALMAC_CONCURRENT
} }
void SetBWMode(_adapter *padapter, unsigned short bwmode, unsigned char channel_offset) void SetBWMode(struct adapter *padapter, unsigned short bwmode, unsigned char channel_offset)
{ {
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -498,7 +498,7 @@ void SetBWMode(_adapter *padapter, unsigned short bwmode, unsigned char channel_
#endif // CONFIG_DUALMAC_CONCURRENT #endif // CONFIG_DUALMAC_CONCURRENT
} }
void set_channel_bwmode(_adapter *padapter, unsigned char channel, unsigned char channel_offset, unsigned short bwmode) void set_channel_bwmode(struct adapter *padapter, unsigned char channel, unsigned char channel_offset, unsigned short bwmode)
{ {
u8 center_ch; u8 center_ch;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -584,7 +584,7 @@ u16 get_beacon_interval(WLAN_BSSID_EX *bss)
return le16_to_cpu(le_val); return le16_to_cpu(le_val);
} }
int is_client_associated_to_ap(_adapter *padapter) int is_client_associated_to_ap(struct adapter *padapter)
{ {
struct mlme_ext_priv *pmlmeext; struct mlme_ext_priv *pmlmeext;
struct mlme_ext_info *pmlmeinfo; struct mlme_ext_info *pmlmeinfo;
@ -605,7 +605,7 @@ int is_client_associated_to_ap(_adapter *padapter)
} }
} }
int is_client_associated_to_ibss(_adapter *padapter) int is_client_associated_to_ibss(struct adapter *padapter)
{ {
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -620,7 +620,7 @@ int is_client_associated_to_ibss(_adapter *padapter)
} }
} }
int is_IBSS_empty(_adapter *padapter) int is_IBSS_empty(struct adapter *padapter)
{ {
unsigned int i; unsigned int i;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -655,19 +655,19 @@ unsigned int decide_wait_for_beacon_timeout(unsigned int bcn_interval)
} }
void CAM_empty_entry( 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);
} }
#if 0 #if 0
static u32 _ReadCAM(_adapter *padapter ,u32 addr) static u32 _ReadCAM(struct adapter *padapter ,u32 addr)
{ {
u32 count = 0, cmd; u32 count = 0, cmd;
cmd = CAM_POLLINIG |addr ; cmd = CAM_POLLINIG |addr ;
@ -682,7 +682,7 @@ static u32 _ReadCAM(_adapter *padapter ,u32 addr)
return rtw_read32(padapter,REG_CAMREAD); return rtw_read32(padapter,REG_CAMREAD);
} }
#endif #endif
void read_cam(_adapter *padapter ,u8 entry) void read_cam(struct adapter *padapter ,u8 entry)
{ {
u32 j,count = 0, addr; u32 j,count = 0, addr;
u32 cam_val[2]; //cam_val[0] is read_val, cam_val[1] is the address u32 cam_val[2]; //cam_val[0] is read_val, cam_val[1] is the address
@ -701,7 +701,7 @@ void read_cam(_adapter *padapter ,u8 entry)
} }
void write_cam(_adapter *padapter, u8 entry, u16 ctrl, u8 *mac, u8 *key) void write_cam(struct adapter *padapter, u8 entry, u16 ctrl, u8 *mac, u8 *key)
{ {
unsigned int i, val, addr; unsigned int i, val, addr;
//unsigned int cmd; //unsigned int cmd;
@ -745,7 +745,7 @@ void write_cam(_adapter *padapter, u8 entry, u16 ctrl, u8 *mac, u8 *key)
} }
void clear_cam_entry(_adapter *padapter, u8 entry) void clear_cam_entry(struct adapter *padapter, u8 entry)
{ {
#if 0 #if 0
u32 addr, val=0; u32 addr, val=0;
@ -776,7 +776,7 @@ void clear_cam_entry(_adapter *padapter, u8 entry)
#endif #endif
} }
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;
@ -795,7 +795,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);
@ -847,7 +847,7 @@ void flush_all_cam_entry(_adapter *padapter)
} }
#if defined(CONFIG_P2P) && defined(CONFIG_WFD) #if defined(CONFIG_P2P) && defined(CONFIG_WFD)
int WFD_info_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) int WFD_info_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
{ {
struct registry_priv *pregpriv = &padapter->registrypriv; struct registry_priv *pregpriv = &padapter->registrypriv;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@ -882,7 +882,7 @@ int WFD_info_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
} }
#endif #endif
int WMM_param_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) int WMM_param_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
{ {
//struct registry_priv *pregpriv = &padapter->registrypriv; //struct registry_priv *pregpriv = &padapter->registrypriv;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@ -921,7 +921,7 @@ int WMM_param_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
} }
void WMMOnAssocRsp(_adapter *padapter) void WMMOnAssocRsp(struct adapter *padapter)
{ {
u8 ACI, ACM, AIFS, ECWMin, ECWMax, aSifsTime; u8 ACI, ACM, AIFS, ECWMin, ECWMax, aSifsTime;
u8 acm_mask; u8 acm_mask;
@ -1042,7 +1042,7 @@ void WMMOnAssocRsp(_adapter *padapter)
return; return;
} }
static void bwmode_update_check(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) static void bwmode_update_check(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
{ {
#ifdef CONFIG_80211N_HT #ifdef CONFIG_80211N_HT
unsigned char new_bwmode; unsigned char new_bwmode;
@ -1142,7 +1142,7 @@ static void bwmode_update_check(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pI
#endif //CONFIG_80211N_HT #endif //CONFIG_80211N_HT
} }
void HT_caps_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) void HT_caps_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
{ {
#ifdef CONFIG_80211N_HT #ifdef CONFIG_80211N_HT
unsigned int i; unsigned int i;
@ -1229,7 +1229,7 @@ void HT_caps_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
return; return;
} }
void HT_info_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) void HT_info_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
{ {
#ifdef CONFIG_80211N_HT #ifdef CONFIG_80211N_HT
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -1251,7 +1251,7 @@ void HT_info_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs 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;
@ -1337,7 +1337,7 @@ void HTOnAssocRsp(_adapter *padapter)
} }
void ERP_IE_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) void ERP_IE_handler(struct adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
{ {
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -1349,7 +1349,7 @@ void ERP_IE_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
_rtw_memcpy(&(pmlmeinfo->ERP_IE), pIE->data, pIE->Length); _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;
@ -1417,7 +1417,7 @@ int check_ap_tdls_prohibited(u8 *pframe, u8 pkt_len)
} }
#endif //CONFIG_TDLS #endif //CONFIG_TDLS
int rtw_check_bcn_info(ADAPTER *Adapter, u8 *pframe, u32 packet_len) int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)
{ {
unsigned int len; unsigned int len;
unsigned char *p; unsigned char *p;
@ -1626,7 +1626,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;
@ -1680,7 +1680,7 @@ void update_beacon_info(_adapter *padapter, u8 *pframe, uint pkt_len, struct sta
} }
#ifdef CONFIG_DFS #ifdef CONFIG_DFS
void process_csa_ie(_adapter *padapter, u8 *pframe, uint pkt_len) void process_csa_ie(struct adapter *padapter, u8 *pframe, uint pkt_len)
{ {
unsigned int i; unsigned int i;
unsigned int len; unsigned int len;
@ -1709,7 +1709,7 @@ void process_csa_ie(_adapter *padapter, u8 *pframe, uint pkt_len)
} }
#endif //CONFIG_DFS #endif //CONFIG_DFS
unsigned int is_ap_in_tkip(_adapter *padapter) unsigned int is_ap_in_tkip(struct adapter *padapter)
{ {
u32 i; u32 i;
PNDIS_802_11_VARIABLE_IEs pIE; PNDIS_802_11_VARIABLE_IEs pIE;
@ -1754,7 +1754,7 @@ unsigned int is_ap_in_tkip(_adapter *padapter)
} }
unsigned int should_forbid_n_rate(_adapter * padapter) unsigned int should_forbid_n_rate(struct adapter * padapter)
{ {
u32 i; u32 i;
PNDIS_802_11_VARIABLE_IEs pIE; PNDIS_802_11_VARIABLE_IEs pIE;
@ -1798,7 +1798,7 @@ unsigned int should_forbid_n_rate(_adapter * padapter)
} }
unsigned int is_ap_in_wep(_adapter *padapter) unsigned int is_ap_in_wep(struct adapter *padapter)
{ {
u32 i; u32 i;
PNDIS_802_11_VARIABLE_IEs pIE; PNDIS_802_11_VARIABLE_IEs pIE;
@ -1938,7 +1938,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;
@ -1997,25 +1997,25 @@ unsigned char get_highest_mcs_rate(struct HT_caps_element *pHT_caps)
return i; return i;
} }
void Update_RA_Entry(_adapter *padapter, struct sta_info *psta) void Update_RA_Entry(struct adapter *padapter, struct sta_info *psta)
{ {
rtw_hal_update_ra_mask(psta, 0); rtw_hal_update_ra_mask(psta, 0);
} }
void enable_rate_adaptive(_adapter *padapter, struct sta_info *psta); void enable_rate_adaptive(struct adapter *padapter, struct sta_info *psta);
void enable_rate_adaptive(_adapter *padapter, struct sta_info *psta) void enable_rate_adaptive(struct adapter *padapter, struct sta_info *psta)
{ {
Update_RA_Entry(padapter, psta); Update_RA_Entry(padapter, psta);
} }
void set_sta_rate(_adapter *padapter, struct sta_info *psta) void set_sta_rate(struct adapter *padapter, struct sta_info *psta)
{ {
//rate adaptive //rate adaptive
enable_rate_adaptive(padapter, psta); enable_rate_adaptive(padapter, psta);
} }
// 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)
{ {
NDIS_802_11_RATES_EX supported_rates; NDIS_802_11_RATES_EX supported_rates;
#ifdef CONFIG_P2P #ifdef CONFIG_P2P
@ -2141,7 +2141,7 @@ unsigned char check_assoc_AP(u8 *pframe, uint len)
} }
} }
void update_IOT_info(_adapter *padapter) void update_IOT_info(struct adapter *padapter)
{ {
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -2173,7 +2173,7 @@ void update_IOT_info(_adapter *padapter)
} }
void update_capinfo(PADAPTER Adapter, u16 updateCap) void update_capinfo(struct adapter *Adapter, u16 updateCap)
{ {
struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -2243,7 +2243,7 @@ void update_capinfo(PADAPTER Adapter, u16 updateCap)
} }
void update_wireless_mode(_adapter *padapter) void update_wireless_mode(struct adapter *padapter)
{ {
int ratelen, network_type = 0; int ratelen, network_type = 0;
u32 SIFS_Timer; u32 SIFS_Timer;
@ -2309,8 +2309,8 @@ 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 fire_write_MAC_cmd(_adapter *padapter, unsigned int addr, unsigned int value); void fire_write_MAC_cmd(struct adapter *padapter, unsigned int addr, unsigned int value);
void fire_write_MAC_cmd(_adapter *padapter, unsigned int addr, unsigned int value) void fire_write_MAC_cmd(struct adapter *padapter, unsigned int addr, unsigned int value)
{ {
#if 0 #if 0
struct cmd_obj *ph2c; struct cmd_obj *ph2c;
@ -2337,7 +2337,7 @@ void fire_write_MAC_cmd(_adapter *padapter, unsigned int addr, unsigned int valu
#endif #endif
} }
void update_bmc_sta_support_rate(_adapter *padapter, u32 mac_id) void update_bmc_sta_support_rate(struct adapter *padapter, u32 mac_id)
{ {
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -2353,7 +2353,7 @@ void update_bmc_sta_support_rate(_adapter *padapter, u32 mac_id)
} }
} }
int update_sta_support_rate(_adapter *padapter, u8* pvar_ie, uint var_ie_len, int cam_idx) int update_sta_support_rate(struct adapter *padapter, u8* pvar_ie, uint var_ie_len, int cam_idx)
{ {
unsigned int ie_len; unsigned int ie_len;
PNDIS_802_11_VARIABLE_IEs pIE; PNDIS_802_11_VARIABLE_IEs pIE;
@ -2380,7 +2380,7 @@ int update_sta_support_rate(_adapter *padapter, u8* pvar_ie, uint var_ie_len, in
} }
void process_addba_req(_adapter *padapter, u8 *paddba_req, u8 *addr) void process_addba_req(struct adapter *padapter, u8 *paddba_req, u8 *addr)
{ {
struct sta_info *psta; struct sta_info *psta;
u16 tid, start_seq, param; u16 tid, start_seq, param;
@ -2431,18 +2431,18 @@ void update_TSF(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint len)
pmlmeext->TSFValue |= le32_to_cpu(*pbuf); pmlmeext->TSFValue |= le32_to_cpu(*pbuf);
} }
void correct_TSF(_adapter *padapter, struct mlme_ext_priv *pmlmeext) void correct_TSF(struct adapter *padapter, struct mlme_ext_priv *pmlmeext)
{ {
rtw_hal_set_hwreg(padapter, HW_VAR_CORRECT_TSF, 0); rtw_hal_set_hwreg(padapter, HW_VAR_CORRECT_TSF, 0);
} }
void beacon_timing_control(_adapter *padapter) void beacon_timing_control(struct adapter *padapter)
{ {
rtw_hal_bcn_related_reg_setting(padapter); rtw_hal_bcn_related_reg_setting(padapter);
} }
#if 0 #if 0
unsigned int setup_beacon_frame(_adapter *padapter, unsigned char *beacon_frame) unsigned int setup_beacon_frame(struct adapter *padapter, unsigned char *beacon_frame)
{ {
unsigned short ATIMWindow; unsigned short ATIMWindow;
unsigned char *pframe; unsigned char *pframe;
@ -2543,9 +2543,9 @@ unsigned int setup_beacon_frame(_adapter *padapter, unsigned char *beacon_frame)
} }
#endif #endif
static _adapter *pbuddy_padapter = NULL; static struct adapter *pbuddy_padapter = NULL;
int rtw_handle_dualmac(_adapter *adapter, bool init) int rtw_handle_dualmac(struct adapter *adapter, bool init)
{ {
int status = _SUCCESS; int status = _SUCCESS;
struct dvobj_priv *dvobj = adapter_to_dvobj(adapter); struct dvobj_priv *dvobj = adapter_to_dvobj(adapter);
@ -2575,15 +2575,15 @@ int rtw_handle_dualmac(_adapter *adapter, bool init)
if (dvobj->InterfaceNumber == 0) { if (dvobj->InterfaceNumber == 0) {
//set adapter_type/iface type //set adapter_type/iface type
adapter->isprimary = _TRUE; adapter->isprimary = _TRUE;
adapter->adapter_type = PRIMARY_ADAPTER; adapter->adapter_type = PRIMARY_struct adapter;
adapter->iface_type = IFACE_PORT0; adapter->iface_type = IFACE_PORT0;
DBG_871X("%s(): PRIMARY_ADAPTER\n",__FUNCTION__); DBG_871X("%s(): PRIMARY_struct adapter\n",__FUNCTION__);
} else { } else {
//set adapter_type/iface type //set adapter_type/iface type
adapter->isprimary = _FALSE; adapter->isprimary = _FALSE;
adapter->adapter_type = SECONDARY_ADAPTER; adapter->adapter_type = SECONDARY_struct adapter;
adapter->iface_type = IFACE_PORT1; adapter->iface_type = IFACE_PORT1;
DBG_871X("%s(): SECONDARY_ADAPTER\n",__FUNCTION__); DBG_871X("%s(): SECONDARY_struct adapter\n",__FUNCTION__);
} }
#endif #endif
}else { }else {
@ -2593,7 +2593,7 @@ exit:
return status; return status;
} }
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
void rtw_get_current_ip_address(PADAPTER padapter, u8 *pcurrentip) void rtw_get_current_ip_address(struct adapter *padapter, u8 *pcurrentip)
{ {
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
@ -2615,7 +2615,7 @@ void rtw_get_current_ip_address(PADAPTER padapter, u8 *pcurrentip)
} }
} }
} }
void rtw_get_sec_iv(PADAPTER padapter, u8*pcur_dot11txpn, u8 *StaAddr) void rtw_get_sec_iv(struct adapter *padapter, u8*pcur_dot11txpn, u8 *StaAddr)
{ {
struct sta_info *psta; struct sta_info *psta;
struct security_priv *psecpriv = &padapter->securitypriv; struct security_priv *psecpriv = &padapter->securitypriv;
@ -2637,7 +2637,7 @@ void rtw_get_sec_iv(PADAPTER padapter, u8*pcur_dot11txpn, u8 *StaAddr)
DBG_871X("%s(): CurrentIV: 0x%016llx\n", __func__, psta->dot11txpn.val); DBG_871X("%s(): CurrentIV: 0x%016llx\n", __func__, psta->dot11txpn.val);
} }
} }
void rtw_set_sec_iv(PADAPTER padapter) void rtw_set_sec_iv(struct adapter *padapter)
{ {
struct sta_info *psta; struct sta_info *psta;
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);

84
core/rtw_xmit.c
View file

@ -69,7 +69,7 @@ _func_exit_;
} }
s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, _adapter *padapter) s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
{ {
int i; int i;
struct xmit_buf *pxmitbuf; struct xmit_buf *pxmitbuf;
@ -366,7 +366,7 @@ void rtw_mfree_xmit_priv_lock (struct xmit_priv *pxmitpriv)
void _rtw_free_xmit_priv (struct xmit_priv *pxmitpriv) 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;
@ -448,7 +448,7 @@ _func_exit_;
} }
static void update_attrib_vcs_info(_adapter *padapter, struct xmit_frame *pxmitframe) static void update_attrib_vcs_info(struct adapter *padapter, struct xmit_frame *pxmitframe)
{ {
u32 sz; u32 sz;
struct pkt_attrib *pattrib = &pxmitframe->attrib; struct pkt_attrib *pattrib = &pxmitframe->attrib;
@ -674,7 +674,7 @@ static void set_qos(struct pkt_file *ppktfile, struct pkt_attrib *pattrib)
pattrib->subtype = WIFI_QOS_DATA_TYPE; pattrib->subtype = WIFI_QOS_DATA_TYPE;
} }
static s32 update_attrib(_adapter *padapter, _pkt *pkt, struct pkt_attrib *pattrib) static s32 update_attrib(struct adapter *padapter, _pkt *pkt, struct pkt_attrib *pattrib)
{ {
uint i; uint i;
struct pkt_file pktfile; struct pkt_file pktfile;
@ -959,7 +959,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){
sint curfragnum,length; sint curfragnum,length;
u8 *pframe, *payload,mic[8]; u8 *pframe, *payload,mic[8];
struct mic_data micdata; struct mic_data micdata;
@ -1107,7 +1107,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;
@ -1147,7 +1147,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;
@ -1373,7 +1373,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;
@ -1383,7 +1383,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;
@ -1438,7 +1438,7 @@ s32 rtw_txframes_sta_ac_pending(_adapter *padapter, struct pkt_attrib *pattrib)
#ifdef CONFIG_TDLS #ifdef CONFIG_TDLS
int rtw_build_tdls_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe, u8 action) int rtw_build_tdls_ies(struct adapter * padapter, struct xmit_frame * pxmitframe, u8 *pframe, u8 action)
{ {
int res=_SUCCESS; int res=_SUCCESS;
@ -1483,7 +1483,7 @@ int rtw_build_tdls_ies(_adapter * padapter, struct xmit_frame * pxmitframe, u8 *
return res; return res;
} }
s32 rtw_make_tdls_wlanhdr (_adapter *padapter , u8 *hdr, struct pkt_attrib *pattrib, u8 action) s32 rtw_make_tdls_wlanhdr (struct adapter *padapter , u8 *hdr, struct pkt_attrib *pattrib, u8 action)
{ {
u16 *qc; u16 *qc;
struct rtw_ieee80211_hdr *pwlanhdr = (struct rtw_ieee80211_hdr *)hdr; struct rtw_ieee80211_hdr *pwlanhdr = (struct rtw_ieee80211_hdr *)hdr;
@ -1590,7 +1590,7 @@ _func_exit_;
return res; return res;
} }
s32 rtw_xmit_tdls_coalesce(_adapter * padapter, struct xmit_frame * pxmitframe, u8 action) s32 rtw_xmit_tdls_coalesce(struct adapter * padapter, struct xmit_frame * pxmitframe, u8 action)
{ {
s32 llc_sz; s32 llc_sz;
@ -1728,7 +1728,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, _pkt *pkt, struct xmit_frame *pxmitframe) s32 rtw_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit_frame *pxmitframe)
{ {
struct pkt_file pktfile; struct pkt_file pktfile;
@ -1940,7 +1940,7 @@ _func_exit_;
#ifdef CONFIG_IEEE80211W #ifdef CONFIG_IEEE80211W
//broadcast or multicast management pkt use BIP, unicast management pkt use CCMP encryption //broadcast or multicast management pkt use BIP, unicast management pkt use CCMP encryption
s32 rtw_mgmt_xmitframe_coalesce(_adapter *padapter, _pkt *pkt, struct xmit_frame *pxmitframe) s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, _pkt *pkt, struct xmit_frame *pxmitframe)
{ {
struct pkt_file pktfile; struct pkt_file pktfile;
s32 frg_inx, frg_len, mpdu_len, llc_sz, mem_sz; s32 frg_inx, frg_len, mpdu_len, llc_sz, mem_sz;
@ -2211,7 +2211,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;
@ -2260,7 +2260,7 @@ _func_exit_;
} }
void rtw_count_tx_stats(PADAPTER padapter, struct xmit_frame *pxmitframe, int sz) void rtw_count_tx_stats(struct adapter *padapter, struct xmit_frame *pxmitframe, int sz)
{ {
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
struct stainfo_stats *pstats = NULL; struct stainfo_stats *pstats = NULL;
@ -2542,7 +2542,7 @@ struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv)//(_queue *pf
struct xmit_frame *pxframe = NULL; struct xmit_frame *pxframe = NULL;
_list *plist, *phead; _list *plist, *phead;
_queue *pfree_xmit_queue = &pxmitpriv->free_xmit_queue; _queue *pfree_xmit_queue = &pxmitpriv->free_xmit_queue;
_adapter *padapter = pxmitpriv->adapter; struct adapter *padapter = pxmitpriv->adapter;
_func_enter_; _func_enter_;
@ -2638,7 +2638,7 @@ s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitfram
{ {
_irqL irqL; _irqL irqL;
_queue *queue; _queue *queue;
_adapter *padapter = pxmitpriv->adapter; struct adapter *padapter = pxmitpriv->adapter;
_pkt *pndis_pkt = NULL; _pkt *pndis_pkt = NULL;
_func_enter_; _func_enter_;
@ -2721,7 +2721,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)
{ {
@ -2785,7 +2785,7 @@ struct xmit_frame* rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct hw_xmi
struct tx_servq *ptxservq = NULL; struct tx_servq *ptxservq = NULL;
_queue *pframe_queue = NULL; _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];
#ifdef CONFIG_USB_HCI #ifdef CONFIG_USB_HCI
@ -2864,7 +2864,7 @@ _func_exit_;
return pxmitframe; return pxmitframe;
} }
struct tx_servq *rtw_get_sta_pending(_adapter *padapter, struct sta_info *psta, sint up, u8 *ac) struct tx_servq *rtw_get_sta_pending(struct adapter *padapter, struct sta_info *psta, sint up, u8 *ac)
{ {
struct tx_servq *ptxservq=NULL; struct tx_servq *ptxservq=NULL;
@ -2912,7 +2912,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)
{ {
//_irqL irqL0; //_irqL irqL0;
u8 ac_index; u8 ac_index;
@ -2970,7 +2970,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;
@ -3032,7 +3032,7 @@ void rtw_alloc_hwxmits(_adapter *padapter)
} }
void rtw_free_hwxmits(_adapter *padapter) void rtw_free_hwxmits(struct adapter *padapter)
{ {
struct hw_xmit *hwxmits; struct hw_xmit *hwxmits;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@ -3057,14 +3057,14 @@ _func_exit_;
} }
#ifdef CONFIG_BR_EXT #ifdef CONFIG_BR_EXT
int rtw_br_client_tx(_adapter *padapter, struct sk_buff **pskb) int rtw_br_client_tx(struct adapter *padapter, struct sk_buff **pskb)
{ {
struct sk_buff *skb = *pskb; struct sk_buff *skb = *pskb;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
_irqL irqL; _irqL irqL;
//if(check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == _TRUE) //if(check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == _TRUE)
{ {
void dhcp_flag_bcast(_adapter *priv, struct sk_buff *skb); void dhcp_flag_bcast(struct adapter *priv, struct sk_buff *skb);
int res, is_vlan_tag=0, i, do_nat25=1; int res, is_vlan_tag=0, i, do_nat25=1;
unsigned short vlan_hdr=0; unsigned short vlan_hdr=0;
void *br_port = NULL; void *br_port = NULL;
@ -3109,7 +3109,7 @@ int rtw_br_client_tx(_adapter *padapter, struct sk_buff **pskb)
if (*((unsigned short *)(skb->data+MACADDRLEN*2)) == __constant_htons(ETH_P_IP)) { if (*((unsigned short *)(skb->data+MACADDRLEN*2)) == __constant_htons(ETH_P_IP)) {
if (memcmp(padapter->scdb_mac, skb->data+MACADDRLEN, MACADDRLEN)) { if (memcmp(padapter->scdb_mac, skb->data+MACADDRLEN, MACADDRLEN)) {
void *scdb_findEntry(_adapter *priv, unsigned char *macAddr, unsigned char *ipAddr); void *scdb_findEntry(struct adapter *priv, unsigned char *macAddr, unsigned char *ipAddr);
if ((padapter->scdb_entry = (struct nat25_network_db_entry *)scdb_findEntry(padapter, if ((padapter->scdb_entry = (struct nat25_network_db_entry *)scdb_findEntry(padapter,
skb->data+MACADDRLEN, skb->data+WLAN_ETHHDR_LEN+12)) != NULL) { skb->data+MACADDRLEN, skb->data+WLAN_ETHHDR_LEN+12)) != NULL) {
@ -3134,7 +3134,7 @@ int rtw_br_client_tx(_adapter *padapter, struct sk_buff **pskb)
#endif // 1 #endif // 1
if (do_nat25) if (do_nat25)
{ {
int nat25_db_handle(_adapter *priv, struct sk_buff *skb, int method); int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method);
if (nat25_db_handle(padapter, skb, NAT25_CHECK) == 0) { if (nat25_db_handle(padapter, skb, NAT25_CHECK) == 0) {
struct sk_buff *newskb; struct sk_buff *newskb;
@ -3279,7 +3279,7 @@ u32 rtw_get_ff_hwaddr(struct xmit_frame *pxmitframe)
} }
static void do_queue_select(_adapter *padapter, struct pkt_attrib *pattrib) static void do_queue_select(struct adapter *padapter, struct pkt_attrib *pattrib)
{ {
u8 qsel; u8 qsel;
@ -3302,7 +3302,7 @@ static void do_queue_select(_adapter *padapter, struct pkt_attrib *pattrib)
* 0 success, hardware will handle this xmit frame(packet) * 0 success, hardware will handle this xmit frame(packet)
* <0 fail * <0 fail
*/ */
s32 rtw_xmit(_adapter *padapter, _pkt **ppkt) s32 rtw_xmit(struct adapter *padapter, _pkt **ppkt)
{ {
static u32 start = 0; static u32 start = 0;
static u32 drop_cnt = 0; static u32 drop_cnt = 0;
@ -3401,7 +3401,7 @@ s32 rtw_xmit(_adapter *padapter, _pkt **ppkt)
} }
#ifdef CONFIG_TDLS #ifdef CONFIG_TDLS
sint xmitframe_enqueue_for_tdls_sleeping_sta(_adapter *padapter, struct xmit_frame *pxmitframe) sint xmitframe_enqueue_for_tdls_sleeping_sta(struct adapter *padapter, struct xmit_frame *pxmitframe)
{ {
sint ret=_FALSE; sint ret=_FALSE;
@ -3477,7 +3477,7 @@ sint xmitframe_enqueue_for_tdls_sleeping_sta(_adapter *padapter, struct xmit_fra
#if defined(CONFIG_AP_MODE) || defined(CONFIG_TDLS) #if defined(CONFIG_AP_MODE) || defined(CONFIG_TDLS)
sint xmitframe_enqueue_for_sleeping_sta(_adapter *padapter, struct xmit_frame *pxmitframe) sint xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_frame *pxmitframe)
{ {
_irqL irqL; _irqL irqL;
sint ret=_FALSE; sint ret=_FALSE;
@ -3644,7 +3644,7 @@ sint xmitframe_enqueue_for_sleeping_sta(_adapter *padapter, struct xmit_frame *p
} }
static void dequeue_xmitframes_to_sleeping_queue(_adapter *padapter, struct sta_info *psta, _queue *pframequeue) static void dequeue_xmitframes_to_sleeping_queue(struct adapter *padapter, struct sta_info *psta, _queue *pframequeue)
{ {
sint ret; sint ret;
_list *plist, *phead; _list *plist, *phead;
@ -3683,7 +3683,7 @@ static void dequeue_xmitframes_to_sleeping_queue(_adapter *padapter, struct sta_
} }
void stop_sta_xmit(_adapter *padapter, struct sta_info *psta) void stop_sta_xmit(struct adapter *padapter, struct sta_info *psta)
{ {
_irqL irqL0; _irqL irqL0;
struct sta_info *psta_bmc; struct sta_info *psta_bmc;
@ -3746,7 +3746,7 @@ void stop_sta_xmit(_adapter *padapter, struct sta_info *psta)
} }
void wakeup_sta_to_xmit(_adapter *padapter, struct sta_info *psta) void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta)
{ {
_irqL irqL; _irqL irqL;
u8 update_mask=0, wmmps_ac=0; u8 update_mask=0, wmmps_ac=0;
@ -3925,7 +3925,7 @@ _exit:
} }
void xmit_delivery_enabled_frames(_adapter *padapter, struct sta_info *psta) void xmit_delivery_enabled_frames(struct adapter *padapter, struct sta_info *psta)
{ {
_irqL irqL; _irqL irqL;
u8 wmmps_ac=0; u8 wmmps_ac=0;
@ -4032,7 +4032,7 @@ void enqueue_pending_xmitbuf(
{ {
_irqL irql; _irqL irql;
_queue *pqueue; _queue *pqueue;
_adapter *pri_adapter = pxmitpriv->adapter; struct adapter *pri_adapter = pxmitpriv->adapter;
pqueue = &pxmitpriv->pending_xmitbuf_queue; pqueue = &pxmitpriv->pending_xmitbuf_queue;
@ -4154,7 +4154,7 @@ sint check_pending_xmitbuf(
thread_return rtw_xmit_thread(thread_context context) thread_return rtw_xmit_thread(thread_context context)
{ {
s32 err; s32 err;
PADAPTER padapter; struct adapter *padapter;
err = _SUCCESS; err = _SUCCESS;
@ -4237,7 +4237,7 @@ void rtw_sctx_done(struct submit_ctx **sctx)
#ifdef CONFIG_XMIT_ACK #ifdef CONFIG_XMIT_ACK
#ifdef CONFIG_XMIT_ACK_POLLING #ifdef CONFIG_XMIT_ACK_POLLING
s32 c2h_evt_hdl(_adapter *adapter, struct c2h_evt_hdr *c2h_evt, c2h_id_filter filter); s32 c2h_evt_hdl(struct adapter *adapter, struct c2h_evt_hdr *c2h_evt, c2h_id_filter filter);
/** /**
* rtw_ack_tx_polling - * rtw_ack_tx_polling -
@ -4252,7 +4252,7 @@ int rtw_ack_tx_polling(struct xmit_priv *pxmitpriv, u32 timeout_ms)
{ {
int ret = _FAIL; int ret = _FAIL;
struct submit_ctx *pack_tx_ops = &pxmitpriv->ack_tx_ops; struct submit_ctx *pack_tx_ops = &pxmitpriv->ack_tx_ops;
_adapter *adapter = container_of(pxmitpriv, _adapter, xmitpriv); struct adapter *adapter = container_of(pxmitpriv, struct adapter, xmitpriv);
pack_tx_ops->submit_time = rtw_get_current_time(); pack_tx_ops->submit_time = rtw_get_current_time();
pack_tx_ops->timeout_ms = timeout_ms; pack_tx_ops->timeout_ms = timeout_ms;
@ -4288,13 +4288,13 @@ int rtw_ack_tx_polling(struct xmit_priv *pxmitpriv, u32 timeout_ms)
#endif #endif
#ifdef CONFIG_DETECT_C2H_BY_POLLING #ifdef CONFIG_DETECT_C2H_BY_POLLING
s32 c2h_evt_hdl(_adapter *adapter, struct c2h_evt_hdr *c2h_evt, c2h_id_filter filter); s32 c2h_evt_hdl(struct adapter *adapter, struct c2h_evt_hdr *c2h_evt, c2h_id_filter filter);
#endif #endif
int rtw_ack_tx_wait(struct xmit_priv *pxmitpriv, u32 timeout_ms) int rtw_ack_tx_wait(struct xmit_priv *pxmitpriv, u32 timeout_ms)
{ {
#ifdef CONFIG_DETECT_C2H_BY_POLLING #ifdef CONFIG_DETECT_C2H_BY_POLLING
_adapter *adapter = container_of(pxmitpriv, _adapter, xmitpriv); struct adapter *adapter = container_of(pxmitpriv, struct adapter, xmitpriv);
c2h_id_filter ccx_id_filter = rtw_hal_c2h_id_filter_ccx(adapter); c2h_id_filter ccx_id_filter = rtw_hal_c2h_id_filter_ccx(adapter);
struct submit_ctx *pack_tx_ops = &pxmitpriv->ack_tx_ops; struct submit_ctx *pack_tx_ops = &pxmitpriv->ack_tx_ops;
u8 check_c2hcmd; u8 check_c2hcmd;

32
hal/HalPhyRf.c
View file

@ -25,7 +25,7 @@
VOID VOID
phy_PathAStandBy( phy_PathAStandBy(
IN PADAPTER pAdapter IN struct adapter *pAdapter
) )
{ {
RTPRINT(FINIT, INIT_IQK, ("Path-A standby mode!\n")); RTPRINT(FINIT, INIT_IQK, ("Path-A standby mode!\n"));
@ -41,7 +41,7 @@ phy_PathAStandBy(
u1Byte //bit0 = 1 => Tx OK, bit1 = 1 => Rx OK u1Byte //bit0 = 1 => Tx OK, bit1 = 1 => Rx OK
phy_PathA_IQK_8192C( phy_PathA_IQK_8192C(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN BOOLEAN configPathB IN BOOLEAN configPathB
) )
{ {
@ -129,7 +129,7 @@ phy_PathA_IQK_8192C(
u1Byte //bit0 = 1 => Tx OK, bit1 = 1 => Rx OK u1Byte //bit0 = 1 => Tx OK, bit1 = 1 => Rx OK
phy_PathB_IQK_8192C( phy_PathB_IQK_8192C(
IN PADAPTER pAdapter IN struct adapter *pAdapter
) )
{ {
u4Byte regEAC, regEB4, regEBC, regEC4, regECC; u4Byte regEAC, regEB4, regEBC, regEC4, regECC;
@ -178,7 +178,7 @@ phy_PathB_IQK_8192C(
VOID VOID
phy_PathAFillIQKMatrix( phy_PathAFillIQKMatrix(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN BOOLEAN bIQKOK, IN BOOLEAN bIQKOK,
IN s4Byte result[][8], IN s4Byte result[][8],
IN u1Byte final_candidate, IN u1Byte final_candidate,
@ -245,7 +245,7 @@ phy_PathAFillIQKMatrix(
VOID VOID
phy_PathBFillIQKMatrix( phy_PathBFillIQKMatrix(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN BOOLEAN bIQKOK, IN BOOLEAN bIQKOK,
IN s4Byte result[][8], IN s4Byte result[][8],
IN u1Byte final_candidate, IN u1Byte final_candidate,
@ -307,7 +307,7 @@ phy_PathBFillIQKMatrix(
BOOLEAN BOOLEAN
phy_SimularityCompare_92C( phy_SimularityCompare_92C(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN s4Byte result[][8], IN s4Byte result[][8],
IN u1Byte c1, IN u1Byte c1,
IN u1Byte c2 IN u1Byte c2
@ -379,7 +379,7 @@ return FALSE => do IQK again
*/ */
BOOLEAN BOOLEAN
phy_SimularityCompare( phy_SimularityCompare(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN s4Byte result[][8], IN s4Byte result[][8],
IN u1Byte c1, IN u1Byte c1,
IN u1Byte c2 IN u1Byte c2
@ -394,7 +394,7 @@ phy_SimularityCompare(
VOID VOID
phy_IQCalibrate_8192C( phy_IQCalibrate_8192C(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN s4Byte result[][8], IN s4Byte result[][8],
IN u1Byte t, IN u1Byte t,
IN BOOLEAN is2T IN BOOLEAN is2T
@ -650,7 +650,7 @@ phy_IQCalibrate_8192C(
VOID VOID
phy_LCCalibrate92C( phy_LCCalibrate92C(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN BOOLEAN is2T IN BOOLEAN is2T
) )
{ {
@ -714,7 +714,7 @@ phy_LCCalibrate92C(
VOID VOID
phy_LCCalibrate( phy_LCCalibrate(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN BOOLEAN is2T IN BOOLEAN is2T
) )
{ {
@ -741,7 +741,7 @@ phy_LCCalibrate(
VOID VOID
phy_APCalibrate_8192C( phy_APCalibrate_8192C(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN s1Byte delta, IN s1Byte delta,
IN BOOLEAN is2T IN BOOLEAN is2T
) )
@ -1186,7 +1186,7 @@ if (pAdapter->registrypriv.mp_mode == 1)
VOID VOID
PHY_IQCalibrate_8192C( PHY_IQCalibrate_8192C(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN BOOLEAN bReCovery IN BOOLEAN bReCovery
) )
{ {
@ -1396,7 +1396,7 @@ if (pAdapter->registrypriv.mp_mode == 1)
VOID VOID
PHY_LCCalibrate_8192C( PHY_LCCalibrate_8192C(
IN PADAPTER pAdapter IN struct adapter *pAdapter
) )
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter);
@ -1404,7 +1404,7 @@ PHY_LCCalibrate_8192C(
PMGNT_INFO pMgntInfo=&pAdapter->MgntInfo; PMGNT_INFO pMgntInfo=&pAdapter->MgntInfo;
PMGNT_INFO pMgntInfoBuddyAdapter; PMGNT_INFO pMgntInfoBuddyAdapter;
u4Byte timeout = 2000, timecount = 0; u4Byte timeout = 2000, timecount = 0;
PADAPTER BuddyAdapter = pAdapter->BuddyAdapter; struct adapter *BuddyAdapter = pAdapter->BuddyAdapter;
#if MP_DRIVER == 1 #if MP_DRIVER == 1
if (pAdapter->registrypriv.mp_mode == 1) if (pAdapter->registrypriv.mp_mode == 1)
@ -1464,7 +1464,7 @@ if (pAdapter->registrypriv.mp_mode == 1)
VOID VOID
PHY_APCalibrate_8192C( PHY_APCalibrate_8192C(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN s1Byte delta IN s1Byte delta
) )
{ {
@ -1509,7 +1509,7 @@ ODM_ResetIQKResult(
{ {
u1Byte i; u1Byte i;
#if (DM_ODM_SUPPORT_TYPE == ODM_MP || DM_ODM_SUPPORT_TYPE == ODM_CE) #if (DM_ODM_SUPPORT_TYPE == ODM_MP || DM_ODM_SUPPORT_TYPE == ODM_CE)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter *Adapter = pDM_Odm->Adapter;
if (!IS_HARDWARE_TYPE_8192D(Adapter)) if (!IS_HARDWARE_TYPE_8192D(Adapter))
return; return;

60
hal/HalPhyRf_8188e.c
View file

@ -139,7 +139,7 @@ void doIQK(
) )
{ {
#if !(DM_ODM_SUPPORT_TYPE & ODM_AP) #if !(DM_ODM_SUPPORT_TYPE & ODM_AP)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
#endif #endif
@ -290,7 +290,7 @@ odm_TxPwrTrackSetPwr88E(
u1Byte BW20PowerLevel[MAX_TX_COUNT], BW40PowerLevel[MAX_TX_COUNT]; u1Byte BW20PowerLevel[MAX_TX_COUNT], BW40PowerLevel[MAX_TX_COUNT];
u1Byte rf = 0; u1Byte rf = 0;
u4Byte pwr = 0, TxAGC = 0; u4Byte pwr = 0, TxAGC = 0;
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter *Adapter = pDM_Odm->Adapter;
//printk("odm_TxPwrTrackSetPwr88E CH=%d, modify TXAGC \n", *(pDM_Odm->pChannel)); //printk("odm_TxPwrTrackSetPwr88E CH=%d, modify TXAGC \n", *(pDM_Odm->pChannel));
ODM_RT_TRACE(pDM_Odm, ODM_COMP_TX_PWR_TRACK, ODM_DBG_LOUD, ("odm_TxPwrTrackSetPwr88E CH=%d\n", *(pDM_Odm->pChannel))); ODM_RT_TRACE(pDM_Odm, ODM_COMP_TX_PWR_TRACK, ODM_DBG_LOUD, ("odm_TxPwrTrackSetPwr88E CH=%d\n", *(pDM_Odm->pChannel)));
#if (DM_ODM_SUPPORT_TYPE & (ODM_MP|ODM_CE )) #if (DM_ODM_SUPPORT_TYPE & (ODM_MP|ODM_CE ))
@ -384,7 +384,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E(
#if (DM_ODM_SUPPORT_TYPE & ODM_AP) #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
IN PDM_ODM_T pDM_Odm IN PDM_ODM_T pDM_Odm
#else #else
IN PADAPTER Adapter IN struct adapter *Adapter
#endif #endif
) )
{ {
@ -643,7 +643,7 @@ phy_PathA_IQK_8188E(
#if (DM_ODM_SUPPORT_TYPE & ODM_AP) #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
#else #else
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
#endif #endif
IN BOOLEAN configPathB IN BOOLEAN configPathB
) )
@ -719,7 +719,7 @@ phy_PathA_RxIQK(
#if (DM_ODM_SUPPORT_TYPE & ODM_AP) #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
#else #else
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
#endif #endif
IN BOOLEAN configPathB IN BOOLEAN configPathB
) )
@ -880,7 +880,7 @@ phy_PathB_IQK_8188E(
#if (DM_ODM_SUPPORT_TYPE & ODM_AP) #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
IN PDM_ODM_T pDM_Odm IN PDM_ODM_T pDM_Odm
#else #else
IN PADAPTER pAdapter IN struct adapter *pAdapter
#endif #endif
) )
{ {
@ -943,7 +943,7 @@ _PHY_PathAFillIQKMatrix(
#if (DM_ODM_SUPPORT_TYPE & ODM_AP) #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
#else #else
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
#endif #endif
IN BOOLEAN bIQKOK, IN BOOLEAN bIQKOK,
IN s4Byte result[][8], IN s4Byte result[][8],
@ -1018,7 +1018,7 @@ _PHY_PathBFillIQKMatrix(
#if (DM_ODM_SUPPORT_TYPE & ODM_AP) #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
#else #else
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
#endif #endif
IN BOOLEAN bIQKOK, IN BOOLEAN bIQKOK,
IN s4Byte result[][8], IN s4Byte result[][8],
@ -1087,7 +1087,7 @@ _PHY_PathBFillIQKMatrix(
#if !(DM_ODM_SUPPORT_TYPE & ODM_MP) #if !(DM_ODM_SUPPORT_TYPE & ODM_MP)
BOOLEAN BOOLEAN
ODM_CheckPowerStatus( ODM_CheckPowerStatus(
IN PADAPTER Adapter) IN struct adapter * Adapter)
{ {
/* /*
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
@ -1122,7 +1122,7 @@ _PHY_SaveADDARegisters(
#if (DM_ODM_SUPPORT_TYPE & ODM_AP) #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
#else #else
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
#endif #endif
IN pu4Byte ADDAReg, IN pu4Byte ADDAReg,
IN pu4Byte ADDABackup, IN pu4Byte ADDABackup,
@ -1155,7 +1155,7 @@ _PHY_SaveMACRegisters(
#if (DM_ODM_SUPPORT_TYPE & ODM_AP) #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
#else #else
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
#endif #endif
IN pu4Byte MACReg, IN pu4Byte MACReg,
IN pu4Byte MACBackup IN pu4Byte MACBackup
@ -1185,7 +1185,7 @@ _PHY_ReloadADDARegisters(
#if (DM_ODM_SUPPORT_TYPE & ODM_AP) #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
#else #else
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
#endif #endif
IN pu4Byte ADDAReg, IN pu4Byte ADDAReg,
IN pu4Byte ADDABackup, IN pu4Byte ADDABackup,
@ -1215,7 +1215,7 @@ _PHY_ReloadMACRegisters(
#if (DM_ODM_SUPPORT_TYPE & ODM_AP) #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
#else #else
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
#endif #endif
IN pu4Byte MACReg, IN pu4Byte MACReg,
IN pu4Byte MACBackup IN pu4Byte MACBackup
@ -1244,7 +1244,7 @@ _PHY_PathADDAOn(
#if (DM_ODM_SUPPORT_TYPE & ODM_AP) #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
#else #else
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
#endif #endif
IN pu4Byte ADDAReg, IN pu4Byte ADDAReg,
IN BOOLEAN isPathAOn, IN BOOLEAN isPathAOn,
@ -1284,7 +1284,7 @@ _PHY_MACSettingCalibration(
#if (DM_ODM_SUPPORT_TYPE & ODM_AP) #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
#else #else
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
#endif #endif
IN pu4Byte MACReg, IN pu4Byte MACReg,
IN pu4Byte MACBackup IN pu4Byte MACBackup
@ -1316,7 +1316,7 @@ _PHY_PathAStandBy(
#if (DM_ODM_SUPPORT_TYPE & ODM_AP) #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
IN PDM_ODM_T pDM_Odm IN PDM_ODM_T pDM_Odm
#else #else
IN PADAPTER pAdapter IN struct adapter *pAdapter
#endif #endif
) )
{ {
@ -1341,7 +1341,7 @@ _PHY_PIModeSwitch(
#if (DM_ODM_SUPPORT_TYPE & ODM_AP) #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
#else #else
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
#endif #endif
IN BOOLEAN PIMode IN BOOLEAN PIMode
) )
@ -1368,7 +1368,7 @@ phy_SimularityCompare_8188E(
#if (DM_ODM_SUPPORT_TYPE & ODM_AP) #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
#else #else
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
#endif #endif
IN s4Byte result[][8], IN s4Byte result[][8],
IN u1Byte c1, IN u1Byte c1,
@ -1503,7 +1503,7 @@ phy_IQCalibrate_8188E(
#if (DM_ODM_SUPPORT_TYPE & ODM_AP) #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
#else #else
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
#endif #endif
IN s4Byte result[][8], IN s4Byte result[][8],
IN u1Byte t, IN u1Byte t,
@ -1796,7 +1796,7 @@ phy_LCCalibrate_8188E(
#if (DM_ODM_SUPPORT_TYPE & ODM_AP) #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
#else #else
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
#endif #endif
IN BOOLEAN is2T IN BOOLEAN is2T
) )
@ -1887,7 +1887,7 @@ phy_APCalibrate_8188E(
#if (DM_ODM_SUPPORT_TYPE & ODM_AP) #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
#else #else
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
#endif #endif
IN s1Byte delta, IN s1Byte delta,
IN BOOLEAN is2T IN BOOLEAN is2T
@ -2380,7 +2380,7 @@ PHY_IQCalibrate_8188E(
#if (DM_ODM_SUPPORT_TYPE & ODM_AP) #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
#else #else
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
#endif #endif
IN BOOLEAN bReCovery IN BOOLEAN bReCovery
) )
@ -2675,7 +2675,7 @@ PHY_LCCalibrate_8188E(
#if (DM_ODM_SUPPORT_TYPE & ODM_AP) #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
IN PDM_ODM_T pDM_Odm IN PDM_ODM_T pDM_Odm
#else #else
IN PADAPTER pAdapter IN struct adapter *pAdapter
#endif #endif
) )
{ {
@ -2764,7 +2764,7 @@ PHY_APCalibrate_8188E(
#if (DM_ODM_SUPPORT_TYPE & ODM_AP) #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
#else #else
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
#endif #endif
IN s1Byte delta IN s1Byte delta
) )
@ -2814,7 +2814,7 @@ VOID phy_SetRFPathSwitch_8188E(
#if (DM_ODM_SUPPORT_TYPE & ODM_AP) #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
#else #else
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
#endif #endif
IN BOOLEAN bMain, IN BOOLEAN bMain,
IN BOOLEAN is2T IN BOOLEAN is2T
@ -2863,7 +2863,7 @@ VOID PHY_SetRFPathSwitch_8188E(
#if (DM_ODM_SUPPORT_TYPE & ODM_AP) #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
#else #else
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
#endif #endif
IN BOOLEAN bMain IN BOOLEAN bMain
) )
@ -2905,7 +2905,7 @@ VOID PHY_SetRFPathSwitch_8188E(
VOID VOID
phy_DigitalPredistortion( phy_DigitalPredistortion(
#if !(DM_ODM_SUPPORT_TYPE & ODM_AP) #if !(DM_ODM_SUPPORT_TYPE & ODM_AP)
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
#else #else
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
#endif #endif
@ -2917,7 +2917,7 @@ phy_DigitalPredistortion(
VOID VOID
PHY_DigitalPredistortion_8188E( PHY_DigitalPredistortion_8188E(
#if !(DM_ODM_SUPPORT_TYPE & ODM_AP) #if !(DM_ODM_SUPPORT_TYPE & ODM_AP)
IN PADAPTER pAdapter IN struct adapter *pAdapter
#else #else
IN PDM_ODM_T pDM_Odm IN PDM_ODM_T pDM_Odm
#endif #endif
@ -2961,7 +2961,7 @@ BOOLEAN phy_QueryRFPathSwitch_8188E(
#if (DM_ODM_SUPPORT_TYPE & ODM_AP) #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
#else #else
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
#endif #endif
IN BOOLEAN is2T IN BOOLEAN is2T
) )
@ -3007,7 +3007,7 @@ BOOLEAN PHY_QueryRFPathSwitch_8188E(
#if (DM_ODM_SUPPORT_TYPE & ODM_AP) #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
IN PDM_ODM_T pDM_Odm IN PDM_ODM_T pDM_Odm
#else #else
IN PADAPTER pAdapter IN struct adapter *pAdapter
#endif #endif
) )
{ {

18
hal/HalPhyRf_8188e.h
View file

@ -47,7 +47,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E(
#if (DM_ODM_SUPPORT_TYPE & ODM_AP) #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
IN PDM_ODM_T pDM_Odm IN PDM_ODM_T pDM_Odm
#else #else
IN PADAPTER Adapter IN struct adapter * Adapter
#endif #endif
); );
@ -59,7 +59,7 @@ PHY_IQCalibrate_8188E(
#if (DM_ODM_SUPPORT_TYPE & ODM_AP) #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
#else #else
IN PADAPTER Adapter, IN struct adapter * Adapter,
#endif #endif
IN BOOLEAN bReCovery); IN BOOLEAN bReCovery);
@ -72,7 +72,7 @@ PHY_LCCalibrate_8188E(
#if (DM_ODM_SUPPORT_TYPE & ODM_AP) #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
IN PDM_ODM_T pDM_Odm IN PDM_ODM_T pDM_Odm
#else #else
IN PADAPTER pAdapter IN struct adapter * pAdapter
#endif #endif
); );
@ -84,11 +84,11 @@ PHY_APCalibrate_8188E(
#if (DM_ODM_SUPPORT_TYPE & ODM_AP) #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
#else #else
IN PADAPTER pAdapter, IN struct adapter * pAdapter,
#endif #endif
IN s1Byte delta); IN s1Byte delta);
void void
PHY_DigitalPredistortion_8188E( IN PADAPTER pAdapter); PHY_DigitalPredistortion_8188E( IN struct adapter * pAdapter);
VOID VOID
@ -96,7 +96,7 @@ _PHY_SaveADDARegisters(
#if (DM_ODM_SUPPORT_TYPE & ODM_AP) #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
#else #else
IN PADAPTER pAdapter, IN struct adapter * pAdapter,
#endif #endif
IN pu4Byte ADDAReg, IN pu4Byte ADDAReg,
IN pu4Byte ADDABackup, IN pu4Byte ADDABackup,
@ -108,7 +108,7 @@ _PHY_PathADDAOn(
#if (DM_ODM_SUPPORT_TYPE & ODM_AP) #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
#else #else
IN PADAPTER pAdapter, IN struct adapter * pAdapter,
#endif #endif
IN pu4Byte ADDAReg, IN pu4Byte ADDAReg,
IN BOOLEAN isPathAOn, IN BOOLEAN isPathAOn,
@ -120,7 +120,7 @@ _PHY_MACSettingCalibration(
#if (DM_ODM_SUPPORT_TYPE & ODM_AP) #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
IN PDM_ODM_T pDM_Odm, IN PDM_ODM_T pDM_Odm,
#else #else
IN PADAPTER pAdapter, IN struct adapter * pAdapter,
#endif #endif
IN pu4Byte MACReg, IN pu4Byte MACReg,
IN pu4Byte MACBackup IN pu4Byte MACBackup
@ -132,7 +132,7 @@ _PHY_PathAStandBy(
#if (DM_ODM_SUPPORT_TYPE & ODM_AP) #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
IN PDM_ODM_T pDM_Odm IN PDM_ODM_T pDM_Odm
#else #else
IN PADAPTER pAdapter IN struct adapter * pAdapter
#endif #endif
); );

2
hal/HalPwrSeqCmd.c
View file

@ -50,7 +50,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,

22
hal/hal_com.c
View file

@ -74,7 +74,7 @@ void dump_chip_info(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(
IN PADAPTER padapter, IN struct adapter *padapter,
IN u8 hw_channel_plan, //channel plan from HW (efuse/eeprom) IN u8 hw_channel_plan, //channel plan from HW (efuse/eeprom)
IN u8 sw_channel_plan, //channel plan from SW (registry/module param) IN u8 sw_channel_plan, //channel plan from SW (registry/module param)
IN u8 def_channel_plan, //channel plan used when the former two is invalid IN u8 def_channel_plan, //channel plan used when the former two is invalid
@ -141,7 +141,7 @@ u8 MRateToHwRate(u8 rate)
} }
void HalSetBrateCfg( void HalSetBrateCfg(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN u8 *mBratesOS, IN u8 *mBratesOS,
OUT u16 *pBrateCfg) OUT u16 *pBrateCfg)
{ {
@ -175,7 +175,7 @@ void HalSetBrateCfg(
static VOID static VOID
_OneOutPipeMapping( _OneOutPipeMapping(
IN PADAPTER pAdapter IN struct adapter *pAdapter
) )
{ {
struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(pAdapter); struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(pAdapter);
@ -193,7 +193,7 @@ _OneOutPipeMapping(
static VOID static VOID
_TwoOutPipeMapping( _TwoOutPipeMapping(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN BOOLEAN bWIFICfg IN BOOLEAN bWIFICfg
) )
{ {
@ -238,7 +238,7 @@ _TwoOutPipeMapping(
} }
static VOID _ThreeOutPipeMapping( static VOID _ThreeOutPipeMapping(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN BOOLEAN bWIFICfg IN BOOLEAN bWIFICfg
) )
{ {
@ -283,7 +283,7 @@ static VOID _ThreeOutPipeMapping(
BOOLEAN BOOLEAN
Hal_MappingOutPipe( Hal_MappingOutPipe(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN u8 NumOutPipe IN u8 NumOutPipe
) )
{ {
@ -313,7 +313,7 @@ Hal_MappingOutPipe(
} }
void hal_init_macaddr(_adapter *adapter) void hal_init_macaddr(struct adapter *adapter)
{ {
rtw_hal_set_hwreg(adapter, HW_VAR_MAC_ADDR, adapter->eeprompriv.mac_addr); rtw_hal_set_hwreg(adapter, HW_VAR_MAC_ADDR, adapter->eeprompriv.mac_addr);
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
@ -328,12 +328,12 @@ void hal_init_macaddr(_adapter *adapter)
* BITS [127:120] [119:16] [15:8] [7:4] [3:0] * 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;
@ -386,7 +386,7 @@ exit:
} }
u8 u8
SetHalDefVar(_adapter *adapter, HAL_DEF_VARIABLE variable, void *value) SetHalDefVar(struct adapter *adapter, HAL_DEF_VARIABLE variable, void *value)
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(adapter);
PDM_ODM_T pDM_Odm = &(pHalData->odmpriv); PDM_ODM_T pDM_Odm = &(pHalData->odmpriv);
@ -415,7 +415,7 @@ SetHalDefVar(_adapter *adapter, HAL_DEF_VARIABLE variable, void *value)
} }
u8 u8
GetHalDefVar(_adapter *adapter, HAL_DEF_VARIABLE variable, void *value) GetHalDefVar(struct adapter *adapter, HAL_DEF_VARIABLE variable, void *value)
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(adapter);
PDM_ODM_T pDM_Odm = &(pHalData->odmpriv); PDM_ODM_T pDM_Odm = &(pHalData->odmpriv);

120
hal/hal_intf.c
View file

@ -34,75 +34,75 @@
#include <gspi_hal.h> #include <gspi_hal.h>
#endif #endif
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 (is_primary_adapter(padapter)) if (is_primary_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 (is_primary_adapter(padapter)) if (is_primary_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 (is_primary_adapter(padapter)) if (is_primary_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 (is_primary_adapter(padapter)) if (is_primary_adapter(padapter))
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);
return _FAIL; return _FAIL;
} }
void rtw_hal_power_off(_adapter *padapter) void rtw_hal_power_off(struct adapter *padapter)
{ {
if(padapter->HalFunc.hal_power_off) if(padapter->HalFunc.hal_power_off)
padapter->HalFunc.hal_power_off(padapter); padapter->HalFunc.hal_power_off(padapter);
} }
uint rtw_hal_init(_adapter *padapter) uint rtw_hal_init(struct adapter *padapter)
{ {
uint status = _SUCCESS; uint status = _SUCCESS;
struct dvobj_priv *dvobj = adapter_to_dvobj(padapter); struct dvobj_priv *dvobj = adapter_to_dvobj(padapter);
@ -169,7 +169,7 @@ uint rtw_hal_init(_adapter *padapter)
} }
uint rtw_hal_deinit(_adapter *padapter) uint rtw_hal_deinit(struct adapter *padapter)
{ {
uint status = _SUCCESS; uint status = _SUCCESS;
struct dvobj_priv *dvobj = adapter_to_dvobj(padapter); struct dvobj_priv *dvobj = adapter_to_dvobj(padapter);
@ -199,43 +199,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, HAL_DEF_VARIABLE eVariable, PVOID pValue) u8 rtw_hal_set_def_var(struct adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue)
{ {
if(padapter->HalFunc.SetHalDefVarHandler) 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, HAL_DEF_VARIABLE eVariable, PVOID pValue) u8 rtw_hal_get_def_var(struct adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue)
{ {
if(padapter->HalFunc.GetHalDefVarHandler) 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, HAL_ODM_VARIABLE eVariable, PVOID pValue1,BOOLEAN bSet) void rtw_hal_set_odm_var(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1,BOOLEAN bSet)
{ {
if(padapter->HalFunc.SetHalODMVarHandler) 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, HAL_ODM_VARIABLE eVariable, PVOID pValue1,BOOLEAN bSet) void rtw_hal_get_odm_var(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1,BOOLEAN bSet)
{ {
if(padapter->HalFunc.GetHalODMVarHandler) 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 (!is_primary_adapter(padapter)){ if (!is_primary_adapter(padapter)){
DBG_871X(" rtw_hal_enable_interrupt: Secondary adapter return l\n"); DBG_871X(" rtw_hal_enable_interrupt: Secondary adapter return l\n");
@ -248,7 +248,7 @@ void rtw_hal_enable_interrupt(_adapter *padapter)
DBG_871X("%s: HalFunc.enable_interrupt is NULL!\n", __FUNCTION__); DBG_871X("%s: HalFunc.enable_interrupt is NULL!\n", __FUNCTION__);
} }
void rtw_hal_disable_interrupt(_adapter *padapter) void rtw_hal_disable_interrupt(struct adapter *padapter)
{ {
if (!is_primary_adapter(padapter)){ if (!is_primary_adapter(padapter)){
DBG_871X(" rtw_hal_disable_interrupt: Secondary adapter return l\n"); DBG_871X(" rtw_hal_disable_interrupt: Secondary adapter return l\n");
@ -263,7 +263,7 @@ void rtw_hal_disable_interrupt(_adapter *padapter)
} }
u32 rtw_hal_inirp_init(_adapter *padapter) u32 rtw_hal_inirp_init(struct adapter *padapter)
{ {
u32 rst = _FAIL; u32 rst = _FAIL;
if(padapter->HalFunc.inirp_init) if(padapter->HalFunc.inirp_init)
@ -273,7 +273,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)
@ -283,14 +283,14 @@ u32 rtw_hal_inirp_deinit(_adapter *padapter)
} }
u8 rtw_hal_intf_ps_func(_adapter *padapter,HAL_INTF_PS_FUNC efunc_id, u8* val) u8 rtw_hal_intf_ps_func(struct adapter *padapter,HAL_INTF_PS_FUNC efunc_id, u8* val)
{ {
if(padapter->HalFunc.interface_ps_func) 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_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe) s32 rtw_hal_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitframe)
{ {
if(padapter->HalFunc.hal_xmitframe_enqueue) if(padapter->HalFunc.hal_xmitframe_enqueue)
return padapter->HalFunc.hal_xmitframe_enqueue(padapter, pxmitframe); return padapter->HalFunc.hal_xmitframe_enqueue(padapter, pxmitframe);
@ -298,7 +298,7 @@ s32 rtw_hal_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe)
return _FALSE; return _FALSE;
} }
s32 rtw_hal_xmit(_adapter *padapter, struct xmit_frame *pxmitframe) s32 rtw_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe)
{ {
if(padapter->HalFunc.hal_xmit) if(padapter->HalFunc.hal_xmit)
return padapter->HalFunc.hal_xmit(padapter, pxmitframe); return padapter->HalFunc.hal_xmit(padapter, pxmitframe);
@ -306,7 +306,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;
unsigned char *pframe; unsigned char *pframe;
@ -338,26 +338,26 @@ 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);
@ -365,7 +365,7 @@ void rtw_hal_free_recv_priv(_adapter *padapter)
void rtw_hal_update_ra_mask(struct sta_info *psta, u8 rssi_level) void rtw_hal_update_ra_mask(struct sta_info *psta, u8 rssi_level)
{ {
_adapter *padapter; struct adapter *padapter;
struct mlme_priv *pmlmepriv; struct mlme_priv *pmlmepriv;
if(!psta) if(!psta)
@ -386,71 +386,71 @@ void rtw_hal_update_ra_mask(struct sta_info *psta, u8 rssi_level)
} }
} }
void rtw_hal_add_ra_tid(_adapter *padapter, u32 bitmap, u8 arg, u8 rssi_level) void rtw_hal_add_ra_tid(struct adapter *padapter, u32 bitmap, u8 arg, u8 rssi_level)
{ {
if(padapter->HalFunc.Add_RateATid) 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, u32 eRFPath, u32 RegAddr, u32 BitMask) u32 rtw_hal_read_rfreg(struct adapter *padapter, u32 eRFPath, 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, eRFPath, RegAddr, BitMask); data = padapter->HalFunc.read_rfreg(padapter, eRFPath, RegAddr, BitMask);
return data; return data;
} }
void rtw_hal_write_rfreg(_adapter *padapter, u32 eRFPath, u32 RegAddr, u32 BitMask, u32 Data) void rtw_hal_write_rfreg(struct adapter *padapter, u32 eRFPath, u32 RegAddr, u32 BitMask, u32 Data)
{ {
if(padapter->HalFunc.write_rfreg) if(padapter->HalFunc.write_rfreg)
padapter->HalFunc.write_rfreg(padapter, eRFPath, RegAddr, BitMask, Data); padapter->HalFunc.write_rfreg(padapter, eRFPath, RegAddr, BitMask, Data);
} }
s32 rtw_hal_interrupt_handler(_adapter *padapter) s32 rtw_hal_interrupt_handler(struct adapter *padapter)
{ {
if(padapter->HalFunc.interrupt_handler) 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, HT_CHANNEL_WIDTH Bandwidth, u8 Offset) void rtw_hal_set_bwmode(struct adapter *padapter, HT_CHANNEL_WIDTH Bandwidth, u8 Offset)
{ {
if(padapter->HalFunc.set_bwmode_handler) 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 defined(CONFIG_CONCURRENT_MODE) #if defined(CONFIG_CONCURRENT_MODE)
if (padapter->adapter_type != PRIMARY_ADAPTER) if (padapter->adapter_type != PRIMARY_ADAPTER)
@ -460,7 +460,7 @@ void rtw_hal_dm_watchdog(_adapter *padapter)
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);
@ -468,13 +468,13 @@ void rtw_hal_bcn_related_reg_setting(_adapter *padapter)
#ifdef CONFIG_ANTENNA_DIVERSITY #ifdef CONFIG_ANTENNA_DIVERSITY
u8 rtw_hal_antdiv_before_linked(_adapter *padapter) u8 rtw_hal_antdiv_before_linked(struct adapter *padapter)
{ {
if(padapter->HalFunc.AntDivBeforeLinkHandler) 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, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src) void rtw_hal_antdiv_rssi_compared(struct adapter *padapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src)
{ {
if(padapter->HalFunc.AntDivCompareHandler) if(padapter->HalFunc.AntDivCompareHandler)
padapter->HalFunc.AntDivCompareHandler(padapter, dst, src); padapter->HalFunc.AntDivCompareHandler(padapter, dst, src);
@ -482,7 +482,7 @@ void rtw_hal_antdiv_rssi_compared(_adapter *padapter, WLAN_BSSID_EX *dst, WLAN_B
#endif #endif
#ifdef CONFIG_HOSTAPD_MLME #ifdef CONFIG_HOSTAPD_MLME
s32 rtw_hal_hostap_mgnt_xmit_entry(_adapter *padapter, _pkt *pkt) s32 rtw_hal_hostap_mgnt_xmit_entry(struct adapter *padapter, _pkt *pkt)
{ {
if(padapter->HalFunc.hostap_mgnt_xmit_entry) if(padapter->HalFunc.hostap_mgnt_xmit_entry)
return padapter->HalFunc.hostap_mgnt_xmit_entry(padapter, pkt); return padapter->HalFunc.hostap_mgnt_xmit_entry(padapter, pkt);
@ -491,12 +491,12 @@ s32 rtw_hal_hostap_mgnt_xmit_entry(_adapter *padapter, _pkt *pkt)
#endif //CONFIG_HOSTAPD_MLME #endif //CONFIG_HOSTAPD_MLME
#ifdef DBG_CONFIG_ERROR_DETECT #ifdef DBG_CONFIG_ERROR_DETECT
void rtw_hal_sreset_init(_adapter *padapter) void rtw_hal_sreset_init(struct adapter *padapter)
{ {
if(padapter->HalFunc.sreset_init_value) 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)
{ {
padapter = GET_PRIMARY_ADAPTER(padapter); padapter = GET_PRIMARY_ADAPTER(padapter);
@ -504,13 +504,13 @@ void rtw_hal_sreset_reset(_adapter *padapter)
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 (!is_primary_adapter(padapter)) if (!is_primary_adapter(padapter))
return; return;
@ -518,7 +518,7 @@ void rtw_hal_sreset_xmit_status_check(_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 (!is_primary_adapter(padapter)) if (!is_primary_adapter(padapter))
return; return;
@ -526,7 +526,7 @@ void rtw_hal_sreset_linked_status_check(_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)
@ -534,7 +534,7 @@ u8 rtw_hal_sreset_get_wifi_status(_adapter *padapter)
return status; return status;
} }
bool rtw_hal_sreset_inprogress(_adapter *padapter) bool rtw_hal_sreset_inprogress(struct adapter *padapter)
{ {
bool inprogress = _FALSE; bool inprogress = _FALSE;
@ -547,7 +547,7 @@ bool rtw_hal_sreset_inprogress(_adapter *padapter)
#endif //DBG_CONFIG_ERROR_DETECT #endif //DBG_CONFIG_ERROR_DETECT
#ifdef CONFIG_IOL #ifdef CONFIG_IOL
int rtw_hal_iol_cmd(ADAPTER *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt) int rtw_hal_iol_cmd(struct adapter *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt)
{ {
if(adapter->HalFunc.IOL_exec_cmds_sync) 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);
@ -556,7 +556,7 @@ int rtw_hal_iol_cmd(ADAPTER *adapter, struct xmit_frame *xmit_frame, u32 max_wat
#endif #endif
#ifdef CONFIG_XMIT_THREAD_MODE #ifdef CONFIG_XMIT_THREAD_MODE
s32 rtw_hal_xmit_thread_handler(_adapter *padapter) s32 rtw_hal_xmit_thread_handler(struct adapter *padapter)
{ {
if(padapter->HalFunc.xmit_thread_handler) if(padapter->HalFunc.xmit_thread_handler)
return padapter->HalFunc.xmit_thread_handler(padapter); return padapter->HalFunc.xmit_thread_handler(padapter);
@ -564,19 +564,19 @@ s32 rtw_hal_xmit_thread_handler(_adapter *padapter)
} }
#endif #endif
void rtw_hal_notch_filter(_adapter *adapter, bool enable) void rtw_hal_notch_filter(struct adapter *adapter, bool enable)
{ {
if(adapter->HalFunc.hal_notch_filter) 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)
@ -584,7 +584,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;
} }

218
hal/odm.c
View file

@ -369,11 +369,11 @@ odm_Adaptivity(
//============================================================ //============================================================
// Function predefine. // Function predefine.
//============================================================ //============================================================
VOID odm_PathDiversityInit_92C( IN PADAPTER Adapter); VOID odm_PathDiversityInit_92C( IN struct adapter *Adapter);
VOID odm_2TPathDiversityInit_92C( IN PADAPTER Adapter); VOID odm_2TPathDiversityInit_92C( IN struct adapter *Adapter);
VOID odm_1TPathDiversityInit_92C( IN PADAPTER Adapter); VOID odm_1TPathDiversityInit_92C( IN struct adapter *Adapter);
BOOLEAN odm_IsConnected_92C(IN PADAPTER Adapter); BOOLEAN odm_IsConnected_92C(IN struct adapter *Adapter);
VOID odm_PathDiversityAfterLink_92C( IN PADAPTER Adapter); VOID odm_PathDiversityAfterLink_92C( IN struct adapter *Adapter);
VOID VOID
odm_CCKTXPathDiversityCallback( odm_CCKTXPathDiversityCallback(
@ -395,10 +395,10 @@ odm_PathDivChkAntSwitchWorkitemCallback(
IN PVOID pContext IN PVOID pContext
); );
VOID odm_SetRespPath_92C( IN PADAPTER Adapter, IN u1Byte DefaultRespPath); VOID odm_SetRespPath_92C( IN struct adapter *Adapter, IN u1Byte DefaultRespPath);
VOID odm_OFDMTXPathDiversity_92C( IN PADAPTER Adapter); VOID odm_OFDMTXPathDiversity_92C( IN struct adapter *Adapter);
VOID odm_CCKTXPathDiversity_92C( IN PADAPTER Adapter); VOID odm_CCKTXPathDiversity_92C( IN struct adapter *Adapter);
VOID odm_ResetPathDiversity_92C( IN PADAPTER Adapter); VOID odm_ResetPathDiversity_92C( IN struct adapter *Adapter);
//Start-------------------- RX High Power------------------------// //Start-------------------- RX High Power------------------------//
VOID odm_RXHPInit( IN PDM_ODM_T pDM_Odm); VOID odm_RXHPInit( IN PDM_ODM_T pDM_Odm);
@ -415,7 +415,7 @@ odm_PathDivInit( IN PDM_ODM_T pDM_Odm);
VOID VOID
odm_SetRespPath_92C( odm_SetRespPath_92C(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u1Byte DefaultRespPath IN u1Byte DefaultRespPath
); );
@ -608,33 +608,33 @@ odm_TXPowerTrackingCheckCE(
VOID VOID
ODM_RateAdaptiveStateApInit( ODM_RateAdaptiveStateApInit(
IN PADAPTER Adapter , IN struct adapter *Adapter ,
IN PRT_WLAN_STA pEntry IN PRT_WLAN_STA pEntry
); );
VOID VOID
odm_TXPowerTrackingCallbackThermalMeter92C( odm_TXPowerTrackingCallbackThermalMeter92C(
IN PADAPTER Adapter IN struct adapter *Adapter
); );
VOID VOID
odm_TXPowerTrackingCallbackRXGainThermalMeter92D( odm_TXPowerTrackingCallbackRXGainThermalMeter92D(
IN PADAPTER Adapter IN struct adapter * Adapter
); );
VOID VOID
odm_TXPowerTrackingCallbackThermalMeter92D( odm_TXPowerTrackingCallbackThermalMeter92D(
IN PADAPTER Adapter IN struct adapter *Adapter
); );
VOID VOID
odm_TXPowerTrackingDirectCall92C( odm_TXPowerTrackingDirectCall92C(
IN PADAPTER Adapter IN struct adapter * Adapter
); );
VOID VOID
odm_TXPowerTrackingThermalMeterCheck( odm_TXPowerTrackingThermalMeterCheck(
IN PADAPTER Adapter IN struct adapter * Adapter
); );
#endif #endif
@ -1065,7 +1065,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:
@ -1277,7 +1277,7 @@ odm_CommonInfoSelfUpdate(
#if (DM_ODM_SUPPORT_TYPE == ODM_MP) #if (DM_ODM_SUPPORT_TYPE == ODM_MP)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter *Adapter = pDM_Odm->Adapter;
PMGNT_INFO pMgntInfo = &Adapter->MgntInfo; PMGNT_INFO pMgntInfo = &Adapter->MgntInfo;
pEntry = pDM_Odm->pODM_StaInfo[0]; pEntry = pDM_Odm->pODM_StaInfo[0];
@ -1392,7 +1392,7 @@ VOID
ODM_InitAllWorkItems(IN PDM_ODM_T pDM_Odm ) ODM_InitAllWorkItems(IN PDM_ODM_T pDM_Odm )
{ {
#if USE_WORKITEM #if USE_WORKITEM
PADAPTER pAdapter = pDM_Odm->Adapter; struct adapter * pAdapter = pDM_Odm->Adapter;
ODM_InitializeWorkItem( pDM_Odm, ODM_InitializeWorkItem( pDM_Odm,
&pDM_Odm->DM_SWAT_Table.SwAntennaSwitchWorkitem, &pDM_Odm->DM_SWAT_Table.SwAntennaSwitchWorkitem,
@ -1588,7 +1588,7 @@ odm_EnableEDCCA(
{ {
// This should be moved out of OUTSRC // This should be moved out of OUTSRC
PADAPTER pAdapter = pDM_Odm->Adapter; struct adapter * pAdapter = pDM_Odm->Adapter;
// Enable EDCCA. The value is suggested by SD3 Wilson. // Enable EDCCA. The value is suggested by SD3 Wilson.
// //
@ -1631,7 +1631,7 @@ odm_DynamicEDCCA(
IN PDM_ODM_T pDM_Odm IN PDM_ODM_T pDM_Odm
) )
{ {
PADAPTER pAdapter = pDM_Odm->Adapter; struct adapter * pAdapter = pDM_Odm->Adapter;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter);
u1Byte RegC50, RegC58; u1Byte RegC50, RegC58;
BOOLEAN bEDCCAenable = FALSE; BOOLEAN bEDCCAenable = FALSE;
@ -1730,7 +1730,7 @@ odm_DIGbyRSSI_LPS(
IN PDM_ODM_T pDM_Odm IN PDM_ODM_T pDM_Odm
) )
{ {
PADAPTER pAdapter =pDM_Odm->Adapter; struct adapter * pAdapter =pDM_Odm->Adapter;
pDIG_T pDM_DigTable = &pDM_Odm->DM_DigTable; pDIG_T pDM_DigTable = &pDM_Odm->DM_DigTable;
PFALSE_ALARM_STATISTICS pFalseAlmCnt = &pDM_Odm->FalseAlmCnt; PFALSE_ALARM_STATISTICS pFalseAlmCnt = &pDM_Odm->FalseAlmCnt;
@ -1835,7 +1835,7 @@ odm_Adaptivity(
BOOLEAN EDCCA_State = 0; BOOLEAN EDCCA_State = 0;
#if (DM_ODM_SUPPORT_TYPE == ODM_MP) #if (DM_ODM_SUPPORT_TYPE == ODM_MP)
PADAPTER pAdapter = pDM_Odm->Adapter; struct adapter * pAdapter = pDM_Odm->Adapter;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter);
BOOLEAN bFwCurrentInPSMode=FALSE; BOOLEAN bFwCurrentInPSMode=FALSE;
PMGNT_INFO pMgntInfo = &(pAdapter->MgntInfo); PMGNT_INFO pMgntInfo = &(pAdapter->MgntInfo);
@ -2043,7 +2043,7 @@ odm_DIG(
#if (DM_ODM_SUPPORT_TYPE == ODM_MP) #if (DM_ODM_SUPPORT_TYPE == ODM_MP)
// This should be moved out of OUTSRC // This should be moved out of OUTSRC
PADAPTER pAdapter = pDM_Odm->Adapter; struct adapter * pAdapter = pDM_Odm->Adapter;
#if OS_WIN_FROM_WIN7(OS_VERSION) #if OS_WIN_FROM_WIN7(OS_VERSION)
if(IsAPModeExist( pAdapter) && pAdapter->bInHctTest) if(IsAPModeExist( pAdapter) && pAdapter->bInHctTest)
{ {
@ -2673,7 +2673,7 @@ odm_DigAbort(
{ {
#if (DM_ODM_SUPPORT_TYPE == ODM_MP) #if (DM_ODM_SUPPORT_TYPE == ODM_MP)
// This should be moved out of OUTSRC // This should be moved out of OUTSRC
PADAPTER pAdapter = pDM_Odm->Adapter; struct adapter * pAdapter = pDM_Odm->Adapter;
pRXHP_T pRX_HP_Table = &pDM_Odm->DM_RXHP_Table; pRXHP_T pRX_HP_Table = &pDM_Odm->DM_RXHP_Table;
#if OS_WIN_FROM_WIN7(OS_VERSION) #if OS_WIN_FROM_WIN7(OS_VERSION)
@ -2763,7 +2763,7 @@ odm_DIG(
#if (DM_ODM_SUPPORT_TYPE == ODM_MP) #if (DM_ODM_SUPPORT_TYPE == ODM_MP)
// This should be moved out of OUTSRC // This should be moved out of OUTSRC
PADAPTER pAdapter = pDM_Odm->Adapter; struct adapter * pAdapter = pDM_Odm->Adapter;
#if OS_WIN_FROM_WIN7(OS_VERSION) #if OS_WIN_FROM_WIN7(OS_VERSION)
if(IsAPModeExist( pAdapter) && pAdapter->bInHctTest) if(IsAPModeExist( pAdapter) && pAdapter->bInHctTest)
{ {
@ -3713,7 +3713,7 @@ odm_RateAdaptiveMaskInit(
#if (DM_ODM_SUPPORT_TYPE & ODM_MP) #if (DM_ODM_SUPPORT_TYPE & ODM_MP)
VOID VOID
ODM_RateAdaptiveStateApInit( ODM_RateAdaptiveStateApInit(
IN PADAPTER Adapter , IN struct adapter *Adapter ,
IN PRT_WLAN_STA pEntry IN PRT_WLAN_STA pEntry
) )
{ {
@ -3878,8 +3878,8 @@ odm_RefreshRateAdaptiveMaskMP(
) )
{ {
#if (DM_ODM_SUPPORT_TYPE == ODM_MP) #if (DM_ODM_SUPPORT_TYPE == ODM_MP)
PADAPTER pAdapter = pDM_Odm->Adapter; struct adapter *pAdapter = pDM_Odm->Adapter;
PADAPTER pTargetAdapter = NULL; struct adapter * pTargetAdapter = NULL;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter);
PMGNT_INFO pMgntInfo = GetDefaultMgntInfo(pAdapter); PMGNT_INFO pMgntInfo = GetDefaultMgntInfo(pAdapter);
//PRATE_ADAPTIVE pRA = (PRATE_ADAPTIVE)&pMgntInfo->RateAdaptive; //PRATE_ADAPTIVE pRA = (PRATE_ADAPTIVE)&pMgntInfo->RateAdaptive;
@ -3996,7 +3996,7 @@ odm_RefreshRateAdaptiveMaskCE(
{ {
#if (DM_ODM_SUPPORT_TYPE == ODM_CE) #if (DM_ODM_SUPPORT_TYPE == ODM_CE)
u1Byte i; u1Byte i;
PADAPTER pAdapter = pDM_Odm->Adapter; struct adapter *pAdapter = pDM_Odm->Adapter;
if(pAdapter->bDriverStopped) if(pAdapter->bDriverStopped)
{ {
@ -4131,7 +4131,7 @@ odm_DynamicTxPowerInit(
) )
{ {
#if (DM_ODM_SUPPORT_TYPE == ODM_MP) #if (DM_ODM_SUPPORT_TYPE == ODM_MP)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter *Adapter = pDM_Odm->Adapter;
PMGNT_INFO pMgntInfo = &Adapter->MgntInfo; PMGNT_INFO pMgntInfo = &Adapter->MgntInfo;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
@ -4154,7 +4154,7 @@ odm_DynamicTxPowerInit(
pHalData->LastDTPLvl = TxHighPwrLevel_Normal; pHalData->LastDTPLvl = TxHighPwrLevel_Normal;
pHalData->DynamicTxHighPowerLvl = TxHighPwrLevel_Normal; pHalData->DynamicTxHighPowerLvl = TxHighPwrLevel_Normal;
#elif (DM_ODM_SUPPORT_TYPE == ODM_CE) #elif (DM_ODM_SUPPORT_TYPE == ODM_CE)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter *Adapter = pDM_Odm->Adapter;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
struct dm_priv *pdmpriv = &pHalData->dmpriv; struct dm_priv *pdmpriv = &pHalData->dmpriv;
pdmpriv->bDynamicTxPowerEnable = _FALSE; pdmpriv->bDynamicTxPowerEnable = _FALSE;
@ -4195,12 +4195,12 @@ odm_DynamicTxPowerSavePowerIndex(
u4Byte Power_Index_REG[6] = {0xc90, 0xc91, 0xc92, 0xc98, 0xc99, 0xc9a}; u4Byte Power_Index_REG[6] = {0xc90, 0xc91, 0xc92, 0xc98, 0xc99, 0xc9a};
#if (DM_ODM_SUPPORT_TYPE == ODM_MP) #if (DM_ODM_SUPPORT_TYPE == ODM_MP)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter *Adapter = pDM_Odm->Adapter;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
for(index = 0; index< 6; index++) for(index = 0; index< 6; index++)
pHalData->PowerIndex_backup[index] = PlatformEFIORead1Byte(Adapter, Power_Index_REG[index]); pHalData->PowerIndex_backup[index] = PlatformEFIORead1Byte(Adapter, Power_Index_REG[index]);
#elif (DM_ODM_SUPPORT_TYPE == ODM_CE) #elif (DM_ODM_SUPPORT_TYPE == ODM_CE)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter *Adapter = pDM_Odm->Adapter;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *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++)
@ -4214,7 +4214,7 @@ odm_DynamicTxPowerRestorePowerIndex(
) )
{ {
u1Byte index; u1Byte index;
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
#if (DM_ODM_SUPPORT_TYPE & (ODM_CE|ODM_MP)) #if (DM_ODM_SUPPORT_TYPE & (ODM_CE|ODM_MP))
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
@ -4255,7 +4255,7 @@ odm_DynamicTxPower(
// For AP/ADSL use prtl8192cd_priv // For AP/ADSL use prtl8192cd_priv
// For CE/NIC use PADAPTER // For CE/NIC use PADAPTER
// //
//PADAPTER pAdapter = pDM_Odm->Adapter; //struct adapter * pAdapter = pDM_Odm->Adapter;
// prtl8192cd_priv priv = pDM_Odm->priv; // prtl8192cd_priv priv = pDM_Odm->priv;
if (!(pDM_Odm->SupportAbility & ODM_BB_DYNAMIC_TXPWR)) if (!(pDM_Odm->SupportAbility & ODM_BB_DYNAMIC_TXPWR))
@ -4364,7 +4364,7 @@ odm_DynamicTxPower_92C(
) )
{ {
#if (DM_ODM_SUPPORT_TYPE == ODM_MP) #if (DM_ODM_SUPPORT_TYPE == ODM_MP)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter *Adapter = pDM_Odm->Adapter;
PMGNT_INFO pMgntInfo = &Adapter->MgntInfo; PMGNT_INFO pMgntInfo = &Adapter->MgntInfo;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
s4Byte UndecoratedSmoothedPWDB; s4Byte UndecoratedSmoothedPWDB;
@ -4481,7 +4481,7 @@ odm_DynamicTxPower_92C(
#elif (DM_ODM_SUPPORT_TYPE == ODM_CE) #elif (DM_ODM_SUPPORT_TYPE == ODM_CE)
#if (RTL8192C_SUPPORT==1) #if (RTL8192C_SUPPORT==1)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter *Adapter = pDM_Odm->Adapter;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
struct dm_priv *pdmpriv = &pHalData->dmpriv; struct dm_priv *pdmpriv = &pHalData->dmpriv;
struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv); struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv);
@ -4611,12 +4611,12 @@ odm_DynamicTxPower_92D(
) )
{ {
#if (DM_ODM_SUPPORT_TYPE == ODM_MP) #if (DM_ODM_SUPPORT_TYPE == ODM_MP)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter *Adapter = pDM_Odm->Adapter;
PMGNT_INFO pMgntInfo = &Adapter->MgntInfo; PMGNT_INFO pMgntInfo = &Adapter->MgntInfo;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
s4Byte UndecoratedSmoothedPWDB; s4Byte UndecoratedSmoothedPWDB;
PADAPTER BuddyAdapter = Adapter->BuddyAdapter; struct adapter *BuddyAdapter = Adapter->BuddyAdapter;
BOOLEAN bGetValueFromBuddyAdapter = dm_DualMacGetParameterFromBuddyAdapter(Adapter); BOOLEAN bGetValueFromBuddyAdapter = dm_DualMacGetParameterFromBuddyAdapter(Adapter);
u1Byte HighPowerLvlBackForMac0 = TxHighPwrLevel_Level1; u1Byte HighPowerLvlBackForMac0 = TxHighPwrLevel_Level1;
@ -4769,7 +4769,7 @@ odm_DynamicTxPower_92D(
pHalData->LastDTPLvl = pHalData->DynamicTxHighPowerLvl; pHalData->LastDTPLvl = pHalData->DynamicTxHighPowerLvl;
#elif (DM_ODM_SUPPORT_TYPE == ODM_CE) #elif (DM_ODM_SUPPORT_TYPE == ODM_CE)
#if (RTL8192D_SUPPORT==1) #if (RTL8192D_SUPPORT==1)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter *Adapter = pDM_Odm->Adapter;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv); struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv);
@ -4777,7 +4777,7 @@ odm_DynamicTxPower_92D(
DM_ODM_T *podmpriv = &pHalData->odmpriv; DM_ODM_T *podmpriv = &pHalData->odmpriv;
int UndecoratedSmoothedPWDB; int UndecoratedSmoothedPWDB;
#if (RTL8192D_EASY_SMART_CONCURRENT == 1) #if (RTL8192D_EASY_SMART_CONCURRENT == 1)
PADAPTER BuddyAdapter = Adapter->BuddyAdapter; struct adapter *BuddyAdapter = Adapter->BuddyAdapter;
BOOLEAN bGetValueFromBuddyAdapter = DualMacGetParameterFromBuddyAdapter(Adapter); BOOLEAN bGetValueFromBuddyAdapter = DualMacGetParameterFromBuddyAdapter(Adapter);
u8 HighPowerLvlBackForMac0 = TxHighPwrLevel_Level1; u8 HighPowerLvlBackForMac0 = TxHighPwrLevel_Level1;
#endif #endif
@ -4952,7 +4952,7 @@ odm_RSSIMonitorCheck(
// For AP/ADSL use prtl8192cd_priv // For AP/ADSL use prtl8192cd_priv
// For CE/NIC use PADAPTER // For CE/NIC use PADAPTER
// //
PADAPTER pAdapter = pDM_Odm->Adapter; struct adapter * pAdapter = pDM_Odm->Adapter;
prtl8192cd_priv priv = pDM_Odm->priv; prtl8192cd_priv priv = pDM_Odm->priv;
if (!(pDM_Odm->SupportAbility & ODM_BB_RSSI_MONITOR)) if (!(pDM_Odm->SupportAbility & ODM_BB_RSSI_MONITOR))
@ -4991,7 +4991,7 @@ odm_RSSIMonitorCheckMP(
) )
{ {
#if (DM_ODM_SUPPORT_TYPE == ODM_MP) #if (DM_ODM_SUPPORT_TYPE == ODM_MP)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter *Adapter = pDM_Odm->Adapter;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
PRT_WLAN_STA pEntry; PRT_WLAN_STA pEntry;
u1Byte i; u1Byte i;
@ -5077,7 +5077,7 @@ odm_RSSIMonitorCheckMP(
// //
static VOID static VOID
FindMinimumRSSI_Dmsp( FindMinimumRSSI_Dmsp(
IN PADAPTER pAdapter IN struct adapter *pAdapter
) )
{ {
#if 0 #if 0
@ -5086,7 +5086,7 @@ FindMinimumRSSI_Dmsp(
s32 Rssi_val_min_back_for_mac0; s32 Rssi_val_min_back_for_mac0;
BOOLEAN bGetValueFromBuddyAdapter = dm_DualMacGetParameterFromBuddyAdapter(pAdapter); BOOLEAN bGetValueFromBuddyAdapter = dm_DualMacGetParameterFromBuddyAdapter(pAdapter);
BOOLEAN bRestoreRssi = _FALSE; BOOLEAN bRestoreRssi = _FALSE;
PADAPTER BuddyAdapter = pAdapter->BuddyAdapter; struct adapter *BuddyAdapter = pAdapter->BuddyAdapter;
if(pHalData->MacPhyMode92D == DUALMAC_SINGLEPHY) if(pHalData->MacPhyMode92D == DUALMAC_SINGLEPHY)
{ {
@ -5121,7 +5121,7 @@ FindMinimumRSSI_Dmsp(
static void static void
FindMinimumRSSI( FindMinimumRSSI(
IN PADAPTER pAdapter IN struct adapter *pAdapter
) )
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter);
@ -5152,7 +5152,7 @@ odm_RSSIMonitorCheckCE(
) )
{ {
#if (DM_ODM_SUPPORT_TYPE == ODM_CE) #if (DM_ODM_SUPPORT_TYPE == ODM_CE)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter *Adapter = pDM_Odm->Adapter;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
struct dm_priv *pdmpriv = &pHalData->dmpriv; struct dm_priv *pdmpriv = &pHalData->dmpriv;
int i; int i;
@ -5421,7 +5421,7 @@ odm_TXPowerTrackingThermalMeterInit(
) )
{ {
#if (DM_ODM_SUPPORT_TYPE == ODM_MP) #if (DM_ODM_SUPPORT_TYPE == ODM_MP)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
PMGNT_INFO pMgntInfo = &Adapter->MgntInfo; PMGNT_INFO pMgntInfo = &Adapter->MgntInfo;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
@ -5482,7 +5482,7 @@ ODM_TXPowerTrackingCheck(
// For AP/ADSL use prtl8192cd_priv // For AP/ADSL use prtl8192cd_priv
// For CE/NIC use PADAPTER // For CE/NIC use PADAPTER
// //
PADAPTER pAdapter = pDM_Odm->Adapter; struct adapter * pAdapter = pDM_Odm->Adapter;
prtl8192cd_priv priv = pDM_Odm->priv; prtl8192cd_priv priv = pDM_Odm->priv;
//if (!(pDM_Odm->SupportAbility & ODM_RF_TX_PWR_TRACK)) //if (!(pDM_Odm->SupportAbility & ODM_RF_TX_PWR_TRACK))
@ -5520,7 +5520,7 @@ odm_TXPowerTrackingCheckCE(
) )
{ {
#if (DM_ODM_SUPPORT_TYPE == ODM_CE) #if (DM_ODM_SUPPORT_TYPE == ODM_CE)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter *Adapter = pDM_Odm->Adapter;
#if( (RTL8192C_SUPPORT==1) || (RTL8723A_SUPPORT==1) ) #if( (RTL8192C_SUPPORT==1) || (RTL8723A_SUPPORT==1) )
rtl8192c_odm_CheckTXPowerTracking(Adapter); rtl8192c_odm_CheckTXPowerTracking(Adapter);
#endif #endif
@ -5567,7 +5567,7 @@ odm_TXPowerTrackingCheckMP(
) )
{ {
#if (DM_ODM_SUPPORT_TYPE == ODM_MP) #if (DM_ODM_SUPPORT_TYPE == ODM_MP)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter *Adapter = pDM_Odm->Adapter;
if (ODM_CheckPowerStatus(Adapter) == FALSE) if (ODM_CheckPowerStatus(Adapter) == FALSE)
return; return;
@ -5609,7 +5609,7 @@ odm_TXPowerTrackingCheckAP(
VOID VOID
odm_TXPowerTrackingThermalMeterCheck( odm_TXPowerTrackingThermalMeterCheck(
IN PADAPTER Adapter IN struct adapter * Adapter
) )
{ {
#ifndef AP_BUILD_WORKAROUND #ifndef AP_BUILD_WORKAROUND
@ -5673,7 +5673,7 @@ odm_SwAntDivInit_NIC_8723A(
IN PDM_ODM_T pDM_Odm) IN PDM_ODM_T pDM_Odm)
{ {
pSWAT_T pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table; pSWAT_T pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table;
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
u1Byte btAntNum=BT_GetPGAntNum(Adapter); u1Byte btAntNum=BT_GetPGAntNum(Adapter);
@ -5805,7 +5805,7 @@ odm_SwAntDivChkAntSwitch(
// For AP/ADSL use prtl8192cd_priv // For AP/ADSL use prtl8192cd_priv
// For CE/NIC use PADAPTER // For CE/NIC use PADAPTER
// //
PADAPTER pAdapter = pDM_Odm->Adapter; struct adapter * pAdapter = pDM_Odm->Adapter;
prtl8192cd_priv priv = pDM_Odm->priv; prtl8192cd_priv priv = pDM_Odm->priv;
// //
@ -5946,7 +5946,7 @@ odm_SwAntDivChkAntSwitchNIC(
} }
#elif (DM_ODM_SUPPORT_TYPE & ODM_MP) #elif (DM_ODM_SUPPORT_TYPE & ODM_MP)
{ {
PADAPTER pAdapter = pDM_Odm->Adapter; struct adapter *pAdapter = pDM_Odm->Adapter;
PMGNT_INFO pMgntInfo=&pAdapter->MgntInfo; PMGNT_INFO pMgntInfo=&pAdapter->MgntInfo;
// Select RSSI checking target // Select RSSI checking target
@ -5960,7 +5960,7 @@ odm_SwAntDivChkAntSwitchNIC(
{ {
u1Byte index = 0; u1Byte index = 0;
PSTA_INFO_T pEntry = NULL; PSTA_INFO_T pEntry = NULL;
PADAPTER pTargetAdapter = NULL; struct adapter * pTargetAdapter = NULL;
if(pMgntInfo->mIbss ) if(pMgntInfo->mIbss )
{ {
@ -6014,7 +6014,7 @@ odm_SwAntDivChkAntSwitchNIC(
else else
{ {
#if (DM_ODM_SUPPORT_TYPE &( ODM_MP)) #if (DM_ODM_SUPPORT_TYPE &( ODM_MP))
//PADAPTER Adapter = pDM_Odm->Adapter; //struct adapter *Adapter = pDM_Odm->Adapter;
curTxOkCnt = pAdapter->TxStats.NumTxBytesUnicast - pDM_SWAT_Table->lastTxOkCnt; curTxOkCnt = pAdapter->TxStats.NumTxBytesUnicast - pDM_SWAT_Table->lastTxOkCnt;
curRxOkCnt =pAdapter->RxStats.NumRxBytesUnicast - pDM_SWAT_Table->lastRxOkCnt; curRxOkCnt =pAdapter->RxStats.NumRxBytesUnicast - pDM_SWAT_Table->lastRxOkCnt;
pDM_SWAT_Table->lastTxOkCnt = pAdapter->TxStats.NumTxBytesUnicast; pDM_SWAT_Table->lastTxOkCnt = pAdapter->TxStats.NumTxBytesUnicast;
@ -6252,7 +6252,7 @@ odm_SwAntDivChkAntSwitchNIC(
//1 6.Set next timer //1 6.Set next timer
{ {
PADAPTER pAdapter = pDM_Odm->Adapter; struct adapter * pAdapter = pDM_Odm->Adapter;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter);
@ -6309,7 +6309,7 @@ odm_SwAntDivChkAntSwitchNIC(
u1Byte u1Byte
odm_SwAntDivSelectChkChnl( odm_SwAntDivSelectChkChnl(
IN PADAPTER Adapter IN struct adapter *Adapter
) )
{ {
#if (RT_MEM_SIZE_LEVEL != RT_MEM_SIZE_MINIMUM) #if (RT_MEM_SIZE_LEVEL != RT_MEM_SIZE_MINIMUM)
@ -6355,7 +6355,7 @@ odm_SwAntDivSelectChkChnl(
VOID VOID
odm_SwAntDivConsructChkScanChnl( odm_SwAntDivConsructChkScanChnl(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u1Byte ChkChnl IN u1Byte ChkChnl
) )
{ {
@ -6401,7 +6401,7 @@ odm_SwAntDivChkAntSwitchCallback(
PRT_TIMER pTimer PRT_TIMER pTimer
) )
{ {
PADAPTER Adapter = (PADAPTER)pTimer->Adapter; struct adapter * Adapter = (PADAPTER)pTimer->Adapter;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
pSWAT_T pDM_SWAT_Table = &pHalData->DM_OutSrc.DM_SWAT_Table; pSWAT_T pDM_SWAT_Table = &pHalData->DM_OutSrc.DM_SWAT_Table;
@ -6422,7 +6422,7 @@ odm_SwAntDivChkAntSwitchWorkitemCallback(
) )
{ {
PADAPTER pAdapter = (PADAPTER)pContext; struct adapter * pAdapter = (PADAPTER)pContext;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter);
odm_SwAntDivChkAntSwitch(&pHalData->DM_OutSrc, SWAW_STEP_DETERMINE); odm_SwAntDivChkAntSwitch(&pHalData->DM_OutSrc, SWAW_STEP_DETERMINE);
@ -6432,7 +6432,7 @@ odm_SwAntDivChkAntSwitchWorkitemCallback(
VOID odm_SwAntDivChkAntSwitchCallback(void *FunctionContext) VOID odm_SwAntDivChkAntSwitchCallback(void *FunctionContext)
{ {
PDM_ODM_T pDM_Odm= (PDM_ODM_T)FunctionContext; PDM_ODM_T pDM_Odm= (PDM_ODM_T)FunctionContext;
PADAPTER padapter = pDM_Odm->Adapter; struct adapter *padapter = pDM_Odm->Adapter;
if(padapter->net_closed == _TRUE) if(padapter->net_closed == _TRUE)
return; return;
odm_SwAntDivChkAntSwitch(pDM_Odm, SWAW_STEP_DETERMINE); odm_SwAntDivChkAntSwitch(pDM_Odm, SWAW_STEP_DETERMINE);
@ -6460,10 +6460,10 @@ VOID odm_SwAntDivChkAntSwitch(
VOID ODM_SwAntDivResetBeforeLink( IN PDM_ODM_T pDM_Odm ){} VOID ODM_SwAntDivResetBeforeLink( IN PDM_ODM_T pDM_Odm ){}
VOID ODM_SwAntDivRestAfterLink( IN PDM_ODM_T pDM_Odm ){} VOID ODM_SwAntDivRestAfterLink( IN PDM_ODM_T pDM_Odm ){}
#if (DM_ODM_SUPPORT_TYPE == ODM_MP) #if (DM_ODM_SUPPORT_TYPE == ODM_MP)
u1Byte odm_SwAntDivSelectChkChnl( IN PADAPTER Adapter ){ return 0;} u1Byte odm_SwAntDivSelectChkChnl( IN struct adapter *Adapter ){ return 0;}
VOID VOID
odm_SwAntDivConsructChkScanChnl( odm_SwAntDivConsructChkScanChnl(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u1Byte ChkChnl IN u1Byte ChkChnl
){} ){}
#endif #endif
@ -6487,7 +6487,7 @@ ODM_SwAntDivCheckBeforeLink8192C(
{ {
#if (RT_MEM_SIZE_LEVEL != RT_MEM_SIZE_MINIMUM) #if (RT_MEM_SIZE_LEVEL != RT_MEM_SIZE_MINIMUM)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter *Adapter = pDM_Odm->Adapter;
HAL_DATA_TYPE *pHalData=NULL; HAL_DATA_TYPE *pHalData=NULL;
PMGNT_INFO pMgntInfo = NULL; PMGNT_INFO pMgntInfo = NULL;
//pSWAT_T pDM_SWAT_Table = &Adapter->DM_SWAT_Table; //pSWAT_T pDM_SWAT_Table = &Adapter->DM_SWAT_Table;
@ -7358,7 +7358,7 @@ ODM_EdcaTurboInit(
#if ((DM_ODM_SUPPORT_TYPE == ODM_AP)||(DM_ODM_SUPPORT_TYPE==ODM_ADSL)) #if ((DM_ODM_SUPPORT_TYPE == ODM_AP)||(DM_ODM_SUPPORT_TYPE==ODM_ADSL))
odm_EdcaParaInit(pDM_Odm); odm_EdcaParaInit(pDM_Odm);
#elif (DM_ODM_SUPPORT_TYPE==ODM_MP) #elif (DM_ODM_SUPPORT_TYPE==ODM_MP)
PADAPTER Adapter = NULL; struct adapter *Adapter = NULL;
HAL_DATA_TYPE *pHalData = NULL; HAL_DATA_TYPE *pHalData = NULL;
if(pDM_Odm->Adapter==NULL) { if(pDM_Odm->Adapter==NULL) {
@ -7374,7 +7374,7 @@ ODM_EdcaTurboInit(
pHalData->bIsAnyNonBEPkts = FALSE; pHalData->bIsAnyNonBEPkts = FALSE;
#elif(DM_ODM_SUPPORT_TYPE==ODM_CE) #elif(DM_ODM_SUPPORT_TYPE==ODM_CE)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter *Adapter = pDM_Odm->Adapter;
pDM_Odm->DM_EDCA_Table.bCurrentTurboEDCA = FALSE; pDM_Odm->DM_EDCA_Table.bCurrentTurboEDCA = FALSE;
pDM_Odm->DM_EDCA_Table.bIsCurRDLState = FALSE; pDM_Odm->DM_EDCA_Table.bIsCurRDLState = FALSE;
Adapter->recvpriv.bIsAnyNonBEPkts =FALSE; Adapter->recvpriv.bIsAnyNonBEPkts =FALSE;
@ -7397,7 +7397,7 @@ odm_EdcaTurboCheck(
// For AP/ADSL use prtl8192cd_priv // For AP/ADSL use prtl8192cd_priv
// For CE/NIC use PADAPTER // For CE/NIC use PADAPTER
// //
PADAPTER pAdapter = pDM_Odm->Adapter; struct adapter * pAdapter = pDM_Odm->Adapter;
prtl8192cd_priv priv = pDM_Odm->priv; prtl8192cd_priv priv = pDM_Odm->priv;
// //
@ -7448,7 +7448,7 @@ odm_EdcaTurboCheckCE(
#if(DM_ODM_SUPPORT_TYPE==ODM_CE) #if(DM_ODM_SUPPORT_TYPE==ODM_CE)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
u32 trafficIndex; u32 trafficIndex;
u32 edca_param; u32 edca_param;
@ -7575,12 +7575,12 @@ odm_EdcaTurboCheckMP(
{ {
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
#if(DM_ODM_SUPPORT_TYPE==ODM_MP) #if(DM_ODM_SUPPORT_TYPE==ODM_MP)
PADAPTER pDefaultAdapter = GetDefaultAdapter(Adapter); struct adapter * pDefaultAdapter = GetDefaultAdapter(Adapter);
PADAPTER pExtAdapter = GetFirstExtAdapter(Adapter);//NULL; struct adapter * pExtAdapter = GetFirstExtAdapter(Adapter);//NULL;
PMGNT_INFO pMgntInfo = &Adapter->MgntInfo; PMGNT_INFO pMgntInfo = &Adapter->MgntInfo;
PSTA_QOS pStaQos = Adapter->MgntInfo.pStaQos; PSTA_QOS pStaQos = Adapter->MgntInfo.pStaQos;
//[Win7 Count Tx/Rx statistic for Extension Port] odm_CheckEdcaTurbo's Adapter is always Default. 2009.08.20, by Bohn //[Win7 Count Tx/Rx statistic for Extension Port] odm_CheckEdcaTurbo's Adapter is always Default. 2009.08.20, by Bohn
@ -7750,7 +7750,7 @@ odm_IsEdcaTurboDisable(
IN PDM_ODM_T pDM_Odm IN PDM_ODM_T pDM_Odm
) )
{ {
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
#if(DM_ODM_SUPPORT_TYPE==ODM_MP) #if(DM_ODM_SUPPORT_TYPE==ODM_MP)
@ -7834,7 +7834,7 @@ ODM_EdcaParaSelByIot(
) )
{ {
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
u4Byte IOTPeer=0; u4Byte IOTPeer=0;
u4Byte ICType=pDM_Odm->SupportICType; u4Byte ICType=pDM_Odm->SupportICType;
@ -7842,8 +7842,8 @@ ODM_EdcaParaSelByIot(
u4Byte RFType=pDM_Odm->RFType; u4Byte RFType=pDM_Odm->RFType;
#if(DM_ODM_SUPPORT_TYPE==ODM_MP) #if(DM_ODM_SUPPORT_TYPE==ODM_MP)
PADAPTER pDefaultAdapter = GetDefaultAdapter(Adapter); struct adapter * pDefaultAdapter = GetDefaultAdapter(Adapter);
PADAPTER pExtAdapter = GetFirstExtAdapter(Adapter);//NULL; struct adapter * pExtAdapter = GetFirstExtAdapter(Adapter);//NULL;
PMGNT_INFO pMgntInfo = &Adapter->MgntInfo; PMGNT_INFO pMgntInfo = &Adapter->MgntInfo;
u1Byte TwoPortStatus = (u1Byte)TWO_PORT_STATUS__WITHOUT_ANY_ASSOCIATE; u1Byte TwoPortStatus = (u1Byte)TWO_PORT_STATUS__WITHOUT_ANY_ASSOCIATE;
@ -8807,7 +8807,7 @@ odm_IotEngine(
// //
BOOLEAN BOOLEAN
ODM_CheckPowerStatus( ODM_CheckPowerStatus(
IN PADAPTER Adapter) IN struct adapter * Adapter)
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
@ -8994,7 +8994,7 @@ PatchDCTone(
) )
{ {
//HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
//PADAPTER pAdapter; //struct adapter *pAdapter;
u4Byte psd_report; u4Byte psd_report;
@ -9293,7 +9293,7 @@ odm_PSD_Monitor(
u4Byte ReScan, Interval, Is40MHz; u4Byte ReScan, Interval, Is40MHz;
u8Byte curTxOkCnt, curRxOkCnt; u8Byte curTxOkCnt, curRxOkCnt;
int cur_byte_idx, cur_bit_idx; int cur_byte_idx, cur_bit_idx;
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
PMGNT_INFO pMgntInfo = &Adapter->MgntInfo; PMGNT_INFO pMgntInfo = &Adapter->MgntInfo;
//--------------2G band synthesizer for 92D switch RF channel using----------------- //--------------2G band synthesizer for 92D switch RF channel using-----------------
u1Byte group_idx=0; u1Byte group_idx=0;
@ -9839,7 +9839,7 @@ odm_PSDMonitorCallback(
PRT_TIMER pTimer PRT_TIMER pTimer
) )
{ {
PADAPTER Adapter = (PADAPTER)pTimer->Adapter; struct adapter * Adapter = (PADAPTER)pTimer->Adapter;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
PDM_ODM_T pDM_Odm = &pHalData->DM_OutSrc; PDM_ODM_T pDM_Odm = &pHalData->DM_OutSrc;
@ -9856,7 +9856,7 @@ odm_PSDMonitorWorkItemCallback(
IN PVOID pContext IN PVOID pContext
) )
{ {
PADAPTER Adapter = (PADAPTER)pContext; struct adapter *Adapter = (PADAPTER)pContext;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
PDM_ODM_T pDM_Odm = &pHalData->DM_OutSrc; PDM_ODM_T pDM_Odm = &pHalData->DM_OutSrc;
@ -9870,7 +9870,7 @@ odm_PSDMonitorWorkItemCallback(
VOID VOID
ODM_PSDDbgControl( ODM_PSDDbgControl(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u4Byte mode, IN u4Byte mode,
IN u4Byte btRssi IN u4Byte btRssi
) )
@ -9924,7 +9924,7 @@ void odm_RXHP(
{ {
#if( DM_ODM_SUPPORT_TYPE & (ODM_MP)) #if( DM_ODM_SUPPORT_TYPE & (ODM_MP))
#if (DEV_BUS_TYPE == RT_PCI_INTERFACE) | (DEV_BUS_TYPE == RT_USB_INTERFACE) #if (DEV_BUS_TYPE == RT_PCI_INTERFACE) | (DEV_BUS_TYPE == RT_USB_INTERFACE)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter *Adapter = pDM_Odm->Adapter;
PMGNT_INFO pMgntInfo = &(Adapter->MgntInfo); PMGNT_INFO pMgntInfo = &(Adapter->MgntInfo);
pDIG_T pDM_DigTable = &pDM_Odm->DM_DigTable; pDIG_T pDM_DigTable = &pDM_Odm->DM_DigTable;
pRXHP_T pRX_HP_Table = &pDM_Odm->DM_RXHP_Table; pRXHP_T pRX_HP_Table = &pDM_Odm->DM_RXHP_Table;
@ -10308,7 +10308,7 @@ odm_PSD_RXHP(
) )
{ {
pRXHP_T pRX_HP_Table = &pDM_Odm->DM_RXHP_Table; pRXHP_T pRX_HP_Table = &pDM_Odm->DM_RXHP_Table;
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
PMGNT_INFO pMgntInfo = &(Adapter->MgntInfo); PMGNT_INFO pMgntInfo = &(Adapter->MgntInfo);
unsigned int pts, start_point, stop_point, initial_gain ; unsigned int pts, start_point, stop_point, initial_gain ;
static u1Byte PSD_bitmap_memory[80], init_memory = 0; static u1Byte PSD_bitmap_memory[80], init_memory = 0;
@ -10604,7 +10604,7 @@ odm_PSD_RXHPCallback(
PRT_TIMER pTimer PRT_TIMER pTimer
) )
{ {
PADAPTER Adapter = (PADAPTER)pTimer->Adapter; struct adapter * Adapter = (PADAPTER)pTimer->Adapter;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
PDM_ODM_T pDM_Odm = &pHalData->DM_OutSrc; PDM_ODM_T pDM_Odm = &pHalData->DM_OutSrc;
pRXHP_T pRX_HP_Table = &pDM_Odm->DM_RXHP_Table; pRXHP_T pRX_HP_Table = &pDM_Odm->DM_RXHP_Table;
@ -10626,7 +10626,7 @@ odm_PSD_RXHPWorkitemCallback(
IN PVOID pContext IN PVOID pContext
) )
{ {
PADAPTER pAdapter = (PADAPTER)pContext; struct adapter *pAdapter = (PADAPTER)pContext;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter);
PDM_ODM_T pDM_Odm = &pHalData->DM_OutSrc; PDM_ODM_T pDM_Odm = &pHalData->DM_OutSrc;
@ -10671,7 +10671,7 @@ odm_GlobalAdapterCheck(
#if (DM_ODM_SUPPORT_TYPE == ODM_MP) #if (DM_ODM_SUPPORT_TYPE == ODM_MP)
VOID VOID
odm_OFDMTXPathDiversity_92C( odm_OFDMTXPathDiversity_92C(
IN PADAPTER Adapter) IN struct adapter *Adapter)
{ {
// HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); // HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
PMGNT_INFO pMgntInfo = &(Adapter->MgntInfo); PMGNT_INFO pMgntInfo = &(Adapter->MgntInfo);
@ -10753,7 +10753,7 @@ odm_OFDMTXPathDiversity_92C(
BOOLEAN BOOLEAN
odm_IsConnected_92C( odm_IsConnected_92C(
IN PADAPTER Adapter IN struct adapter *Adapter
) )
{ {
PRT_WLAN_STA pEntry; PRT_WLAN_STA pEntry;
@ -10794,7 +10794,7 @@ odm_IsConnected_92C(
VOID VOID
odm_ResetPathDiversity_92C( odm_ResetPathDiversity_92C(
IN PADAPTER Adapter IN struct adapter *Adapter
) )
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
@ -10841,7 +10841,7 @@ odm_ResetPathDiversity_92C(
VOID VOID
odm_CCKTXPathDiversity_92C( odm_CCKTXPathDiversity_92C(
IN PADAPTER Adapter IN struct adapter *Adapter
) )
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
@ -10990,7 +10990,7 @@ odm_CCKTXPathDiversity_92C(
VOID VOID
odm_PathDiversityAfterLink_92C( odm_PathDiversityAfterLink_92C(
IN PADAPTER Adapter IN struct adapter *Adapter
) )
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
@ -11086,11 +11086,11 @@ odm_CCKTXPathDiversityCallback(
) )
{ {
#if USE_WORKITEM #if USE_WORKITEM
PADAPTER Adapter = (PADAPTER)pTimer->Adapter; struct adapter *Adapter = (PADAPTER)pTimer->Adapter;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
PDM_ODM_T pDM_Odm = &pHalData->DM_OutSrc; PDM_ODM_T pDM_Odm = &pHalData->DM_OutSrc;
#else #else
PADAPTER Adapter = (PADAPTER)pTimer->Adapter; struct adapter *Adapter = (PADAPTER)pTimer->Adapter;
#endif #endif
#if DEV_BUS_TYPE==RT_PCI_INTERFACE #if DEV_BUS_TYPE==RT_PCI_INTERFACE
@ -11111,7 +11111,7 @@ odm_CCKTXPathDiversityWorkItemCallback(
IN PVOID pContext IN PVOID pContext
) )
{ {
PADAPTER Adapter = (PADAPTER)pContext; struct adapter *Adapter = (PADAPTER)pContext;
odm_CCKTXPathDiversity_92C(Adapter); odm_CCKTXPathDiversity_92C(Adapter);
} }
@ -11119,7 +11119,7 @@ odm_CCKTXPathDiversityWorkItemCallback(
VOID VOID
ODM_CCKPathDiversityChkPerPktRssi( ODM_CCKPathDiversityChkPerPktRssi(
PADAPTER Adapter, struct adapter * Adapter,
BOOLEAN bIsDefPort, BOOLEAN bIsDefPort,
BOOLEAN bMatchBSSID, BOOLEAN bMatchBSSID,
PRT_WLAN_STA pEntry, PRT_WLAN_STA pEntry,
@ -11183,12 +11183,12 @@ ODM_CCKPathDiversityChkPerPktRssi(
BOOLEAN BOOLEAN
ODM_PathDiversityBeforeLink92C( ODM_PathDiversityBeforeLink92C(
//IN PADAPTER Adapter //IN struct adapter *Adapter
IN PDM_ODM_T pDM_Odm IN PDM_ODM_T pDM_Odm
) )
{ {
#if (RT_MEM_SIZE_LEVEL != RT_MEM_SIZE_MINIMUM) #if (RT_MEM_SIZE_LEVEL != RT_MEM_SIZE_MINIMUM)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
HAL_DATA_TYPE* pHalData = NULL; HAL_DATA_TYPE* pHalData = NULL;
PMGNT_INFO pMgntInfo = NULL; PMGNT_INFO pMgntInfo = NULL;
//pSWAT_T pDM_SWAT_Table = &Adapter->DM_SWAT_Table; //pSWAT_T pDM_SWAT_Table = &Adapter->DM_SWAT_Table;
@ -11407,7 +11407,7 @@ ODM_PathDiversityBeforeLink92C(
// //
VOID VOID
ODM_PathDivChkPerPktRssi( ODM_PathDivChkPerPktRssi(
PADAPTER Adapter, struct adapter * Adapter,
BOOLEAN bIsDefPort, BOOLEAN bIsDefPort,
BOOLEAN bMatchBSSID, BOOLEAN bMatchBSSID,
PRT_WLAN_STA pEntry, PRT_WLAN_STA pEntry,
@ -11452,7 +11452,7 @@ ODM_PathDivRestAfterLink(
IN PDM_ODM_T pDM_Odm IN PDM_ODM_T pDM_Odm
) )
{ {
PADAPTER Adapter=pDM_Odm->Adapter; struct adapter * Adapter=pDM_Odm->Adapter;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
pSWAT_T pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table; pSWAT_T pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table;
@ -11475,7 +11475,7 @@ odm_PathDivChkAntSwitchCallback(
PRT_TIMER pTimer PRT_TIMER pTimer
) )
{ {
PADAPTER Adapter = (PADAPTER)pTimer->Adapter; struct adapter * Adapter = (PADAPTER)pTimer->Adapter;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
PDM_ODM_T pDM_Odm = &pHalData->DM_OutSrc; PDM_ODM_T pDM_Odm = &pHalData->DM_OutSrc;
@ -11500,7 +11500,7 @@ odm_PathDivChkAntSwitchWorkitemCallback(
IN PVOID pContext IN PVOID pContext
) )
{ {
PADAPTER pAdapter = (PADAPTER)pContext; struct adapter *pAdapter = (PADAPTER)pContext;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter);
PDM_ODM_T pDM_Odm = &pHalData->DM_OutSrc; PDM_ODM_T pDM_Odm = &pHalData->DM_OutSrc;
@ -11518,11 +11518,11 @@ odm_PathDivChkAntSwitchWorkitemCallback(
VOID VOID
odm_PathDivChkAntSwitch( odm_PathDivChkAntSwitch(
PDM_ODM_T pDM_Odm PDM_ODM_T pDM_Odm
//PADAPTER Adapter, //struct adapter * Adapter,
//u1Byte Step //u1Byte Step
) )
{ {
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
PMGNT_INFO pMgntInfo = &Adapter->MgntInfo; PMGNT_INFO pMgntInfo = &Adapter->MgntInfo;
@ -11549,7 +11549,7 @@ odm_PathDivChkAntSwitch(
u1Byte n=0; u1Byte n=0;
static u8Byte lastTxOkCnt_tmp=0, lastRxOkCnt_tmp=0; static u8Byte lastTxOkCnt_tmp=0, lastRxOkCnt_tmp=0;
//u8Byte curTxOkCnt_tmp, curRxOkCnt_tmp; //u8Byte curTxOkCnt_tmp, curRxOkCnt_tmp;
PADAPTER BuddyAdapter = Adapter->BuddyAdapter; // another adapter MAC struct adapter * BuddyAdapter = Adapter->BuddyAdapter; // another adapter MAC
// Path Diversity //Neil Chen--2011--06--22 // Path Diversity //Neil Chen--2011--06--22
//u1Byte PathDiv_Trigger = (u1Byte) PHY_QueryBBReg(Adapter, 0xBA0,BIT31); //u1Byte PathDiv_Trigger = (u1Byte) PHY_QueryBBReg(Adapter, 0xBA0,BIT31);
@ -11608,7 +11608,7 @@ odm_PathDivChkAntSwitch(
{ {
u1Byte index = 0; u1Byte index = 0;
PRT_WLAN_STA pEntry = NULL; PRT_WLAN_STA pEntry = NULL;
PADAPTER pTargetAdapter = NULL; struct adapter * pTargetAdapter = NULL;
if( pMgntInfo->mIbss || ACTING_AS_AP(Adapter) ) if( pMgntInfo->mIbss || ACTING_AS_AP(Adapter) )
{ {
@ -11986,7 +11986,7 @@ odm_PathDivChkAntSwitch(
VOID VOID
odm_SetRespPath_92C( odm_SetRespPath_92C(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u1Byte DefaultRespPath IN u1Byte DefaultRespPath
) )
{ {
@ -12010,7 +12010,7 @@ odm_SetRespPath_92C(
VOID VOID
ODM_FillTXPathInTXDESC( ODM_FillTXPathInTXDESC(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN PRT_TCB pTcb, IN PRT_TCB pTcb,
IN pu1Byte pDesc IN pu1Byte pDesc
) )

28
hal/odm.h
View file

@ -140,7 +140,7 @@ typedef struct _ADAPTER{
HAL_DATA_TYPE* temp2; HAL_DATA_TYPE* temp2;
prtl8192cd_priv priv; prtl8192cd_priv priv;
#endif #endif
}ADAPTER, *PADAPTER; }ADAPTER, *struct adapter *;
#endif #endif
#if (DM_ODM_SUPPORT_TYPE == ODM_AP) #if (DM_ODM_SUPPORT_TYPE == ODM_AP)
@ -1118,7 +1118,7 @@ typedef struct DM_Out_Source_Dynamic_Mechanism_Structure
// //
// Add for different team use temporarily // Add for different team use temporarily
// //
PADAPTER Adapter; // For CE/NIC team struct adapter * Adapter; // For CE/NIC team
prtl8192cd_priv priv; // For AP/ADSL team prtl8192cd_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.
BOOLEAN odm_ready; BOOLEAN odm_ready;
@ -1196,7 +1196,7 @@ typedef struct DM_Out_Source_Dynamic_Mechanism_Structure
u1Byte u1Byte_temp; u1Byte u1Byte_temp;
BOOLEAN BOOLEAN_temp; BOOLEAN BOOLEAN_temp;
PADAPTER PADAPTER_temp; struct adapter *_temp;
// MAC PHY Mode SMSP/DMSP/DMDP = 0/1/2 // MAC PHY Mode SMSP/DMSP/DMDP = 0/1/2
u1Byte *pMacPhyMode; u1Byte *pMacPhyMode;
@ -1219,7 +1219,7 @@ typedef struct DM_Out_Source_Dynamic_Mechanism_Structure
// Common info for 92D DMSP // Common info for 92D DMSP
BOOLEAN *pbGetValueFromOtherMac; BOOLEAN *pbGetValueFromOtherMac;
PADAPTER *pBuddyAdapter; struct adapter * *pBuddyAdapter;
BOOLEAN *pbMasterOfDMSP; //MAC0: master, MAC1: slave BOOLEAN *pbMasterOfDMSP; //MAC0: master, MAC1: slave
// Common info for Status // Common info for Status
BOOLEAN *pbScanInProcess; BOOLEAN *pbScanInProcess;
@ -1709,7 +1709,7 @@ ODM_RAStateCheck(
// function prototype // function prototype
//============================================================ //============================================================
//#define DM_ChangeDynamicInitGainThresh ODM_ChangeDynamicInitGainThresh //#define DM_ChangeDynamicInitGainThresh ODM_ChangeDynamicInitGainThresh
//void ODM_ChangeDynamicInitGainThresh(IN PADAPTER pAdapter, //void ODM_ChangeDynamicInitGainThresh(IN struct adapter * pAdapter,
// IN INT32 DM_Type, // IN INT32 DM_Type,
// IN INT32 DM_Value); // IN INT32 DM_Value);
VOID VOID
@ -1721,14 +1721,14 @@ ODM_ChangeDynamicInitGainThresh(
BOOLEAN BOOLEAN
ODM_CheckPowerStatus( ODM_CheckPowerStatus(
IN PADAPTER Adapter IN struct adapter * Adapter
); );
#if (DM_ODM_SUPPORT_TYPE != ODM_ADSL) #if (DM_ODM_SUPPORT_TYPE != ODM_ADSL)
VOID VOID
ODM_RateAdaptiveStateApInit( ODM_RateAdaptiveStateApInit(
IN PADAPTER Adapter , IN struct adapter * Adapter ,
IN PRT_WLAN_STA pEntry IN PRT_WLAN_STA pEntry
); );
#endif #endif
@ -1833,7 +1833,7 @@ VOID odm_PSDMonitorInit(PDM_ODM_T pDM_Odm);
VOID VOID
ODM_PSDDbgControl( ODM_PSDDbgControl(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN u4Byte mode, IN u4Byte mode,
IN u4Byte btRssi IN u4Byte btRssi
); );
@ -1922,13 +1922,13 @@ VOID ODM_PathDivRestAfterLink(
//#define PATHDIV_ENABLE 1 //#define PATHDIV_ENABLE 1
//VOID odm_PathDivChkAntSwitch(PADAPTER Adapter,u1Byte Step); //VOID odm_PathDivChkAntSwitch(struct adapter * Adapter,u1Byte Step);
VOID ODM_PathDivRestAfterLink( VOID ODM_PathDivRestAfterLink(
IN PDM_ODM_T pDM_Odm IN PDM_ODM_T pDM_Odm
); );
#define dm_PathDiv_RSSI_Check ODM_PathDivChkPerPktRssi #define dm_PathDiv_RSSI_Check ODM_PathDivChkPerPktRssi
VOID ODM_PathDivChkPerPktRssi(PADAPTER Adapter, VOID ODM_PathDivChkPerPktRssi(struct adapter * Adapter,
BOOLEAN bIsDefPort, BOOLEAN bIsDefPort,
BOOLEAN bMatchBSSID, BOOLEAN bMatchBSSID,
PRT_WLAN_STA pEntry, PRT_WLAN_STA pEntry,
@ -1956,12 +1956,12 @@ PlatformDivision64(
#define PathDivCheckBeforeLink8192C ODM_PathDiversityBeforeLink92C #define PathDivCheckBeforeLink8192C ODM_PathDiversityBeforeLink92C
BOOLEAN BOOLEAN
ODM_PathDiversityBeforeLink92C( ODM_PathDiversityBeforeLink92C(
//IN PADAPTER Adapter //IN struct adapter * Adapter
IN PDM_ODM_T pDM_Odm IN PDM_ODM_T pDM_Odm
); );
#define DM_ChangeDynamicInitGainThresh ODM_ChangeDynamicInitGainThresh #define DM_ChangeDynamicInitGainThresh ODM_ChangeDynamicInitGainThresh
//void ODM_ChangeDynamicInitGainThresh(IN PADAPTER pAdapter, //void ODM_ChangeDynamicInitGainThresh(IN struct adapter * pAdapter,
// IN INT32 DM_Type, // IN INT32 DM_Type,
// IN INT32 DM_Value); // IN INT32 DM_Value);
// //
@ -1969,7 +1969,7 @@ ODM_PathDiversityBeforeLink92C(
VOID VOID
ODM_CCKPathDiversityChkPerPktRssi( ODM_CCKPathDiversityChkPerPktRssi(
PADAPTER Adapter, struct adapter * Adapter,
BOOLEAN bIsDefPort, BOOLEAN bIsDefPort,
BOOLEAN bMatchBSSID, BOOLEAN bMatchBSSID,
PRT_WLAN_STA pEntry, PRT_WLAN_STA pEntry,
@ -1991,7 +1991,7 @@ typedef enum tag_DIG_Connect_Definition
VOID VOID
ODM_FillTXPathInTXDESC( ODM_FillTXPathInTXDESC(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN PRT_TCB pTcb, IN PRT_TCB pTcb,
IN pu1Byte pDesc IN pu1Byte pDesc
); );

18
hal/odm_RTL8188E.c
View file

@ -51,7 +51,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)
{ {
@ -89,7 +89,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)
@ -142,7 +142,7 @@ odm_FastAntTrainingInit(
u4Byte value32, i; u4Byte value32, i;
pFAT_T pDM_FatTable = &pDM_Odm->DM_FatTable; pFAT_T 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)
@ -254,7 +254,7 @@ ODM_AntennaDiversityInit_88E(
//2012.03.27 LukeLee: For temp use, should be removed later //2012.03.27 LukeLee: For temp use, should be removed later
//pDM_Odm->AntDivType = CG_TRX_HW_ANTDIV; //pDM_Odm->AntDivType = CG_TRX_HW_ANTDIV;
//{ //{
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
HAL_DATA_TYPE* pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE* pHalData = GET_HAL_DATA(Adapter);
//pHalData->AntDivCfg = 1; //pHalData->AntDivCfg = 1;
//} //}
@ -537,7 +537,7 @@ odm_SetNextMACAddrTarget(
// //
#if( DM_ODM_SUPPORT_TYPE & ODM_MP) #if( DM_ODM_SUPPORT_TYPE & ODM_MP)
{ {
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter *Adapter = pDM_Odm->Adapter;
PMGNT_INFO pMgntInfo = &Adapter->MgntInfo; PMGNT_INFO pMgntInfo = &Adapter->MgntInfo;
for (i=0; i<6; i++) for (i=0; i<6; i++)
@ -696,7 +696,7 @@ odm_FastAntTrainingCallback(
{ {
#if (DM_ODM_SUPPORT_TYPE == ODM_CE) #if (DM_ODM_SUPPORT_TYPE == ODM_CE)
PADAPTER padapter = pDM_Odm->Adapter; struct adapter *padapter = pDM_Odm->Adapter;
if(padapter->net_closed == _TRUE) if(padapter->net_closed == _TRUE)
return; return;
//if(*pDM_Odm->pbNet_closed == TRUE) //if(*pDM_Odm->pbNet_closed == TRUE)
@ -815,7 +815,7 @@ odm_FastAntTrainingCallback(
PRT_TIMER pTimer PRT_TIMER pTimer
) )
{ {
PADAPTER Adapter = (PADAPTER)pTimer->Adapter; struct adapter * Adapter = (PADAPTER)pTimer->Adapter;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
//#if DEV_BUS_TYPE==RT_PCI_INTERFACE //#if DEV_BUS_TYPE==RT_PCI_INTERFACE
@ -833,7 +833,7 @@ odm_FastAntTrainingCallback(
VOID odm_FastAntTrainingCallback(void *FunctionContext) VOID odm_FastAntTrainingCallback(void *FunctionContext)
{ {
PDM_ODM_T pDM_Odm= (PDM_ODM_T)FunctionContext; PDM_ODM_T pDM_Odm= (PDM_ODM_T)FunctionContext;
PADAPTER padapter = pDM_Odm->Adapter; struct adapter *padapter = pDM_Odm->Adapter;
if(padapter->net_closed == _TRUE) if(padapter->net_closed == _TRUE)
return; return;
odm_FastAntTraining(pDM_Odm); odm_FastAntTraining(pDM_Odm);
@ -898,7 +898,7 @@ odm_DynamicPrimaryCCA(
IN PDM_ODM_T pDM_Odm IN PDM_ODM_T pDM_Odm
) )
{ {
PADAPTER Adapter = pDM_Odm->Adapter; // for NIC struct adapter *Adapter = pDM_Odm->Adapter; // for NIC
prtl8192cd_priv priv = pDM_Odm->priv; // for AP prtl8192cd_priv priv = pDM_Odm->priv; // for AP
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);

58
hal/odm_interface.c
View file

@ -37,10 +37,10 @@ ODM_Read1Byte(
prtl8192cd_priv priv = pDM_Odm->priv; prtl8192cd_priv priv = pDM_Odm->priv;
return RTL_R8(RegAddr); return RTL_R8(RegAddr);
#elif(DM_ODM_SUPPORT_TYPE & ODM_CE) #elif(DM_ODM_SUPPORT_TYPE & ODM_CE)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
return rtw_read8(Adapter,RegAddr); return rtw_read8(Adapter,RegAddr);
#elif(DM_ODM_SUPPORT_TYPE & ODM_MP) #elif(DM_ODM_SUPPORT_TYPE & ODM_MP)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
return PlatformEFIORead1Byte(Adapter, RegAddr); return PlatformEFIORead1Byte(Adapter, RegAddr);
#endif #endif
@ -57,10 +57,10 @@ ODM_Read2Byte(
prtl8192cd_priv priv = pDM_Odm->priv; prtl8192cd_priv priv = pDM_Odm->priv;
return RTL_R16(RegAddr); return RTL_R16(RegAddr);
#elif(DM_ODM_SUPPORT_TYPE & ODM_CE) #elif(DM_ODM_SUPPORT_TYPE & ODM_CE)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
return rtw_read16(Adapter,RegAddr); return rtw_read16(Adapter,RegAddr);
#elif(DM_ODM_SUPPORT_TYPE & ODM_MP) #elif(DM_ODM_SUPPORT_TYPE & ODM_MP)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
return PlatformEFIORead2Byte(Adapter, RegAddr); return PlatformEFIORead2Byte(Adapter, RegAddr);
#endif #endif
@ -77,10 +77,10 @@ ODM_Read4Byte(
prtl8192cd_priv priv = pDM_Odm->priv; prtl8192cd_priv priv = pDM_Odm->priv;
return RTL_R32(RegAddr); return RTL_R32(RegAddr);
#elif(DM_ODM_SUPPORT_TYPE & ODM_CE) #elif(DM_ODM_SUPPORT_TYPE & ODM_CE)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
return rtw_read32(Adapter,RegAddr); return rtw_read32(Adapter,RegAddr);
#elif(DM_ODM_SUPPORT_TYPE & ODM_MP) #elif(DM_ODM_SUPPORT_TYPE & ODM_MP)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
return PlatformEFIORead4Byte(Adapter, RegAddr); return PlatformEFIORead4Byte(Adapter, RegAddr);
#endif #endif
@ -98,10 +98,10 @@ ODM_Write1Byte(
prtl8192cd_priv priv = pDM_Odm->priv; prtl8192cd_priv priv = pDM_Odm->priv;
RTL_W8(RegAddr, Data); RTL_W8(RegAddr, Data);
#elif(DM_ODM_SUPPORT_TYPE & ODM_CE) #elif(DM_ODM_SUPPORT_TYPE & ODM_CE)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
rtw_write8(Adapter,RegAddr, Data); rtw_write8(Adapter,RegAddr, Data);
#elif(DM_ODM_SUPPORT_TYPE & ODM_MP) #elif(DM_ODM_SUPPORT_TYPE & ODM_MP)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
PlatformEFIOWrite1Byte(Adapter, RegAddr, Data); PlatformEFIOWrite1Byte(Adapter, RegAddr, Data);
#endif #endif
@ -119,10 +119,10 @@ ODM_Write2Byte(
prtl8192cd_priv priv = pDM_Odm->priv; prtl8192cd_priv priv = pDM_Odm->priv;
RTL_W16(RegAddr, Data); RTL_W16(RegAddr, Data);
#elif(DM_ODM_SUPPORT_TYPE & ODM_CE) #elif(DM_ODM_SUPPORT_TYPE & ODM_CE)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
rtw_write16(Adapter,RegAddr, Data); rtw_write16(Adapter,RegAddr, Data);
#elif(DM_ODM_SUPPORT_TYPE & ODM_MP) #elif(DM_ODM_SUPPORT_TYPE & ODM_MP)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
PlatformEFIOWrite2Byte(Adapter, RegAddr, Data); PlatformEFIOWrite2Byte(Adapter, RegAddr, Data);
#endif #endif
@ -140,10 +140,10 @@ ODM_Write4Byte(
prtl8192cd_priv priv = pDM_Odm->priv; prtl8192cd_priv priv = pDM_Odm->priv;
RTL_W32(RegAddr, Data); RTL_W32(RegAddr, Data);
#elif(DM_ODM_SUPPORT_TYPE & ODM_CE) #elif(DM_ODM_SUPPORT_TYPE & ODM_CE)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
rtw_write32(Adapter,RegAddr, Data); rtw_write32(Adapter,RegAddr, Data);
#elif(DM_ODM_SUPPORT_TYPE & ODM_MP) #elif(DM_ODM_SUPPORT_TYPE & ODM_MP)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
PlatformEFIOWrite4Byte(Adapter, RegAddr, Data); PlatformEFIOWrite4Byte(Adapter, RegAddr, Data);
#endif #endif
@ -161,7 +161,7 @@ ODM_SetMACReg(
#if(DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) #if(DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL))
PHY_SetBBReg(pDM_Odm->priv, RegAddr, BitMask, Data); PHY_SetBBReg(pDM_Odm->priv, RegAddr, BitMask, Data);
#elif(DM_ODM_SUPPORT_TYPE & (ODM_CE|ODM_MP)) #elif(DM_ODM_SUPPORT_TYPE & (ODM_CE|ODM_MP))
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
PHY_SetBBReg(Adapter, RegAddr, BitMask, Data); PHY_SetBBReg(Adapter, RegAddr, BitMask, Data);
#endif #endif
} }
@ -177,7 +177,7 @@ ODM_GetMACReg(
#if(DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) #if(DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL))
return PHY_QueryBBReg(pDM_Odm->priv, RegAddr, BitMask); return PHY_QueryBBReg(pDM_Odm->priv, RegAddr, BitMask);
#elif(DM_ODM_SUPPORT_TYPE & (ODM_CE|ODM_MP)) #elif(DM_ODM_SUPPORT_TYPE & (ODM_CE|ODM_MP))
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
return PHY_QueryBBReg(Adapter, RegAddr, BitMask); return PHY_QueryBBReg(Adapter, RegAddr, BitMask);
#endif #endif
} }
@ -194,7 +194,7 @@ ODM_SetBBReg(
#if(DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) #if(DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL))
PHY_SetBBReg(pDM_Odm->priv, RegAddr, BitMask, Data); PHY_SetBBReg(pDM_Odm->priv, RegAddr, BitMask, Data);
#elif(DM_ODM_SUPPORT_TYPE & (ODM_CE|ODM_MP)) #elif(DM_ODM_SUPPORT_TYPE & (ODM_CE|ODM_MP))
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
PHY_SetBBReg(Adapter, RegAddr, BitMask, Data); PHY_SetBBReg(Adapter, RegAddr, BitMask, Data);
#endif #endif
} }
@ -210,7 +210,7 @@ ODM_GetBBReg(
#if(DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) #if(DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL))
return PHY_QueryBBReg(pDM_Odm->priv, RegAddr, BitMask); return PHY_QueryBBReg(pDM_Odm->priv, RegAddr, BitMask);
#elif(DM_ODM_SUPPORT_TYPE & (ODM_CE|ODM_MP)) #elif(DM_ODM_SUPPORT_TYPE & (ODM_CE|ODM_MP))
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
return PHY_QueryBBReg(Adapter, RegAddr, BitMask); return PHY_QueryBBReg(Adapter, RegAddr, BitMask);
#endif #endif
} }
@ -228,7 +228,7 @@ ODM_SetRFReg(
#if(DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) #if(DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL))
PHY_SetRFReg(pDM_Odm->priv, eRFPath, RegAddr, BitMask, Data); PHY_SetRFReg(pDM_Odm->priv, eRFPath, RegAddr, BitMask, Data);
#elif(DM_ODM_SUPPORT_TYPE & (ODM_CE|ODM_MP)) #elif(DM_ODM_SUPPORT_TYPE & (ODM_CE|ODM_MP))
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
PHY_SetRFReg(Adapter, eRFPath, RegAddr, BitMask, Data); PHY_SetRFReg(Adapter, eRFPath, RegAddr, BitMask, Data);
#endif #endif
} }
@ -245,7 +245,7 @@ ODM_GetRFReg(
#if(DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL)) #if(DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL))
return PHY_QueryRFReg(pDM_Odm->priv, eRFPath, RegAddr, BitMask, 1); return PHY_QueryRFReg(pDM_Odm->priv, eRFPath, RegAddr, BitMask, 1);
#elif(DM_ODM_SUPPORT_TYPE & (ODM_CE|ODM_MP)) #elif(DM_ODM_SUPPORT_TYPE & (ODM_CE|ODM_MP))
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
return PHY_QueryRFReg(Adapter, eRFPath, RegAddr, BitMask); return PHY_QueryRFReg(Adapter, eRFPath, RegAddr, BitMask);
#endif #endif
} }
@ -268,7 +268,7 @@ ODM_AllocateMemory(
#elif (DM_ODM_SUPPORT_TYPE & ODM_CE ) #elif (DM_ODM_SUPPORT_TYPE & ODM_CE )
*pPtr = rtw_zvmalloc(length); *pPtr = rtw_zvmalloc(length);
#elif(DM_ODM_SUPPORT_TYPE & ODM_MP) #elif(DM_ODM_SUPPORT_TYPE & ODM_MP)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
PlatformAllocateMemory(Adapter, pPtr, length); PlatformAllocateMemory(Adapter, pPtr, length);
#endif #endif
} }
@ -286,7 +286,7 @@ ODM_FreeMemory(
#elif (DM_ODM_SUPPORT_TYPE & ODM_CE ) #elif (DM_ODM_SUPPORT_TYPE & ODM_CE )
rtw_vmfree(pPtr, length); rtw_vmfree(pPtr, length);
#elif(DM_ODM_SUPPORT_TYPE & ODM_MP) #elif(DM_ODM_SUPPORT_TYPE & ODM_MP)
//PADAPTER Adapter = pDM_Odm->Adapter; //struct adapter * Adapter = pDM_Odm->Adapter;
PlatformFreeMemory(pPtr, length); PlatformFreeMemory(pPtr, length);
#endif #endif
} }
@ -322,7 +322,7 @@ ODM_AcquireSpinLock(
#elif (DM_ODM_SUPPORT_TYPE & ODM_CE ) #elif (DM_ODM_SUPPORT_TYPE & ODM_CE )
#elif(DM_ODM_SUPPORT_TYPE & ODM_MP) #elif(DM_ODM_SUPPORT_TYPE & ODM_MP)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
PlatformAcquireSpinLock(Adapter, type); PlatformAcquireSpinLock(Adapter, type);
#endif #endif
} }
@ -337,7 +337,7 @@ ODM_ReleaseSpinLock(
#elif (DM_ODM_SUPPORT_TYPE & ODM_CE ) #elif (DM_ODM_SUPPORT_TYPE & ODM_CE )
#elif(DM_ODM_SUPPORT_TYPE & ODM_MP) #elif(DM_ODM_SUPPORT_TYPE & ODM_MP)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
PlatformReleaseSpinLock(Adapter, type); PlatformReleaseSpinLock(Adapter, type);
#endif #endif
} }
@ -359,7 +359,7 @@ ODM_InitializeWorkItem(
#elif(DM_ODM_SUPPORT_TYPE & ODM_CE) #elif(DM_ODM_SUPPORT_TYPE & ODM_CE)
#elif(DM_ODM_SUPPORT_TYPE & ODM_MP) #elif(DM_ODM_SUPPORT_TYPE & ODM_MP)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
PlatformInitializeWorkItem(Adapter, pRtWorkItem, RtWorkItemCallback, pContext, szID); PlatformInitializeWorkItem(Adapter, pRtWorkItem, RtWorkItemCallback, pContext, szID);
#endif #endif
} }
@ -516,7 +516,7 @@ ODM_SetTimer(
#elif(DM_ODM_SUPPORT_TYPE & ODM_CE) #elif(DM_ODM_SUPPORT_TYPE & ODM_CE)
_set_timer(pTimer,msDelay ); //ms _set_timer(pTimer,msDelay ); //ms
#elif(DM_ODM_SUPPORT_TYPE & ODM_MP) #elif(DM_ODM_SUPPORT_TYPE & ODM_MP)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter * Adapter = pDM_Odm->Adapter;
PlatformSetTimer(Adapter, pTimer, msDelay); PlatformSetTimer(Adapter, pTimer, msDelay);
#endif #endif
@ -536,10 +536,10 @@ ODM_InitializeTimer(
pTimer->data = (unsigned long)pDM_Odm; pTimer->data = (unsigned long)pDM_Odm;
init_timer(pTimer); init_timer(pTimer);
#elif(DM_ODM_SUPPORT_TYPE & ODM_CE) #elif(DM_ODM_SUPPORT_TYPE & ODM_CE)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter *Adapter = pDM_Odm->Adapter;
_init_timer(pTimer,Adapter->pnetdev,CallBackFunc,pDM_Odm); _init_timer(pTimer,Adapter->pnetdev,CallBackFunc,pDM_Odm);
#elif(DM_ODM_SUPPORT_TYPE & ODM_MP) #elif(DM_ODM_SUPPORT_TYPE & ODM_MP)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter *Adapter = pDM_Odm->Adapter;
PlatformInitializeTimer(Adapter, pTimer, CallBackFunc,pContext,szID); PlatformInitializeTimer(Adapter, pTimer, CallBackFunc,pContext,szID);
#endif #endif
} }
@ -556,7 +556,7 @@ ODM_CancelTimer(
#elif(DM_ODM_SUPPORT_TYPE & ODM_CE) #elif(DM_ODM_SUPPORT_TYPE & ODM_CE)
_cancel_timer_ex(pTimer); _cancel_timer_ex(pTimer);
#elif(DM_ODM_SUPPORT_TYPE & ODM_MP) #elif(DM_ODM_SUPPORT_TYPE & ODM_MP)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter *Adapter = pDM_Odm->Adapter;
PlatformCancelTimer(Adapter, pTimer); PlatformCancelTimer(Adapter, pTimer);
#endif #endif
} }
@ -574,7 +574,7 @@ ODM_ReleaseTimer(
#elif(DM_ODM_SUPPORT_TYPE & ODM_MP) #elif(DM_ODM_SUPPORT_TYPE & ODM_MP)
PADAPTER Adapter = pDM_Odm->Adapter; struct adapter *Adapter = pDM_Odm->Adapter;
// <20120301, Kordan> If the initilization fails, InitializeAdapterXxx will return regardless of InitHalDm. // <20120301, Kordan> If the initilization fails, InitializeAdapterXxx will return regardless of InitHalDm.
// Hence, uninitialized timers cause BSOD when the driver releases resources since the init fail. // Hence, uninitialized timers cause BSOD when the driver releases resources since the init fail.
@ -595,7 +595,7 @@ ODM_ReleaseTimer(
#if (DM_ODM_SUPPORT_TYPE & ODM_MP) #if (DM_ODM_SUPPORT_TYPE & ODM_MP)
VOID VOID
ODM_FillH2CCmd( ODM_FillH2CCmd(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN u1Byte ElementID, IN u1Byte ElementID,
IN u4Byte CmdLen, IN u4Byte CmdLen,
IN pu1Byte pCmdBuffer IN pu1Byte pCmdBuffer

46
hal/rtl8188e_cmd.c
View file

@ -39,7 +39,7 @@
#define RTL88E_EX_MESSAGE_BOX_SIZE 4 #define RTL88E_EX_MESSAGE_BOX_SIZE 4
#define RTL88E_RSVDPAGE_SIZE 1024 #define RTL88E_RSVDPAGE_SIZE 1024
static u8 _is_fw_read_cmd_down(_adapter* padapter, u8 msgbox_num) static u8 _is_fw_read_cmd_down(struct adapter* padapter, u8 msgbox_num)
{ {
u8 read_down = _FALSE; u8 read_down = _FALSE;
int retry_cnts = 100; int retry_cnts = 100;
@ -73,7 +73,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;
@ -170,7 +170,7 @@ _func_exit_;
return ret; return ret;
} }
u8 rtl8192c_h2c_msg_hdl(_adapter *padapter, unsigned char *pbuf) u8 rtl8192c_h2c_msg_hdl(struct adapter *padapter, unsigned char *pbuf)
{ {
u8 ElementID, CmdLen; u8 ElementID, CmdLen;
u8 *pCmdBuffer; u8 *pCmdBuffer;
@ -190,7 +190,7 @@ u8 rtl8192c_h2c_msg_hdl(_adapter *padapter, unsigned char *pbuf)
} }
/* /*
#if defined(CONFIG_AUTOSUSPEND) && defined(SUPPORT_HW_RFOFF_DETECTED) #if defined(CONFIG_AUTOSUSPEND) && defined(SUPPORT_HW_RFOFF_DETECTED)
u8 rtl8192c_set_FwSelectSuspend_cmd(_adapter *padapter ,u8 bfwpoll, u16 period) u8 rtl8192c_set_FwSelectSuspend_cmd(struct adapter *padapter ,u8 bfwpoll, u16 period)
{ {
u8 res=_SUCCESS; u8 res=_SUCCESS;
struct H2C_SS_RFOFF_PARAM param; struct H2C_SS_RFOFF_PARAM param;
@ -202,7 +202,7 @@ u8 rtl8192c_set_FwSelectSuspend_cmd(_adapter *padapter ,u8 bfwpoll, u16 period)
} }
#endif //CONFIG_AUTOSUSPEND && SUPPORT_HW_RFOFF_DETECTED #endif //CONFIG_AUTOSUSPEND && SUPPORT_HW_RFOFF_DETECTED
*/ */
u8 rtl8188e_set_rssi_cmd(_adapter*padapter, u8 *param) u8 rtl8188e_set_rssi_cmd(struct adapter*padapter, u8 *param)
{ {
u8 res=_SUCCESS; u8 res=_SUCCESS;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
@ -224,7 +224,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;
@ -251,7 +251,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)
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter);
//struct dm_priv *pdmpriv = &pHalData->dmpriv; //struct dm_priv *pdmpriv = &pHalData->dmpriv;
@ -301,7 +301,7 @@ void rtl8188e_Add_RateATid(PADAPTER pAdapter, u32 bitmap, u8 arg, u8 rssi_level)
} }
void rtl8188e_set_FwPwrMode_cmd(PADAPTER padapter, u8 Mode) void rtl8188e_set_FwPwrMode_cmd(struct adapter *padapter, u8 Mode)
{ {
SETPWRMODE_PARM H2CSetPwrMode; SETPWRMODE_PARM H2CSetPwrMode;
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
@ -359,7 +359,7 @@ _func_enter_;
_func_exit_; _func_exit_;
} }
void rtl8188e_set_FwMediaStatus_cmd(PADAPTER padapter, u16 mstatus_rpt ) void rtl8188e_set_FwMediaStatus_cmd(struct adapter *padapter, u16 mstatus_rpt )
{ {
u8 opmode,macid; u8 opmode,macid;
u16 mst_rpt = cpu_to_le16 (mstatus_rpt); u16 mst_rpt = cpu_to_le16 (mstatus_rpt);
@ -388,7 +388,7 @@ void rtl8188e_set_FwMediaStatus_cmd(PADAPTER padapter, u16 mstatus_rpt )
} }
void ConstructBeacon(_adapter *padapter, u8 *pframe, u32 *pLength) void ConstructBeacon(struct adapter *padapter, u8 *pframe, u32 *pLength)
{ {
struct rtw_ieee80211_hdr *pwlanhdr; struct rtw_ieee80211_hdr *pwlanhdr;
u16 *fctrl; u16 *fctrl;
@ -490,7 +490,7 @@ _ConstructBeacon:
} }
void ConstructPSPoll(_adapter *padapter, u8 *pframe, u32 *pLength) void ConstructPSPoll(struct adapter *padapter, u8 *pframe, u32 *pLength)
{ {
struct rtw_ieee80211_hdr *pwlanhdr; struct rtw_ieee80211_hdr *pwlanhdr;
u16 *fctrl; u16 *fctrl;
@ -521,7 +521,7 @@ void ConstructPSPoll(_adapter *padapter, u8 *pframe, u32 *pLength)
} }
void ConstructNullFunctionData( void ConstructNullFunctionData(
PADAPTER padapter, struct adapter *padapter,
u8 *pframe, u8 *pframe,
u32 *pLength, u32 *pLength,
u8 *StaAddr, u8 *StaAddr,
@ -593,7 +593,7 @@ void ConstructNullFunctionData(
*pLength = pktlen; *pLength = pktlen;
} }
void ConstructProbeRsp(_adapter *padapter, u8 *pframe, u32 *pLength, u8 *StaAddr, BOOLEAN bHideSSID) void ConstructProbeRsp(struct adapter *padapter, u8 *pframe, u32 *pLength, u8 *StaAddr, BOOLEAN bHideSSID)
{ {
struct rtw_ieee80211_hdr *pwlanhdr; struct rtw_ieee80211_hdr *pwlanhdr;
u16 *fctrl; u16 *fctrl;
@ -639,7 +639,7 @@ void ConstructProbeRsp(_adapter *padapter, u8 *pframe, u32 *pLength, u8 *StaAddr
// Construct the ARP response packet to support ARP offload. // Construct the ARP response packet to support ARP offload.
// //
static void ConstructARPResponse( static void ConstructARPResponse(
PADAPTER padapter, struct adapter *padapter,
u8 *pframe, u8 *pframe,
u32 *pLength, u32 *pLength,
u8 *pIPAddress u8 *pIPAddress
@ -802,7 +802,7 @@ static void ConstructARPResponse(
} }
#endif #endif
void rtl8188e_set_FwRsvdPage_cmd(PADAPTER padapter, PRSVDPAGE_LOC rsvdpageloc) void rtl8188e_set_FwRsvdPage_cmd(struct adapter *padapter, PRSVDPAGE_LOC rsvdpageloc)
{ {
u8 u1H2CRsvdPageParm[H2C_8188E_RSVDPAGE_LOC_LEN]={0}; u8 u1H2CRsvdPageParm[H2C_8188E_RSVDPAGE_LOC_LEN]={0};
u8 u1H2CAoacRsvdPageParm[H2C_8188E_AOAC_RSVDPAGE_LOC_LEN]={0}; u8 u1H2CAoacRsvdPageParm[H2C_8188E_AOAC_RSVDPAGE_LOC_LEN]={0};
@ -829,7 +829,7 @@ void rtl8188e_set_FwRsvdPage_cmd(PADAPTER padapter, PRSVDPAGE_LOC rsvdpageloc)
// 2010.06.23. Added by tynli. // 2010.06.23. Added by tynli.
VOID VOID
CheckFwRsvdPageContent( CheckFwRsvdPageContent(
IN PADAPTER Adapter IN struct adapter * Adapter
) )
{ {
HAL_DATA_TYPE* pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE* pHalData = GET_HAL_DATA(Adapter);
@ -855,7 +855,7 @@ CheckFwRsvdPageContent(
// TRUE: At the second time, we should send the first packet (default:beacon) // 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, BOOLEAN bDLFinished) static void SetFwRsvdPagePkt(struct adapter *padapter, BOOLEAN bDLFinished)
{ {
PHAL_DATA_TYPE pHalData; PHAL_DATA_TYPE pHalData;
struct xmit_frame *pmgntframe; struct xmit_frame *pmgntframe;
@ -1019,7 +1019,7 @@ exit:
rtw_mfree(ReservedPagePacket, RTL88E_RSVDPAGE_SIZE); rtw_mfree(ReservedPagePacket, RTL88E_RSVDPAGE_SIZE);
} }
void rtl8188e_set_FwJoinBssReport_cmd(PADAPTER padapter, u8 mstatus) void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *padapter, u8 mstatus)
{ {
JOINBSSRPT_PARM JoinBssRptParm; JOINBSSRPT_PARM JoinBssRptParm;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
@ -1193,7 +1193,7 @@ _func_exit_;
} }
#ifdef CONFIG_P2P_PS #ifdef CONFIG_P2P_PS
void rtl8188e_set_p2p_ps_offload_cmd(_adapter* padapter, u8 p2p_ps_state) void rtl8188e_set_p2p_ps_offload_cmd(struct adapter* padapter, u8 p2p_ps_state)
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
@ -1288,7 +1288,7 @@ _func_exit_;
/* /*
ask FW to Reset sync register at Beacon early interrupt ask FW to Reset sync register at Beacon early interrupt
*/ */
u8 rtl8188e_reset_tsf(_adapter *padapter, u8 reset_port ) u8 rtl8188e_reset_tsf(struct adapter *padapter, u8 reset_port )
{ {
u8 buf[2]; u8 buf[2];
u8 res=_SUCCESS; u8 res=_SUCCESS;
@ -1308,7 +1308,7 @@ _func_exit_;
return res; return res;
} }
int reset_tsf(PADAPTER Adapter, u8 reset_port ) int reset_tsf(struct adapter *Adapter, u8 reset_port )
{ {
u8 reset_cnt_before = 0, reset_cnt_after = 0, loop_cnt = 0; u8 reset_cnt_before = 0, reset_cnt_after = 0, loop_cnt = 0;
u32 reg_reset_tsf_cnt = (IFACE_PORT0==reset_port) ? u32 reg_reset_tsf_cnt = (IFACE_PORT0==reset_port) ?
@ -1334,7 +1334,7 @@ int reset_tsf(PADAPTER Adapter, u8 reset_port )
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
#ifdef CONFIG_GPIO_WAKEUP #ifdef CONFIG_GPIO_WAKEUP
void rtl8188es_set_output_gpio(_adapter* padapter, u8 index, u8 outputval) void rtl8188es_set_output_gpio(struct adapter* padapter, u8 index, u8 outputval)
{ {
if ( index <= 7 ) { if ( index <= 7 ) {
/* config GPIO mode */ /* config GPIO mode */
@ -1376,7 +1376,7 @@ void rtl8188es_set_output_gpio(_adapter* padapter, u8 index, u8 outputval)
} }
#endif //CONFIG_GPIO_WAKEUP #endif //CONFIG_GPIO_WAKEUP
void rtl8188es_set_wowlan_cmd(_adapter* padapter, u8 enable) void rtl8188es_set_wowlan_cmd(struct adapter* padapter, u8 enable)
{ {
u8 res=_SUCCESS; u8 res=_SUCCESS;
u32 test=0; u32 test=0;

30
hal/rtl8188e_dm.c
View file

@ -43,7 +43,7 @@
static VOID static VOID
dm_CheckProtection( dm_CheckProtection(
IN PADAPTER Adapter IN struct adapter *Adapter
) )
{ {
#if 0 #if 0
@ -70,7 +70,7 @@ dm_CheckProtection(
static VOID static VOID
dm_CheckStatistics( dm_CheckStatistics(
IN PADAPTER Adapter IN struct adapter *Adapter
) )
{ {
#if 0 #if 0
@ -89,7 +89,7 @@ dm_CheckStatistics(
#endif #endif
} }
static void dm_CheckPbcGPIO(_adapter *padapter) static void dm_CheckPbcGPIO(struct adapter *padapter)
{ {
u8 tmp1byte; u8 tmp1byte;
u8 bPbcPressed = _FALSE; u8 bPbcPressed = _FALSE;
@ -166,7 +166,7 @@ static void dm_CheckPbcGPIO(_adapter *padapter)
// //
VOID VOID
dm_InterruptMigration( dm_InterruptMigration(
IN PADAPTER Adapter IN struct adapter *Adapter
) )
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
@ -244,7 +244,7 @@ dm_InterruptMigration(
// //
static void static void
dm_InitGPIOSetting( dm_InitGPIOSetting(
IN PADAPTER Adapter IN struct adapter *Adapter
) )
{ {
PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter);
@ -269,7 +269,7 @@ dm_InitGPIOSetting(
//============================================================ //============================================================
// functions // functions
//============================================================ //============================================================
static void Init_ODM_ComInfo_88E(PADAPTER Adapter) static void Init_ODM_ComInfo_88E(struct adapter *Adapter)
{ {
PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter);
@ -340,7 +340,7 @@ static void Init_ODM_ComInfo_88E(PADAPTER Adapter)
ODM_CmnInfoUpdate(pDM_Odm,ODM_CMNINFO_ABILITY,pdmpriv->InitODMFlag); 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;
@ -426,7 +426,7 @@ static void Update_ODM_ComInfo_88E(PADAPTER Adapter)
void void
rtl8188e_InitHalDm( rtl8188e_InitHalDm(
IN PADAPTER Adapter IN struct adapter *Adapter
) )
{ {
PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter);
@ -451,7 +451,7 @@ rtl8188e_InitHalDm(
VOID VOID
rtl8188e_HalDmWatchDog( rtl8188e_HalDmWatchDog(
IN PADAPTER Adapter IN struct adapter *Adapter
) )
{ {
BOOLEAN bFwCurrentInPSMode = _FALSE; BOOLEAN bFwCurrentInPSMode = _FALSE;
@ -461,7 +461,7 @@ rtl8188e_HalDmWatchDog(
struct dm_priv *pdmpriv = &pHalData->dmpriv; struct dm_priv *pdmpriv = &pHalData->dmpriv;
PDM_ODM_T pDM_Odm = &(pHalData->odmpriv); PDM_ODM_T pDM_Odm = &(pHalData->odmpriv);
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
PADAPTER pbuddy_adapter = Adapter->pbuddy_adapter; struct adapter *pbuddy_adapter = Adapter->pbuddy_adapter;
#endif //CONFIG_CONCURRENT_MODE #endif //CONFIG_CONCURRENT_MODE
_func_enter_; _func_enter_;
@ -554,7 +554,7 @@ skip_dm:
return; return;
} }
void rtl8188e_init_dm_priv(IN PADAPTER Adapter) void rtl8188e_init_dm_priv(IN struct adapter *Adapter)
{ {
PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter);
struct dm_priv *pdmpriv = &pHalData->dmpriv; struct dm_priv *pdmpriv = &pHalData->dmpriv;
@ -569,7 +569,7 @@ void rtl8188e_init_dm_priv(IN PADAPTER Adapter)
ODM_InitDebugSetting(podmpriv); ODM_InitDebugSetting(podmpriv);
} }
void rtl8188e_deinit_dm_priv(IN PADAPTER Adapter) void rtl8188e_deinit_dm_priv(IN struct adapter *Adapter)
{ {
PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter);
struct dm_priv *pdmpriv = &pHalData->dmpriv; struct dm_priv *pdmpriv = &pHalData->dmpriv;
@ -586,9 +586,9 @@ void rtl8188e_deinit_dm_priv(IN PADAPTER Adapter)
// Add new function to reset the state of antenna diversity before link. // 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, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src) void AntDivCompare8188E(struct adapter *Adapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src)
{ {
//PADAPTER Adapter = pDM_Odm->Adapter ; //struct adapter *Adapter = pDM_Odm->Adapter ;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
if(0 != pHalData->AntDivCfg ) if(0 != pHalData->AntDivCfg )
@ -605,7 +605,7 @@ void AntDivCompare8188E(PADAPTER Adapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src
} }
// Add new function to reset the state of antenna diversity before link. // Add new function to reset the state of antenna diversity before link.
u8 AntDivBeforeLink8188E(PADAPTER Adapter ) u8 AntDivBeforeLink8188E(struct adapter *Adapter )
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);

176
hal/rtl8188e_hal_init.c
View file

@ -31,7 +31,7 @@
#ifdef CONFIG_USB_HCI #ifdef CONFIG_USB_HCI
#include <usb_ops.h> #include <usb_ops.h>
#endif #endif
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;
@ -58,7 +58,7 @@ static void iol_mode_enable(PADAPTER padapter, u8 enable)
} }
} }
static s32 iol_execute(PADAPTER padapter, u8 control) static s32 iol_execute(struct adapter *padapter, u8 control)
{ {
s32 status = _FAIL; s32 status = _FAIL;
u8 reg_0x88 = 0,reg_1c7=0; u8 reg_0x88 = 0,reg_1c7=0;
@ -92,7 +92,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
) )
{ {
@ -284,7 +284,7 @@ exit:
} }
void efuse_read_phymap_from_txpktbuf( 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
@ -402,7 +402,7 @@ 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,
@ -445,7 +445,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;
printk("==> %s \n",__FUNCTION__); printk("==> %s \n",__FUNCTION__);
@ -462,7 +462,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
) )
{ {
@ -475,7 +475,7 @@ static s32 iol_ioconfig(
return rst; return rst;
} }
int rtl8188e_IOL_exec_cmds_sync(ADAPTER *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms,u32 bndy_cnt) int rtl8188e_IOL_exec_cmds_sync(struct adapter *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms,u32 bndy_cnt)
{ {
u32 start_time = rtw_get_current_time(); u32 start_time = rtw_get_current_time();
@ -524,7 +524,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;
@ -568,7 +568,7 @@ void rtw_IOL_cmd_tx_pkt_buf_dump(ADAPTER *Adapter,int data_len)
static VOID static VOID
_FWDownloadEnable( _FWDownloadEnable(
IN PADAPTER padapter, IN struct adapter * padapter,
IN BOOLEAN enable IN BOOLEAN enable
) )
{ {
@ -598,7 +598,7 @@ _FWDownloadEnable(
#define MAX_REG_BOLCK_SIZE 196 #define MAX_REG_BOLCK_SIZE 196
static int static int
_BlockWrite( _BlockWrite(
IN PADAPTER padapter, IN struct adapter * padapter,
IN PVOID buffer, IN PVOID buffer,
IN u32 buffSize IN u32 buffSize
) )
@ -711,7 +711,7 @@ exit:
static int static int
_PageWrite( _PageWrite(
IN PADAPTER padapter, IN struct adapter *padapter,
IN u32 page, IN u32 page,
IN PVOID buffer, IN PVOID buffer,
IN u32 size IN u32 size
@ -748,7 +748,7 @@ _FillDummy(
static int static int
_WriteFW( _WriteFW(
IN PADAPTER padapter, IN struct adapter * padapter,
IN PVOID buffer, IN PVOID buffer,
IN u32 size IN u32 size
) )
@ -792,7 +792,7 @@ exit:
return ret; return ret;
} }
void _MCUIO_Reset88E(PADAPTER padapter,u8 bReset) void _MCUIO_Reset88E(struct adapter *padapter,u8 bReset)
{ {
u8 u1bTmp; u8 u1bTmp;
@ -807,7 +807,7 @@ void _MCUIO_Reset88E(PADAPTER padapter,u8 bReset)
} }
} }
void _8051Reset88E(PADAPTER padapter) void _8051Reset88E(struct adapter *padapter)
{ {
u8 u1bTmp; u8 u1bTmp;
@ -820,7 +820,7 @@ void _8051Reset88E(PADAPTER padapter)
DBG_871X("=====> _8051Reset88E(): 8051 reset success .\n"); DBG_871X("=====> _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;
@ -874,9 +874,9 @@ u8 FwBuffer8188E[FW_8188E_SIZE];
// Download 8192C firmware code. // Download 8192C firmware code.
// //
// //
s32 rtl8188e_FirmwareDownload(PADAPTER padapter, BOOLEAN bUsedWoWLANFw) s32 rtl8188e_FirmwareDownload(struct adapter *padapter, BOOLEAN bUsedWoWLANFw)
#else #else
s32 rtl8188e_FirmwareDownload(PADAPTER padapter) s32 rtl8188e_FirmwareDownload(struct adapter *padapter)
#endif #endif
{ {
s32 rtStatus = _SUCCESS; s32 rtStatus = _SUCCESS;
@ -1044,7 +1044,7 @@ Exit:
} }
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
void rtl8188e_InitializeFirmwareVars(PADAPTER padapter) void rtl8188e_InitializeFirmwareVars(struct adapter *padapter)
{ {
PHAL_DATA_TYPE pHalData = GET_HAL_DATA(padapter); PHAL_DATA_TYPE pHalData = GET_HAL_DATA(padapter);
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
@ -1067,7 +1067,7 @@ void rtl8188e_InitializeFirmwareVars(PADAPTER padapter)
// //
VOID VOID
SetFwRelatedForWoWLAN8188ES( SetFwRelatedForWoWLAN8188ES(
IN PADAPTER padapter, IN struct adapter * padapter,
IN u8 bHostIsGoingtoSleep IN u8 bHostIsGoingtoSleep
) )
{ {
@ -1090,7 +1090,7 @@ SetFwRelatedForWoWLAN8188ES(
rtl8188e_InitializeFirmwareVars(padapter); rtl8188e_InitializeFirmwareVars(padapter);
} }
#else #else
void rtl8188e_InitializeFirmwareVars(PADAPTER padapter) void rtl8188e_InitializeFirmwareVars(struct adapter *padapter)
{ {
PHAL_DATA_TYPE pHalData = GET_HAL_DATA(padapter); PHAL_DATA_TYPE pHalData = GET_HAL_DATA(padapter);
@ -1105,7 +1105,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_;
@ -1128,21 +1128,21 @@ enum{
static BOOLEAN static BOOLEAN
hal_EfusePgPacketWrite2ByteHeader( hal_EfusePgPacketWrite2ByteHeader(
IN PADAPTER pAdapter, IN struct adapter * pAdapter,
IN u8 efuseType, IN u8 efuseType,
IN u16 *pAddr, IN u16 *pAddr,
IN PPGPKT_STRUCT pTargetPkt, IN PPGPKT_STRUCT pTargetPkt,
IN BOOLEAN bPseudoTest); IN BOOLEAN bPseudoTest);
static BOOLEAN static BOOLEAN
hal_EfusePgPacketWrite1ByteHeader( hal_EfusePgPacketWrite1ByteHeader(
IN PADAPTER pAdapter, IN struct adapter * pAdapter,
IN u8 efuseType, IN u8 efuseType,
IN u16 *pAddr, IN u16 *pAddr,
IN PPGPKT_STRUCT pTargetPkt, IN PPGPKT_STRUCT pTargetPkt,
IN BOOLEAN bPseudoTest); IN BOOLEAN bPseudoTest);
static BOOLEAN static BOOLEAN
hal_EfusePgPacketWriteData( hal_EfusePgPacketWriteData(
IN PADAPTER pAdapter, IN struct adapter * pAdapter,
IN u8 efuseType, IN u8 efuseType,
IN u16 *pAddr, IN u16 *pAddr,
IN PPGPKT_STRUCT pTargetPkt, IN PPGPKT_STRUCT pTargetPkt,
@ -1150,7 +1150,7 @@ hal_EfusePgPacketWriteData(
static VOID static VOID
hal_EfusePowerSwitch_RTL8188E( hal_EfusePowerSwitch_RTL8188E(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN u8 bWrite, IN u8 bWrite,
IN u8 PwrState) IN u8 PwrState)
{ {
@ -1204,7 +1204,7 @@ hal_EfusePowerSwitch_RTL8188E(
static VOID static VOID
rtl8188e_EfusePowerSwitch( rtl8188e_EfusePowerSwitch(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN u8 bWrite, IN u8 bWrite,
IN u8 PwrState) IN u8 PwrState)
{ {
@ -1214,7 +1214,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
) )
@ -1256,7 +1256,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,
@ -1451,7 +1451,7 @@ exit:
static BOOLEAN static BOOLEAN
Hal_EfuseSwitchToBank( Hal_EfuseSwitchToBank(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN u8 bank, IN u8 bank,
IN BOOLEAN bPseudoTest IN BOOLEAN bPseudoTest
) )
@ -1503,7 +1503,7 @@ Hal_EfuseSwitchToBank(
static VOID static VOID
ReadEFuseByIC( ReadEFuseByIC(
PADAPTER Adapter, struct adapter *Adapter,
u8 efuseType, u8 efuseType,
u16 _offset, u16 _offset,
u16 _size_byte, u16 _size_byte,
@ -1562,7 +1562,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,
@ -1575,7 +1575,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,
@ -1596,7 +1596,7 @@ rtl8188e_ReadEFuse(
//Do not support BT //Do not support BT
VOID VOID
Hal_EFUSEGetEfuseDefinition88E( Hal_EFUSEGetEfuseDefinition88E(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN u1Byte efuseType, IN u1Byte efuseType,
IN u1Byte type, IN u1Byte type,
OUT PVOID pOut OUT PVOID pOut
@ -1664,7 +1664,7 @@ Hal_EFUSEGetEfuseDefinition88E(
} }
VOID VOID
Hal_EFUSEGetEfuseDefinition_Pseudo88E( Hal_EFUSEGetEfuseDefinition_Pseudo88E(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN u8 efuseType, IN u8 efuseType,
IN u8 type, IN u8 type,
OUT PVOID pOut OUT PVOID pOut
@ -1734,7 +1734,7 @@ Hal_EFUSEGetEfuseDefinition_Pseudo88E(
static VOID static VOID
rtl8188e_EFUSE_GetEfuseDefinition( rtl8188e_EFUSE_GetEfuseDefinition(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN u8 efuseType, IN u8 efuseType,
IN u8 type, IN u8 type,
OUT void *pOut, OUT void *pOut,
@ -1752,7 +1752,7 @@ rtl8188e_EFUSE_GetEfuseDefinition(
} }
static u8 static u8
Hal_EfuseWordEnableDataWrite( IN PADAPTER pAdapter, Hal_EfuseWordEnableDataWrite( IN struct adapter *pAdapter,
IN u16 efuse_addr, IN u16 efuse_addr,
IN u8 word_en, IN u8 word_en,
IN u8 *data, IN u8 *data,
@ -1818,7 +1818,7 @@ Hal_EfuseWordEnableDataWrite( IN PADAPTER pAdapter,
} }
static u8 static u8
Hal_EfuseWordEnableDataWrite_Pseudo( IN PADAPTER pAdapter, Hal_EfuseWordEnableDataWrite_Pseudo( IN struct adapter *pAdapter,
IN u16 efuse_addr, IN u16 efuse_addr,
IN u8 word_en, IN u8 word_en,
IN u8 *data, IN u8 *data,
@ -1832,7 +1832,7 @@ Hal_EfuseWordEnableDataWrite_Pseudo( IN PADAPTER pAdapter,
} }
static u8 static u8
rtl8188e_Efuse_WordEnableDataWrite( IN PADAPTER pAdapter, rtl8188e_Efuse_WordEnableDataWrite( IN struct adapter *pAdapter,
IN u16 efuse_addr, IN u16 efuse_addr,
IN u8 word_en, IN u8 word_en,
IN u8 *data, IN u8 *data,
@ -1854,7 +1854,7 @@ rtl8188e_Efuse_WordEnableDataWrite( IN PADAPTER pAdapter,
static u16 static u16
hal_EfuseGetCurrentSize_8188e(IN PADAPTER pAdapter, hal_EfuseGetCurrentSize_8188e(IN struct adapter *pAdapter,
IN BOOLEAN bPseudoTest) IN BOOLEAN bPseudoTest)
{ {
int bContinual = _TRUE; int bContinual = _TRUE;
@ -1925,7 +1925,7 @@ hal_EfuseGetCurrentSize_8188e(IN PADAPTER pAdapter,
} }
static u16 static u16
Hal_EfuseGetCurrentSize_Pseudo(IN PADAPTER pAdapter, Hal_EfuseGetCurrentSize_Pseudo(IN struct adapter *pAdapter,
IN BOOLEAN bPseudoTest) IN BOOLEAN bPseudoTest)
{ {
u16 ret=0; u16 ret=0;
@ -1938,7 +1938,7 @@ Hal_EfuseGetCurrentSize_Pseudo(IN PADAPTER pAdapter,
static u16 static u16
rtl8188e_EfuseGetCurrentSize( rtl8188e_EfuseGetCurrentSize(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN u8 efuseType, IN u8 efuseType,
IN BOOLEAN bPseudoTest) IN BOOLEAN bPseudoTest)
{ {
@ -1960,7 +1960,7 @@ rtl8188e_EfuseGetCurrentSize(
static int static int
hal_EfusePgPacketRead_8188e( hal_EfusePgPacketRead_8188e(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN u8 offset, IN u8 offset,
IN u8 *data, IN u8 *data,
IN BOOLEAN bPseudoTest) IN BOOLEAN bPseudoTest)
@ -2075,7 +2075,7 @@ hal_EfusePgPacketRead_8188e(
} }
static int static int
Hal_EfusePgPacketRead( IN PADAPTER pAdapter, Hal_EfusePgPacketRead( IN struct adapter *pAdapter,
IN u8 offset, IN u8 offset,
IN u8 *data, IN u8 *data,
IN BOOLEAN bPseudoTest) IN BOOLEAN bPseudoTest)
@ -2089,7 +2089,7 @@ Hal_EfusePgPacketRead( IN PADAPTER pAdapter,
} }
static int static int
Hal_EfusePgPacketRead_Pseudo( IN PADAPTER pAdapter, Hal_EfusePgPacketRead_Pseudo( IN struct adapter *pAdapter,
IN u8 offset, IN u8 offset,
IN u8 *data, IN u8 *data,
IN BOOLEAN bPseudoTest) IN BOOLEAN bPseudoTest)
@ -2102,7 +2102,7 @@ Hal_EfusePgPacketRead_Pseudo( IN PADAPTER pAdapter,
} }
static int static int
rtl8188e_Efuse_PgPacketRead( IN PADAPTER pAdapter, rtl8188e_Efuse_PgPacketRead( IN struct adapter *pAdapter,
IN u8 offset, IN u8 offset,
IN u8 *data, IN u8 *data,
IN BOOLEAN bPseudoTest) IN BOOLEAN bPseudoTest)
@ -2123,7 +2123,7 @@ rtl8188e_Efuse_PgPacketRead( IN PADAPTER pAdapter,
static BOOLEAN static BOOLEAN
hal_EfuseFixHeaderProcess( hal_EfuseFixHeaderProcess(
IN PADAPTER pAdapter, IN struct adapter * pAdapter,
IN u8 efuseType, IN u8 efuseType,
IN PPGPKT_STRUCT pFixPkt, IN PPGPKT_STRUCT pFixPkt,
IN u16 *pAddr, IN u16 *pAddr,
@ -2164,7 +2164,7 @@ hal_EfuseFixHeaderProcess(
static BOOLEAN static BOOLEAN
hal_EfusePgPacketWrite2ByteHeader( hal_EfusePgPacketWrite2ByteHeader(
IN PADAPTER pAdapter, IN struct adapter * pAdapter,
IN u8 efuseType, IN u8 efuseType,
IN u16 *pAddr, IN u16 *pAddr,
IN PPGPKT_STRUCT pTargetPkt, IN PPGPKT_STRUCT pTargetPkt,
@ -2261,7 +2261,7 @@ hal_EfusePgPacketWrite2ByteHeader(
static BOOLEAN static BOOLEAN
hal_EfusePgPacketWrite1ByteHeader( hal_EfusePgPacketWrite1ByteHeader(
IN PADAPTER pAdapter, IN struct adapter * pAdapter,
IN u8 efuseType, IN u8 efuseType,
IN u16 *pAddr, IN u16 *pAddr,
IN PPGPKT_STRUCT pTargetPkt, IN PPGPKT_STRUCT pTargetPkt,
@ -2309,7 +2309,7 @@ hal_EfusePgPacketWrite1ByteHeader(
static BOOLEAN static BOOLEAN
hal_EfusePgPacketWriteData( hal_EfusePgPacketWriteData(
IN PADAPTER pAdapter, IN struct adapter * pAdapter,
IN u8 efuseType, IN u8 efuseType,
IN u16 *pAddr, IN u16 *pAddr,
IN PPGPKT_STRUCT pTargetPkt, IN PPGPKT_STRUCT pTargetPkt,
@ -2346,7 +2346,7 @@ hal_EfusePgPacketWriteData(
static BOOLEAN static BOOLEAN
hal_EfusePgPacketWriteHeader( hal_EfusePgPacketWriteHeader(
IN PADAPTER pAdapter, IN struct adapter * pAdapter,
IN u8 efuseType, IN u8 efuseType,
IN u16 *pAddr, IN u16 *pAddr,
IN PPGPKT_STRUCT pTargetPkt, IN PPGPKT_STRUCT pTargetPkt,
@ -2408,7 +2408,7 @@ wordEnMatched(
static BOOLEAN static BOOLEAN
hal_EfuseCheckIfDatafollowed( hal_EfuseCheckIfDatafollowed(
IN PADAPTER pAdapter, IN struct adapter * pAdapter,
IN u8 word_cnts, IN u8 word_cnts,
IN u16 startAddr, IN u16 startAddr,
IN BOOLEAN bPseudoTest IN BOOLEAN bPseudoTest
@ -2428,7 +2428,7 @@ hal_EfuseCheckIfDatafollowed(
static BOOLEAN static BOOLEAN
hal_EfusePartialWriteCheck( hal_EfusePartialWriteCheck(
IN PADAPTER pAdapter, IN struct adapter * pAdapter,
IN u8 efuseType, IN u8 efuseType,
IN u16 *pAddr, IN u16 *pAddr,
IN PPGPKT_STRUCT pTargetPkt, IN PPGPKT_STRUCT pTargetPkt,
@ -2553,7 +2553,7 @@ hal_EfusePartialWriteCheck(
static BOOLEAN static BOOLEAN
hal_EfusePgCheckAvailableAddr( hal_EfusePgCheckAvailableAddr(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN u8 efuseType, IN u8 efuseType,
IN BOOLEAN bPseudoTest IN BOOLEAN bPseudoTest
) )
@ -2594,7 +2594,7 @@ hal_EfuseConstructPGPkt(
static BOOLEAN static BOOLEAN
hal_EfusePgPacketWrite_BT( hal_EfusePgPacketWrite_BT(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN u8 offset, IN u8 offset,
IN u8 word_en, IN u8 word_en,
IN u8 *pData, IN u8 *pData,
@ -2624,7 +2624,7 @@ hal_EfusePgPacketWrite_BT(
static BOOLEAN static BOOLEAN
hal_EfusePgPacketWrite_8188e( hal_EfusePgPacketWrite_8188e(
IN PADAPTER pAdapter, IN struct adapter * pAdapter,
IN u8 offset, IN u8 offset,
IN u8 word_en, IN u8 word_en,
IN u8 *pData, IN u8 *pData,
@ -2654,7 +2654,7 @@ hal_EfusePgPacketWrite_8188e(
static int static int
Hal_EfusePgPacketWrite_Pseudo(IN PADAPTER pAdapter, Hal_EfusePgPacketWrite_Pseudo(IN struct adapter *pAdapter,
IN u8 offset, IN u8 offset,
IN u8 word_en, IN u8 word_en,
IN u8 *data, IN u8 *data,
@ -2668,7 +2668,7 @@ Hal_EfusePgPacketWrite_Pseudo(IN PADAPTER pAdapter,
} }
static int static int
Hal_EfusePgPacketWrite(IN PADAPTER pAdapter, Hal_EfusePgPacketWrite(IN struct adapter *pAdapter,
IN u8 offset, IN u8 offset,
IN u8 word_en, IN u8 word_en,
IN u8 *data, IN u8 *data,
@ -2682,7 +2682,7 @@ Hal_EfusePgPacketWrite(IN PADAPTER pAdapter,
} }
static int static int
rtl8188e_Efuse_PgPacketWrite(IN PADAPTER pAdapter, rtl8188e_Efuse_PgPacketWrite(IN struct adapter *pAdapter,
IN u8 offset, IN u8 offset,
IN u8 word_en, IN u8 word_en,
IN u8 *data, IN u8 *data,
@ -2703,7 +2703,7 @@ rtl8188e_Efuse_PgPacketWrite(IN PADAPTER pAdapter,
static HAL_VERSION static HAL_VERSION
ReadChipVersion8188E( ReadChipVersion8188E(
IN PADAPTER padapter IN struct adapter *padapter
) )
{ {
u32 value32; u32 value32;
@ -2753,12 +2753,12 @@ ReadChipVersion8188E(
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);
} }
void rtl8188e_GetHalODMVar( void rtl8188e_GetHalODMVar(
PADAPTER Adapter, struct adapter * Adapter,
HAL_ODM_VARIABLE eVariable, HAL_ODM_VARIABLE eVariable,
PVOID pValue1, PVOID pValue1,
BOOLEAN bSet) BOOLEAN bSet)
@ -2773,7 +2773,7 @@ void rtl8188e_GetHalODMVar(
} }
} }
void rtl8188e_SetHalODMVar( void rtl8188e_SetHalODMVar(
PADAPTER Adapter, struct adapter * Adapter,
HAL_ODM_VARIABLE eVariable, HAL_ODM_VARIABLE eVariable,
PVOID pValue1, PVOID pValue1,
BOOLEAN bSet) BOOLEAN bSet)
@ -2812,7 +2812,7 @@ void rtl8188e_SetHalODMVar(
} }
} }
void rtl8188e_start_thread(_adapter *padapter) void rtl8188e_start_thread(struct adapter *padapter)
{ {
#ifdef CONFIG_SDIO_HCI #ifdef CONFIG_SDIO_HCI
#ifndef CONFIG_SDIO_TX_TASKLET #ifndef CONFIG_SDIO_TX_TASKLET
@ -2827,7 +2827,7 @@ void rtl8188e_start_thread(_adapter *padapter)
#endif #endif
} }
void rtl8188e_stop_thread(_adapter *padapter) void rtl8188e_stop_thread(struct adapter *padapter)
{ {
#ifdef CONFIG_SDIO_HCI #ifdef CONFIG_SDIO_HCI
#ifndef CONFIG_SDIO_TX_TASKLET #ifndef CONFIG_SDIO_TX_TASKLET
@ -2842,7 +2842,7 @@ void rtl8188e_stop_thread(_adapter *padapter)
#endif #endif
#endif #endif
} }
void hal_notch_filter_8188e(_adapter *adapter, bool enable) void hal_notch_filter_8188e(struct adapter *adapter, bool enable)
{ {
if (enable) { if (enable) {
DBG_871X("Enable notch filter\n"); DBG_871X("Enable notch filter\n");
@ -2916,7 +2916,7 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)
} }
u8 GetEEPROMSize8188E(PADAPTER padapter) u8 GetEEPROMSize8188E(struct adapter *padapter)
{ {
u8 size = 0; u8 size = 0;
u32 cr; u32 cr;
@ -2936,7 +2936,7 @@ u8 GetEEPROMSize8188E(PADAPTER padapter)
// LLT R/W/Init function // LLT R/W/Init function
// //
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
s32 _LLTWrite(PADAPTER padapter, u32 address, u32 data) s32 _LLTWrite(struct adapter *padapter, u32 address, u32 data)
{ {
s32 status = _SUCCESS; s32 status = _SUCCESS;
s32 count = 0; s32 count = 0;
@ -2963,7 +2963,7 @@ s32 _LLTWrite(PADAPTER padapter, u32 address, u32 data)
return status; return status;
} }
u8 _LLTRead(PADAPTER padapter, u32 address) u8 _LLTRead(struct adapter *padapter, u32 address)
{ {
s32 count = 0; s32 count = 0;
u32 value = _LLT_INIT_ADDR(address) | _LLT_OP(_LLT_READ_ACCESS); u32 value = _LLT_INIT_ADDR(address) | _LLT_OP(_LLT_READ_ACCESS);
@ -2987,7 +2987,7 @@ u8 _LLTRead(PADAPTER padapter, u32 address)
return 0xFF; return 0xFF;
} }
void Read_LLT_Tab(PADAPTER padapter) void Read_LLT_Tab(struct adapter *padapter)
{ {
u32 addr,next_addr; u32 addr,next_addr;
printk("############### %s ###################\n",__FUNCTION__); printk("############### %s ###################\n",__FUNCTION__);
@ -3002,7 +3002,7 @@ void Read_LLT_Tab(PADAPTER padapter)
} }
s32 InitLLTTable(PADAPTER padapter, u8 txpktbuf_bndy) s32 InitLLTTable(struct adapter *padapter, u8 txpktbuf_bndy)
{ {
s32 status = _FAIL; s32 status = _FAIL;
u32 i; u32 i;
@ -3053,7 +3053,7 @@ s32 InitLLTTable(PADAPTER padapter, u8 txpktbuf_bndy)
void void
Hal_InitPGData88E(PADAPTER padapter) Hal_InitPGData88E(struct adapter *padapter)
{ {
EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter); EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter);
// HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); // HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
@ -3089,7 +3089,7 @@ Hal_InitPGData88E(PADAPTER padapter)
void void
Hal_EfuseParseIDCode88E( Hal_EfuseParseIDCode88E(
IN PADAPTER padapter, IN struct adapter *padapter,
IN u8 *hwinfo IN u8 *hwinfo
) )
{ {
@ -3146,7 +3146,7 @@ Hal_EEValueCheck(
static void static void
Hal_ReadPowerValueFromPROM_8188E( Hal_ReadPowerValueFromPROM_8188E(
IN PADAPTER padapter, IN struct adapter * padapter,
IN PTxPowerInfo24G pwrInfo24G, IN PTxPowerInfo24G pwrInfo24G,
IN u8* PROMContent, IN u8* PROMContent,
IN BOOLEAN AutoLoadFail IN BOOLEAN AutoLoadFail
@ -3370,7 +3370,7 @@ Hal_GetChnlGroup88E(
} }
void Hal_ReadPowerSavingMode88E( void Hal_ReadPowerSavingMode88E(
PADAPTER padapter, struct adapter * padapter,
IN u8* hwinfo, IN u8* hwinfo,
IN BOOLEAN AutoLoadFail IN BOOLEAN AutoLoadFail
) )
@ -3414,7 +3414,7 @@ void Hal_ReadPowerSavingMode88E(
void void
Hal_ReadTxPowerInfo88E( Hal_ReadTxPowerInfo88E(
IN PADAPTER padapter, IN struct adapter * padapter,
IN u8* PROMContent, IN u8* PROMContent,
IN BOOLEAN AutoLoadFail IN BOOLEAN AutoLoadFail
) )
@ -3495,7 +3495,7 @@ Hal_ReadTxPowerInfo88E(
VOID VOID
Hal_EfuseParseXtal_8188E( Hal_EfuseParseXtal_8188E(
IN PADAPTER pAdapter, IN struct adapter * pAdapter,
IN u8* hwinfo, IN u8* hwinfo,
IN BOOLEAN AutoLoadFail IN BOOLEAN AutoLoadFail
) )
@ -3517,7 +3517,7 @@ Hal_EfuseParseXtal_8188E(
void void
Hal_EfuseParseBoardType88E( Hal_EfuseParseBoardType88E(
IN PADAPTER pAdapter, IN struct adapter * pAdapter,
IN u8* hwinfo, IN u8* hwinfo,
IN BOOLEAN AutoLoadFail IN BOOLEAN AutoLoadFail
) )
@ -3533,7 +3533,7 @@ Hal_EfuseParseBoardType88E(
void void
Hal_EfuseParseEEPROMVer88E( Hal_EfuseParseEEPROMVer88E(
IN PADAPTER padapter, IN struct adapter * padapter,
IN u8* hwinfo, IN u8* hwinfo,
IN BOOLEAN AutoLoadFail IN BOOLEAN AutoLoadFail
) )
@ -3554,7 +3554,7 @@ Hal_EfuseParseEEPROMVer88E(
void void
rtl8188e_EfuseParseChnlPlan( rtl8188e_EfuseParseChnlPlan(
IN PADAPTER padapter, IN struct adapter * padapter,
IN u8* hwinfo, IN u8* hwinfo,
IN BOOLEAN AutoLoadFail IN BOOLEAN AutoLoadFail
) )
@ -3572,7 +3572,7 @@ rtl8188e_EfuseParseChnlPlan(
void void
Hal_EfuseParseCustomerID88E( Hal_EfuseParseCustomerID88E(
IN PADAPTER padapter, IN struct adapter * padapter,
IN u8* hwinfo, IN u8* hwinfo,
IN BOOLEAN AutoLoadFail IN BOOLEAN AutoLoadFail
) )
@ -3596,7 +3596,7 @@ Hal_EfuseParseCustomerID88E(
void void
Hal_ReadAntennaDiversity88E( Hal_ReadAntennaDiversity88E(
IN PADAPTER pAdapter, IN struct adapter * pAdapter,
IN u8* PROMContent, IN u8* PROMContent,
IN BOOLEAN AutoLoadFail IN BOOLEAN AutoLoadFail
) )
@ -3644,7 +3644,7 @@ Hal_ReadAntennaDiversity88E(
void void
Hal_ReadThermalMeter_88E( Hal_ReadThermalMeter_88E(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u8* PROMContent, IN u8* PROMContent,
IN BOOLEAN AutoloadFail IN BOOLEAN AutoloadFail
) )
@ -3675,7 +3675,7 @@ Hal_ReadThermalMeter_88E(
void void
Hal_InitChannelPlan( Hal_InitChannelPlan(
IN PADAPTER padapter IN struct adapter *padapter
) )
{ {
#if 0 #if 0
@ -3712,7 +3712,7 @@ Hal_InitChannelPlan(
#endif #endif
} }
BOOLEAN HalDetectPwrDownMode88E(PADAPTER Adapter) BOOLEAN HalDetectPwrDownMode88E(struct adapter *Adapter)
{ {
u8 tmpvalue = 0; u8 tmpvalue = 0;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
@ -3736,7 +3736,7 @@ BOOLEAN HalDetectPwrDownMode88E(PADAPTER Adapter)
} // HalDetectPwrDownMode } // HalDetectPwrDownMode
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
void Hal_DetectWoWMode(PADAPTER pAdapter) void Hal_DetectWoWMode(struct adapter *pAdapter)
{ {
adapter_to_pwrctl(pAdapter)->bSupportRemoteWakeup = _TRUE; adapter_to_pwrctl(pAdapter)->bSupportRemoteWakeup = _TRUE;
DBG_871X("%s\n", __func__); DBG_871X("%s\n", __func__);
@ -3745,7 +3745,7 @@ void Hal_DetectWoWMode(PADAPTER pAdapter)
#ifdef CONFIG_RF_GAIN_OFFSET #ifdef CONFIG_RF_GAIN_OFFSET
void Hal_ReadRFGainOffset( void Hal_ReadRFGainOffset(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN u8* PROMContent, IN u8* PROMContent,
IN BOOLEAN AutoloadFail) IN BOOLEAN AutoloadFail)
{ {
@ -3777,7 +3777,7 @@ void Hal_ReadRFGainOffset(
// 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)
{ {

148
hal/rtl8188e_phycfg.c
View file

@ -86,7 +86,7 @@ phy_CalculateBitShift(
#if(SIC_ENABLE == 1) #if(SIC_ENABLE == 1)
static BOOLEAN static BOOLEAN
sic_IsSICReady( sic_IsSICReady(
IN PADAPTER Adapter IN struct adapter *Adapter
) )
{ {
BOOLEAN bRet=_FALSE; BOOLEAN bRet=_FALSE;
@ -241,7 +241,7 @@ sic_Write4Byte(
//============================================================ //============================================================
static VOID static VOID
SIC_SetBBReg( SIC_SetBBReg(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u32 RegAddr, IN u32 RegAddr,
IN u32 BitMask, IN u32 BitMask,
IN u32 Data IN u32 Data
@ -286,7 +286,7 @@ SIC_SetBBReg(
static u32 static u32
SIC_QueryBBReg( SIC_QueryBBReg(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u32 RegAddr, IN u32 RegAddr,
IN u32 BitMask IN u32 BitMask
) )
@ -324,7 +324,7 @@ SIC_QueryBBReg(
VOID VOID
SIC_Init( SIC_Init(
IN PADAPTER Adapter IN 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
@ -350,7 +350,7 @@ SIC_Init(
static BOOLEAN static BOOLEAN
SIC_LedOff( SIC_LedOff(
IN PADAPTER Adapter IN 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,
@ -365,7 +365,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
@ -375,7 +375,7 @@ SIC_LedOff(
*/ */
u32 u32
rtl8188e_PHY_QueryBBReg( rtl8188e_PHY_QueryBBReg(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u32 RegAddr, IN u32 RegAddr,
IN u32 BitMask IN u32 BitMask
) )
@ -411,7 +411,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
@ -425,7 +425,7 @@ rtl8188e_PHY_QueryBBReg(
VOID VOID
rtl8188e_PHY_SetBBReg( rtl8188e_PHY_SetBBReg(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u32 RegAddr, IN u32 RegAddr,
IN u32 BitMask, IN u32 BitMask,
IN u32 Data IN u32 Data
@ -469,7 +469,7 @@ rtl8188e_PHY_SetBBReg(
* OverView: Read regster from RF chips * OverView: Read regster from RF chips
* *
* Input: * Input:
* PADAPTER Adapter, * struct adapter * Adapter,
* RF_RADIO_PATH_E eRFPath, //Radio path of A/B/C/D * RF_RADIO_PATH_E eRFPath, //Radio path of A/B/C/D
* u4Byte Offset, //The target address to be read * u4Byte Offset, //The target address to be read
* *
@ -484,7 +484,7 @@ rtl8188e_PHY_SetBBReg(
*/ */
static u32 static u32
phy_RFSerialRead( phy_RFSerialRead(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN RF_RADIO_PATH_E eRFPath, IN RF_RADIO_PATH_E eRFPath,
IN u32 Offset IN u32 Offset
) )
@ -567,7 +567,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,
* RF_RADIO_PATH_E eRFPath, //Radio path of A/B/C/D * RF_RADIO_PATH_E 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
@ -606,7 +606,7 @@ phy_RFSerialRead(
*/ */
static VOID static VOID
phy_RFSerialWrite( phy_RFSerialWrite(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN RF_RADIO_PATH_E eRFPath, IN RF_RADIO_PATH_E eRFPath,
IN u32 Offset, IN u32 Offset,
IN u32 Data IN u32 Data
@ -665,7 +665,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,
* RF_RADIO_PATH_E eRFPath, //Radio path of A/B/C/D * RF_RADIO_PATH_E 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
@ -677,7 +677,7 @@ phy_RFSerialWrite(
*/ */
u32 u32
rtl8188e_PHY_QueryRFReg( rtl8188e_PHY_QueryRFReg(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN RF_RADIO_PATH_E eRFPath, IN RF_RADIO_PATH_E eRFPath,
IN u32 RegAddr, IN u32 RegAddr,
IN u32 BitMask IN u32 BitMask
@ -726,7 +726,7 @@ rtl8188e_PHY_QueryRFReg(
* 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,
* RF_RADIO_PATH_E eRFPath, //Radio path of A/B/C/D * RF_RADIO_PATH_E 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
@ -740,7 +740,7 @@ rtl8188e_PHY_QueryRFReg(
*/ */
VOID VOID
rtl8188e_PHY_SetRFReg( rtl8188e_PHY_SetRFReg(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN RF_RADIO_PATH_E eRFPath, IN RF_RADIO_PATH_E eRFPath,
IN u32 RegAddr, IN u32 RegAddr,
IN u32 BitMask, IN u32 BitMask,
@ -804,7 +804,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
@ -816,7 +816,7 @@ rtl8188e_PHY_SetRFReg(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
static int static int
phy_ConfigMACWithParaFile( phy_ConfigMACWithParaFile(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN u8* pFileName IN u8* pFileName
) )
{ {
@ -833,7 +833,7 @@ phy_ConfigMACWithParaFile(
* Overview: This function read BB parameters from Header file we gen, and do register * Overview: This function read BB parameters from Header file we gen, and do register
* Read/Write * Read/Write
* *
* Input: PADAPTER Adapter * Input: struct adapter * Adapter
* ps1Byte pFileName * ps1Byte pFileName
* *
* Output: NONE * Output: NONE
@ -846,7 +846,7 @@ phy_ConfigMACWithParaFile(
#ifndef CONFIG_PHY_SETTING_WITH_ODM #ifndef CONFIG_PHY_SETTING_WITH_ODM
static int static int
phy_ConfigMACWithHeaderFile( phy_ConfigMACWithHeaderFile(
IN PADAPTER Adapter IN struct adapter * Adapter
) )
{ {
u32 i = 0; u32 i = 0;
@ -898,7 +898,7 @@ phy_ConfigMACWithHeaderFile(
* 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;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
@ -940,7 +940,7 @@ s32 PHY_MACConfig8188E(PADAPTER Adapter)
* OverView: Initialize Register definition offset for Radio Path A/B/C/D * 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
@ -948,7 +948,7 @@ s32 PHY_MACConfig8188E(PADAPTER Adapter)
*/ */
static VOID static VOID
phy_InitBBRFRegisterDefinition( phy_InitBBRFRegisterDefinition(
IN PADAPTER Adapter IN struct adapter * Adapter
) )
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
@ -1060,7 +1060,7 @@ phy_InitBBRFRegisterDefinition(
* Overview: This function read BB parameters from general file format, and do register * 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
@ -1072,7 +1072,7 @@ phy_InitBBRFRegisterDefinition(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
static int static int
phy_ConfigBBWithParaFile( phy_ConfigBBWithParaFile(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN u8* pFileName IN u8* pFileName
) )
{ {
@ -1090,7 +1090,7 @@ phy_ConfigBBWithParaFile(
//**************************************** //****************************************
VOID VOID
phy_ConfigBBExternalPA( phy_ConfigBBExternalPA(
IN PADAPTER Adapter IN struct adapter * Adapter
) )
{ {
#ifdef CONFIG_USB_HCI #ifdef CONFIG_USB_HCI
@ -1124,7 +1124,7 @@ phy_ConfigBBExternalPA(
* 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
* u1Byte ConfigType 0 => PHY_CONFIG * u1Byte ConfigType 0 => PHY_CONFIG
* 1 =>AGC_TAB * 1 =>AGC_TAB
* *
@ -1136,7 +1136,7 @@ phy_ConfigBBExternalPA(
#ifndef CONFIG_PHY_SETTING_WITH_ODM #ifndef CONFIG_PHY_SETTING_WITH_ODM
static int static int
phy_ConfigBBWithHeaderFile( phy_ConfigBBWithHeaderFile(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN u8 ConfigType IN u8 ConfigType
) )
{ {
@ -1266,7 +1266,7 @@ exit:
VOID VOID
storePwrIndexDiffRateOffset( storePwrIndexDiffRateOffset(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u32 RegAddr, IN u32 RegAddr,
IN u32 BitMask, IN u32 BitMask,
IN u32 Data IN u32 Data
@ -1399,7 +1399,7 @@ storePwrIndexDiffRateOffset(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
static int static int
phy_ConfigBBWithPgParaFile( phy_ConfigBBWithPgParaFile(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN u8* pFileName) IN u8* pFileName)
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
@ -1430,7 +1430,7 @@ phy_ConfigBBWithPgParaFile(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
static int static int
phy_ConfigBBWithPgHeaderFile( phy_ConfigBBWithPgHeaderFile(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN u8 ConfigType) IN u8 ConfigType)
{ {
int i; int i;
@ -1489,7 +1489,7 @@ phy_ConfigBBWithPgHeaderFile(
static VOID static VOID
phy_BB8192C_Config_1T( phy_BB8192C_Config_1T(
IN PADAPTER Adapter IN struct adapter *Adapter
) )
{ {
#if 0 #if 0
@ -1525,7 +1525,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(
IN PADAPTER Adapter IN struct adapter *Adapter
) )
{ {
//RT_ASSERT(FALSE, ("This function is not implement yet!! \n")); //RT_ASSERT(FALSE, ("This function is not implement yet!! \n"));
@ -1534,7 +1534,7 @@ phy_BB8190_Config_HardCode(
static int static int
phy_BB8188E_Config_ParaFile( phy_BB8188E_Config_ParaFile(
IN PADAPTER Adapter IN struct adapter *Adapter
) )
{ {
EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(Adapter); EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(Adapter);
@ -1640,7 +1640,7 @@ phy_BB8190_Config_ParaFile_Fail:
int int
PHY_BBConfig8188E( PHY_BBConfig8188E(
IN PADAPTER Adapter IN struct adapter *Adapter
) )
{ {
int rtStatus = _SUCCESS; int rtStatus = _SUCCESS;
@ -1709,7 +1709,7 @@ PHY_BBConfig8188E(
int int
PHY_RFConfig8188E( PHY_RFConfig8188E(
IN PADAPTER Adapter IN struct adapter *Adapter
) )
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
@ -1749,7 +1749,7 @@ PHY_RFConfig8188E(
* *
* Overview: This function read RF parameters from general file format, and do RF 3-wire * 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
* RF_RADIO_PATH_E eRFPath * RF_RADIO_PATH_E eRFPath
* *
@ -1761,7 +1761,7 @@ PHY_RFConfig8188E(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
int int
rtl8188e_PHY_ConfigRFWithParaFile( rtl8188e_PHY_ConfigRFWithParaFile(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN u8* pFileName, IN u8* pFileName,
RF_RADIO_PATH_E eRFPath RF_RADIO_PATH_E eRFPath
) )
@ -1796,7 +1796,7 @@ u32 Rtl8192S_HighPower_RadioA_Array[HighPowerRadioAArrayLen] = {
int int
PHY_ConfigRFExternalPA( PHY_ConfigRFExternalPA(
IN PADAPTER Adapter, IN struct adapter * Adapter,
RF_RADIO_PATH_E eRFPath RF_RADIO_PATH_E eRFPath
) )
{ {
@ -1830,7 +1830,7 @@ PHY_ConfigRFExternalPA(
* *
* Overview: This function read RF parameters from general file format, and do RF 3-wire * 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
* RF_RADIO_PATH_E eRFPath * RF_RADIO_PATH_E eRFPath
* *
@ -1843,7 +1843,7 @@ PHY_ConfigRFExternalPA(
#ifndef CONFIG_PHY_SETTING_WITH_ODM #ifndef CONFIG_PHY_SETTING_WITH_ODM
int int
rtl8188e_PHY_ConfigRFWithHeaderFile( rtl8188e_PHY_ConfigRFWithHeaderFile(
IN PADAPTER Adapter, IN struct adapter * Adapter,
RF_RADIO_PATH_E eRFPath RF_RADIO_PATH_E eRFPath
) )
{ {
@ -2024,7 +2024,7 @@ exit:
* Overview: This function is write register and then readback to make sure whether * Overview: This function is write register and then readback to make sure whether
* BB[PHY0, PHY1], RF[Patha, path b, path c, path d] is Ok * BB[PHY0, PHY1], RF[Patha, path b, path c, path d] is Ok
* *
* Input: PADAPTER Adapter * Input: struct adapter * Adapter
* HW90_BLOCK_E CheckBlock * HW90_BLOCK_E CheckBlock
* RF_RADIO_PATH_E eRFPath // it is used only when CheckBlock is HW90_BLOCK_RF * RF_RADIO_PATH_E eRFPath // it is used only when CheckBlock is HW90_BLOCK_RF
* *
@ -2036,7 +2036,7 @@ exit:
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
int int
PHY_CheckBBAndRFOK( PHY_CheckBBAndRFOK(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN HW90_BLOCK_E CheckBlock, IN HW90_BLOCK_E CheckBlock,
IN RF_RADIO_PATH_E eRFPath IN RF_RADIO_PATH_E eRFPath
) )
@ -2111,7 +2111,7 @@ PHY_CheckBBAndRFOK(
VOID VOID
rtl8192c_PHY_GetHWRegOriginalValue( rtl8192c_PHY_GetHWRegOriginalValue(
IN PADAPTER Adapter IN struct adapter * Adapter
) )
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
@ -2143,7 +2143,7 @@ rtl8192c_PHY_GetHWRegOriginalValue(
// //
static u8 static u8
phy_DbmToTxPwrIdx( phy_DbmToTxPwrIdx(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN WIRELESS_MODE WirelessMode, IN WIRELESS_MODE WirelessMode,
IN int PowerInDbm IN int PowerInDbm
) )
@ -2199,7 +2199,7 @@ phy_DbmToTxPwrIdx(
// //
int int
phy_TxPwrIdxToDbm( phy_TxPwrIdxToDbm(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN WIRELESS_MODE WirelessMode, IN WIRELESS_MODE WirelessMode,
IN u8 TxPwrIdx IN u8 TxPwrIdx
) )
@ -2238,7 +2238,7 @@ phy_TxPwrIdxToDbm(
* *
* 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
@ -2248,7 +2248,7 @@ phy_TxPwrIdxToDbm(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
VOID VOID
PHY_GetTxPowerLevel8188E( PHY_GetTxPowerLevel8188E(
IN PADAPTER Adapter, IN struct adapter * Adapter,
OUT u32* powerlevel OUT u32* powerlevel
) )
{ {
@ -2284,7 +2284,7 @@ PHY_GetTxPowerLevel8188E(
#if 0 #if 0
static void getTxPowerIndex( static void getTxPowerIndex(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN u8 channel, IN u8 channel,
IN OUT u8* cckPowerLevel, IN OUT u8* cckPowerLevel,
IN OUT u8* ofdmPowerLevel IN OUT u8* ofdmPowerLevel
@ -2314,7 +2314,7 @@ static void getTxPowerIndex(
#endif #endif
void getTxPowerIndex88E( void getTxPowerIndex88E(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN u8 channel, IN u8 channel,
IN OUT u8* cckPowerLevel, IN OUT u8* cckPowerLevel,
IN OUT u8* ofdmPowerLevel, IN OUT u8* ofdmPowerLevel,
@ -2447,7 +2447,7 @@ void getTxPowerIndex88E(
} }
void phy_PowerIndexCheck88E( void phy_PowerIndexCheck88E(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u8 channel, IN u8 channel,
IN OUT u8 * cckPowerLevel, IN OUT u8 * cckPowerLevel,
IN OUT u8 * ofdmPowerLevel, IN OUT u8 * ofdmPowerLevel,
@ -2527,7 +2527,7 @@ void phy_PowerIndexCheck88E(
* 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
@ -2540,7 +2540,7 @@ void phy_PowerIndexCheck88E(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
VOID VOID
PHY_SetTxPowerLevel8188E( PHY_SetTxPowerLevel8188E(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN u8 channel IN u8 channel
) )
{ {
@ -2606,7 +2606,7 @@ PHY_SetTxPowerLevel8188E(
// //
BOOLEAN BOOLEAN
PHY_UpdateTxPowerDbm8188E( PHY_UpdateTxPowerDbm8188E(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN int powerInDbm IN int powerInDbm
) )
{ {
@ -2652,7 +2652,7 @@ PHY_UpdateTxPowerDbm8188E(
void void
rtl8192c_PHY_SetBeaconHwReg( rtl8192c_PHY_SetBeaconHwReg(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN u16 BeaconInterval IN u16 BeaconInterval
) )
{ {
@ -2662,7 +2662,7 @@ rtl8192c_PHY_SetBeaconHwReg(
VOID VOID
PHY_ScanOperationBackup8188E( PHY_ScanOperationBackup8188E(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u8 Operation IN u8 Operation
) )
{ {
@ -2709,10 +2709,10 @@ PHY_ScanOperationBackup8188E(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
static VOID static VOID
_PHY_SetBWMode92C( _PHY_SetBWMode92C(
IN PADAPTER Adapter IN struct adapter *Adapter
) )
{ {
// PADAPTER Adapter = (PADAPTER)pTimer->Adapter; // struct adapter * Adapter = (PADAPTER)pTimer->Adapter;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
u8 regBwOpMode; u8 regBwOpMode;
u8 regRRSR_RSC; u8 regRRSR_RSC;
@ -2861,7 +2861,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
* HT_CHANNEL_WIDTH Bandwidth //20M or 40M * HT_CHANNEL_WIDTH Bandwidth //20M or 40M
* *
* Output: NONE * Output: NONE
@ -2872,7 +2872,7 @@ _PHY_SetBWMode92C(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
VOID VOID
PHY_SetBWMode8188E( PHY_SetBWMode8188E(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN HT_CHANNEL_WIDTH Bandwidth, // 20M or 40M IN HT_CHANNEL_WIDTH Bandwidth, // 20M or 40M
IN unsigned char Offset // Upper, Lower, or Don't care IN unsigned char Offset // Upper, Lower, or Don't care
) )
@ -2937,7 +2937,7 @@ PHY_SetBWMode8188E(
} }
static void _PHY_SwChnl8192C(PADAPTER Adapter, u8 channel) static void _PHY_SwChnl8192C(struct adapter *Adapter, u8 channel)
{ {
u8 eRFPath; u8 eRFPath;
u32 param1, param2; u32 param1, param2;
@ -2967,7 +2967,7 @@ static void _PHY_SwChnl8192C(PADAPTER Adapter, u8 channel)
// <20130708, James> A workaround to eliminate the 2480MHz spur for 8188E I-Cut // <20130708, James> A workaround to eliminate the 2480MHz spur for 8188E I-Cut
void void
phy_SpurCalibration_8188E( phy_SpurCalibration_8188E(
IN PADAPTER Adapter IN struct adapter * Adapter
) )
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
@ -2985,11 +2985,11 @@ phy_SpurCalibration_8188E(
} }
VOID VOID
PHY_SwChnl8188E( // Call after initialization PHY_SwChnl8188E( // Call after initialization
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u8 channel IN u8 channel
) )
{ {
//PADAPTER Adapter = ADJUST_TO_ADAPTIVE_ADAPTER(pAdapter, _TRUE); //struct adapter *Adapter = ADJUST_TO_ADAPTIVE_ADAPTER(pAdapter, _TRUE);
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
u8 tmpchannel = pHalData->CurrentChannel; u8 tmpchannel = pHalData->CurrentChannel;
BOOLEAN bResult = _TRUE; BOOLEAN bResult = _TRUE;
@ -3076,7 +3076,7 @@ PHY_SwChnl8188E( // Call after initialization
static BOOLEAN static BOOLEAN
phy_SwChnlStepByStep( phy_SwChnlStepByStep(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u8 channel, IN u8 channel,
IN u8 *stage, IN u8 *stage,
IN u8 *step, IN u8 *step,
@ -3273,7 +3273,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
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u8 channel IN u8 channel
) )
{ {
@ -3302,7 +3302,7 @@ phy_FinishSwChnlNow( // We should not call this function directly
// //
VOID VOID
PHY_SwChnlPhy8192C( // Only called during initialize PHY_SwChnlPhy8192C( // Only called during initialize
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u8 channel IN u8 channel
) )
{ {
@ -3348,7 +3348,7 @@ PHY_SwChnlPhy8192C( // Only called during initialize
// //
VOID VOID
PHY_SetMonitorMode8192C( PHY_SetMonitorMode8192C(
IN PADAPTER pAdapter, IN struct adapter * pAdapter,
IN BOOLEAN bEnableMonitorMode IN BOOLEAN bEnableMonitorMode
) )
{ {
@ -3398,7 +3398,7 @@ PHY_SetMonitorMode8192C(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
BOOLEAN BOOLEAN
PHY_CheckIsLegalRfPath8192C( PHY_CheckIsLegalRfPath8192C(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN u32 eRFPath) IN u32 eRFPath)
{ {
// HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); // HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter);
@ -3420,7 +3420,7 @@ PHY_CheckIsLegalRfPath8192C(
} /* PHY_CheckIsLegalRfPath8192C */ } /* PHY_CheckIsLegalRfPath8192C */
static VOID _PHY_SetRFPathSwitch( static VOID _PHY_SetRFPathSwitch(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN BOOLEAN bMain, IN BOOLEAN bMain,
IN BOOLEAN is2T IN BOOLEAN is2T
) )
@ -3456,7 +3456,7 @@ static VOID _PHY_SetRFPathSwitch(
//return value TRUE => Main; FALSE => Aux //return value TRUE => Main; FALSE => Aux
static BOOLEAN _PHY_QueryRFPathSwitch( static BOOLEAN _PHY_QueryRFPathSwitch(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN BOOLEAN is2T IN BOOLEAN is2T
) )
{ {
@ -3487,7 +3487,7 @@ static BOOLEAN _PHY_QueryRFPathSwitch(
static VOID static VOID
_PHY_DumpRFReg(IN PADAPTER pAdapter) _PHY_DumpRFReg(IN struct adapter *pAdapter)
{ {
u32 rfRegValue,rfRegOffset; u32 rfRegValue,rfRegOffset;
@ -3514,7 +3514,7 @@ _PHY_DumpRFReg(IN PADAPTER pAdapter)
// //
VOID VOID
DumpBBDbgPort_92CU( DumpBBDbgPort_92CU(
IN PADAPTER Adapter IN struct adapter * Adapter
) )
{ {

48
hal/rtl8188e_rf6052.c
View file

@ -93,7 +93,7 @@ static RF_SHADOW_T RF_Shadow[RF6052_MAX_PATH][RF6052_MAX_REG];
* Firmwaer support the utility later. * Firmwaer support the utility later.
* *
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
void rtl8188e_RF_ChangeTxPath( IN PADAPTER Adapter, void rtl8188e_RF_ChangeTxPath( IN struct adapter *Adapter,
IN u16 DataRate) IN u16 DataRate)
{ {
// We do not support gain table change inACUT now !!!! Delete later !!! // We do not support gain table change inACUT now !!!! Delete later !!!
@ -149,7 +149,7 @@ void rtl8188e_RF_ChangeTxPath( IN PADAPTER Adapter,
* *
* Overview: This function is called by SetBWModeCallback8190Pci() only * 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
@ -160,7 +160,7 @@ void rtl8188e_RF_ChangeTxPath( IN PADAPTER Adapter,
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
VOID VOID
rtl8188e_PHY_RF6052SetBandwidth( rtl8188e_PHY_RF6052SetBandwidth(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN HT_CHANNEL_WIDTH Bandwidth) //20M or 40M IN HT_CHANNEL_WIDTH Bandwidth) //20M or 40M
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
@ -204,7 +204,7 @@ rtl8188e_PHY_RF6052SetBandwidth(
VOID VOID
rtl8188e_PHY_RF6052SetCckTxPower( rtl8188e_PHY_RF6052SetCckTxPower(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN u8* pPowerlevel) IN u8* pPowerlevel)
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
@ -336,7 +336,7 @@ rtl8188e_PHY_RF6052SetCckTxPower(
// powerbase1 for HT MCS rates // powerbase1 for HT MCS rates
// //
static void getPowerBase( static void getPowerBase(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u8* pPowerLevel, IN u8* pPowerLevel,
IN u8 Channel, IN u8 Channel,
IN OUT u32* OfdmBase, IN OUT u32* OfdmBase,
@ -379,7 +379,7 @@ static void getPowerBase(
// powerbase1 for HT MCS rates // powerbase1 for HT MCS rates
// //
void getPowerBase88E( void getPowerBase88E(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u8* pPowerLevelOFDM, IN u8* pPowerLevelOFDM,
IN u8* pPowerLevelBW20, IN u8* pPowerLevelBW20,
IN u8* pPowerLevelBW40, IN u8* pPowerLevelBW40,
@ -422,7 +422,7 @@ void getPowerBase88E(
} }
#if 0 #if 0
static void getTxPowerWriteValByRegulatory( static void getTxPowerWriteValByRegulatory(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u8 Channel, IN u8 Channel,
IN u8 index, IN u8 index,
IN u32* powerBase0, IN u32* powerBase0,
@ -554,7 +554,7 @@ static void getTxPowerWriteValByRegulatory(
} }
#endif #endif
void getTxPowerWriteValByRegulatory88E( void getTxPowerWriteValByRegulatory88E(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u8 Channel, IN u8 Channel,
IN u8 index, IN u8 index,
IN u32* powerBase0, IN u32* powerBase0,
@ -734,7 +734,7 @@ void getTxPowerWriteValByRegulatory88E(
} }
static void writeOFDMPowerReg88E( static void writeOFDMPowerReg88E(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u8 index, IN u8 index,
IN u32* pValue IN u32* pValue
) )
@ -818,7 +818,7 @@ static void writeOFDMPowerReg88E(
VOID VOID
rtl8188e_PHY_RF6052SetOFDMTxPower( rtl8188e_PHY_RF6052SetOFDMTxPower(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u8* pPowerLevelOFDM, IN u8* pPowerLevelOFDM,
IN u8* pPowerLevelBW20, IN u8* pPowerLevelBW20,
IN u8* pPowerLevelBW40, IN u8* pPowerLevelBW40,
@ -863,7 +863,7 @@ rtl8188e_PHY_RF6052SetOFDMTxPower(
static VOID static VOID
phy_RF6052_Config_HardCode( phy_RF6052_Config_HardCode(
IN PADAPTER Adapter IN struct adapter * Adapter
) )
{ {
@ -876,7 +876,7 @@ phy_RF6052_Config_HardCode(
static int static int
phy_RF6052_Config_ParaFile( phy_RF6052_Config_ParaFile(
IN PADAPTER Adapter IN struct adapter * Adapter
) )
{ {
u32 u4RegValue; u32 u4RegValue;
@ -996,7 +996,7 @@ phy_RF6052_Config_ParaFile_Fail:
int int
PHY_RF6052_Config8188E( PHY_RF6052_Config8188E(
IN PADAPTER Adapter) IN struct adapter * Adapter)
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
int rtStatus = _SUCCESS; int rtStatus = _SUCCESS;
@ -1071,7 +1071,7 @@ PHY_RF6052_Config8188E(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
u32 u32
PHY_RFShadowRead( PHY_RFShadowRead(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN RF_RADIO_PATH_E eRFPath, IN RF_RADIO_PATH_E eRFPath,
IN u32 Offset) IN u32 Offset)
{ {
@ -1082,7 +1082,7 @@ PHY_RFShadowRead(
VOID VOID
PHY_RFShadowWrite( PHY_RFShadowWrite(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN RF_RADIO_PATH_E eRFPath, IN RF_RADIO_PATH_E eRFPath,
IN u32 Offset, IN u32 Offset,
IN u32 Data) IN u32 Data)
@ -1095,7 +1095,7 @@ PHY_RFShadowWrite(
BOOLEAN BOOLEAN
PHY_RFShadowCompare( PHY_RFShadowCompare(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN RF_RADIO_PATH_E eRFPath, IN RF_RADIO_PATH_E eRFPath,
IN u32 Offset) IN u32 Offset)
{ {
@ -1121,7 +1121,7 @@ PHY_RFShadowCompare(
VOID VOID
PHY_RFShadowRecorver( PHY_RFShadowRecorver(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN RF_RADIO_PATH_E eRFPath, IN RF_RADIO_PATH_E eRFPath,
IN u32 Offset) IN u32 Offset)
{ {
@ -1144,7 +1144,7 @@ PHY_RFShadowRecorver(
VOID VOID
PHY_RFShadowCompareAll( PHY_RFShadowCompareAll(
IN PADAPTER Adapter) IN struct adapter * Adapter)
{ {
u32 eRFPath; u32 eRFPath;
u32 Offset; u32 Offset;
@ -1162,7 +1162,7 @@ PHY_RFShadowCompareAll(
VOID VOID
PHY_RFShadowRecorverAll( PHY_RFShadowRecorverAll(
IN PADAPTER Adapter) IN struct adapter * Adapter)
{ {
u32 eRFPath; u32 eRFPath;
u32 Offset; u32 Offset;
@ -1180,7 +1180,7 @@ PHY_RFShadowRecorverAll(
VOID VOID
PHY_RFShadowCompareFlagSet( PHY_RFShadowCompareFlagSet(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN RF_RADIO_PATH_E eRFPath, IN RF_RADIO_PATH_E eRFPath,
IN u32 Offset, IN u32 Offset,
IN u8 Type) IN u8 Type)
@ -1193,7 +1193,7 @@ PHY_RFShadowCompareFlagSet(
VOID VOID
PHY_RFShadowRecorverFlagSet( PHY_RFShadowRecorverFlagSet(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN RF_RADIO_PATH_E eRFPath, IN RF_RADIO_PATH_E eRFPath,
IN u32 Offset, IN u32 Offset,
IN u8 Type) IN u8 Type)
@ -1206,7 +1206,7 @@ PHY_RFShadowRecorverFlagSet(
VOID VOID
PHY_RFShadowCompareFlagSetAll( PHY_RFShadowCompareFlagSetAll(
IN PADAPTER Adapter) IN struct adapter * Adapter)
{ {
u32 eRFPath; u32 eRFPath;
u32 Offset; u32 Offset;
@ -1228,7 +1228,7 @@ PHY_RFShadowCompareFlagSetAll(
VOID VOID
PHY_RFShadowRecorverFlagSetAll( PHY_RFShadowRecorverFlagSetAll(
IN PADAPTER Adapter) IN struct adapter * Adapter)
{ {
u32 eRFPath; u32 eRFPath;
u32 Offset; u32 Offset;
@ -1249,7 +1249,7 @@ PHY_RFShadowRecorverFlagSetAll(
VOID VOID
PHY_RFShadowRefresh( PHY_RFShadowRefresh(
IN PADAPTER Adapter) IN struct adapter * Adapter)
{ {
u32 eRFPath; u32 eRFPath;
u32 Offset; u32 Offset;

10
hal/rtl8188e_rxdesc.c
View file

@ -37,7 +37,7 @@ static s32 translate2dbm(u8 signal_strength_idx)
} }
static void process_rssi(_adapter *padapter,union recv_frame *prframe) static void process_rssi(struct adapter *padapter,union recv_frame *prframe)
{ {
u32 last_rssi, tmp_val; u32 last_rssi, tmp_val;
struct rx_pkt_attrib *pattrib = &prframe->u.hdr.attrib; struct rx_pkt_attrib *pattrib = &prframe->u.hdr.attrib;
@ -93,7 +93,7 @@ static void process_rssi(_adapter *padapter,union recv_frame *prframe)
static void process_link_qual(_adapter *padapter,union recv_frame *prframe) static void process_link_qual(struct adapter *padapter,union recv_frame *prframe)
{ {
u32 last_evm=0, tmpVal; u32 last_evm=0, tmpVal;
struct rx_pkt_attrib *pattrib; struct rx_pkt_attrib *pattrib;
@ -156,8 +156,8 @@ static void process_link_qual(_adapter *padapter,union recv_frame *prframe)
} }
//void rtl8188e_process_phy_info(_adapter *padapter, union recv_frame *prframe) //void rtl8188e_process_phy_info(struct adapter *padapter, union recv_frame *prframe)
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;
@ -267,7 +267,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;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
PODM_PHY_INFO_T pPHYInfo = (PODM_PHY_INFO_T)(&pattrib->phy_info); PODM_PHY_INFO_T pPHYInfo = (PODM_PHY_INFO_T)(&pattrib->phy_info);

4
hal/rtl8188e_sreset.c
View file

@ -24,7 +24,7 @@
#ifdef DBG_CONFIG_ERROR_DETECT #ifdef DBG_CONFIG_ERROR_DETECT
void rtl8188e_sreset_xmit_status_check(_adapter *padapter) void rtl8188e_sreset_xmit_status_check(struct adapter *padapter)
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
struct sreset_priv *psrtpriv = &pHalData->srestpriv; struct sreset_priv *psrtpriv = &pHalData->srestpriv;
@ -78,7 +78,7 @@ void rtl8188e_sreset_xmit_status_check(_adapter *padapter)
} }
} }
void rtl8188e_sreset_linked_status_check(_adapter *padapter) void rtl8188e_sreset_linked_status_check(struct adapter *padapter)
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
struct sreset_priv *psrtpriv = &pHalData->srestpriv; struct sreset_priv *psrtpriv = &pHalData->srestpriv;

6
hal/rtl8188e_xmit.c
View file

@ -46,7 +46,7 @@ void dump_txrpt_ccx_88e(void *buf)
); );
} }
void handle_txrpt_ccx_88e(_adapter *adapter, u8 *buf) void handle_txrpt_ccx_88e(struct adapter *adapter, u8 *buf)
{ {
struct txrpt_ccx_88e *txrpt_ccx = (struct txrpt_ccx_88e *)buf; struct txrpt_ccx_88e *txrpt_ccx = (struct txrpt_ccx_88e *)buf;
@ -63,7 +63,7 @@ void handle_txrpt_ccx_88e(_adapter *adapter, u8 *buf)
} }
#endif //CONFIG_XMIT_ACK #endif //CONFIG_XMIT_ACK
void _dbg_dump_tx_info(_adapter *padapter,int frame_tag,struct tx_desc *ptxdesc) void _dbg_dump_tx_info(struct adapter *padapter,int frame_tag,struct tx_desc *ptxdesc)
{ {
u8 bDumpTxPkt; u8 bDumpTxPkt;
u8 bDumpTxDesc = _FALSE; u8 bDumpTxDesc = _FALSE;
@ -214,7 +214,7 @@ InsertEMContent_8188E(
void UpdateEarlyModeInfo8188E(struct xmit_priv *pxmitpriv,struct xmit_buf *pxmitbuf ) void UpdateEarlyModeInfo8188E(struct xmit_priv *pxmitpriv,struct xmit_buf *pxmitbuf )
{ {
//_adapter *padapter, struct xmit_frame *pxmitframe,struct tx_servq *ptxservq //struct adapter *padapter, struct xmit_frame *pxmitframe,struct tx_servq *ptxservq
int index,j; int index,j;
u16 offset,pktlen; u16 offset,pktlen;
PTXDESC ptxdesc; PTXDESC ptxdesc;

8
hal/rtl8188eu_led.c
View file

@ -43,7 +43,7 @@
// //
void void
SwLedOn( SwLedOn(
_adapter *padapter, struct adapter *padapter,
PLED_871x pLed PLED_871x pLed
) )
{ {
@ -80,7 +80,7 @@ SwLedOn(
// //
void void
SwLedOff( SwLedOff(
_adapter *padapter, struct adapter *padapter,
PLED_871x pLed PLED_871x pLed
) )
{ {
@ -140,7 +140,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);
@ -159,7 +159,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

@ -35,7 +35,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;
@ -52,7 +52,7 @@ void rtl8188eu_init_recvbuf(_adapter *padapter, struct recv_buf *precvbuf)
} }
int rtl8188eu_init_recv_priv(_adapter *padapter) int rtl8188eu_init_recv_priv(struct adapter *padapter)
{ {
struct recv_priv *precvpriv = &padapter->recvpriv; struct recv_priv *precvpriv = &padapter->recvpriv;
int i, res = _SUCCESS; int i, res = _SUCCESS;
@ -166,7 +166,7 @@ exit:
return res; return res;
} }
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;

32
hal/rtl8188eu_xmit.c
View file

@ -28,7 +28,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;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
@ -43,11 +43,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)
{ {
} }
u8 urb_zero_packet_chk(_adapter *padapter, int sz) u8 urb_zero_packet_chk(struct adapter *padapter, int sz)
{ {
u8 blnSetTxDescOffset; u8 blnSetTxDescOffset;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
@ -79,7 +79,7 @@ void rtl8188eu_cal_txdesc_chksum(struct tx_desc *ptxdesc)
// Fw can tell Hw to send these packet derectly. // 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,
@ -227,7 +227,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;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
@ -524,7 +524,7 @@ if (padapter->registrypriv.mp_mode == 0)
* _SUCCESS ok * _SUCCESS ok
* _FAIL something error * _FAIL something error
*/ */
s32 rtl8188eu_xmit_buf_handler(PADAPTER padapter) s32 rtl8188eu_xmit_buf_handler(struct adapter *padapter)
{ {
//PHAL_DATA_TYPE phal; //PHAL_DATA_TYPE phal;
struct xmit_priv *pxmitpriv; struct xmit_priv *pxmitpriv;
@ -582,7 +582,7 @@ s32 rtl8188eu_xmit_buf_handler(PADAPTER padapter)
#include <rtw_iol.h> #include <rtw_iol.h>
#endif #endif
//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;
@ -691,7 +691,7 @@ static u32 xmitframe_need_length(struct xmit_frame *pxmitframe)
} }
#define IDEA_CONDITION 1 // check all packets before enqueue #define IDEA_CONDITION 1 // check all packets before enqueue
s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf) s32 rtl8188eu_xmitframe_complete(struct adapter *padapter, struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
struct xmit_frame *pxmitframe = NULL; struct xmit_frame *pxmitframe = NULL;
@ -995,7 +995,7 @@ s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
#else #else
s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf) s32 rtl8188eu_xmitframe_complete(struct adapter *padapter, struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)
{ {
struct hw_xmit *phwxmits; struct hw_xmit *phwxmits;
@ -1074,7 +1074,7 @@ s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
static s32 xmitframe_direct(_adapter *padapter, struct xmit_frame *pxmitframe) static s32 xmitframe_direct(struct adapter *padapter, struct xmit_frame *pxmitframe)
{ {
s32 res = _SUCCESS; s32 res = _SUCCESS;
//DBG_8192C("==> %s \n",__FUNCTION__); //DBG_8192C("==> %s \n",__FUNCTION__);
@ -1095,7 +1095,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)
{ {
_irqL irqL; _irqL irqL;
s32 res; s32 res;
@ -1104,7 +1104,7 @@ static s32 pre_xmitframe(_adapter *padapter, struct xmit_frame *pxmitframe)
struct pkt_attrib *pattrib = &pxmitframe->attrib; struct pkt_attrib *pattrib = &pxmitframe->attrib;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; struct adapter *pbuddy_adapter = padapter->pbuddy_adapter;
struct mlme_priv *pbuddy_mlmepriv = &(pbuddy_adapter->mlmepriv); struct mlme_priv *pbuddy_mlmepriv = &(pbuddy_adapter->mlmepriv);
#endif #endif
@ -1161,7 +1161,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);
} }
@ -1171,12 +1171,12 @@ 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);
} }
s32 rtl8188eu_hal_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe) s32 rtl8188eu_hal_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitframe)
{ {
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
s32 err; s32 err;
@ -1210,7 +1210,7 @@ static void rtl8188eu_hostap_mgnt_xmit_cb(struct urb *urb)
rtw_skb_free(skb); rtw_skb_free(skb);
} }
s32 rtl8188eu_hostap_mgnt_xmit_entry(_adapter *padapter, _pkt *pkt) s32 rtl8188eu_hostap_mgnt_xmit_entry(struct adapter *padapter, _pkt *pkt)
{ {
u16 fc; u16 fc;
int rc, len, pipe; int rc, len, pipe;

204
hal/usb_halinit.c
View file

@ -59,7 +59,7 @@
static VOID static VOID
_ConfigNormalChipOutEP_8188E( _ConfigNormalChipOutEP_8188E(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN u8 NumOutPipe IN u8 NumOutPipe
) )
{ {
@ -87,7 +87,7 @@ _ConfigNormalChipOutEP_8188E(
} }
static BOOLEAN HalUsbSetQueuePipeMapping8188EUsb( static BOOLEAN HalUsbSetQueuePipeMapping8188EUsb(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN u8 NumInPipe, IN u8 NumInPipe,
IN u8 NumOutPipe IN u8 NumOutPipe
) )
@ -115,7 +115,7 @@ static BOOLEAN HalUsbSetQueuePipeMapping8188EUsb(
} }
void rtl8188eu_interface_configure(_adapter *padapter) void rtl8188eu_interface_configure(struct adapter *padapter)
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter); struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);
@ -149,7 +149,7 @@ void rtl8188eu_interface_configure(_adapter *padapter)
} }
static u32 InitPowerOn_rtl8188eu(_adapter *padapter) static u32 InitPowerOn_rtl8188eu(struct adapter *padapter)
{ {
u16 value16; u16 value16;
u8 bMacPwrCtrlOn=_FALSE; u8 bMacPwrCtrlOn=_FALSE;
@ -186,7 +186,7 @@ static u32 InitPowerOn_rtl8188eu(_adapter *padapter)
} }
static void _dbg_dump_macreg(_adapter *padapter) static void _dbg_dump_macreg(struct adapter *padapter)
{ {
u32 offset = 0; u32 offset = 0;
u32 val32 = 0; u32 val32 = 0;
@ -200,7 +200,7 @@ static void _dbg_dump_macreg(_adapter *padapter)
} }
static void _InitPABias(_adapter *padapter) static void _InitPABias(struct adapter *padapter)
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
u8 pa_setting; u8 pa_setting;
@ -239,7 +239,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)
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
struct btcoexist_priv *pbtpriv = &(pHalData->bt_coexist); struct btcoexist_priv *pbtpriv = &(pHalData->bt_coexist);
@ -300,7 +300,7 @@ static void _InitBTCoexist(_adapter *padapter)
//--------------------------------------------------------------- //---------------------------------------------------------------
static VOID static VOID
_SetMacID( _SetMacID(
IN PADAPTER Adapter, u8* MacID IN struct adapter *Adapter, u8* MacID
) )
{ {
u32 i; u32 i;
@ -316,7 +316,7 @@ _SetMacID(
static VOID static VOID
_SetBSSID( _SetBSSID(
IN PADAPTER Adapter, u8* BSSID IN struct adapter *Adapter, u8* BSSID
) )
{ {
u32 i; u32 i;
@ -334,7 +334,7 @@ _SetBSSID(
// Shall USB interface init this? // Shall USB interface init this?
static VOID static VOID
_InitInterrupt( _InitInterrupt(
IN PADAPTER Adapter IN struct adapter *Adapter
) )
{ {
u32 imr,imr_ex; u32 imr,imr_ex;
@ -377,7 +377,7 @@ _InitInterrupt(
static VOID static VOID
_InitQueueReservedPage( _InitQueueReservedPage(
IN PADAPTER Adapter IN struct adapter *Adapter
) )
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
@ -426,7 +426,7 @@ _InitQueueReservedPage(
static VOID static VOID
_InitTxBufferBoundary( _InitTxBufferBoundary(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u8 txpktbuf_bndy IN u8 txpktbuf_bndy
) )
{ {
@ -445,7 +445,7 @@ _InitTxBufferBoundary(
static VOID static VOID
_InitPageBoundary( _InitPageBoundary(
IN PADAPTER Adapter IN struct adapter *Adapter
) )
{ {
// RX Page Boundary // RX Page Boundary
@ -471,7 +471,7 @@ _InitPageBoundary(
static VOID static VOID
_InitNormalChipRegPriority( _InitNormalChipRegPriority(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u16 beQ, IN u16 beQ,
IN u16 bkQ, IN u16 bkQ,
IN u16 viQ, IN u16 viQ,
@ -491,7 +491,7 @@ _InitNormalChipRegPriority(
static VOID static VOID
_InitNormalChipOneOutEpPriority( _InitNormalChipOneOutEpPriority(
IN PADAPTER Adapter IN struct adapter *Adapter
) )
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
@ -526,7 +526,7 @@ _InitNormalChipOneOutEpPriority(
static VOID static VOID
_InitNormalChipTwoOutEpPriority( _InitNormalChipTwoOutEpPriority(
IN PADAPTER Adapter IN struct adapter *Adapter
) )
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
@ -579,7 +579,7 @@ _InitNormalChipTwoOutEpPriority(
static VOID static VOID
_InitNormalChipThreeOutEpPriority( _InitNormalChipThreeOutEpPriority(
IN PADAPTER Adapter IN struct adapter *Adapter
) )
{ {
struct registry_priv *pregistrypriv = &Adapter->registrypriv; struct registry_priv *pregistrypriv = &Adapter->registrypriv;
@ -606,7 +606,7 @@ _InitNormalChipThreeOutEpPriority(
static VOID static VOID
_InitQueuePriority( _InitQueuePriority(
IN PADAPTER Adapter IN struct adapter *Adapter
) )
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
@ -634,7 +634,7 @@ _InitQueuePriority(
static VOID static VOID
_InitHardwareDropIncorrectBulkOut( _InitHardwareDropIncorrectBulkOut(
IN PADAPTER Adapter IN struct adapter *Adapter
) )
{ {
#ifdef ENABLE_USB_DROP_INCORRECT_OUT #ifdef ENABLE_USB_DROP_INCORRECT_OUT
@ -646,7 +646,7 @@ _InitHardwareDropIncorrectBulkOut(
static VOID static VOID
_InitNetworkType( _InitNetworkType(
IN PADAPTER Adapter IN struct adapter *Adapter
) )
{ {
u32 value32; u32 value32;
@ -661,7 +661,7 @@ _InitNetworkType(
static VOID static VOID
_InitTransferPageSize( _InitTransferPageSize(
IN PADAPTER Adapter IN struct adapter *Adapter
) )
{ {
// Tx page size is always 128. // Tx page size is always 128.
@ -673,7 +673,7 @@ _InitTransferPageSize(
static VOID static VOID
_InitDriverInfoSize( _InitDriverInfoSize(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u8 drvInfoSize IN u8 drvInfoSize
) )
{ {
@ -682,7 +682,7 @@ _InitDriverInfoSize(
static VOID static VOID
_InitWMACSetting( _InitWMACSetting(
IN PADAPTER Adapter IN struct adapter *Adapter
) )
{ {
//u4Byte value32; //u4Byte value32;
@ -728,7 +728,7 @@ _InitWMACSetting(
static VOID static VOID
_InitAdaptiveCtrl( _InitAdaptiveCtrl(
IN PADAPTER Adapter IN struct adapter *Adapter
) )
{ {
u16 value16; u16 value16;
@ -755,7 +755,7 @@ _InitAdaptiveCtrl(
static VOID static VOID
_InitRateFallback( _InitRateFallback(
IN PADAPTER Adapter IN struct adapter *Adapter
) )
{ {
// Set Data Auto Rate Fallback Retry Count register. // Set Data Auto Rate Fallback Retry Count register.
@ -769,7 +769,7 @@ _InitRateFallback(
static VOID static VOID
_InitEDCA( _InitEDCA(
IN PADAPTER Adapter IN struct adapter *Adapter
) )
{ {
// Set Spec SIFS (used in NAV) // Set Spec SIFS (used in NAV)
@ -792,7 +792,7 @@ _InitEDCA(
static VOID static VOID
_InitBeaconMaxError( _InitBeaconMaxError(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN BOOLEAN InfraMode IN BOOLEAN InfraMode
) )
{ {
@ -801,7 +801,7 @@ _InitBeaconMaxError(
#ifdef CONFIG_LED #ifdef CONFIG_LED
static void _InitHWLed(PADAPTER Adapter) static void _InitHWLed(struct adapter *Adapter)
{ {
struct led_priv *pledpriv = &(Adapter->ledpriv); struct led_priv *pledpriv = &(Adapter->ledpriv);
@ -817,7 +817,7 @@ static void _InitHWLed(PADAPTER Adapter)
static VOID static VOID
_InitRDGSetting( _InitRDGSetting(
IN PADAPTER Adapter IN struct adapter *Adapter
) )
{ {
rtw_write8(Adapter,REG_RD_CTRL,0xFF); rtw_write8(Adapter,REG_RD_CTRL,0xFF);
@ -827,7 +827,7 @@ _InitRDGSetting(
static VOID static VOID
_InitRxSetting( _InitRxSetting(
IN PADAPTER Adapter IN struct adapter *Adapter
) )
{ {
rtw_write32(Adapter, REG_MACID, 0x87654321); rtw_write32(Adapter, REG_MACID, 0x87654321);
@ -836,7 +836,7 @@ _InitRxSetting(
static VOID static VOID
_InitRetryFunction( _InitRetryFunction(
IN PADAPTER Adapter IN struct adapter *Adapter
) )
{ {
u8 value8; u8 value8;
@ -866,7 +866,7 @@ _InitRetryFunction(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
static VOID static VOID
usb_AggSettingTxUpdate( usb_AggSettingTxUpdate(
IN PADAPTER Adapter IN struct adapter * Adapter
) )
{ {
#ifdef CONFIG_USB_TX_AGGREGATION #ifdef CONFIG_USB_TX_AGGREGATION
@ -906,7 +906,7 @@ usb_AggSettingTxUpdate(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
static VOID static VOID
usb_AggSettingRxUpdate( usb_AggSettingRxUpdate(
IN PADAPTER Adapter IN struct adapter * Adapter
) )
{ {
#ifdef CONFIG_USB_RX_AGGREGATION #ifdef CONFIG_USB_RX_AGGREGATION
@ -992,7 +992,7 @@ usb_AggSettingRxUpdate(
static VOID static VOID
InitUsbAggregationSetting( InitUsbAggregationSetting(
IN PADAPTER Adapter IN struct adapter *Adapter
) )
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
@ -1008,7 +1008,7 @@ InitUsbAggregationSetting(
} }
VOID VOID
HalRxAggr8188EUsb( HalRxAggr8188EUsb(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN BOOLEAN Value IN BOOLEAN Value
) )
{ {
@ -1065,14 +1065,14 @@ HalRxAggr8188EUsb(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
VOID VOID
USB_AggModeSwitch( USB_AggModeSwitch(
IN PADAPTER Adapter IN struct adapter * Adapter
) )
{ {
} // USB_AggModeSwitch } // USB_AggModeSwitch
static VOID static VOID
_InitOperationMode( _InitOperationMode(
IN PADAPTER Adapter IN struct adapter * Adapter
) )
{ {
} }
@ -1080,7 +1080,7 @@ _InitOperationMode(
static VOID static VOID
_InitBeaconParameters( _InitBeaconParameters(
IN PADAPTER Adapter IN struct adapter *Adapter
) )
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
@ -1105,7 +1105,7 @@ _InitBeaconParameters(
static VOID static VOID
_InitRFType( _InitRFType(
IN PADAPTER Adapter IN struct adapter *Adapter
) )
{ {
struct registry_priv *pregpriv = &Adapter->registrypriv; struct registry_priv *pregpriv = &Adapter->registrypriv;
@ -1135,7 +1135,7 @@ _InitRFType(
static VOID static VOID
_BeaconFunctionEnable( _BeaconFunctionEnable(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN BOOLEAN Enable, IN BOOLEAN Enable,
IN BOOLEAN Linked IN BOOLEAN Linked
) )
@ -1150,7 +1150,7 @@ _BeaconFunctionEnable(
// Set CCK and OFDM Block "ON" // Set CCK and OFDM Block "ON"
static VOID _BBTurnOnBlock( static VOID _BBTurnOnBlock(
IN PADAPTER Adapter IN struct adapter * Adapter
) )
{ {
#if (DISABLE_BB_RF) #if (DISABLE_BB_RF)
@ -1162,7 +1162,7 @@ static VOID _BBTurnOnBlock(
} }
static VOID _RfPowerSave( static VOID _RfPowerSave(
IN PADAPTER Adapter IN struct adapter * Adapter
) )
{ {
#if 0 #if 0
@ -1201,7 +1201,7 @@ enum {
}; };
static VOID static VOID
_InitAntenna_Selection(IN PADAPTER Adapter) _InitAntenna_Selection(IN struct adapter *Adapter)
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
@ -1229,7 +1229,7 @@ _InitAntenna_Selection(IN PADAPTER Adapter)
// //
static VOID static VOID
HalDetectSelectiveSuspendMode( HalDetectSelectiveSuspendMode(
IN PADAPTER Adapter IN struct adapter * Adapter
) )
{ {
#if 0 #if 0
@ -1283,7 +1283,7 @@ HalDetectSelectiveSuspendMode(
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
static VOID static VOID
HwSuspendModeEnable_88eu( HwSuspendModeEnable_88eu(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN u8 Type IN u8 Type
) )
{ {
@ -1323,7 +1323,7 @@ HwSuspendModeEnable_88eu(
} }
} // HwSuspendModeEnable92Cu } // HwSuspendModeEnable92Cu
rt_rf_power_state RfOnOffDetect(IN PADAPTER pAdapter ) rt_rf_power_state RfOnOffDetect(IN struct adapter *pAdapter )
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter);
u8 val8; u8 val8;
@ -1345,9 +1345,9 @@ rt_rf_power_state RfOnOffDetect(IN PADAPTER pAdapter )
return rfpowerstate; return rfpowerstate;
} // HalDetectPwrDownMode } // HalDetectPwrDownMode
void _ps_open_RF(_adapter *padapter); void _ps_open_RF(struct adapter *padapter);
u32 rtl8188eu_hal_init(PADAPTER Adapter) u32 rtl8188eu_hal_init(struct adapter *Adapter)
{ {
u8 value8 = 0; u8 value8 = 0;
u16 value16; u16 value16;
@ -1949,19 +1949,19 @@ _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);
} }
void _ps_close_RF(_adapter *padapter){ 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);
} }
VOID hal_poweroff_rtl8188eu( VOID hal_poweroff_rtl8188eu(
IN PADAPTER Adapter IN struct adapter * Adapter
) )
{ {
// PMGNT_INFO pMgntInfo = &(Adapter->MgntInfo); // PMGNT_INFO pMgntInfo = &(Adapter->MgntInfo);
@ -2045,7 +2045,7 @@ VOID hal_poweroff_rtl8188eu(
rtw_hal_set_hwreg(Adapter, HW_VAR_APFM_ON_MAC, &bMacPwrCtrlOn); rtw_hal_set_hwreg(Adapter, HW_VAR_APFM_ON_MAC, &bMacPwrCtrlOn);
Adapter->bFWReady = _FALSE; Adapter->bFWReady = _FALSE;
} }
static void rtl8188eu_hw_power_down(_adapter *padapter) static void rtl8188eu_hw_power_down(struct adapter *padapter)
{ {
// 2010/-8/09 MH For power down module, we need to enable register block contrl reg at 0x1c. // 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.
@ -2055,7 +2055,7 @@ static void rtl8188eu_hw_power_down(_adapter *padapter)
rtw_write16(padapter, REG_APS_FSMCO, 0x8812); rtw_write16(padapter, REG_APS_FSMCO, 0x8812);
} }
u32 rtl8188eu_hal_deinit(PADAPTER Adapter) u32 rtl8188eu_hal_deinit(struct adapter *Adapter)
{ {
struct pwrctrl_priv *pwrctl = adapter_to_pwrctl(Adapter); struct pwrctrl_priv *pwrctl = adapter_to_pwrctl(Adapter);
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
@ -2089,7 +2089,7 @@ u32 rtl8188eu_hal_deinit(PADAPTER Adapter)
} }
unsigned int rtl8188eu_inirp_init(PADAPTER Adapter) unsigned int rtl8188eu_inirp_init(struct adapter *Adapter)
{ {
u8 i; u8 i;
struct recv_buf *precvbuf; struct recv_buf *precvbuf;
@ -2153,7 +2153,7 @@ _func_exit_;
} }
unsigned int rtl8188eu_inirp_deinit(PADAPTER Adapter) unsigned int rtl8188eu_inirp_deinit(struct adapter *Adapter)
{ {
RT_TRACE(_module_hci_hal_init_c_,_drv_info_,("\n ===> usb_rx_deinit \n")); RT_TRACE(_module_hci_hal_init_c_,_drv_info_,("\n ===> usb_rx_deinit \n"));
@ -2264,7 +2264,7 @@ _GetChannelGroup(
static VOID static VOID
ReadTxPowerInfo( ReadTxPowerInfo(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN u8* PROMContent, IN u8* PROMContent,
IN BOOLEAN AutoLoadFail IN BOOLEAN AutoLoadFail
) )
@ -2349,7 +2349,7 @@ ReadTxPowerInfo(
//------------------------------------------------------------------- //-------------------------------------------------------------------
static void static void
_ReadIDs( _ReadIDs(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u8* PROMContent, IN u8* PROMContent,
IN BOOLEAN AutoloadFail IN BOOLEAN AutoloadFail
) )
@ -2426,7 +2426,7 @@ _ReadIDs(
static VOID static VOID
_ReadMACAddress( _ReadMACAddress(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u8* PROMContent, IN u8* PROMContent,
IN BOOLEAN AutoloadFail IN BOOLEAN AutoloadFail
) )
@ -2453,7 +2453,7 @@ _ReadMACAddress(
static VOID static VOID
_ReadBoardType( _ReadBoardType(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u8* PROMContent, IN u8* PROMContent,
IN BOOLEAN AutoloadFail IN BOOLEAN AutoloadFail
) )
@ -2464,7 +2464,7 @@ _ReadBoardType(
static VOID static VOID
_ReadLEDSetting( _ReadLEDSetting(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u8* PROMContent, IN u8* PROMContent,
IN BOOLEAN AutoloadFail IN BOOLEAN AutoloadFail
) )
@ -2488,7 +2488,7 @@ _ReadLEDSetting(
static VOID static VOID
_ReadThermalMeter( _ReadThermalMeter(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u8* PROMContent, IN u8* PROMContent,
IN BOOLEAN AutoloadFail IN BOOLEAN AutoloadFail
) )
@ -2524,7 +2524,7 @@ _ReadThermalMeter(
static VOID static VOID
_ReadRFSetting( _ReadRFSetting(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u8* PROMContent, IN u8* PROMContent,
IN BOOLEAN AutoloadFail IN BOOLEAN AutoloadFail
) )
@ -2533,7 +2533,7 @@ _ReadRFSetting(
static void static void
_ReadPROMVersion( _ReadPROMVersion(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u8* PROMContent, IN u8* PROMContent,
IN BOOLEAN AutoloadFail IN BOOLEAN AutoloadFail
) )
@ -2552,7 +2552,7 @@ _ReadPROMVersion(
static VOID static VOID
readAntennaDiversity( readAntennaDiversity(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN u8 *hwinfo, IN u8 *hwinfo,
IN BOOLEAN AutoLoadFail IN BOOLEAN AutoLoadFail
) )
@ -2587,7 +2587,7 @@ readAntennaDiversity(
static VOID static VOID
hal_InitPGData( hal_InitPGData(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN OUT u8 *PROMContent IN OUT u8 *PROMContent
) )
{ {
@ -2627,7 +2627,7 @@ hal_InitPGData(
} }
static void static void
Hal_EfuseParsePIDVID_8188EU( Hal_EfuseParsePIDVID_8188EU(
IN PADAPTER pAdapter, IN struct adapter * pAdapter,
IN u8* hwinfo, IN u8* hwinfo,
IN BOOLEAN AutoLoadFail IN BOOLEAN AutoLoadFail
) )
@ -2663,7 +2663,7 @@ Hal_EfuseParsePIDVID_8188EU(
static void static void
Hal_EfuseParseMACAddr_8188EU( Hal_EfuseParseMACAddr_8188EU(
IN PADAPTER padapter, IN struct adapter * padapter,
IN u8* hwinfo, IN u8* hwinfo,
IN BOOLEAN AutoLoadFail IN BOOLEAN AutoLoadFail
) )
@ -2696,7 +2696,7 @@ Hal_EfuseParseMACAddr_8188EU(
static void static void
Hal_CustomizeByCustomerID_8188EU( Hal_CustomizeByCustomerID_8188EU(
IN PADAPTER padapter IN struct adapter * padapter
) )
{ {
#if 0 #if 0
@ -2745,7 +2745,7 @@ Hal_CustomizeByCustomerID_8188EU(
} }
// Read HW power down mode selection // Read HW power down mode selection
static void _ReadPSSetting(IN PADAPTER Adapter,IN u8*PROMContent,IN u8 AutoloadFail) static void _ReadPSSetting(IN struct adapter *Adapter,IN u8*PROMContent,IN u8 AutoloadFail)
{ {
#if 0 #if 0
struct pwrctrl_priv *pwrctl = adapter_to_pwrctl(Adapter); struct pwrctrl_priv *pwrctl = adapter_to_pwrctl(Adapter);
@ -2786,7 +2786,7 @@ static void _ReadPSSetting(IN PADAPTER Adapter,IN u8*PROMContent,IN u8 AutoloadF
#ifdef CONFIG_EFUSE_CONFIG_FILE #ifdef CONFIG_EFUSE_CONFIG_FILE
static u32 Hal_readPGDataFromConfigFile( static u32 Hal_readPGDataFromConfigFile(
PADAPTER padapter) struct adapter *padapter)
{ {
u32 i; u32 i;
struct file *fp; struct file *fp;
@ -2828,7 +2828,7 @@ static u32 Hal_readPGDataFromConfigFile(
static void static void
Hal_ReadMACAddrFromFile_8188EU( Hal_ReadMACAddrFromFile_8188EU(
PADAPTER padapter struct adapter * padapter
) )
{ {
u32 i; u32 i;
@ -2899,7 +2899,7 @@ Hal_ReadMACAddrFromFile_8188EU(
static VOID static VOID
readAdapterInfo_8188EU( readAdapterInfo_8188EU(
IN PADAPTER padapter IN struct adapter *padapter
) )
{ {
#if 1 #if 1
@ -2953,7 +2953,7 @@ readAdapterInfo_8188EU(
} }
static void _ReadPROMContent( static void _ReadPROMContent(
IN PADAPTER Adapter IN struct adapter * Adapter
) )
{ {
EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(Adapter); EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(Adapter);
@ -2981,7 +2981,7 @@ static void _ReadPROMContent(
static VOID static VOID
_ReadRFType( _ReadRFType(
IN PADAPTER Adapter IN struct adapter *Adapter
) )
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
@ -2993,7 +2993,7 @@ _ReadRFType(
#endif #endif
} }
static int _ReadAdapterInfo8188EU(PADAPTER Adapter) static int _ReadAdapterInfo8188EU(struct adapter *Adapter)
{ {
//HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
u32 start=rtw_get_current_time(); u32 start=rtw_get_current_time();
@ -3016,7 +3016,7 @@ static int _ReadAdapterInfo8188EU(PADAPTER Adapter)
} }
static void ReadAdapterInfo8188EU(PADAPTER Adapter) static void ReadAdapterInfo8188EU(struct adapter *Adapter)
{ {
// Read EEPROM size before call any EEPROM function // Read EEPROM size before call any EEPROM function
Adapter->EepromAddressSize = GetEEPROMSize8188E(Adapter); Adapter->EepromAddressSize = GetEEPROMSize8188E(Adapter);
@ -3026,7 +3026,7 @@ 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)
{ {
#ifdef CONFIG_USB_SUPPORT_ASYNC_VDN_REQ #ifdef CONFIG_USB_SUPPORT_ASYNC_VDN_REQ
u32 gpioctrl; u32 gpioctrl;
@ -3041,7 +3041,7 @@ static void rtl8192cu_trigger_gpio_0(_adapter *padapter)
#endif #endif
} }
static void ResumeTxBeacon(_adapter *padapter) static void ResumeTxBeacon(struct adapter *padapter)
{ {
HAL_DATA_TYPE* pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE* pHalData = GET_HAL_DATA(padapter);
@ -3054,7 +3054,7 @@ static void ResumeTxBeacon(_adapter *padapter)
pHalData->RegReg542 |= BIT0; pHalData->RegReg542 |= BIT0;
rtw_write8(padapter, REG_TBTT_PROHIBIT+2, pHalData->RegReg542); rtw_write8(padapter, REG_TBTT_PROHIBIT+2, pHalData->RegReg542);
} }
void UpdateInterruptMask8188EU(PADAPTER padapter,u8 bHIMR0 ,u32 AddMSR, u32 RemoveMSR) void UpdateInterruptMask8188EU(struct adapter *padapter,u8 bHIMR0 ,u32 AddMSR, u32 RemoveMSR)
{ {
HAL_DATA_TYPE *pHalData; HAL_DATA_TYPE *pHalData;
@ -3079,7 +3079,7 @@ void UpdateInterruptMask8188EU(PADAPTER padapter,u8 bHIMR0 ,u32 AddMSR, u32 Remo
} }
static void StopTxBeacon(_adapter *padapter) static void StopTxBeacon(struct adapter *padapter)
{ {
HAL_DATA_TYPE* pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE* pHalData = GET_HAL_DATA(padapter);
@ -3097,7 +3097,7 @@ static void StopTxBeacon(_adapter *padapter)
} }
static void hw_var_set_opmode(PADAPTER Adapter, u8 variable, u8* val) static void hw_var_set_opmode(struct adapter *Adapter, u8 variable, u8* val)
{ {
u8 val8; u8 val8;
u8 mode = *((u8 *)val); u8 mode = *((u8 *)val);
@ -3329,7 +3329,7 @@ static void hw_var_set_opmode(PADAPTER Adapter, u8 variable, u8* val)
} }
static void hw_var_set_macaddr(PADAPTER Adapter, u8 variable, u8* val) static void hw_var_set_macaddr(struct adapter *Adapter, u8 variable, u8* val)
{ {
u8 idx = 0; u8 idx = 0;
u32 reg_macid; u32 reg_macid;
@ -3352,7 +3352,7 @@ static void hw_var_set_macaddr(PADAPTER Adapter, u8 variable, u8* val)
} }
static void hw_var_set_bssid(PADAPTER Adapter, u8 variable, u8* val) static void hw_var_set_bssid(struct adapter *Adapter, u8 variable, u8* val)
{ {
u8 idx = 0; u8 idx = 0;
u32 reg_bssid; u32 reg_bssid;
@ -3375,7 +3375,7 @@ static void hw_var_set_bssid(PADAPTER Adapter, u8 variable, u8* val)
} }
static void hw_var_set_bcn_func(PADAPTER Adapter, u8 variable, u8* val) static void hw_var_set_bcn_func(struct adapter *Adapter, u8 variable, u8* val)
{ {
u32 bcn_ctrl_reg; u32 bcn_ctrl_reg;
@ -3402,13 +3402,13 @@ static void hw_var_set_bcn_func(PADAPTER Adapter, u8 variable, u8* val)
} }
static void hw_var_set_correct_tsf(PADAPTER Adapter, u8 variable, u8* val) static void hw_var_set_correct_tsf(struct adapter *Adapter, u8 variable, u8* val)
{ {
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
u64 tsf; u64 tsf;
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);
PADAPTER pbuddy_adapter = Adapter->pbuddy_adapter; struct adapter *pbuddy_adapter = Adapter->pbuddy_adapter;
//tsf = pmlmeext->TSFValue - ((u32)pmlmeext->TSFValue % (pmlmeinfo->bcn_interval*1024)) -1024; //us //tsf = pmlmeext->TSFValue - ((u32)pmlmeext->TSFValue % (pmlmeinfo->bcn_interval*1024)) -1024; //us
tsf = pmlmeext->TSFValue - rtw_modular64(pmlmeext->TSFValue, (pmlmeinfo->bcn_interval*1024)) -1024; //us tsf = pmlmeext->TSFValue - rtw_modular64(pmlmeext->TSFValue, (pmlmeinfo->bcn_interval*1024)) -1024; //us
@ -3498,11 +3498,11 @@ static void hw_var_set_correct_tsf(PADAPTER Adapter, u8 variable, u8* val)
#endif #endif
} }
static void hw_var_set_mlme_disconnect(PADAPTER Adapter, u8 variable, u8* val) static void hw_var_set_mlme_disconnect(struct adapter *Adapter, u8 variable, u8* val)
{ {
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
//HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
PADAPTER pbuddy_adapter = Adapter->pbuddy_adapter; struct adapter *pbuddy_adapter = Adapter->pbuddy_adapter;
if(check_buddy_mlmeinfo_state(Adapter, _HW_STATE_NOLINK_)) if(check_buddy_mlmeinfo_state(Adapter, _HW_STATE_NOLINK_))
@ -3531,7 +3531,7 @@ static void hw_var_set_mlme_disconnect(PADAPTER Adapter, u8 variable, u8* val)
#endif #endif
} }
static void hw_var_set_mlme_sitesurvey(PADAPTER Adapter, u8 variable, u8* val) static void hw_var_set_mlme_sitesurvey(struct adapter *Adapter, u8 variable, u8* val)
{ {
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
@ -3588,7 +3588,7 @@ static void hw_var_set_mlme_sitesurvey(PADAPTER Adapter, u8 variable, u8* val)
#endif #endif
} }
static void hw_var_set_mlme_join(PADAPTER Adapter, u8 variable, u8* val) static void hw_var_set_mlme_join(struct adapter *Adapter, u8 variable, u8* val)
{ {
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
u8 RetryLimit = 0x30; u8 RetryLimit = 0x30;
@ -3671,7 +3671,7 @@ static void hw_var_set_mlme_join(PADAPTER Adapter, u8 variable, u8* val)
#endif #endif
} }
void SetHwReg8188EU(PADAPTER Adapter, u8 variable, u8* val) void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val)
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
struct dm_priv *pdmpriv = &pHalData->dmpriv; struct dm_priv *pdmpriv = &pHalData->dmpriv;
@ -4545,7 +4545,7 @@ _func_enter_;
_func_exit_; _func_exit_;
} }
void GetHwReg8188EU(PADAPTER Adapter, u8 variable, u8* val) void GetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val)
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
DM_ODM_T *podmpriv = &pHalData->odmpriv; DM_ODM_T *podmpriv = &pHalData->odmpriv;
@ -4636,7 +4636,7 @@ _func_exit_;
// //
u8 u8
GetHalDefVar8188EUsb( GetHalDefVar8188EUsb(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN HAL_DEF_VARIABLE eVariable, IN HAL_DEF_VARIABLE eVariable,
IN PVOID pValue IN PVOID pValue
) )
@ -4725,7 +4725,7 @@ GetHalDefVar8188EUsb(
u8 i; u8 i;
u8 bLinked = _FALSE; u8 bLinked = _FALSE;
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
PADAPTER pbuddy_adapter = Adapter->pbuddy_adapter; struct adapter *pbuddy_adapter = Adapter->pbuddy_adapter;
#endif //CONFIG_CONCURRENT_MODE #endif //CONFIG_CONCURRENT_MODE
//if(check_fwstate(&Adapter->mlmepriv, _FW_LINKED)== _TRUE) //if(check_fwstate(&Adapter->mlmepriv, _FW_LINKED)== _TRUE)
@ -4783,7 +4783,7 @@ GetHalDefVar8188EUsb(
// //
u8 u8
SetHalDefVar8188EUsb( SetHalDefVar8188EUsb(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN HAL_DEF_VARIABLE eVariable, IN HAL_DEF_VARIABLE eVariable,
IN PVOID pValue IN PVOID pValue
) )
@ -4846,7 +4846,7 @@ SetHalDefVar8188EUsb(
return bResult; return bResult;
} }
/* /*
u32 _update_92cu_basic_rate(_adapter *padapter, unsigned int mask) u32 _update_92cu_basic_rate(struct adapter *padapter, unsigned int mask)
{ {
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
@ -4874,7 +4874,7 @@ u32 _update_92cu_basic_rate(_adapter *padapter, unsigned int mask)
return BrateCfg; return BrateCfg;
} }
*/ */
void _update_response_rate(_adapter *padapter,unsigned int mask) void _update_response_rate(struct adapter *padapter,unsigned int mask)
{ {
u8 RateIndex = 0; u8 RateIndex = 0;
// Set RRSR rate table. // Set RRSR rate table.
@ -4890,7 +4890,7 @@ void _update_response_rate(_adapter *padapter,unsigned int mask)
rtw_write8(padapter, REG_INIRTS_RATE_SEL, RateIndex); rtw_write8(padapter, REG_INIRTS_RATE_SEL, RateIndex);
} }
void UpdateHalRAMask8188EUsb(PADAPTER padapter, u32 mac_id, u8 rssi_level) void UpdateHalRAMask8188EUsb(struct adapter *padapter, u32 mac_id, u8 rssi_level)
{ {
//volatile unsigned int result; //volatile unsigned int result;
u8 init_rate=0; u8 init_rate=0;
@ -5033,7 +5033,7 @@ void UpdateHalRAMask8188EUsb(PADAPTER padapter, u32 mac_id, u8 rssi_level)
} }
void SetBeaconRelatedRegisters8188EUsb(PADAPTER padapter) void SetBeaconRelatedRegisters8188EUsb(struct adapter *padapter)
{ {
u32 value32; u32 value32;
//HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
@ -5090,7 +5090,7 @@ void SetBeaconRelatedRegisters8188EUsb(PADAPTER padapter)
} }
static void rtl8188eu_init_default_value(_adapter * padapter) static void rtl8188eu_init_default_value(struct adapter * padapter)
{ {
PHAL_DATA_TYPE pHalData; PHAL_DATA_TYPE pHalData;
struct pwrctrl_priv *pwrctrlpriv; struct pwrctrl_priv *pwrctrlpriv;
@ -5120,7 +5120,7 @@ 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,HAL_INTF_PS_FUNC efunc_id, u8 *val) static u8 rtl8188eu_ps_func(struct adapter *Adapter,HAL_INTF_PS_FUNC efunc_id, u8 *val)
{ {
u8 bResult = _TRUE; u8 bResult = _TRUE;
switch(efunc_id){ switch(efunc_id){
@ -5140,7 +5140,7 @@ static u8 rtl8188eu_ps_func(PADAPTER Adapter,HAL_INTF_PS_FUNC efunc_id, u8 *val)
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;

32
hal/usb_ops_linux.c
View file

@ -30,7 +30,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;
@ -378,7 +378,7 @@ static int usb_writeN(struct intf_hdl *pintfhdl, u32 addr, u32 length, u8 *pdata
} }
#ifdef CONFIG_SUPPORT_USB_INT #ifdef CONFIG_SUPPORT_USB_INT
void interrupt_handler_8188eu(_adapter *padapter,u16 pkt_len,u8 *pbuf) void interrupt_handler_8188eu(struct adapter *padapter,u16 pkt_len,u8 *pbuf)
{ {
HAL_DATA_TYPE *pHalData=GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData=GET_HAL_DATA(padapter);
struct reportpwrstate_parm pwr_rpt; struct reportpwrstate_parm pwr_rpt;
@ -492,7 +492,7 @@ void interrupt_handler_8188eu(_adapter *padapter,u16 pkt_len,u8 *pbuf)
static void usb_read_interrupt_complete(struct urb *purb, struct pt_regs *regs) static void usb_read_interrupt_complete(struct urb *purb, struct pt_regs *regs)
{ {
int err; int err;
_adapter *padapter = (_adapter *)purb->context; struct adapter *padapter = (struct adapter *)purb->context;
if(padapter->bSurpriseRemoved || padapter->bDriverStopped||padapter->bReadPortCancel) if(padapter->bSurpriseRemoved || padapter->bDriverStopped||padapter->bReadPortCancel)
{ {
@ -549,7 +549,7 @@ static u32 usb_read_interrupt(struct intf_hdl *pintfhdl, u32 addr)
int err; int err;
unsigned int pipe; unsigned int pipe;
u32 ret = _SUCCESS; u32 ret = _SUCCESS;
_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;
@ -585,8 +585,8 @@ static s32 pre_recv_entry(union recv_frame *precvframe, struct recv_stat *prxsta
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
u8 *primary_myid, *secondary_myid, *paddr1; u8 *primary_myid, *secondary_myid, *paddr1;
union recv_frame *precvframe_if2 = NULL; union recv_frame *precvframe_if2 = NULL;
_adapter *primary_padapter = precvframe->u.hdr.adapter; struct adapter *primary_padapter = precvframe->u.hdr.adapter;
_adapter *secondary_padapter = primary_padapter->pbuddy_adapter; struct adapter *secondary_padapter = primary_padapter->pbuddy_adapter;
struct recv_priv *precvpriv = &primary_padapter->recvpriv; struct recv_priv *precvpriv = &primary_padapter->recvpriv;
_queue *pfree_recv_queue = &precvpriv->free_recv_queue; _queue *pfree_recv_queue = &precvpriv->free_recv_queue;
u8 *pbuf = precvframe->u.hdr.rx_data; u8 *pbuf = precvframe->u.hdr.rx_data;
@ -779,7 +779,7 @@ static s32 pre_recv_entry(union recv_frame *precvframe, struct recv_stat *prxsta
} }
#ifdef CONFIG_USE_USB_BUFFER_ALLOC_RX #ifdef CONFIG_USE_USB_BUFFER_ALLOC_RX
static int recvbuf2recvframe(_adapter *padapter, struct recv_buf *precvbuf) static int recvbuf2recvframe(struct adapter *padapter, struct recv_buf *precvbuf)
{ {
u8 *pbuf; u8 *pbuf;
u8 shift_sz = 0; u8 shift_sz = 0;
@ -1005,7 +1005,7 @@ _exit_recvbuf2recvframe:
void rtl8188eu_recv_tasklet(void *priv) void rtl8188eu_recv_tasklet(void *priv)
{ {
struct recv_buf *precvbuf = NULL; struct recv_buf *precvbuf = NULL;
_adapter *padapter = (_adapter*)priv; struct adapter *padapter = (struct adapter*)priv;
struct recv_priv *precvpriv = &padapter->recvpriv; struct recv_priv *precvpriv = &padapter->recvpriv;
while (NULL != (precvbuf = rtw_dequeue_recvbuf(&precvpriv->recv_buf_pending_queue))) while (NULL != (precvbuf = rtw_dequeue_recvbuf(&precvpriv->recv_buf_pending_queue)))
@ -1028,7 +1028,7 @@ void rtl8188eu_recv_tasklet(void *priv)
static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs) static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
{ {
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"));
@ -1119,7 +1119,7 @@ static u32 usb_read_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem)
u32 ret = _SUCCESS; u32 ret = _SUCCESS;
PURB purb = NULL; PURB 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;
@ -1176,7 +1176,7 @@ _func_exit_;
return ret; return ret;
} }
#else // CONFIG_USE_USB_BUFFER_ALLOC_RX #else // CONFIG_USE_USB_BUFFER_ALLOC_RX
static int recvbuf2recvframe(_adapter *padapter, _pkt *pskb) static int recvbuf2recvframe(struct adapter *padapter, _pkt *pskb)
{ {
u8 *pbuf; u8 *pbuf;
u8 shift_sz = 0; u8 shift_sz = 0;
@ -1410,7 +1410,7 @@ _exit_recvbuf2recvframe:
void rtl8188eu_recv_tasklet(void *priv) void rtl8188eu_recv_tasklet(void *priv)
{ {
_pkt *pskb; _pkt *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)))
@ -1446,7 +1446,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
_irqL irqL; _irqL 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"));
@ -1566,7 +1566,7 @@ static u32 usb_read_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem)
u32 ret = _SUCCESS; u32 ret = _SUCCESS;
PURB purb = NULL; PURB 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;
@ -1669,7 +1669,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)
@ -1728,7 +1728,7 @@ void rtl8188eu_set_intf_ops(struct _io_ops *pops)
} }
void rtl8188eu_set_hw_type(_adapter *padapter) void rtl8188eu_set_hw_type(struct adapter *padapter)
{ {
padapter->chip_type = RTL8188E; padapter->chip_type = RTL8188E;
padapter->HardwareType = HARDWARE_TYPE_RTL8188EU; padapter->HardwareType = HARDWARE_TYPE_RTL8188EU;

64
include/Hal8188EPhyCfg.h
View file

@ -215,18 +215,18 @@ typedef struct _R_ANTENNA_SELECT_CCK{
// //
// BB and RF register read/write // BB and RF register read/write
// //
u32 rtl8188e_PHY_QueryBBReg( IN PADAPTER Adapter, u32 rtl8188e_PHY_QueryBBReg( IN struct adapter *Adapter,
IN u32 RegAddr, IN u32 RegAddr,
IN u32 BitMask ); IN u32 BitMask );
void rtl8188e_PHY_SetBBReg( IN PADAPTER Adapter, void rtl8188e_PHY_SetBBReg( IN struct adapter *Adapter,
IN u32 RegAddr, IN u32 RegAddr,
IN u32 BitMask, IN u32 BitMask,
IN u32 Data ); IN u32 Data );
u32 rtl8188e_PHY_QueryRFReg( IN PADAPTER Adapter, u32 rtl8188e_PHY_QueryRFReg( IN struct adapter * Adapter,
IN RF_RADIO_PATH_E eRFPath, IN RF_RADIO_PATH_E eRFPath,
IN u32 RegAddr, IN u32 RegAddr,
IN u32 BitMask ); IN u32 BitMask );
void rtl8188e_PHY_SetRFReg( IN PADAPTER Adapter, void rtl8188e_PHY_SetRFReg( IN struct adapter * Adapter,
IN RF_RADIO_PATH_E eRFPath, IN RF_RADIO_PATH_E eRFPath,
IN u32 RegAddr, IN u32 RegAddr,
IN u32 BitMask, IN u32 BitMask,
@ -236,57 +236,57 @@ void rtl8188e_PHY_SetRFReg( IN PADAPTER Adapter,
// Initialization related function // Initialization related function
// //
/* MAC/BB/RF HAL config */ /* MAC/BB/RF HAL config */
int PHY_MACConfig8188E(IN PADAPTER Adapter ); int PHY_MACConfig8188E(IN struct adapter *Adapter );
int PHY_BBConfig8188E(IN PADAPTER Adapter ); int PHY_BBConfig8188E(IN struct adapter *Adapter );
int PHY_RFConfig8188E(IN PADAPTER Adapter ); int PHY_RFConfig8188E(IN struct adapter *Adapter );
/* RF config */ /* RF config */
int rtl8188e_PHY_ConfigRFWithParaFile(IN PADAPTER Adapter, IN u8 * pFileName, RF_RADIO_PATH_E eRFPath); int rtl8188e_PHY_ConfigRFWithParaFile(IN struct adapter *Adapter, IN u8 * pFileName, RF_RADIO_PATH_E eRFPath);
int rtl8188e_PHY_ConfigRFWithHeaderFile( IN PADAPTER Adapter, int rtl8188e_PHY_ConfigRFWithHeaderFile( IN struct adapter * Adapter,
IN RF_RADIO_PATH_E eRFPath); IN RF_RADIO_PATH_E eRFPath);
/* Read initi reg value for tx power setting. */ /* Read initi reg value for tx power setting. */
void rtl8192c_PHY_GetHWRegOriginalValue( IN PADAPTER Adapter ); void rtl8192c_PHY_GetHWRegOriginalValue( IN struct adapter * Adapter );
// //
// RF Power setting // RF Power setting
// //
//extern BOOLEAN PHY_SetRFPowerState(IN PADAPTER Adapter, //extern BOOLEAN PHY_SetRFPowerState(IN struct adapter * Adapter,
// IN RT_RF_POWER_STATE eRFPowerState); // IN RT_RF_POWER_STATE eRFPowerState);
// //
// BB TX Power R/W // BB TX Power R/W
// //
void PHY_GetTxPowerLevel8188E( IN PADAPTER Adapter, void PHY_GetTxPowerLevel8188E( IN struct adapter * Adapter,
OUT u32* powerlevel ); OUT u32* powerlevel );
void PHY_SetTxPowerLevel8188E( IN PADAPTER Adapter, void PHY_SetTxPowerLevel8188E( IN struct adapter * Adapter,
IN u8 channel ); IN u8 channel );
BOOLEAN PHY_UpdateTxPowerDbm8188E( IN PADAPTER Adapter, BOOLEAN PHY_UpdateTxPowerDbm8188E( IN struct adapter *Adapter,
IN int powerInDbm ); IN int powerInDbm );
// //
VOID VOID
PHY_ScanOperationBackup8188E(IN PADAPTER Adapter, PHY_ScanOperationBackup8188E(IN struct adapter *Adapter,
IN u8 Operation ); IN u8 Operation );
// //
// Switch bandwidth for 8192S // Switch bandwidth for 8192S
// //
//extern void PHY_SetBWModeCallback8192C( IN PRT_TIMER pTimer ); //extern void PHY_SetBWModeCallback8192C( IN PRT_TIMER pTimer );
void PHY_SetBWMode8188E( IN PADAPTER pAdapter, void PHY_SetBWMode8188E( IN struct adapter * pAdapter,
IN HT_CHANNEL_WIDTH ChnlWidth, IN HT_CHANNEL_WIDTH ChnlWidth,
IN unsigned char Offset ); IN unsigned char Offset );
// //
// Set FW CMD IO for 8192S. // Set FW CMD IO for 8192S.
// //
//extern BOOLEAN HalSetIO8192C( IN PADAPTER Adapter, //extern BOOLEAN HalSetIO8192C( IN struct adapter * Adapter,
// IN IO_TYPE IOType); // IN IO_TYPE IOType);
// //
// Set A2 entry to fw for 8192S // Set A2 entry to fw for 8192S
// //
extern void FillA2Entry8192C( IN PADAPTER Adapter, extern void FillA2Entry8192C( IN struct adapter * Adapter,
IN u8 index, IN u8 index,
IN u8* val); IN u8* val);
@ -295,45 +295,45 @@ extern void FillA2Entry8192C( IN PADAPTER Adapter,
// channel switch related funciton // channel switch related funciton
// //
//extern void PHY_SwChnlCallback8192C( IN PRT_TIMER pTimer ); //extern void PHY_SwChnlCallback8192C( IN PRT_TIMER pTimer );
void PHY_SwChnl8188E( IN PADAPTER pAdapter, void PHY_SwChnl8188E( IN struct adapter * pAdapter,
IN u8 channel ); IN u8 channel );
// Call after initialization // Call after initialization
void PHY_SwChnlPhy8192C( IN PADAPTER pAdapter, void PHY_SwChnlPhy8192C( IN struct adapter * pAdapter,
IN u8 channel ); IN u8 channel );
void ChkFwCmdIoDone( IN PADAPTER Adapter); void ChkFwCmdIoDone( IN struct adapter *Adapter);
// //
// BB/MAC/RF other monitor API // BB/MAC/RF other monitor API
// //
void PHY_SetMonitorMode8192C(IN PADAPTER pAdapter, void PHY_SetMonitorMode8192C(IN struct adapter *pAdapter,
IN BOOLEAN bEnableMonitorMode ); IN BOOLEAN bEnableMonitorMode );
BOOLEAN PHY_CheckIsLegalRfPath8192C(IN PADAPTER pAdapter, BOOLEAN PHY_CheckIsLegalRfPath8192C(IN struct adapter *pAdapter,
IN u32 eRFPath ); IN u32 eRFPath );
VOID PHY_SetRFPathSwitch_8188E(IN PADAPTER pAdapter, IN BOOLEAN bMain); VOID PHY_SetRFPathSwitch_8188E(IN struct adapter *pAdapter, IN BOOLEAN bMain);
extern VOID extern VOID
PHY_SwitchEphyParameter( PHY_SwitchEphyParameter(
IN PADAPTER Adapter IN struct adapter * Adapter
); );
extern VOID extern VOID
PHY_EnableHostClkReq( PHY_EnableHostClkReq(
IN PADAPTER Adapter IN struct adapter * Adapter
); );
BOOLEAN BOOLEAN
SetAntennaConfig92C( SetAntennaConfig92C(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u8 DefaultAnt IN u8 DefaultAnt
); );
#ifdef CONFIG_PHY_SETTING_WITH_ODM #ifdef CONFIG_PHY_SETTING_WITH_ODM
VOID VOID
storePwrIndexDiffRateOffset( storePwrIndexDiffRateOffset(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u32 RegAddr, IN u32 RegAddr,
IN u32 BitMask, IN u32 BitMask,
IN u32 Data IN u32 Data
@ -354,9 +354,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);
@ -421,7 +421,7 @@ storePwrIndexDiffRateOffset(
#endif #endif
#if(SIC_ENABLE == 1) #if(SIC_ENABLE == 1)
VOID SIC_Init(IN PADAPTER Adapter); VOID SIC_Init(IN struct adapter *Adapter);
#endif #endif

60
include/Hal8192CPhyCfg.h
View file

@ -250,18 +250,18 @@ typedef struct _R_ANTENNA_SELECT_CCK{
// //
// BB and RF register read/write // BB and RF register read/write
// //
u32 rtl8192c_PHY_QueryBBReg( IN PADAPTER Adapter, u32 rtl8192c_PHY_QueryBBReg( IN struct adapter *Adapter,
IN u32 RegAddr, IN u32 RegAddr,
IN u32 BitMask ); IN u32 BitMask );
void rtl8192c_PHY_SetBBReg( IN PADAPTER Adapter, void rtl8192c_PHY_SetBBReg( IN struct adapter *Adapter,
IN u32 RegAddr, IN u32 RegAddr,
IN u32 BitMask, IN u32 BitMask,
IN u32 Data ); IN u32 Data );
u32 rtl8192c_PHY_QueryRFReg( IN PADAPTER Adapter, u32 rtl8192c_PHY_QueryRFReg( IN struct adapter * Adapter,
IN RF_RADIO_PATH_E eRFPath, IN RF_RADIO_PATH_E eRFPath,
IN u32 RegAddr, IN u32 RegAddr,
IN u32 BitMask ); IN u32 BitMask );
void rtl8192c_PHY_SetRFReg( IN PADAPTER Adapter, void rtl8192c_PHY_SetRFReg( IN struct adapter * Adapter,
IN RF_RADIO_PATH_E eRFPath, IN RF_RADIO_PATH_E eRFPath,
IN u32 RegAddr, IN u32 RegAddr,
IN u32 BitMask, IN u32 BitMask,
@ -271,62 +271,62 @@ void rtl8192c_PHY_SetRFReg( IN PADAPTER Adapter,
// Initialization related function // Initialization related function
// //
/* MAC/BB/RF HAL config */ /* MAC/BB/RF HAL config */
int PHY_MACConfig8192C( IN PADAPTER Adapter ); int PHY_MACConfig8192C( IN struct adapter *Adapter );
int PHY_BBConfig8192C( IN PADAPTER Adapter ); int PHY_BBConfig8192C( IN struct adapter *Adapter );
int PHY_RFConfig8192C( IN PADAPTER Adapter ); int PHY_RFConfig8192C( IN struct adapter *Adapter );
/* RF config */ /* RF config */
int rtl8192c_PHY_ConfigRFWithParaFile( IN PADAPTER Adapter, int rtl8192c_PHY_ConfigRFWithParaFile( IN struct adapter *Adapter,
IN u8* pFileName, IN u8* pFileName,
IN RF_RADIO_PATH_E eRFPath); IN RF_RADIO_PATH_E eRFPath);
int rtl8192c_PHY_ConfigRFWithHeaderFile( IN PADAPTER Adapter, int rtl8192c_PHY_ConfigRFWithHeaderFile( IN struct adapter * Adapter,
IN RF_RADIO_PATH_E eRFPath); IN RF_RADIO_PATH_E eRFPath);
/* BB/RF readback check for making sure init OK */ /* BB/RF readback check for making sure init OK */
int rtl8192c_PHY_CheckBBAndRFOK( IN PADAPTER Adapter, int rtl8192c_PHY_CheckBBAndRFOK( IN struct adapter * Adapter,
IN HW90_BLOCK_E CheckBlock, IN HW90_BLOCK_E CheckBlock,
IN RF_RADIO_PATH_E eRFPath ); IN RF_RADIO_PATH_E eRFPath );
/* Read initi reg value for tx power setting. */ /* Read initi reg value for tx power setting. */
void rtl8192c_PHY_GetHWRegOriginalValue( IN PADAPTER Adapter ); void rtl8192c_PHY_GetHWRegOriginalValue( IN struct adapter * Adapter );
// //
// RF Power setting // RF Power setting
// //
//extern BOOLEAN PHY_SetRFPowerState(IN PADAPTER Adapter, //extern BOOLEAN PHY_SetRFPowerState(IN struct adapter * Adapter,
// IN RT_RF_POWER_STATE eRFPowerState); // IN RT_RF_POWER_STATE eRFPowerState);
// //
// BB TX Power R/W // BB TX Power R/W
// //
void PHY_GetTxPowerLevel8192C( IN PADAPTER Adapter, void PHY_GetTxPowerLevel8192C( IN struct adapter * Adapter,
OUT u32* powerlevel ); OUT u32* powerlevel );
void PHY_SetTxPowerLevel8192C( IN PADAPTER Adapter, void PHY_SetTxPowerLevel8192C( IN struct adapter * Adapter,
IN u8 channel ); IN u8 channel );
BOOLEAN PHY_UpdateTxPowerDbm8192C( IN PADAPTER Adapter, BOOLEAN PHY_UpdateTxPowerDbm8192C( IN struct adapter *Adapter,
IN int powerInDbm ); IN int powerInDbm );
// //
VOID VOID
PHY_ScanOperationBackup8192C(IN PADAPTER Adapter, PHY_ScanOperationBackup8192C(IN struct adapter *Adapter,
IN u8 Operation ); IN u8 Operation );
// //
// Switch bandwidth for 8192S // Switch bandwidth for 8192S
// //
//extern void PHY_SetBWModeCallback8192C( IN PRT_TIMER pTimer ); //extern void PHY_SetBWModeCallback8192C( IN PRT_TIMER pTimer );
void PHY_SetBWMode8192C( IN PADAPTER pAdapter, void PHY_SetBWMode8192C( IN struct adapter * pAdapter,
IN HT_CHANNEL_WIDTH ChnlWidth, IN HT_CHANNEL_WIDTH ChnlWidth,
IN unsigned char Offset ); IN unsigned char Offset );
// //
// Set FW CMD IO for 8192S. // Set FW CMD IO for 8192S.
// //
//extern BOOLEAN HalSetIO8192C( IN PADAPTER Adapter, //extern BOOLEAN HalSetIO8192C( IN struct adapter * Adapter,
// IN IO_TYPE IOType); // IN IO_TYPE IOType);
// //
// Set A2 entry to fw for 8192S // Set A2 entry to fw for 8192S
// //
extern void FillA2Entry8192C( IN PADAPTER Adapter, extern void FillA2Entry8192C( IN struct adapter * Adapter,
IN u8 index, IN u8 index,
IN u8* val); IN u8* val);
@ -335,52 +335,52 @@ extern void FillA2Entry8192C( IN PADAPTER Adapter,
// channel switch related funciton // channel switch related funciton
// //
//extern void PHY_SwChnlCallback8192C( IN PRT_TIMER pTimer ); //extern void PHY_SwChnlCallback8192C( IN PRT_TIMER pTimer );
void PHY_SwChnl8192C( IN PADAPTER pAdapter, void PHY_SwChnl8192C( IN struct adapter * pAdapter,
IN u8 channel ); IN u8 channel );
// Call after initialization // Call after initialization
void PHY_SwChnlPhy8192C( IN PADAPTER pAdapter, void PHY_SwChnlPhy8192C( IN struct adapter * pAdapter,
IN u8 channel ); IN u8 channel );
void ChkFwCmdIoDone( IN PADAPTER Adapter); void ChkFwCmdIoDone( IN struct adapter *Adapter);
// //
// BB/MAC/RF other monitor API // BB/MAC/RF other monitor API
// //
void PHY_SetMonitorMode8192C(IN PADAPTER pAdapter, void PHY_SetMonitorMode8192C(IN struct adapter *pAdapter,
IN BOOLEAN bEnableMonitorMode ); IN BOOLEAN bEnableMonitorMode );
BOOLEAN PHY_CheckIsLegalRfPath8192C(IN PADAPTER pAdapter, BOOLEAN PHY_CheckIsLegalRfPath8192C(IN struct adapter *pAdapter,
IN u32 eRFPath ); IN u32 eRFPath );
VOID rtl8192c_PHY_SetRFPathSwitch(IN PADAPTER pAdapter, IN BOOLEAN bMain); VOID rtl8192c_PHY_SetRFPathSwitch(IN struct adapter *pAdapter, IN BOOLEAN bMain);
// //
// Modify the value of the hw register when beacon interval be changed. // Modify the value of the hw register when beacon interval be changed.
// //
void void
rtl8192c_PHY_SetBeaconHwReg( IN PADAPTER Adapter, rtl8192c_PHY_SetBeaconHwReg( IN struct adapter * Adapter,
IN u16 BeaconInterval ); IN u16 BeaconInterval );
extern VOID extern VOID
PHY_SwitchEphyParameter( PHY_SwitchEphyParameter(
IN PADAPTER Adapter IN struct adapter * Adapter
); );
extern VOID extern VOID
PHY_EnableHostClkReq( PHY_EnableHostClkReq(
IN PADAPTER Adapter IN struct adapter * Adapter
); );
BOOLEAN BOOLEAN
SetAntennaConfig92C( SetAntennaConfig92C(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u8 DefaultAnt IN u8 DefaultAnt
); );
#ifdef RTL8192C_RECONFIG_TO_1T1R #ifdef RTL8192C_RECONFIG_TO_1T1R
extern void PHY_Reconfig_To_1T1R(_adapter *padapter); extern void PHY_Reconfig_To_1T1R(struct adapter *padapter);
#endif #endif
/*--------------------------Exported Function prototype---------------------*/ /*--------------------------Exported Function prototype---------------------*/

76
include/Hal8192DPhyCfg.h
View file

@ -299,22 +299,22 @@ typedef struct _R_ANTENNA_SELECT_CCK{
// //
// BB and RF register read/write // BB and RF register read/write
// //
void rtl8192d_PHY_SetBBReg1Byte( IN PADAPTER Adapter, void rtl8192d_PHY_SetBBReg1Byte( IN struct adapter *Adapter,
IN u32 RegAddr, IN u32 RegAddr,
IN u32 BitMask, IN u32 BitMask,
IN u32 Data ); IN u32 Data );
u32 rtl8192d_PHY_QueryBBReg( IN PADAPTER Adapter, u32 rtl8192d_PHY_QueryBBReg( IN struct adapter *Adapter,
IN u32 RegAddr, IN u32 RegAddr,
IN u32 BitMask ); IN u32 BitMask );
void rtl8192d_PHY_SetBBReg( IN PADAPTER Adapter, void rtl8192d_PHY_SetBBReg( IN struct adapter *Adapter,
IN u32 RegAddr, IN u32 RegAddr,
IN u32 BitMask, IN u32 BitMask,
IN u32 Data ); IN u32 Data );
u32 rtl8192d_PHY_QueryRFReg( IN PADAPTER Adapter, u32 rtl8192d_PHY_QueryRFReg( IN struct adapter * Adapter,
IN RF_RADIO_PATH_E eRFPath, IN RF_RADIO_PATH_E eRFPath,
IN u32 RegAddr, IN u32 RegAddr,
IN u32 BitMask ); IN u32 BitMask );
void rtl8192d_PHY_SetRFReg( IN PADAPTER Adapter, void rtl8192d_PHY_SetRFReg( IN struct adapter * Adapter,
IN RF_RADIO_PATH_E eRFPath, IN RF_RADIO_PATH_E eRFPath,
IN u32 RegAddr, IN u32 RegAddr,
IN u32 BitMask, IN u32 BitMask,
@ -324,62 +324,62 @@ void rtl8192d_PHY_SetRFReg( IN PADAPTER Adapter,
// Initialization related function // Initialization related function
// //
/* MAC/BB/RF HAL config */ /* MAC/BB/RF HAL config */
extern int PHY_MACConfig8192D( IN PADAPTER Adapter ); extern int PHY_MACConfig8192D( IN struct adapter *Adapter );
extern int PHY_BBConfig8192D( IN PADAPTER Adapter ); extern int PHY_BBConfig8192D( IN struct adapter *Adapter );
extern int PHY_RFConfig8192D( IN PADAPTER Adapter ); extern int PHY_RFConfig8192D( IN struct adapter *Adapter );
/* RF config */ /* RF config */
int rtl8192d_PHY_ConfigRFWithParaFile( IN PADAPTER Adapter, int rtl8192d_PHY_ConfigRFWithParaFile( IN struct adapter *Adapter,
IN u8* pFileName, IN u8* pFileName,
IN RF_RADIO_PATH_E eRFPath); IN RF_RADIO_PATH_E eRFPath);
int rtl8192d_PHY_ConfigRFWithHeaderFile( IN PADAPTER Adapter, int rtl8192d_PHY_ConfigRFWithHeaderFile( IN struct adapter * Adapter,
IN RF_CONTENT Content, IN RF_CONTENT Content,
IN RF_RADIO_PATH_E eRFPath); IN RF_RADIO_PATH_E eRFPath);
/* BB/RF readback check for making sure init OK */ /* BB/RF readback check for making sure init OK */
int rtl8192d_PHY_CheckBBAndRFOK( IN PADAPTER Adapter, int rtl8192d_PHY_CheckBBAndRFOK( IN struct adapter * Adapter,
IN HW90_BLOCK_E CheckBlock, IN HW90_BLOCK_E CheckBlock,
IN RF_RADIO_PATH_E eRFPath ); IN RF_RADIO_PATH_E eRFPath );
/* Read initi reg value for tx power setting. */ /* Read initi reg value for tx power setting. */
void rtl8192d_PHY_GetHWRegOriginalValue( IN PADAPTER Adapter ); void rtl8192d_PHY_GetHWRegOriginalValue( IN struct adapter * Adapter );
// //
// RF Power setting // RF Power setting
// //
//extern BOOLEAN PHY_SetRFPowerState(IN PADAPTER Adapter, //extern BOOLEAN PHY_SetRFPowerState(IN struct adapter * Adapter,
// IN RT_RF_POWER_STATE eRFPowerState); // IN RT_RF_POWER_STATE eRFPowerState);
// //
// BB TX Power R/W // BB TX Power R/W
// //
void PHY_GetTxPowerLevel8192D( IN PADAPTER Adapter, void PHY_GetTxPowerLevel8192D( IN struct adapter * Adapter,
OUT u32* powerlevel ); OUT u32* powerlevel );
void PHY_SetTxPowerLevel8192D( IN PADAPTER Adapter, void PHY_SetTxPowerLevel8192D( IN struct adapter * Adapter,
IN u8 channel ); IN u8 channel );
BOOLEAN PHY_UpdateTxPowerDbm8192D( IN PADAPTER Adapter, BOOLEAN PHY_UpdateTxPowerDbm8192D( IN struct adapter *Adapter,
IN int powerInDbm ); IN int powerInDbm );
// //
VOID VOID
PHY_ScanOperationBackup8192D(IN PADAPTER Adapter, PHY_ScanOperationBackup8192D(IN struct adapter *Adapter,
IN u8 Operation ); IN u8 Operation );
// //
// Switch bandwidth for 8192S // Switch bandwidth for 8192S
// //
//void PHY_SetBWModeCallback8192C( IN PRT_TIMER pTimer ); //void PHY_SetBWModeCallback8192C( IN PRT_TIMER pTimer );
void PHY_SetBWMode8192D( IN PADAPTER pAdapter, void PHY_SetBWMode8192D( IN struct adapter * pAdapter,
IN HT_CHANNEL_WIDTH ChnlWidth, IN HT_CHANNEL_WIDTH ChnlWidth,
IN unsigned char Offset ); IN unsigned char Offset );
// //
// Set FW CMD IO for 8192S. // Set FW CMD IO for 8192S.
// //
//extern BOOLEAN HalSetIO8192C( IN PADAPTER Adapter, //extern BOOLEAN HalSetIO8192C( IN struct adapter * Adapter,
// IN IO_TYPE IOType); // IN IO_TYPE IOType);
// //
// Set A2 entry to fw for 8192S // Set A2 entry to fw for 8192S
// //
extern void FillA2Entry8192C( IN PADAPTER Adapter, extern void FillA2Entry8192C( IN struct adapter * Adapter,
IN u8 index, IN u8 index,
IN u8* val); IN u8* val);
@ -388,22 +388,22 @@ extern void FillA2Entry8192C( IN PADAPTER Adapter,
// channel switch related funciton // channel switch related funciton
// //
//extern void PHY_SwChnlCallback8192C( IN PRT_TIMER pTimer ); //extern void PHY_SwChnlCallback8192C( IN PRT_TIMER pTimer );
void PHY_SwChnl8192D( IN PADAPTER pAdapter, void PHY_SwChnl8192D( IN struct adapter * pAdapter,
IN u8 channel ); IN u8 channel );
// Call after initialization // Call after initialization
void PHY_SwChnlPhy8192D( IN PADAPTER pAdapter, void PHY_SwChnlPhy8192D( IN struct adapter * pAdapter,
IN u8 channel ); IN u8 channel );
extern void ChkFwCmdIoDone( IN PADAPTER Adapter); extern void ChkFwCmdIoDone( IN struct adapter *Adapter);
// //
// BB/MAC/RF other monitor API // BB/MAC/RF other monitor API
// //
void PHY_SetMonitorMode8192D(IN PADAPTER pAdapter, void PHY_SetMonitorMode8192D(IN struct adapter *pAdapter,
IN BOOLEAN bEnableMonitorMode ); IN BOOLEAN bEnableMonitorMode );
BOOLEAN PHY_CheckIsLegalRfPath8192D(IN PADAPTER pAdapter, BOOLEAN PHY_CheckIsLegalRfPath8192D(IN struct adapter *pAdapter,
IN u32 eRFPath ); IN u32 eRFPath );
@ -411,66 +411,66 @@ BOOLEAN PHY_CheckIsLegalRfPath8192D(IN PADAPTER pAdapter,
// Modify the value of the hw register when beacon interval be changed. // Modify the value of the hw register when beacon interval be changed.
// //
void void
rtl8192d_PHY_SetBeaconHwReg( IN PADAPTER Adapter, rtl8192d_PHY_SetBeaconHwReg( IN struct adapter * Adapter,
IN u16 BeaconInterval ); IN u16 BeaconInterval );
extern VOID extern VOID
PHY_SwitchEphyParameter( PHY_SwitchEphyParameter(
IN PADAPTER Adapter IN struct adapter * Adapter
); );
extern VOID extern VOID
PHY_EnableHostClkReq( PHY_EnableHostClkReq(
IN PADAPTER Adapter IN struct adapter * Adapter
); );
BOOLEAN BOOLEAN
SetAntennaConfig92C( SetAntennaConfig92C(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u8 DefaultAnt IN u8 DefaultAnt
); );
VOID VOID
PHY_UpdateBBRFConfiguration8192D( PHY_UpdateBBRFConfiguration8192D(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN BOOLEAN bisBandSwitch IN BOOLEAN bisBandSwitch
); );
VOID PHY_ReadMacPhyMode92D( VOID PHY_ReadMacPhyMode92D(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN BOOLEAN AutoloadFail IN BOOLEAN AutoloadFail
); );
VOID PHY_ConfigMacPhyMode92D( VOID PHY_ConfigMacPhyMode92D(
IN PADAPTER Adapter IN struct adapter *Adapter
); );
VOID PHY_ConfigMacPhyModeInfo92D( VOID PHY_ConfigMacPhyModeInfo92D(
IN PADAPTER Adapter IN struct adapter *Adapter
); );
VOID PHY_ConfigMacCoexist_RFPage92D( VOID PHY_ConfigMacCoexist_RFPage92D(
IN PADAPTER Adapter IN struct adapter *Adapter
); );
VOID VOID
rtl8192d_PHY_InitRxSetting( rtl8192d_PHY_InitRxSetting(
IN PADAPTER Adapter IN struct adapter *Adapter
); );
VOID VOID
rtl8192d_PHY_SetRFPathSwitch(IN PADAPTER pAdapter, IN BOOLEAN bMain); rtl8192d_PHY_SetRFPathSwitch(IN struct adapter *pAdapter, IN BOOLEAN bMain);
VOID VOID
HalChangeCCKStatus8192D( HalChangeCCKStatus8192D(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN BOOLEAN bCCKDisable IN BOOLEAN bCCKDisable
); );
VOID VOID
PHY_InitPABias92D(IN PADAPTER Adapter); PHY_InitPABias92D(IN struct adapter *Adapter);
/*--------------------------Exported Function prototype---------------------*/ /*--------------------------Exported Function prototype---------------------*/

6
include/Hal8723APhyCfg.h
View file

@ -22,9 +22,9 @@
#include <Hal8192CPhyCfg.h> #include <Hal8192CPhyCfg.h>
/* MAC/BB/RF HAL config */ /* MAC/BB/RF HAL config */
int PHY_BBConfig8723A( IN PADAPTER Adapter ); int PHY_BBConfig8723A( IN struct adapter *Adapter );
int PHY_RFConfig8723A( IN PADAPTER Adapter ); int PHY_RFConfig8723A( IN struct adapter *Adapter );
s32 PHY_MACConfig8723A(PADAPTER padapter); s32 PHY_MACConfig8723A(struct adapter *padapter);
#endif #endif

2
include/HalPwrSeqCmd.h
View file

@ -128,7 +128,7 @@ typedef 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,

28
include/drv_types.h
View file

@ -43,8 +43,6 @@ enum _NIC_VERSION {
}; };
typedef struct _ADAPTER _adapter, ADAPTER,*PADAPTER;
#ifdef CONFIG_80211N_HT #ifdef CONFIG_80211N_HT
#include <rtw_ht.h> #include <rtw_ht.h>
#endif #endif
@ -235,10 +233,10 @@ struct registry_priv
#else #else
#define is_primary_adapter(adapter) (1) #define is_primary_adapter(adapter) (1)
#endif #endif
#define GET_PRIMARY_ADAPTER(padapter) (((_adapter *)padapter)->dvobj->if1) #define GET_PRIMARY_ADAPTER(padapter) (((struct adapter *)padapter)->dvobj->if1)
#define GET_IFACE_NUMS(padapter) (((_adapter *)padapter)->dvobj->iface_nums) #define GET_IFACE_NUMS(padapter) (((struct adapter *)padapter)->dvobj->iface_nums)
#define GET_ADAPTER(padapter, iface_id) (((_adapter *)padapter)->dvobj->padapters[iface_id]) #define GET_ADAPTER(padapter, iface_id) (((struct adapter *)padapter)->dvobj->padapters[iface_id])
enum _IFACE_ID { enum _IFACE_ID {
IFACE_ID0, //maping to PRIMARY_ADAPTER IFACE_ID0, //maping to PRIMARY_ADAPTER
@ -250,8 +248,8 @@ enum _IFACE_ID {
struct dvobj_priv struct dvobj_priv
{ {
_adapter *if1; //PRIMARY_ADAPTER struct adapter *if1; //PRIMARY_ADAPTER
_adapter *if2; //SECONDARY_ADAPTER struct adapter *if2; //SECONDARY_ADAPTER
s32 processing_dev_remove; s32 processing_dev_remove;
@ -266,7 +264,7 @@ struct dvobj_priv
unsigned char oper_ch_offset;//PRIME_CHNL_OFFSET unsigned char oper_ch_offset;//PRIME_CHNL_OFFSET
u32 on_oper_ch_time; u32 on_oper_ch_time;
_adapter *padapters[IFACE_ID_MAX]; struct adapter *padapters[IFACE_ID_MAX];
u8 iface_nums; // total number of ifaces used runtime u8 iface_nums; // total number of ifaces used runtime
//For 92D, DMDP have 2 interface. //For 92D, DMDP have 2 interface.
@ -400,9 +398,9 @@ struct proxim {
bool proxim_on; bool proxim_on;
void *proximity_priv; void *proximity_priv;
int (*proxim_rx)(_adapter *padapter, int (*proxim_rx)(struct adapter *padapter,
union recv_frame *precv_frame); union recv_frame *precv_frame);
u8 (*proxim_get_var)(_adapter* padapter, u8 type); u8 (*proxim_get_var)(struct adapter* padapter, u8 type);
}; };
#endif //CONFIG_INTEL_PROXIM #endif //CONFIG_INTEL_PROXIM
@ -423,7 +421,7 @@ typedef struct loopbackdata
}LOOPBACKDATA, *PLOOPBACKDATA; }LOOPBACKDATA, *PLOOPBACKDATA;
#endif #endif
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
@ -506,8 +504,8 @@ struct _ADAPTER{
_thread_hdl_ xmitThread; _thread_hdl_ xmitThread;
_thread_hdl_ recvThread; _thread_hdl_ recvThread;
void (*intf_start)(_adapter * adapter); void (*intf_start)(struct adapter * adapter);
void (*intf_stop)(_adapter * adapter); void (*intf_stop)(struct adapter * adapter);
_nic_hdl pnetdev; _nic_hdl pnetdev;
@ -548,7 +546,7 @@ struct _ADAPTER{
u8 bDisableAutosuspend; u8 bDisableAutosuspend;
#endif #endif
_adapter *pbuddy_adapter; struct adapter *pbuddy_adapter;
#if defined(CONFIG_CONCURRENT_MODE) || defined(CONFIG_DUALMAC_CONCURRENT) #if defined(CONFIG_CONCURRENT_MODE) || defined(CONFIG_DUALMAC_CONCURRENT)
u8 isprimary; //is primary adapter or not u8 isprimary; //is primary adapter or not
@ -604,7 +602,7 @@ struct _ADAPTER{
#define adapter_to_dvobj(adapter) (adapter->dvobj) #define adapter_to_dvobj(adapter) (adapter->dvobj)
#define adapter_to_pwrctl(adapter) (&(adapter->dvobj->pwrctl_priv)) #define adapter_to_pwrctl(adapter) (&(adapter->dvobj->pwrctl_priv))
int rtw_handle_dualmac(_adapter *adapter, bool init); int rtw_handle_dualmac(struct adapter *adapter, bool init);
__inline static u8 *myid(struct eeprom_priv *peepriv) __inline static u8 *myid(struct eeprom_priv *peepriv)
{ {

4
include/gspi_hal.h
View file

@ -20,9 +20,9 @@
#ifndef __GSPI_HAL_H__ #ifndef __GSPI_HAL_H__
#define __GSPI_HAL_H__ #define __GSPI_HAL_H__
void spi_int_dpc(PADAPTER padapter); void spi_int_dpc(struct adapter *padapter);
void rtl8188es_set_hal_ops(PADAPTER padapter); void rtl8188es_set_hal_ops(struct adapter *padapter);
#define hal_set_hal_ops rtl8188es_set_hal_ops #define hal_set_hal_ops rtl8188es_set_hal_ops
#endif //__GSPI_HAL_H__ #endif //__GSPI_HAL_H__

24
include/gspi_ops.h
View file

@ -146,19 +146,19 @@ struct spi_more_data {
unsigned long len; unsigned long len;
}; };
void rtl8188es_set_hal_ops(PADAPTER padapter); void rtl8188es_set_hal_ops(struct adapter *padapter);
#define set_hal_ops rtl8188es_set_hal_ops #define set_hal_ops rtl8188es_set_hal_ops
extern void spi_set_chip_endian(PADAPTER padapter); extern void spi_set_chip_endian(struct adapter *padapter);
extern void spi_set_intf_ops(struct _io_ops *pops); extern void spi_set_intf_ops(struct _io_ops *pops);
extern void spi_set_chip_endian(PADAPTER padapter); extern void spi_set_chip_endian(struct adapter *padapter);
extern void InitInterrupt8723ASdio(PADAPTER padapter); extern void InitInterrupt8723ASdio(struct adapter *padapter);
extern void InitSysInterrupt8723ASdio(PADAPTER padapter); extern void InitSysInterrupt8723ASdio(struct adapter *padapter);
extern void EnableInterrupt8723ASdio(PADAPTER padapter); extern void EnableInterrupt8723ASdio(struct adapter *padapter);
extern void DisableInterrupt8723ASdio(PADAPTER padapter); extern void DisableInterrupt8723ASdio(struct adapter *padapter);
extern void spi_int_hdl(PADAPTER padapter); extern void spi_int_hdl(struct adapter *padapter);
extern u8 HalQueryTxBufferStatus8723ASdio(PADAPTER padapter); extern u8 HalQueryTxBufferStatus8723ASdio(struct adapter *padapter);
extern void InitInterrupt8188ESdio(PADAPTER padapter); extern void InitInterrupt8188ESdio(struct adapter *padapter);
extern void EnableInterrupt8188ESdio(PADAPTER padapter); extern void EnableInterrupt8188ESdio(struct adapter *padapter);
extern void DisableInterrupt8188ESdio(PADAPTER padapter); extern void DisableInterrupt8188ESdio(struct adapter *padapter);
#endif //__GSPI_OPS_H__ #endif //__GSPI_OPS_H__

6
include/gspi_osintf.h
View file

@ -26,9 +26,9 @@
#include <drv_types.h> #include <drv_types.h>
#ifdef PLATFORM_OS_CE #ifdef PLATFORM_OS_CE
extern NDIS_STATUS ce_sd_get_dev_hdl(PADAPTER padapter); extern NDIS_STATUS ce_sd_get_dev_hdl(struct adapter *padapter);
SD_API_STATUS ce_sd_int_callback(SD_DEVICE_HANDLE hDevice, PADAPTER padapter); SD_API_STATUS ce_sd_int_callback(SD_DEVICE_HANDLE hDevice, struct adapter *padapter);
extern void sd_setup_irs(PADAPTER padapter); extern void sd_setup_irs(struct adapter *padapter);
#endif #endif
#endif #endif

6
include/h2clbk.h
View file

@ -26,11 +26,11 @@
#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);

16
include/hal_com.h
View file

@ -153,7 +153,7 @@ void dump_chip_info(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(
IN PADAPTER padapter, IN struct adapter *padapter,
IN u8 hw_channel_plan, //channel plan from HW (efuse/eeprom) IN u8 hw_channel_plan, //channel plan from HW (efuse/eeprom)
IN u8 sw_channel_plan, //channel plan from SW (registry/module param) IN u8 sw_channel_plan, //channel plan from SW (registry/module param)
IN u8 def_channel_plan, //channel plan used when the former two is invalid IN u8 def_channel_plan, //channel plan used when the former two is invalid
@ -163,23 +163,23 @@ hal_com_get_channel_plan(
u8 MRateToHwRate(u8 rate); u8 MRateToHwRate(u8 rate);
void HalSetBrateCfg( void HalSetBrateCfg(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN u8 *mBratesOS, IN u8 *mBratesOS,
OUT u16 *pBrateCfg); OUT u16 *pBrateCfg);
BOOLEAN BOOLEAN
Hal_MappingOutPipe( Hal_MappingOutPipe(
IN PADAPTER pAdapter, IN struct adapter *pAdapter,
IN u8 NumOutPipe IN 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);
u8 SetHalDefVar(_adapter *adapter, HAL_DEF_VARIABLE variable, void *value); u8 SetHalDefVar(struct adapter *adapter, HAL_DEF_VARIABLE variable, void *value);
u8 GetHalDefVar(_adapter *adapter, HAL_DEF_VARIABLE variable, void *value); u8 GetHalDefVar(struct adapter *adapter, HAL_DEF_VARIABLE variable, void *value);
#endif //__HAL_COMMON_H__ #endif //__HAL_COMMON_H__

284
include/hal_intf.h
View file

@ -163,117 +163,117 @@ typedef 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);
void (*hal_power_off)(_adapter *padapter); void (*hal_power_off)(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);
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
void (*clear_interrupt)(_adapter *padapter); void (*clear_interrupt)(struct adapter *padapter);
#endif #endif
void (*set_bwmode_handler)(_adapter *padapter, HT_CHANNEL_WIDTH Bandwidth, u8 Offset); void (*set_bwmode_handler)(struct adapter *padapter, 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, HAL_DEF_VARIABLE eVariable, PVOID pValue); u8 (*GetHalDefVarHandler)(struct adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue);
u8 (*SetHalDefVarHandler)(_adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue); u8 (*SetHalDefVarHandler)(struct adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue);
void (*GetHalODMVarHandler)(_adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1,BOOLEAN bSet); void (*GetHalODMVarHandler)(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1,BOOLEAN bSet);
void (*SetHalODMVarHandler)(_adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1,BOOLEAN bSet); void (*SetHalODMVarHandler)(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1,BOOLEAN bSet);
void (*UpdateRAMaskHandler)(_adapter *padapter, u32 mac_id, u8 rssi_level); void (*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);
#ifdef CONFIG_ANTENNA_DIVERSITY #ifdef CONFIG_ANTENNA_DIVERSITY
u8 (*AntDivBeforeLinkHandler)(_adapter *padapter); u8 (*AntDivBeforeLinkHandler)(struct adapter *padapter);
void (*AntDivCompareHandler)(_adapter *padapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src); void (*AntDivCompareHandler)(struct adapter *padapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src);
#endif #endif
u8 (*interface_ps_func)(_adapter *padapter,HAL_INTF_PS_FUNC efunc_id, u8* val); u8 (*interface_ps_func)(struct adapter *padapter,HAL_INTF_PS_FUNC efunc_id, u8* val);
s32 (*hal_xmit)(_adapter *padapter, struct xmit_frame *pxmitframe); s32 (*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);
s32 (*hal_xmitframe_enqueue)(_adapter *padapter, struct xmit_frame *pxmitframe); s32 (*hal_xmitframe_enqueue)(struct adapter *padapter, struct xmit_frame *pxmitframe);
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, u32 eRFPath, u32 RegAddr, u32 BitMask); u32 (*read_rfreg)(struct adapter *padapter, u32 eRFPath, u32 RegAddr, u32 BitMask);
void (*write_rfreg)(_adapter *padapter, u32 eRFPath, u32 RegAddr, u32 BitMask, u32 Data); void (*write_rfreg)(struct adapter *padapter, u32 eRFPath, u32 RegAddr, u32 BitMask, u32 Data);
#ifdef CONFIG_HOSTAPD_MLME #ifdef CONFIG_HOSTAPD_MLME
s32 (*hostap_mgnt_xmit_entry)(_adapter *padapter, _pkt *pkt); s32 (*hostap_mgnt_xmit_entry)(struct adapter *padapter, _pkt *pkt);
#endif #endif
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, BOOLEAN bPseudoTest); void (*ReadEFuse)(struct adapter *padapter, u8 efuseType, u16 _offset, u16 _size_byte, u8 *pbuf, BOOLEAN bPseudoTest);
void (*EFUSEGetEfuseDefinition)(_adapter *padapter, u8 efuseType, u8 type, void *pOut, BOOLEAN bPseudoTest); void (*EFUSEGetEfuseDefinition)(struct adapter *padapter, u8 efuseType, u8 type, void *pOut, BOOLEAN bPseudoTest);
u16 (*EfuseGetCurrentSize)(_adapter *padapter, u8 efuseType, BOOLEAN bPseudoTest); u16 (*EfuseGetCurrentSize)(struct adapter *padapter, u8 efuseType, BOOLEAN bPseudoTest);
int (*Efuse_PgPacketRead)(_adapter *padapter, u8 offset, u8 *data, BOOLEAN bPseudoTest); int (*Efuse_PgPacketRead)(struct adapter *padapter, u8 offset, u8 *data, BOOLEAN bPseudoTest);
int (*Efuse_PgPacketWrite)(_adapter *padapter, u8 offset, u8 word_en, u8 *data, BOOLEAN bPseudoTest); int (*Efuse_PgPacketWrite)(struct adapter *padapter, u8 offset, u8 word_en, u8 *data, BOOLEAN bPseudoTest);
u8 (*Efuse_WordEnableDataWrite)(_adapter *padapter, u16 efuse_addr, u8 word_en, u8 *data, BOOLEAN bPseudoTest); u8 (*Efuse_WordEnableDataWrite)(struct adapter *padapter, u16 efuse_addr, u8 word_en, u8 *data, BOOLEAN bPseudoTest);
BOOLEAN (*Efuse_PgPacketWrite_BT)(_adapter *padapter, u8 offset, u8 word_en, u8 *data, BOOLEAN bPseudoTest); BOOLEAN (*Efuse_PgPacketWrite_BT)(struct adapter *padapter, u8 offset, u8 word_en, u8 *data, BOOLEAN bPseudoTest);
#ifdef DBG_CONFIG_ERROR_DETECT #ifdef DBG_CONFIG_ERROR_DETECT
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);
bool (*sreset_inprogress)(_adapter *padapter); bool (*sreset_inprogress)(struct adapter *padapter);
#endif #endif
#ifdef CONFIG_IOL #ifdef CONFIG_IOL
int (*IOL_exec_cmds_sync)(_adapter *padapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt); int (*IOL_exec_cmds_sync)(struct adapter *padapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt);
#endif #endif
#ifdef CONFIG_XMIT_THREAD_MODE #ifdef CONFIG_XMIT_THREAD_MODE
s32 (*xmit_thread_handler)(_adapter *padapter); s32 (*xmit_thread_handler)(struct adapter *padapter);
#endif #endif
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
}; };
@ -317,34 +317,34 @@ typedef 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))
@ -386,102 +386,102 @@ 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);
void rtw_hal_power_off(_adapter *padapter); void rtw_hal_power_off(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, HAL_DEF_VARIABLE eVariable, PVOID pValue); u8 rtw_hal_set_def_var(struct adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue);
u8 rtw_hal_get_def_var(_adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue); u8 rtw_hal_get_def_var(struct adapter *padapter, HAL_DEF_VARIABLE eVariable, PVOID pValue);
void rtw_hal_set_odm_var(_adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1,BOOLEAN bSet); void rtw_hal_set_odm_var(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1,BOOLEAN bSet);
void rtw_hal_get_odm_var(_adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1,BOOLEAN bSet); void rtw_hal_get_odm_var(struct adapter *padapter, HAL_ODM_VARIABLE eVariable, PVOID pValue1,BOOLEAN 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,HAL_INTF_PS_FUNC efunc_id, u8* val); u8 rtw_hal_intf_ps_func(struct adapter *padapter,HAL_INTF_PS_FUNC efunc_id, u8* val);
s32 rtw_hal_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe); s32 rtw_hal_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitframe);
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(struct sta_info *psta, u8 rssi_level); void rtw_hal_update_ra_mask(struct sta_info *psta, u8 rssi_level);
void rtw_hal_add_ra_tid(_adapter *padapter, u32 bitmap, u8 arg, u8 rssi_level); void rtw_hal_add_ra_tid(struct adapter *padapter, u32 bitmap, u8 arg, u8 rssi_level);
void rtw_hal_start_thread(_adapter *padapter); void rtw_hal_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, u32 eRFPath, u32 RegAddr, u32 BitMask); u32 rtw_hal_read_rfreg(struct adapter *padapter, u32 eRFPath, u32 RegAddr, u32 BitMask);
void rtw_hal_write_rfreg(_adapter *padapter, u32 eRFPath, u32 RegAddr, u32 BitMask, u32 Data); void rtw_hal_write_rfreg(struct adapter *padapter, u32 eRFPath, u32 RegAddr, u32 BitMask, u32 Data);
s32 rtw_hal_interrupt_handler(_adapter *padapter); s32 rtw_hal_interrupt_handler(struct adapter *padapter);
void rtw_hal_set_bwmode(_adapter *padapter, HT_CHANNEL_WIDTH Bandwidth, u8 Offset); void rtw_hal_set_bwmode(struct adapter *padapter, 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);
#ifdef CONFIG_ANTENNA_DIVERSITY #ifdef CONFIG_ANTENNA_DIVERSITY
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, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src); void rtw_hal_antdiv_rssi_compared(struct adapter *padapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src);
#endif #endif
#ifdef CONFIG_HOSTAPD_MLME #ifdef CONFIG_HOSTAPD_MLME
s32 rtw_hal_hostap_mgnt_xmit_entry(_adapter *padapter, _pkt *pkt); s32 rtw_hal_hostap_mgnt_xmit_entry(struct adapter *padapter, _pkt *pkt);
#endif #endif
#ifdef DBG_CONFIG_ERROR_DETECT #ifdef DBG_CONFIG_ERROR_DETECT
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);
bool rtw_hal_sreset_inprogress(_adapter *padapter); bool rtw_hal_sreset_inprogress(struct adapter *padapter);
#endif #endif
#ifdef CONFIG_IOL #ifdef CONFIG_IOL
int rtw_hal_iol_cmd(ADAPTER *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt); int rtw_hal_iol_cmd(struct adapter *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt);
#endif #endif
#ifdef CONFIG_XMIT_THREAD_MODE #ifdef CONFIG_XMIT_THREAD_MODE
s32 rtw_hal_xmit_thread_handler(_adapter *padapter); s32 rtw_hal_xmit_thread_handler(struct adapter *padapter);
#endif #endif
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__

34
include/ioctl_cfg80211.h
View file

@ -81,7 +81,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;
_lock scan_req_lock; _lock scan_req_lock;
@ -109,37 +109,37 @@ struct rtw_wdev_priv
#define wdev_to_priv(w) ((struct rtw_wdev_priv *)(wdev_priv(w))) #define wdev_to_priv(w) ((struct rtw_wdev_priv *)(wdev_priv(w)))
#define wiphy_to_adapter(x) (_adapter *)(((struct rtw_wdev_priv*)wiphy_priv(x))->padapter) #define wiphy_to_adapter(x) (struct adapter *)(((struct rtw_wdev_priv*)wiphy_priv(x))->padapter)
#define wiphy_to_wdev(x) (struct wireless_dev *)(((struct rtw_wdev_priv*)wiphy_priv(x))->rtw_wdev) #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);
struct cfg80211_bss *rtw_cfg80211_inform_bss(_adapter *padapter, struct wlan_network *pnetwork); struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wlan_network *pnetwork);
int rtw_cfg80211_check_bss(_adapter *padapter); int rtw_cfg80211_check_bss(struct adapter *padapter);
void rtw_cfg80211_ibss_indicate_connect(_adapter *padapter); void rtw_cfg80211_ibss_indicate_connect(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(adapter, freq, sig_dbm, buf, len, gfp) cfg80211_rx_mgmt((adapter)->pnetdev, freq, buf, len, gfp) #define rtw_cfg80211_rx_mgmt(adapter, freq, sig_dbm, buf, len, gfp) cfg80211_rx_mgmt((adapter)->pnetdev, freq, buf, len, gfp)

12
include/mlme_osdep.h
View file

@ -28,13 +28,13 @@
extern int time_after(u32 now, u32 old); extern int time_after(u32 now, u32 old);
#endif #endif
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_

42
include/osdep_intf.h
View file

@ -65,25 +65,25 @@ The protection mechanism is through the pending queue.
}; };
#ifdef CONFIG_R871X_TEST #ifdef CONFIG_R871X_TEST
int rtw_start_pseudo_adhoc(_adapter *padapter); int rtw_start_pseudo_adhoc(struct adapter *padapter);
int rtw_stop_pseudo_adhoc(_adapter *padapter); int rtw_stop_pseudo_adhoc(struct adapter *padapter);
#endif #endif
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);
@ -97,32 +97,32 @@ static void rtw_proc_init_one(struct net_device *dev){}
static void rtw_proc_remove_one(struct net_device *dev){} static void rtw_proc_remove_one(struct net_device *dev){}
#endif //!CONFIG_PROC_DEBUG #endif //!CONFIG_PROC_DEBUG
void rtw_ips_dev_unload(_adapter *padapter); void rtw_ips_dev_unload(struct adapter *padapter);
#ifdef CONFIG_RF_GAIN_OFFSET #ifdef CONFIG_RF_GAIN_OFFSET
void rtw_bb_rf_gain_offset(_adapter *padapter); void rtw_bb_rf_gain_offset(struct adapter *padapter);
#endif //CONFIG_RF_GAIN_OFFSET #endif //CONFIG_RF_GAIN_OFFSET
#ifdef CONFIG_IPS #ifdef CONFIG_IPS
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);
#endif #endif
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
struct _io_ops; struct _io_ops;
_adapter *rtw_drv_if2_init(_adapter *primary_padapter, void (*set_intf_ops)(struct _io_ops *pops)); struct adapter *rtw_drv_if2_init(struct adapter *primary_padapter, void (*set_intf_ops)(struct _io_ops *pops));
void rtw_drv_if2_free(_adapter *if2); void rtw_drv_if2_free(struct adapter *if2);
void rtw_drv_if2_stop(_adapter *if2); void rtw_drv_if2_stop(struct adapter *if2);
#endif #endif
int rtw_drv_register_netdev(_adapter *padapter); int rtw_drv_register_netdev(struct adapter *padapter);
void rtw_ndev_destructor(_nic_hdl ndev); void rtw_ndev_destructor(_nic_hdl ndev);
int rtw_suspend_common(_adapter *padapter); int rtw_suspend_common(struct adapter *padapter);
int rtw_resume_common(_adapter *padapter); int rtw_resume_common(struct adapter *padapter);
#ifdef CONFIG_ARP_KEEP_ALIVE #ifdef CONFIG_ARP_KEEP_ALIVE
int rtw_gw_addr_query(_adapter *padapter); int rtw_gw_addr_query(struct adapter *padapter);
#endif #endif
#endif //_OSDEP_INTF_H_ #endif //_OSDEP_INTF_H_

2
include/pci_hal.h
View file

@ -158,7 +158,7 @@ static inline void NdisRawReadPortUlong(u32 port, u32 *pval)
//*pval = readl((u8 *)RegAddr(port)); //*pval = readl((u8 *)RegAddr(port));
} }
void rtl8188ee_set_hal_ops(_adapter * padapter); void rtl8188ee_set_hal_ops(struct adapter * padapter);
#define hal_set_hal_ops rtl8188ee_set_hal_ops #define hal_set_hal_ops rtl8188ee_set_hal_ops
#endif //__PCIE_HAL_H__ #endif //__PCIE_HAL_H__

10
include/pci_ops.h
View file

@ -26,13 +26,13 @@
#include <osdep_intf.h> #include <osdep_intf.h>
u32 rtl8188ee_init_desc_ring(_adapter * padapter); u32 rtl8188ee_init_desc_ring(struct adapter * padapter);
u32 rtl8188ee_free_desc_ring(_adapter * padapter); u32 rtl8188ee_free_desc_ring(struct adapter * padapter);
void rtl8188ee_reset_desc_ring(_adapter * padapter); void rtl8188ee_reset_desc_ring(struct adapter * padapter);
#ifdef CONFIG_64BIT_DMA #ifdef CONFIG_64BIT_DMA
u8 PlatformEnable88EEDMA64(PADAPTER Adapter); u8 PlatformEnable88EEDMA64(struct adapter *Adapter);
#endif #endif
int rtl8188ee_interrupt(PADAPTER Adapter); int rtl8188ee_interrupt(struct adapter *Adapter);
void rtl8188ee_xmit_tasklet(void *priv); void rtl8188ee_xmit_tasklet(void *priv);
void rtl8188ee_recv_tasklet(void *priv); void rtl8188ee_recv_tasklet(void *priv);
void rtl8188ee_prepare_bcn_tasklet(void *priv); void rtl8188ee_prepare_bcn_tasklet(void *priv);

4
include/pci_osintf.h
View file

@ -25,8 +25,8 @@
#include <drv_types.h> #include <drv_types.h>
void rtw_pci_disable_aspm(_adapter *padapter); void rtw_pci_disable_aspm(struct adapter *padapter);
void rtw_pci_enable_aspm(_adapter *padapter); void rtw_pci_enable_aspm(struct adapter *padapter);
#endif #endif

20
include/recv_osdep.h
View file

@ -25,31 +25,31 @@
#include <drv_types.h> #include <drv_types.h>
extern sint _rtw_init_recv_priv(struct recv_priv *precvpriv, _adapter *padapter); extern sint _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter);
extern void _rtw_free_recv_priv (struct recv_priv *precvpriv); extern 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(IN _nic_hdl cnxt, IN _pkt *preturnedpkt); extern void rtw_recv_returnpacket(IN _nic_hdl cnxt, IN _pkt *preturnedpkt);
extern void rtw_hostapd_mlme_rx(_adapter *padapter, union recv_frame *precv_frame); extern void rtw_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);

26
include/rtl8188e_cmd.h
View file

@ -153,24 +153,24 @@ 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, u16 mstatus_rpt ); void rtl8188e_set_FwMediaStatus_cmd(struct adapter *padapter, u16 mstatus_rpt );
#ifdef CONFIG_TSF_RESET_OFFLOAD #ifdef CONFIG_TSF_RESET_OFFLOAD
//u8 rtl8188e_reset_tsf(_adapter *padapter, u8 reset_port); //u8 rtl8188e_reset_tsf(struct adapter *padapter, u8 reset_port);
int reset_tsf(PADAPTER Adapter, u8 reset_port ); int reset_tsf(struct adapter *Adapter, u8 reset_port );
#endif // CONFIG_TSF_RESET_OFFLOAD #endif // CONFIG_TSF_RESET_OFFLOAD
#define H2C_8188E_RSVDPAGE_LOC_LEN 5 #define H2C_8188E_RSVDPAGE_LOC_LEN 5
@ -236,8 +236,8 @@ typedef struct _SETAOAC_GLOBAL_INFO{
#define FW_WOW_FW_UNICAST_EN BIT(7) #define FW_WOW_FW_UNICAST_EN BIT(7)
#define FW_ADOPT_USER BIT(1) #define FW_ADOPT_USER BIT(1)
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
//---------------------------------------------------------------------------------------------------------// //---------------------------------------------------------------------------------------------------------//

16
include/rtl8188e_dm.h
View file

@ -162,18 +162,18 @@ struct dm_priv
}; };
void rtl8188e_init_dm_priv(IN PADAPTER Adapter); void rtl8188e_init_dm_priv(IN struct adapter *Adapter);
void rtl8188e_deinit_dm_priv(IN PADAPTER Adapter); void rtl8188e_deinit_dm_priv(IN struct adapter *Adapter);
void rtl8188e_InitHalDm(IN PADAPTER Adapter); void rtl8188e_InitHalDm(IN struct adapter *Adapter);
void rtl8188e_HalDmWatchDog(IN PADAPTER Adapter); void rtl8188e_HalDmWatchDog(IN struct adapter *Adapter);
//VOID rtl8192c_dm_CheckTXPowerTracking(IN PADAPTER Adapter); //VOID rtl8192c_dm_CheckTXPowerTracking(IN struct adapter *Adapter);
//void rtl8192c_dm_RF_Saving(IN PADAPTER pAdapter, IN u8 bForceInNormal); //void rtl8192c_dm_RF_Saving(IN struct adapter *pAdapter, IN u8 bForceInNormal);
#ifdef CONFIG_ANTENNA_DIVERSITY #ifdef CONFIG_ANTENNA_DIVERSITY
void AntDivCompare8188E(PADAPTER Adapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src); void AntDivCompare8188E(struct adapter *Adapter, WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src);
u8 AntDivBeforeLink8188E(PADAPTER Adapter ); u8 AntDivBeforeLink8188E(struct adapter *Adapter );
#endif #endif
#endif #endif

64
include/rtl8188e_hal.h
View file

@ -650,64 +650,64 @@ typedef struct hal_data_8188e HAL_DATA_TYPE, *PHAL_DATA_TYPE;
//#define RT_IS_FUNC_DISABLED(__pAdapter, __FuncBits) ( (__pAdapter)->DisabledFunctions & (__FuncBits) ) //#define RT_IS_FUNC_DISABLED(__pAdapter, __FuncBits) ( (__pAdapter)->DisabledFunctions & (__FuncBits) )
#ifdef CONFIG_PCI_HCI #ifdef CONFIG_PCI_HCI
void InterruptRecognized8188EE(PADAPTER Adapter, PRT_ISR_CONTENT pIsrContent); void InterruptRecognized8188EE(struct adapter *Adapter, PRT_ISR_CONTENT pIsrContent);
void UpdateInterruptMask8188EE(PADAPTER Adapter, u32 AddMSR, u32 AddMSR1, u32 RemoveMSR, u32 RemoveMSR1); void UpdateInterruptMask8188EE(struct adapter *Adapter, u32 AddMSR, u32 AddMSR1, u32 RemoveMSR, u32 RemoveMSR1);
#endif //CONFIG_PCI_HCI #endif //CONFIG_PCI_HCI
// rtl8188e_hal_init.c // rtl8188e_hal_init.c
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
s32 rtl8188e_FirmwareDownload(PADAPTER padapter, BOOLEAN bUsedWoWLANFw); s32 rtl8188e_FirmwareDownload(struct adapter *padapter, BOOLEAN 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);
void Read_LLT_Tab(PADAPTER padapter); void Read_LLT_Tab(struct adapter *padapter);
// 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,BOOLEAN AutoLoadFail); void Hal_ReadTxPowerInfo88E(struct adapter *padapter,u8* hwinfo,BOOLEAN AutoLoadFail);
void Hal_EfuseParseEEPROMVer88E(PADAPTER padapter, u8 *hwinfo, BOOLEAN AutoLoadFail); void Hal_EfuseParseEEPROMVer88E(struct adapter *padapter, u8 *hwinfo, BOOLEAN AutoLoadFail);
void rtl8188e_EfuseParseChnlPlan(PADAPTER padapter, u8 *hwinfo, BOOLEAN AutoLoadFail); void rtl8188e_EfuseParseChnlPlan(struct adapter *padapter, u8 *hwinfo, BOOLEAN AutoLoadFail);
void Hal_EfuseParseCustomerID88E(PADAPTER padapter, u8 *hwinfo, BOOLEAN AutoLoadFail); void Hal_EfuseParseCustomerID88E(struct adapter *padapter, u8 *hwinfo, BOOLEAN AutoLoadFail);
void Hal_ReadAntennaDiversity88E (PADAPTER pAdapter,u8*PROMContent,BOOLEAN AutoLoadFail); void Hal_ReadAntennaDiversity88E (struct adapter *pAdapter,u8*PROMContent,BOOLEAN AutoLoadFail);
void Hal_ReadThermalMeter_88E(PADAPTER Adapter,u8* PROMContent,BOOLEAN AutoloadFail); void Hal_ReadThermalMeter_88E(struct adapter *Adapter,u8* PROMContent,BOOLEAN AutoloadFail);
void Hal_EfuseParseXtal_8188E(PADAPTER pAdapter,u8* hwinfo,BOOLEAN AutoLoadFail); void Hal_EfuseParseXtal_8188E(struct adapter *pAdapter,u8* hwinfo,BOOLEAN AutoLoadFail);
void Hal_EfuseParseBoardType88E(PADAPTER pAdapter,u8* hwinfo,BOOLEAN AutoLoadFail); void Hal_EfuseParseBoardType88E(struct adapter *pAdapter,u8* hwinfo,BOOLEAN AutoLoadFail);
void Hal_ReadPowerSavingMode88E(PADAPTER pAdapter,u8* hwinfo,BOOLEAN AutoLoadFail); void Hal_ReadPowerSavingMode88E(struct adapter *pAdapter,u8* hwinfo,BOOLEAN AutoLoadFail);
BOOLEAN HalDetectPwrDownMode88E(PADAPTER Adapter); BOOLEAN HalDetectPwrDownMode88E(struct adapter *Adapter);
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
void Hal_DetectWoWMode(PADAPTER pAdapter); void Hal_DetectWoWMode(struct adapter *pAdapter);
#endif //CONFIG_WOWLAN #endif //CONFIG_WOWLAN
#ifdef CONFIG_RF_GAIN_OFFSET #ifdef CONFIG_RF_GAIN_OFFSET
void Hal_ReadRFGainOffset(PADAPTER pAdapter,u8* hwinfo,BOOLEAN AutoLoadFail); void Hal_ReadRFGainOffset(struct adapter *pAdapter,u8* hwinfo,BOOLEAN AutoLoadFail);
#endif //CONFIG_RF_GAIN_OFFSET #endif //CONFIG_RF_GAIN_OFFSET
//RT_CHANNEL_DOMAIN rtl8723a_HalMapChannelPlan(PADAPTER padapter, u8 HalChannelPlan); //RT_CHANNEL_DOMAIN rtl8723a_HalMapChannelPlan(struct adapter *padapter, u8 HalChannelPlan);
//VERSION_8192C rtl8723a_ReadChipVersion(PADAPTER padapter); //VERSION_8192C rtl8723a_ReadChipVersion(struct adapter *padapter);
//void rtl8723a_ReadBluetoothCoexistInfo(PADAPTER padapter, u8 *PROMContent, BOOLEAN AutoloadFail); //void rtl8723a_ReadBluetoothCoexistInfo(struct adapter *padapter, u8 *PROMContent, BOOLEAN AutoloadFail);
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_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);
#ifdef CONFIG_IOL_EFUSE_PATCH #ifdef CONFIG_IOL_EFUSE_PATCH
s32 rtl8188e_iol_efuse_patch(PADAPTER padapter); s32 rtl8188e_iol_efuse_patch(struct adapter *padapter);
#endif//CONFIG_IOL_EFUSE_PATCH #endif//CONFIG_IOL_EFUSE_PATCH
#endif //__RTL8188E_HAL_H__ #endif //__RTL8188E_HAL_H__

14
include/rtl8188e_led.h
View file

@ -29,17 +29,17 @@
// Interface to manipulate LED objects. // Interface to manipulate LED objects.
//================================================================================ //================================================================================
#ifdef CONFIG_USB_HCI #ifdef CONFIG_USB_HCI
void rtl8188eu_InitSwLeds(PADAPTER padapter); void rtl8188eu_InitSwLeds(struct adapter *padapter);
void rtl8188eu_DeInitSwLeds(PADAPTER padapter); void rtl8188eu_DeInitSwLeds(struct adapter *padapter);
#endif #endif
#ifdef CONFIG_PCI_HCI #ifdef CONFIG_PCI_HCI
void rtl8188ee_gen_RefreshLedState(PADAPTER Adapter); void rtl8188ee_gen_RefreshLedState(struct adapter *Adapter);
void rtl8188ee_InitSwLeds(PADAPTER padapter); void rtl8188ee_InitSwLeds(struct adapter *padapter);
void rtl8188ee_DeInitSwLeds(PADAPTER padapter); void rtl8188ee_DeInitSwLeds(struct adapter *padapter);
#endif #endif
#ifdef CONFIG_SDIO_HCI #ifdef CONFIG_SDIO_HCI
void rtl8188es_InitSwLeds(PADAPTER padapter); void rtl8188es_InitSwLeds(struct adapter *padapter);
void rtl8188es_DeInitSwLeds(PADAPTER padapter); void rtl8188es_DeInitSwLeds(struct adapter *padapter);
#endif #endif
#endif #endif

20
include/rtl8188e_recv.h
View file

@ -117,28 +117,28 @@ typedef struct rxreport_8188e
#ifdef CONFIG_SDIO_HCI #ifdef CONFIG_SDIO_HCI
s32 rtl8188es_init_recv_priv(PADAPTER padapter); s32 rtl8188es_init_recv_priv(struct adapter *padapter);
void rtl8188es_free_recv_priv(PADAPTER padapter); void rtl8188es_free_recv_priv(struct adapter *padapter);
void rtl8188es_recv_hdl(PADAPTER padapter, struct recv_buf *precvbuf); void rtl8188es_recv_hdl(struct adapter *padapter, struct recv_buf *precvbuf);
#endif #endif
#ifdef CONFIG_USB_HCI #ifdef CONFIG_USB_HCI
#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);
#endif #endif
#ifdef CONFIG_PCI_HCI #ifdef CONFIG_PCI_HCI
s32 rtl8188ee_init_recv_priv(PADAPTER padapter); s32 rtl8188ee_init_recv_priv(struct adapter *padapter);
void rtl8188ee_free_recv_priv(PADAPTER padapter); void rtl8188ee_free_recv_priv(struct adapter *padapter);
#endif #endif
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( IN PADAPTER Adapter ); int PHY_RF6052_Config8188E( IN struct adapter * Adapter );
void rtl8188e_RF_ChangeTxPath( IN PADAPTER Adapter, void rtl8188e_RF_ChangeTxPath( IN struct adapter *Adapter,
IN u16 DataRate); IN u16 DataRate);
void rtl8188e_PHY_RF6052SetBandwidth( void rtl8188e_PHY_RF6052SetBandwidth(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN HT_CHANNEL_WIDTH Bandwidth); IN HT_CHANNEL_WIDTH Bandwidth);
VOID rtl8188e_PHY_RF6052SetCckTxPower( VOID rtl8188e_PHY_RF6052SetCckTxPower(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u8* pPowerlevel); IN u8* pPowerlevel);
VOID rtl8188e_PHY_RF6052SetOFDMTxPower( VOID rtl8188e_PHY_RF6052SetOFDMTxPower(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u8* pPowerLevelOFDM, IN u8* pPowerLevelOFDM,
IN u8* pPowerLevelBW20, IN u8* pPowerLevelBW20,
IN u8* pPowerLevelBW40, IN u8* pPowerLevelBW40,

4
include/rtl8188e_sreset.h
View file

@ -26,8 +26,8 @@
#include <rtw_sreset.h> #include <rtw_sreset.h>
#ifdef DBG_CONFIG_ERROR_DETECT #ifdef DBG_CONFIG_ERROR_DETECT
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
#endif #endif

42
include/rtl8188e_xmit.h
View file

@ -254,15 +254,15 @@ struct txrpt_ccx_88e {
#define txrpt_ccx_sw_88e(txrpt_ccx) ((txrpt_ccx)->sw0 + ((txrpt_ccx)->sw1<<8)) #define txrpt_ccx_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);
#ifdef CONFIG_SDIO_HCI #ifdef CONFIG_SDIO_HCI
s32 rtl8188es_init_xmit_priv(PADAPTER padapter); s32 rtl8188es_init_xmit_priv(struct adapter *padapter);
void rtl8188es_free_xmit_priv(PADAPTER padapter); void rtl8188es_free_xmit_priv(struct adapter *padapter);
s32 rtl8188es_hal_xmit(PADAPTER padapter, struct xmit_frame *pxmitframe); s32 rtl8188es_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe);
s32 rtl8188es_mgnt_xmit(PADAPTER padapter, struct xmit_frame *pmgntframe); s32 rtl8188es_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe);
s32 rtl8188es_hal_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe); s32 rtl8188es_hal_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitframe);
thread_return rtl8188es_xmit_thread(thread_context context); thread_return rtl8188es_xmit_thread(thread_context context);
s32 rtl8188es_xmit_buf_handler(PADAPTER padapter); s32 rtl8188es_xmit_buf_handler(struct adapter *padapter);
#define hal_xmit_handler rtl8188es_xmit_buf_handler #define hal_xmit_handler rtl8188es_xmit_buf_handler
#ifdef CONFIG_SDIO_TX_TASKLET #ifdef CONFIG_SDIO_TX_TASKLET
@ -271,24 +271,24 @@ void rtl8188es_xmit_tasklet(void *priv);
#endif #endif
#ifdef CONFIG_USB_HCI #ifdef CONFIG_USB_HCI
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_hal_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe); s32 rtl8188eu_hal_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitframe);
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);
#endif #endif
#ifdef CONFIG_PCI_HCI #ifdef CONFIG_PCI_HCI
s32 rtl8188ee_init_xmit_priv(PADAPTER padapter); s32 rtl8188ee_init_xmit_priv(struct adapter *padapter);
void rtl8188ee_free_xmit_priv(PADAPTER padapter); void rtl8188ee_free_xmit_priv(struct adapter *padapter);
struct xmit_buf *rtl8188ee_dequeue_xmitbuf(struct rtw_tx_ring *ring); struct xmit_buf *rtl8188ee_dequeue_xmitbuf(struct rtw_tx_ring *ring);
void rtl8188ee_xmitframe_resume(_adapter *padapter); void rtl8188ee_xmitframe_resume(struct adapter *padapter);
s32 rtl8188ee_hal_xmit(PADAPTER padapter, struct xmit_frame *pxmitframe); s32 rtl8188ee_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe);
s32 rtl8188ee_mgnt_xmit(PADAPTER padapter, struct xmit_frame *pmgntframe); s32 rtl8188ee_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe);
void rtl8188ee_xmit_tasklet(void *priv); void rtl8188ee_xmit_tasklet(void *priv);
#endif #endif
@ -300,12 +300,12 @@ void UpdateEarlyModeInfo8188E(struct xmit_priv *pxmitpriv,struct xmit_buf *pxmit
#ifdef CONFIG_XMIT_ACK #ifdef CONFIG_XMIT_ACK
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);
#else #else
#define dump_txrpt_ccx_88e(buf) do {} while(0) #define dump_txrpt_ccx_88e(buf) do {} while(0)
#define handle_txrpt_ccx_88e(adapter, buf) do {} while(0) #define handle_txrpt_ccx_88e(adapter, buf) do {} while(0)
#endif //CONFIG_XMIT_ACK #endif //CONFIG_XMIT_ACK
void _dbg_dump_tx_info(_adapter *padapter,int frame_tag,struct tx_desc *ptxdesc); void _dbg_dump_tx_info(struct adapter *padapter,int frame_tag,struct tx_desc *ptxdesc);
#endif //__RTL8188E_XMIT_H__ #endif //__RTL8188E_XMIT_H__

20
include/rtl8192c_cmd.h
View file

@ -86,30 +86,30 @@ struct P2P_PS_CTWPeriod_t {
}; };
// host message to firmware cmd // host message to firmware cmd
void rtl8192c_set_FwPwrMode_cmd(_adapter*padapter, u8 Mode); void rtl8192c_set_FwPwrMode_cmd(struct adapter*padapter, u8 Mode);
void rtl8192c_set_FwJoinBssReport_cmd(_adapter* padapter, u8 mstatus); void rtl8192c_set_FwJoinBssReport_cmd(struct adapter* padapter, u8 mstatus);
u8 rtl8192c_set_rssi_cmd(_adapter*padapter, u8 *param); u8 rtl8192c_set_rssi_cmd(struct adapter*padapter, u8 *param);
u8 rtl8192c_set_raid_cmd(_adapter*padapter, u32 mask, u8 arg); u8 rtl8192c_set_raid_cmd(struct adapter*padapter, u32 mask, u8 arg);
void rtl8192c_Add_RateATid(PADAPTER pAdapter, u32 bitmap, u8 arg, u8 rssi_level); void rtl8192c_Add_RateATid(struct adapter *pAdapter, u32 bitmap, u8 arg, u8 rssi_level);
u8 rtl8192c_set_FwSelectSuspend_cmd(_adapter*padapter,u8 bfwpoll, u16 period); u8 rtl8192c_set_FwSelectSuspend_cmd(struct adapter*padapter,u8 bfwpoll, u16 period);
#ifdef CONFIG_P2P #ifdef CONFIG_P2P
void rtl8192c_set_p2p_ps_offload_cmd(_adapter* padapter, u8 p2p_ps_state); void rtl8192c_set_p2p_ps_offload_cmd(struct adapter* padapter, u8 p2p_ps_state);
#endif //CONFIG_P2P #endif //CONFIG_P2P
#ifdef CONFIG_IOL #ifdef CONFIG_IOL
typedef struct _IO_OFFLOAD_LOC{ typedef struct _IO_OFFLOAD_LOC{
u8 LocCmd; u8 LocCmd;
}IO_OFFLOAD_LOC, *PIO_OFFLOAD_LOC; }IO_OFFLOAD_LOC, *PIO_OFFLOAD_LOC;
int rtl8192c_IOL_exec_cmds_sync(ADAPTER *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt); int rtl8192c_IOL_exec_cmds_sync(struct adapter *adapter, struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt);
#endif //CONFIG_IOL #endif //CONFIG_IOL
#ifdef CONFIG_BEACON_DISABLE_OFFLOAD #ifdef CONFIG_BEACON_DISABLE_OFFLOAD
u8 rtl8192c_dis_beacon_fun_cmd(_adapter* padapter); u8 rtl8192c_dis_beacon_fun_cmd(struct adapter* padapter);
#endif // CONFIG_BEACON_DISABLE_OFFLOAD #endif // CONFIG_BEACON_DISABLE_OFFLOAD
#ifdef CONFIG_TSF_RESET_OFFLOAD #ifdef CONFIG_TSF_RESET_OFFLOAD
u8 rtl8192c_reset_tsf(_adapter *padapter, u8 reset_port); u8 rtl8192c_reset_tsf(struct adapter *padapter, u8 reset_port);
#endif // CONFIG_TSF_RESET_OFFLOAD #endif // CONFIG_TSF_RESET_OFFLOAD
#endif // __RTL8192C_CMD_H_ #endif // __RTL8192C_CMD_H_

12
include/rtl8192c_dm.h
View file

@ -249,15 +249,15 @@ struct dm_priv
// function prototype // function prototype
//============================================================ //============================================================
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
void rtl8192c_set_dm_bt_coexist(_adapter *padapter, u8 bStart); void rtl8192c_set_dm_bt_coexist(struct adapter *padapter, u8 bStart);
void rtl8192c_issue_delete_ba(_adapter *padapter, u8 dir); void rtl8192c_issue_delete_ba(struct adapter *padapter, u8 dir);
#endif #endif
void rtl8192c_init_dm_priv(IN PADAPTER Adapter); void rtl8192c_init_dm_priv(IN struct adapter *Adapter);
void rtl8192c_deinit_dm_priv(IN PADAPTER Adapter); void rtl8192c_deinit_dm_priv(IN struct adapter *Adapter);
void rtl8192c_InitHalDm( IN PADAPTER Adapter); void rtl8192c_InitHalDm( IN struct adapter *Adapter);
void rtl8192c_HalDmWatchDog(IN PADAPTER Adapter); void rtl8192c_HalDmWatchDog(IN struct adapter *Adapter);
#endif //__HAL8190PCIDM_H__ #endif //__HAL8190PCIDM_H__

22
include/rtl8192c_hal.h
View file

@ -629,8 +629,8 @@ typedef struct hal_data_8192ce HAL_DATA_TYPE, *PHAL_DATA_TYPE;
#define RT_IS_FUNC_DISABLED(__pAdapter, __FuncBits) ( (__pAdapter)->DisabledFunctions & (__FuncBits) ) #define RT_IS_FUNC_DISABLED(__pAdapter, __FuncBits) ( (__pAdapter)->DisabledFunctions & (__FuncBits) )
#define IS_MULTI_FUNC_CHIP(_Adapter) (((((PHAL_DATA_TYPE)(_Adapter->HalData))->MultiFunc) & (RT_MULTI_FUNC_BT|RT_MULTI_FUNC_GPS)) ? _TRUE : _FALSE) #define IS_MULTI_FUNC_CHIP(_Adapter) (((((PHAL_DATA_TYPE)(_Adapter->HalData))->MultiFunc) & (RT_MULTI_FUNC_BT|RT_MULTI_FUNC_GPS)) ? _TRUE : _FALSE)
void InterruptRecognized8192CE(PADAPTER Adapter, PRT_ISR_CONTENT pIsrContent); void InterruptRecognized8192CE(struct adapter *Adapter, PRT_ISR_CONTENT pIsrContent);
VOID UpdateInterruptMask8192CE(PADAPTER Adapter, u32 AddMSR, u32 AddMSR1, u32 RemoveMSR, u32 RemoveMSR1); VOID UpdateInterruptMask8192CE(struct adapter *Adapter, u32 AddMSR, u32 AddMSR1, u32 RemoveMSR, u32 RemoveMSR1);
#endif #endif
#ifdef CONFIG_USB_HCI #ifdef CONFIG_USB_HCI
@ -832,16 +832,16 @@ typedef struct hal_data_8192cu HAL_DATA_TYPE, *PHAL_DATA_TYPE;
#define INCLUDE_MULTI_FUNC_BT(_Adapter) (GET_HAL_DATA(_Adapter)->MultiFunc & RT_MULTI_FUNC_BT) #define INCLUDE_MULTI_FUNC_BT(_Adapter) (GET_HAL_DATA(_Adapter)->MultiFunc & RT_MULTI_FUNC_BT)
#define INCLUDE_MULTI_FUNC_GPS(_Adapter) (GET_HAL_DATA(_Adapter)->MultiFunc & RT_MULTI_FUNC_GPS) #define INCLUDE_MULTI_FUNC_GPS(_Adapter) (GET_HAL_DATA(_Adapter)->MultiFunc & RT_MULTI_FUNC_GPS)
VOID rtl8192c_FirmwareSelfReset(IN PADAPTER Adapter); VOID rtl8192c_FirmwareSelfReset(IN struct adapter *Adapter);
int FirmwareDownload92C(IN PADAPTER Adapter); int FirmwareDownload92C(IN struct adapter *Adapter);
VOID InitializeFirmwareVars92C(PADAPTER Adapter); VOID InitializeFirmwareVars92C(struct adapter *Adapter);
u8 GetEEPROMSize8192C(PADAPTER Adapter); u8 GetEEPROMSize8192C(struct adapter *Adapter);
void rtl8192c_EfuseParseChnlPlan(PADAPTER padapter, u8 *hwinfo, BOOLEAN AutoLoadFail); void rtl8192c_EfuseParseChnlPlan(struct adapter *padapter, u8 *hwinfo, BOOLEAN AutoLoadFail);
HAL_VERSION rtl8192c_ReadChipVersion(IN PADAPTER Adapter); HAL_VERSION rtl8192c_ReadChipVersion(IN struct adapter *Adapter);
void rtl8192c_ReadBluetoothCoexistInfo(PADAPTER Adapter, u8 *PROMContent, BOOLEAN AutoloadFail); void rtl8192c_ReadBluetoothCoexistInfo(struct adapter *Adapter, u8 *PROMContent, BOOLEAN AutoloadFail);
//void rtl8192c_free_hal_data(_adapter * padapter); //void rtl8192c_free_hal_data(struct adapter * padapter);
VOID rtl8192c_EfuseParseIDCode(PADAPTER pAdapter, u8 *hwinfo); VOID rtl8192c_EfuseParseIDCode(struct adapter *pAdapter, u8 *hwinfo);
void rtl8192c_set_hal_ops(struct hal_ops *pHalFunc); void rtl8192c_set_hal_ops(struct hal_ops *pHalFunc);
s32 c2h_id_filter_ccx_8192c(u8 id); s32 c2h_id_filter_ccx_8192c(u8 id);

10
include/rtl8192c_led.h
View file

@ -29,13 +29,13 @@
// Interface to manipulate LED objects. // Interface to manipulate LED objects.
//================================================================================ //================================================================================
#ifdef CONFIG_USB_HCI #ifdef CONFIG_USB_HCI
void rtl8192cu_InitSwLeds(_adapter *padapter); void rtl8192cu_InitSwLeds(struct adapter *padapter);
void rtl8192cu_DeInitSwLeds(_adapter *padapter); void rtl8192cu_DeInitSwLeds(struct adapter *padapter);
#endif #endif
#ifdef CONFIG_PCI_HCI #ifdef CONFIG_PCI_HCI
void rtl8192ce_gen_RefreshLedState(PADAPTER Adapter); void rtl8192ce_gen_RefreshLedState(struct adapter *Adapter);
void rtl8192ce_InitSwLeds(_adapter *padapter); void rtl8192ce_InitSwLeds(struct adapter *padapter);
void rtl8192ce_DeInitSwLeds(_adapter *padapter); void rtl8192ce_DeInitSwLeds(struct adapter *padapter);
#endif #endif
#endif #endif

10
include/rtl8192c_recv.h
View file

@ -130,14 +130,14 @@ typedef struct _INTERRUPT_MSG_FORMAT_EX{
unsigned int MSG_EX; unsigned int MSG_EX;
}INTERRUPT_MSG_FORMAT_EX,*PINTERRUPT_MSG_FORMAT_EX; }INTERRUPT_MSG_FORMAT_EX,*PINTERRUPT_MSG_FORMAT_EX;
void rtl8192cu_init_recvbuf(_adapter *padapter, struct recv_buf *precvbuf); void rtl8192cu_init_recvbuf(struct adapter *padapter, struct recv_buf *precvbuf);
int rtl8192cu_init_recv_priv(_adapter * padapter); int rtl8192cu_init_recv_priv(struct adapter * padapter);
void rtl8192cu_free_recv_priv(_adapter * padapter); void rtl8192cu_free_recv_priv(struct adapter * padapter);
#endif #endif
#ifdef CONFIG_PCI_HCI #ifdef CONFIG_PCI_HCI
int rtl8192ce_init_recv_priv(_adapter * padapter); int rtl8192ce_init_recv_priv(struct adapter * padapter);
void rtl8192ce_free_recv_priv(_adapter * padapter); void rtl8192ce_free_recv_priv(struct adapter * padapter);
#endif #endif
void rtl8192c_translate_rx_signal_stuff(union recv_frame *precvframe, struct phy_stat *pphy_status); void rtl8192c_translate_rx_signal_stuff(union recv_frame *precvframe, struct phy_stat *pphy_status);

10
include/rtl8192c_rf.h
View file

@ -71,19 +71,19 @@
// //
// RF RL6052 Series API // RF RL6052 Series API
// //
void rtl8192c_RF_ChangeTxPath( IN PADAPTER Adapter, void rtl8192c_RF_ChangeTxPath( IN struct adapter *Adapter,
IN u16 DataRate); IN u16 DataRate);
void rtl8192c_PHY_RF6052SetBandwidth( void rtl8192c_PHY_RF6052SetBandwidth(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN HT_CHANNEL_WIDTH Bandwidth); IN HT_CHANNEL_WIDTH Bandwidth);
VOID rtl8192c_PHY_RF6052SetCckTxPower( VOID rtl8192c_PHY_RF6052SetCckTxPower(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u8* pPowerlevel); IN u8* pPowerlevel);
VOID rtl8192c_PHY_RF6052SetOFDMTxPower( VOID rtl8192c_PHY_RF6052SetOFDMTxPower(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u8* pPowerLevel, IN u8* pPowerLevel,
IN u8 Channel); IN u8 Channel);
int PHY_RF6052_Config8192C( IN PADAPTER Adapter ); int PHY_RF6052_Config8192C( IN struct adapter * Adapter );
/*--------------------------Exported Function prototype---------------------*/ /*--------------------------Exported Function prototype---------------------*/

4
include/rtl8192c_sreset.h
View file

@ -26,8 +26,8 @@
#include <rtw_sreset.h> #include <rtw_sreset.h>
#ifdef DBG_CONFIG_ERROR_DETECT #ifdef DBG_CONFIG_ERROR_DETECT
extern void rtl8192c_sreset_xmit_status_check(_adapter *padapter); extern void rtl8192c_sreset_xmit_status_check(struct adapter *padapter);
extern void rtl8192c_sreset_linked_status_check(_adapter *padapter); extern void rtl8192c_sreset_linked_status_check(struct adapter *padapter);
#endif #endif
#endif #endif

26
include/rtl8192c_xmit.h
View file

@ -112,7 +112,7 @@ struct txrpt_ccx_8192c {
#ifdef CONFIG_XMIT_ACK #ifdef CONFIG_XMIT_ACK
void dump_txrpt_ccx_8192c(void *buf); void dump_txrpt_ccx_8192c(void *buf);
void handle_txrpt_ccx_8192c(_adapter *adapter, void *buf); void handle_txrpt_ccx_8192c(struct adapter *adapter, void *buf);
#else #else
#define dump_txrpt_ccx_8192c(buf) do {} while(0) #define dump_txrpt_ccx_8192c(buf) do {} while(0)
#define handle_txrpt_ccx_8192c(adapter, buf) do {} while(0) #define handle_txrpt_ccx_8192c(adapter, buf) do {} while(0)
@ -124,39 +124,39 @@ void handle_txrpt_ccx_8192c(_adapter *adapter, void *buf);
#define MAX_TX_AGG_PACKET_NUMBER 0xFF #define MAX_TX_AGG_PACKET_NUMBER 0xFF
#endif #endif
s32 rtl8192cu_init_xmit_priv(_adapter * padapter); s32 rtl8192cu_init_xmit_priv(struct adapter * padapter);
void rtl8192cu_free_xmit_priv(_adapter * padapter); void rtl8192cu_free_xmit_priv(struct adapter * padapter);
void rtl8192cu_cal_txdesc_chksum(struct tx_desc *ptxdesc); void rtl8192cu_cal_txdesc_chksum(struct tx_desc *ptxdesc);
s32 rtl8192cu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf); s32 rtl8192cu_xmitframe_complete(struct adapter *padapter, struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf);
s32 rtl8192cu_mgnt_xmit(_adapter *padapter, struct xmit_frame *pmgntframe); s32 rtl8192cu_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe);
s32 rtl8192cu_hal_xmit(_adapter *padapter, struct xmit_frame *pxmitframe); s32 rtl8192cu_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe);
#ifdef CONFIG_HOSTAPD_MLME #ifdef CONFIG_HOSTAPD_MLME
s32 rtl8192cu_hostap_mgnt_xmit_entry(_adapter *padapter, _pkt *pkt); s32 rtl8192cu_hostap_mgnt_xmit_entry(struct adapter *padapter, _pkt *pkt);
#endif #endif
#endif #endif
#ifdef CONFIG_PCI_HCI #ifdef CONFIG_PCI_HCI
s32 rtl8192ce_init_xmit_priv(_adapter * padapter); s32 rtl8192ce_init_xmit_priv(struct adapter * padapter);
void rtl8192ce_free_xmit_priv(_adapter * padapter); void rtl8192ce_free_xmit_priv(struct adapter * padapter);
s32 rtl8192ce_enqueue_xmitbuf(struct rtw_tx_ring *ring, struct xmit_buf *pxmitbuf); s32 rtl8192ce_enqueue_xmitbuf(struct rtw_tx_ring *ring, struct xmit_buf *pxmitbuf);
struct xmit_buf *rtl8192ce_dequeue_xmitbuf(struct rtw_tx_ring *ring); struct xmit_buf *rtl8192ce_dequeue_xmitbuf(struct rtw_tx_ring *ring);
void rtl8192ce_xmitframe_resume(_adapter *padapter); void rtl8192ce_xmitframe_resume(struct adapter *padapter);
s32 rtl8192ce_mgnt_xmit(_adapter *padapter, struct xmit_frame *pmgntframe); s32 rtl8192ce_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe);
s32 rtl8192ce_hal_xmit(_adapter *padapter, struct xmit_frame *pxmitframe); s32 rtl8192ce_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe);
#ifdef CONFIG_HOSTAPD_MLME #ifdef CONFIG_HOSTAPD_MLME
s32 rtl8192ce_hostap_mgnt_xmit_entry(_adapter *padapter, _pkt *pkt); s32 rtl8192ce_hostap_mgnt_xmit_entry(struct adapter *padapter, _pkt *pkt);
#endif #endif
#endif #endif

14
include/rtl8192d_cmd.h
View file

@ -86,16 +86,16 @@ struct cmd_msg_parm {
}; };
void FillH2CCmd92D(_adapter* padapter, u8 ElementID, u32 CmdLen, u8* pCmdBuffer); void FillH2CCmd92D(struct adapter* padapter, u8 ElementID, u32 CmdLen, u8* pCmdBuffer);
// host message to firmware cmd // host message to firmware cmd
void rtl8192d_set_FwPwrMode_cmd(_adapter*padapter, u8 Mode); void rtl8192d_set_FwPwrMode_cmd(struct adapter*padapter, u8 Mode);
void rtl8192d_set_FwJoinBssReport_cmd(_adapter* padapter, u8 mstatus); void rtl8192d_set_FwJoinBssReport_cmd(struct adapter* padapter, u8 mstatus);
u8 rtl8192d_set_rssi_cmd(_adapter*padapter, u8 *param); u8 rtl8192d_set_rssi_cmd(struct adapter*padapter, u8 *param);
u8 rtl8192d_set_raid_cmd(_adapter*padapter, u32 mask, u8 arg); u8 rtl8192d_set_raid_cmd(struct adapter*padapter, u32 mask, u8 arg);
void rtl8192d_Add_RateATid(PADAPTER pAdapter, u32 bitmap, u8 arg, u8 rssi_level); void rtl8192d_Add_RateATid(struct adapter *pAdapter, u32 bitmap, u8 arg, u8 rssi_level);
#ifdef CONFIG_P2P #ifdef CONFIG_P2P
void rtl8192d_set_p2p_ps_offload_cmd(_adapter* padapter, u8 p2p_ps_state); void rtl8192d_set_p2p_ps_offload_cmd(struct adapter* padapter, u8 p2p_ps_state);
#endif //CONFIG_P2P #endif //CONFIG_P2P
#endif #endif

8
include/rtl8192d_dm.h
View file

@ -173,11 +173,11 @@ struct dm_priv
//============================================================ //============================================================
// function prototype // function prototype
//============================================================ //============================================================
void rtl8192d_init_dm_priv(IN PADAPTER Adapter); void rtl8192d_init_dm_priv(IN struct adapter *Adapter);
void rtl8192d_deinit_dm_priv(IN PADAPTER Adapter); void rtl8192d_deinit_dm_priv(IN struct adapter *Adapter);
void rtl8192d_InitHalDm(IN PADAPTER Adapter); void rtl8192d_InitHalDm(IN struct adapter *Adapter);
void rtl8192d_HalDmWatchDog(IN PADAPTER Adapter); void rtl8192d_HalDmWatchDog(IN struct adapter *Adapter);
#endif //__HAL8190PCIDM_H__ #endif //__HAL8190PCIDM_H__

26
include/rtl8192d_hal.h
View file

@ -622,8 +622,8 @@ typedef struct hal_data_8192de HAL_DATA_TYPE, *PHAL_DATA_TYPE;
#define RT_ENABLE_FUNC(__pAdapter, __FuncBits) ((__pAdapter)->DisabledFunctions &= (~((RT_DF_TYPE)(__FuncBits)))) #define RT_ENABLE_FUNC(__pAdapter, __FuncBits) ((__pAdapter)->DisabledFunctions &= (~((RT_DF_TYPE)(__FuncBits))))
#define RT_IS_FUNC_DISABLED(__pAdapter, __FuncBits) ( (__pAdapter)->DisabledFunctions & (__FuncBits) ) #define RT_IS_FUNC_DISABLED(__pAdapter, __FuncBits) ( (__pAdapter)->DisabledFunctions & (__FuncBits) )
void InterruptRecognized8192DE(PADAPTER Adapter, PRT_ISR_CONTENT pIsrContent); void InterruptRecognized8192DE(struct adapter *Adapter, PRT_ISR_CONTENT pIsrContent);
VOID UpdateInterruptMask8192DE(PADAPTER Adapter, u32 AddMSR, u32 RemoveMSR); VOID UpdateInterruptMask8192DE(struct adapter *Adapter, u32 AddMSR, u32 RemoveMSR);
#endif #endif
#ifdef CONFIG_USB_HCI #ifdef CONFIG_USB_HCI
@ -838,17 +838,17 @@ typedef struct hal_data_8192du HAL_DATA_TYPE, *PHAL_DATA_TYPE;
#define GET_HAL_DATA(__pAdapter) ((HAL_DATA_TYPE *)((__pAdapter)->HalData)) #define GET_HAL_DATA(__pAdapter) ((HAL_DATA_TYPE *)((__pAdapter)->HalData))
#define GET_RF_TYPE(priv) (GET_HAL_DATA(priv)->rf_type) #define GET_RF_TYPE(priv) (GET_HAL_DATA(priv)->rf_type)
int FirmwareDownload92D(IN PADAPTER Adapter); int FirmwareDownload92D(IN struct adapter *Adapter);
VOID rtl8192d_FirmwareSelfReset(IN PADAPTER Adapter); VOID rtl8192d_FirmwareSelfReset(IN struct adapter *Adapter);
void rtl8192d_ReadChipVersion(IN PADAPTER Adapter); void rtl8192d_ReadChipVersion(IN struct adapter *Adapter);
VOID rtl8192d_EfuseParseChnlPlan(PADAPTER Adapter, u8 *hwinfo, BOOLEAN AutoLoadFail); VOID rtl8192d_EfuseParseChnlPlan(struct adapter *Adapter, u8 *hwinfo, BOOLEAN AutoLoadFail);
VOID rtl8192d_ReadTxPowerInfo(PADAPTER Adapter, u8* PROMContent, BOOLEAN AutoLoadFail); VOID rtl8192d_ReadTxPowerInfo(struct adapter *Adapter, u8* PROMContent, BOOLEAN AutoLoadFail);
VOID rtl8192d_ResetDualMacSwitchVariables(IN PADAPTER Adapter); VOID rtl8192d_ResetDualMacSwitchVariables(IN struct adapter *Adapter);
u8 GetEEPROMSize8192D(PADAPTER Adapter); u8 GetEEPROMSize8192D(struct adapter *Adapter);
BOOLEAN PHY_CheckPowerOffFor8192D(PADAPTER Adapter); BOOLEAN PHY_CheckPowerOffFor8192D(struct adapter *Adapter);
VOID PHY_SetPowerOnFor8192D(PADAPTER Adapter); VOID PHY_SetPowerOnFor8192D(struct adapter *Adapter);
//void PHY_ConfigMacPhyMode92D(PADAPTER Adapter); //void PHY_ConfigMacPhyMode92D(struct adapter *Adapter);
void rtl8192d_free_hal_data(_adapter * padapter); void rtl8192d_free_hal_data(struct adapter * padapter);
void rtl8192d_set_hal_ops(struct hal_ops *pHalFunc); void rtl8192d_set_hal_ops(struct hal_ops *pHalFunc);
#endif #endif

10
include/rtl8192d_led.h
View file

@ -29,14 +29,14 @@
// Interface to manipulate LED objects. // Interface to manipulate LED objects.
//================================================================================ //================================================================================
#ifdef CONFIG_USB_HCI #ifdef CONFIG_USB_HCI
void rtl8192du_InitSwLeds(_adapter *padapter); void rtl8192du_InitSwLeds(struct adapter *padapter);
void rtl8192du_DeInitSwLeds(_adapter *padapter); void rtl8192du_DeInitSwLeds(struct adapter *padapter);
#endif #endif
#ifdef CONFIG_PCI_HCI #ifdef CONFIG_PCI_HCI
void rtl8192de_gen_RefreshLedState(PADAPTER Adapter); void rtl8192de_gen_RefreshLedState(struct adapter *Adapter);
void rtl8192de_InitSwLeds(_adapter *padapter); void rtl8192de_InitSwLeds(struct adapter *padapter);
void rtl8192de_DeInitSwLeds(_adapter *padapter); void rtl8192de_DeInitSwLeds(struct adapter *padapter);
#endif #endif
#endif #endif

10
include/rtl8192d_recv.h
View file

@ -122,14 +122,14 @@ typedef struct _INTERRUPT_MSG_FORMAT_EX{
unsigned int MSG_EX; unsigned int MSG_EX;
}INTERRUPT_MSG_FORMAT_EX,*PINTERRUPT_MSG_FORMAT_EX; }INTERRUPT_MSG_FORMAT_EX,*PINTERRUPT_MSG_FORMAT_EX;
void rtl8192du_init_recvbuf(_adapter *padapter, struct recv_buf *precvbuf); void rtl8192du_init_recvbuf(struct adapter *padapter, struct recv_buf *precvbuf);
int rtl8192du_init_recv_priv(_adapter * padapter); int rtl8192du_init_recv_priv(struct adapter * padapter);
void rtl8192du_free_recv_priv(_adapter * padapter); void rtl8192du_free_recv_priv(struct adapter * padapter);
#endif #endif
#ifdef CONFIG_PCI_HCI #ifdef CONFIG_PCI_HCI
int rtl8192de_init_recv_priv(_adapter * padapter); int rtl8192de_init_recv_priv(struct adapter * padapter);
void rtl8192de_free_recv_priv(_adapter * padapter); void rtl8192de_free_recv_priv(struct adapter * padapter);
#endif #endif
void rtl8192d_translate_rx_signal_stuff(union recv_frame *precvframe, struct phy_stat *pphy_status); void rtl8192d_translate_rx_signal_stuff(union recv_frame *precvframe, struct phy_stat *pphy_status);

14
include/rtl8192d_rf.h
View file

@ -71,23 +71,23 @@
// //
// RF RL6052 Series API // RF RL6052 Series API
// //
void rtl8192d_RF_ChangeTxPath( IN PADAPTER Adapter, void rtl8192d_RF_ChangeTxPath( IN struct adapter *Adapter,
IN u16 DataRate); IN u16 DataRate);
void rtl8192d_PHY_RF6052SetBandwidth( void rtl8192d_PHY_RF6052SetBandwidth(
IN PADAPTER Adapter, IN struct adapter * Adapter,
IN HT_CHANNEL_WIDTH Bandwidth); IN HT_CHANNEL_WIDTH Bandwidth);
VOID rtl8192d_PHY_RF6052SetCckTxPower( VOID rtl8192d_PHY_RF6052SetCckTxPower(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u8* pPowerlevel); IN u8* pPowerlevel);
VOID rtl8192d_PHY_RF6052SetOFDMTxPower( VOID rtl8192d_PHY_RF6052SetOFDMTxPower(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u8* pPowerLevel, IN u8* pPowerLevel,
IN u8 Channel); IN u8 Channel);
int PHY_RF6052_Config8192D( IN PADAPTER Adapter ); int PHY_RF6052_Config8192D( IN struct adapter * Adapter );
BOOLEAN rtl8192d_PHY_EnableAnotherPHY(IN PADAPTER Adapter, IN BOOLEAN bMac0); BOOLEAN rtl8192d_PHY_EnableAnotherPHY(IN struct adapter *Adapter, IN BOOLEAN bMac0);
void rtl8192d_PHY_PowerDownAnotherPHY(IN PADAPTER Adapter, IN BOOLEAN bMac0); void rtl8192d_PHY_PowerDownAnotherPHY(IN struct adapter *Adapter, IN BOOLEAN bMac0);
/*--------------------------Exported Function prototype---------------------*/ /*--------------------------Exported Function prototype---------------------*/

26
include/rtl8192d_xmit.h
View file

@ -127,7 +127,7 @@ struct txrpt_ccx_8192d {
#ifdef CONFIG_XMIT_ACK #ifdef CONFIG_XMIT_ACK
void dump_txrpt_ccx_8192d(void *buf); void dump_txrpt_ccx_8192d(void *buf);
void handle_txrpt_ccx_8192d(_adapter *adapter, void *buf); void handle_txrpt_ccx_8192d(struct adapter *adapter, void *buf);
#else #else
#define dump_txrpt_ccx_8192d(buf) do {} while(0) #define dump_txrpt_ccx_8192d(buf) do {} while(0)
#define handle_txrpt_ccx_8192d(adapter, buf) do {} while(0) #define handle_txrpt_ccx_8192d(adapter, buf) do {} while(0)
@ -139,39 +139,39 @@ void handle_txrpt_ccx_8192d(_adapter *adapter, void *buf);
#define MAX_TX_AGG_PACKET_NUMBER 0xFF #define MAX_TX_AGG_PACKET_NUMBER 0xFF
#endif #endif
s32 rtl8192du_init_xmit_priv(_adapter * padapter); s32 rtl8192du_init_xmit_priv(struct adapter * padapter);
void rtl8192du_free_xmit_priv(_adapter * padapter); void rtl8192du_free_xmit_priv(struct adapter * padapter);
void rtl8192du_cal_txdesc_chksum(struct tx_desc *ptxdesc); void rtl8192du_cal_txdesc_chksum(struct tx_desc *ptxdesc);
s32 rtl8192du_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf); s32 rtl8192du_xmitframe_complete(struct adapter *padapter, struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf);
s32 rtl8192du_mgnt_xmit(_adapter *padapter, struct xmit_frame *pmgntframe); s32 rtl8192du_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe);
s32 rtl8192du_hal_xmit(_adapter *padapter, struct xmit_frame *pxmitframe); s32 rtl8192du_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe);
#ifdef CONFIG_HOSTAPD_MLME #ifdef CONFIG_HOSTAPD_MLME
s32 rtl8192du_hostap_mgnt_xmit_entry(_adapter *padapter, _pkt *pkt); s32 rtl8192du_hostap_mgnt_xmit_entry(struct adapter *padapter, _pkt *pkt);
#endif #endif
#endif #endif
#ifdef CONFIG_PCI_HCI #ifdef CONFIG_PCI_HCI
s32 rtl8192de_init_xmit_priv(_adapter * padapter); s32 rtl8192de_init_xmit_priv(struct adapter * padapter);
void rtl8192de_free_xmit_priv(_adapter * padapter); void rtl8192de_free_xmit_priv(struct adapter * padapter);
s32 rtl8192de_enqueue_xmitbuf(struct rtw_tx_ring *ring, struct xmit_buf *pxmitbuf); s32 rtl8192de_enqueue_xmitbuf(struct rtw_tx_ring *ring, struct xmit_buf *pxmitbuf);
struct xmit_buf *rtl8192de_dequeue_xmitbuf(struct rtw_tx_ring *ring); struct xmit_buf *rtl8192de_dequeue_xmitbuf(struct rtw_tx_ring *ring);
void rtl8192de_xmitframe_resume(_adapter *padapter); void rtl8192de_xmitframe_resume(struct adapter *padapter);
s32 rtl8192de_mgnt_xmit(_adapter *padapter, struct xmit_frame *pmgntframe); s32 rtl8192de_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe);
s32 rtl8192de_hal_xmit(_adapter *padapter, struct xmit_frame *pxmitframe); s32 rtl8192de_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe);
#ifdef CONFIG_HOSTAPD_MLME #ifdef CONFIG_HOSTAPD_MLME
s32 rtl8192de_hostap_mgnt_xmit_entry(_adapter *padapter, _pkt *pkt); s32 rtl8192de_hostap_mgnt_xmit_entry(struct adapter *padapter, _pkt *pkt);
#endif #endif
#endif #endif

1816
include/rtl8723a_bt-coexist.h
View file

File diff suppressed because it is too large Load diff

229
include/rtl8723a_cmd.h
View file

@ -1,229 +0,0 @@
/******************************************************************************
*
* Copyright(c) 2007 - 2012 Realtek Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
*
******************************************************************************/
#ifndef __RTL8723A_CMD_H__
#define __RTL8723A_CMD_H__
#define H2C_BT_FW_PATCH_LEN 3
#define H2C_BT_PWR_FORCE_LEN 3
enum cmd_msg_element_id
{
NONE_CMDMSG_EID,
AP_OFFLOAD_EID = 0,
SET_PWRMODE_EID = 1,
JOINBSS_RPT_EID = 2,
RSVD_PAGE_EID = 3,
RSSI_4_EID = 4,
RSSI_SETTING_EID = 5,
MACID_CONFIG_EID = 6,
MACID_PS_MODE_EID = 7,
P2P_PS_OFFLOAD_EID = 8,
SELECTIVE_SUSPEND_ROF_CMD = 9,
BT_QUEUE_PKT_EID = 17,
BT_ANT_TDMA_EID = 20,
BT_2ANT_HID_EID = 21,
P2P_PS_CTW_CMD_EID = 32,
FORCE_BT_TX_PWR_EID = 33,
SET_TDMA_WLAN_ACT_TIME_EID = 34,
SET_BT_TX_RETRY_INDEX_EID = 35,
HID_PROFILE_ENABLE_EID = 36,
BT_IGNORE_WLAN_ACT_EID = 37,
BT_PTA_MANAGER_UPDATE_ENABLE_EID = 38,
DAC_SWING_VALUE_EID = 41,
TRADITIONAL_TDMA_EN_EID = 51,
H2C_BT_FW_PATCH = 54,
B_TYPE_TDMA_EID = 58,
SCAN_EN_EID = 59,
LOWPWR_LPS_EID = 71,
H2C_RESET_TSF = 75,
MAX_CMDMSG_EID
};
struct cmd_msg_parm {
u8 eid; //element id
u8 sz; // sz
u8 buf[6];
};
typedef struct _SETPWRMODE_PARM
{
u8 Mode;
u8 SmartPS;
u8 AwakeInterval; // unit: beacon interval
u8 bAllQueueUAPSD;
#if 0
u8 LowRxBCN:1;
u8 AutoAntSwitch:1;
u8 PSAllowBTHighPriority:1;
u8 rsvd43:5;
#else
#define SETPM_LOWRXBCN BIT(0)
#define SETPM_AUTOANTSWITCH BIT(1)
#define SETPM_PSALLOWBTHIGHPRI BIT(2)
u8 BcnAntMode;
#endif
}__attribute__((__packed__)) SETPWRMODE_PARM, *PSETPWRMODE_PARM;
struct H2C_SS_RFOFF_PARAM{
u8 ROFOn; // 1: on, 0:off
u16 gpio_period; // unit: 1024 us
}__attribute__ ((packed));
typedef struct JOINBSSRPT_PARM{
u8 OpMode; // RT_MEDIA_STATUS
}JOINBSSRPT_PARM, *PJOINBSSRPT_PARM;
typedef struct _RSVDPAGE_LOC {
u8 LocProbeRsp;
u8 LocPsPoll;
u8 LocNullData;
u8 LocQosNull;
u8 LocBTQosNull;
} RSVDPAGE_LOC, *PRSVDPAGE_LOC;
struct P2P_PS_Offload_t {
u8 Offload_En:1;
u8 role:1; // 1: Owner, 0: Client
u8 CTWindow_En:1;
u8 NoA0_En:1;
u8 NoA1_En:1;
u8 AllStaSleep:1; // Only valid in Owner
u8 discovery:1;
u8 rsvd:1;
};
struct P2P_PS_CTWPeriod_t {
u8 CTWPeriod; //TU
};
typedef struct _B_TYPE_TDMA_PARM
{
#if 0
u8 En:1;
u8 FixAntennaInBTSide:1;
u8 TxPspoll:1;
u8 val870:1; // value of 870, when disable
u8 AutoWakeUp:1;
u8 NoPS:1;
u8 WlanHighPriority:1;
u8 rsvd07:1;
#else
#define B_TDMA_EN BIT(0)
#define B_TDMA_FIXANTINBT BIT(1)
#define B_TDMA_TXPSPOLL BIT(2)
#define B_TDMA_VAL870 BIT(3)
#define B_TDMA_AUTOWAKEUP BIT(4)
#define B_TDMA_NOPS BIT(5)
#define B_TDMA_WLANHIGHPRI BIT(6)
u8 option;
#endif
u8 TBTTOnPeriod;
u8 MedPeriod;
u8 rsvd30;
}__attribute__((__packed__)) B_TYPE_TDMA_PARM, *PB_TYPE_TDMA_PARM;
typedef struct _SCAN_EN_PARM {
#if 0
u8 En:1;
u8 rsvd01:7;
#else
u8 En;
#endif
}__attribute__((__packed__)) SCAN_EN_PARM, *PSCAN_EN_PARM;
// BT_PWR
#define SET_H2CCMD_BT_PWR_IDX(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE_8BIT(__pH2CCmd, 0, 8, __Value)
// BT_FW_PATCH
#if 0
#define SET_H2CCMD_BT_FW_PATCH_ENABLE(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE(__pH2CCmd, 0, 8, __Value)
#define SET_H2CCMD_BT_FW_PATCH_SIZE(__pH2CCmd, __Value) SET_BITS_TO_LE_2BYTE((__pH2CCmd)+1, 0, 16, __Value)
#else
#define SET_H2CCMD_BT_FW_PATCH_ENABLE(__pH2CCmd, __Value) SET_BITS_TO_LE_4BYTE(__pH2CCmd, 0, 8, __Value) // SET_BITS_TO_LE_1BYTE(__pH2CCmd, 0, 8, __Value)
#define SET_H2CCMD_BT_FW_PATCH_SIZE(__pH2CCmd, __Value) SET_BITS_TO_LE_4BYTE(__pH2CCmd, 8, 16, __Value) // SET_BITS_TO_LE_2BYTE((__pH2CCmd)+1, 0, 16, __Value)
#endif
#if 0
/*
* H2C_LOWPWR_LPS
* h2c cmd = 71
* byte1[6:0]= bcn count : how many bcn not recevied should return to old mechanism
* byte1[7] = enable : enable mechanism
* byte2=bcn period : bcn recv time of this AP, unit 32 us
* byte3= drop threshold : how many pkts be droped, rx dma should be release
* byte4 = max early period
* byte5 = max bcn timeout period
*/
#define SET_H2CCMD_LOWPWR_LPS_BCN_COUNT(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE(__pH2CCmd, 0, 4, __Value)
#define SET_H2CCMD_LOWPWR_LPS_TB_BCN_THRESH(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE(__pH2CCmd, 4, 3, __Value)
#define SET_H2CCMD_LOWPWR_LPS_ENABLE(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE(__pH2CCmd, 7, 1, __Value)
#define SET_H2CCMD_LOWPWR_LPS_BCN_PERIOD(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE_8BIT((__pH2CCmd)+1, 0, 8, __Value)
#define SET_H2CCMD_LOWPWR_LPS_BCN_DROP_THRESH(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE_8BIT((__pH2CCmd)+2, 0, 8, __Value)
#define SET_H2CCMD_LOWPWR_LPS_MAX_EARLY_PERIOD(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE_8BIT((__pH2CCmd)+3, 0, 8, __Value)
#define SET_H2CCMD_LOWPWR_LPS_MAX_BCN_TO_PERIOD(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE_8BIT((__pH2CCmd)+4, 0, 8, __Value)
#else
typedef struct _LOWPWR_LPS_PARM
{
u8 bcn_count:4;
u8 tb_bcn_threshold:3;
u8 enable:1;
u8 bcn_interval;
u8 drop_threshold;
u8 max_early_period;
u8 max_bcn_timeout_period;
}__attribute__((__packed__)) LOWPWR_LPS_PARM, *PLOWPWR_LPS_PARM;
#endif
// host message to firmware cmd
void rtl8723a_set_FwPwrMode_cmd(PADAPTER padapter, u8 Mode);
void rtl8723a_set_FwJoinBssReport_cmd(PADAPTER padapter, u8 mstatus);
#ifdef CONFIG_BT_COEXIST
void rtl8723a_set_BTCoex_AP_mode_FwRsvdPkt_cmd(PADAPTER padapter);
#endif
u8 rtl8192c_set_rssi_cmd(PADAPTER padapter, u8 *param);
//u8 rtl8723a_set_rssi_cmd(PADAPTER padapter, u8 *param);
u8 rtl8192c_set_raid_cmd(PADAPTER padapter, u32 mask, u8 arg);
//u8 rtl8723a_set_raid_cmd(PADAPTER padapter, u32 mask, u8 arg);
void rtl8192c_Add_RateATid(PADAPTER padapter, u32 bitmap, u8 arg, u8 rssi_level);
//void rtl8723a_Add_RateATid(PADAPTER padapter, u32 bitmap, u8 arg);
u8 rtl8192c_set_FwSelectSuspend_cmd(PADAPTER padapter, u8 bfwpoll, u16 period);
//u8 rtl8723a_set_FwSelectSuspend_cmd(PADAPTER padapter, u8 bfwpoll, u16 period);
#ifdef CONFIG_P2P
void rtl8192c_set_p2p_ps_offload_cmd(PADAPTER padapter, u8 p2p_ps_state);
//void rtl8723a_set_p2p_ps_offload_cmd(PADAPTER padapter, u8 p2p_ps_state);
#endif //CONFIG_P2P
void CheckFwRsvdPageContent(PADAPTER padapter);
void rtl8723a_set_FwMediaStatus_cmd(PADAPTER padapter, u16 mstatus_rpt );
#endif
#ifdef CONFIG_TSF_RESET_OFFLOAD
u8 rtl8723c_reset_tsf(_adapter *padapter, u8 reset_port);
#endif // CONFIG_TSF_RESET_OFFLOAD

194
include/rtl8723a_dm.h
View file

@ -1,194 +0,0 @@
/******************************************************************************
*
* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
*
******************************************************************************/
#ifndef __RTL8723A_DM_H__
#define __RTL8723A_DM_H__
//============================================================
// Description:
//
// This file is for 8723A dynamic mechanism only
//
//
//============================================================
#define DYNAMIC_FUNC_BT BIT(0)
enum{
UP_LINK,
DOWN_LINK,
};
//============================================================
// structure and define
//============================================================
//###### duplicate code,will move to ODM #########
#define IQK_MAC_REG_NUM 4
#define IQK_ADDA_REG_NUM 16
#define IQK_BB_REG_NUM 9
#define HP_THERMAL_NUM 8
//###### duplicate code,will move to ODM #########
struct dm_priv
{
u8 DM_Type;
u8 DMFlag;
u8 InitDMFlag;
u32 InitODMFlag;
//* Upper and Lower Signal threshold for Rate Adaptive*/
int UndecoratedSmoothedPWDB;
int UndecoratedSmoothedCCK;
int EntryMinUndecoratedSmoothedPWDB;
int EntryMaxUndecoratedSmoothedPWDB;
int MinUndecoratedPWDBForDM;
int LastMinUndecoratedPWDBForDM;
s32 UndecoratedSmoothedBeacon;
#ifdef CONFIG_BT_COEXIST
s32 BT_EntryMinUndecoratedSmoothedPWDB;
s32 BT_EntryMaxUndecoratedSmoothedPWDB;
#endif
//###### duplicate code,will move to ODM #########
/*
//for DIG
u8 bDMInitialGainEnable;
u8 binitialized; // for dm_initial_gain_Multi_STA use.
DIG_T DM_DigTable;
PS_T DM_PSTable;
FALSE_ALARM_STATISTICS FalseAlmCnt;
//for rate adaptive, in fact, 88c/92c fw will handle this
u8 bUseRAMask;
RATE_ADAPTIVE RateAdaptive;
*/
//for High Power
u8 bDynamicTxPowerEnable;
u8 LastDTPLvl;
u8 DynamicTxHighPowerLvl;//Add by Jacken Tx Power Control for Near/Far Range 2008/03/06
//for tx power tracking
u8 bTXPowerTracking;
u8 TXPowercount;
u8 bTXPowerTrackingInit;
u8 TxPowerTrackControl; //for mp mode, turn off txpwrtracking as default
u8 TM_Trigger;
u8 ThermalMeter[2]; // ThermalMeter, index 0 for RFIC0, and 1 for RFIC1
u8 ThermalValue;
u8 ThermalValue_LCK;
u8 ThermalValue_IQK;
u8 ThermalValue_DPK;
u8 bRfPiEnable;
//for APK
u32 APKoutput[2][2]; //path A/B; output1_1a/output1_2a
u8 bAPKdone;
u8 bAPKThermalMeterIgnore;
u8 bDPdone;
u8 bDPPathAOK;
u8 bDPPathBOK;
//for IQK
u32 RegC04;
u32 Reg874;
u32 RegC08;
u32 RegB68;
u32 RegB6C;
u32 Reg870;
u32 Reg860;
u32 Reg864;
u32 ADDA_backup[IQK_ADDA_REG_NUM];
u32 IQK_MAC_backup[IQK_MAC_REG_NUM];
u32 IQK_BB_backup_recover[9];
u32 IQK_BB_backup[IQK_BB_REG_NUM];
u8 PowerIndex_backup[6];
u8 bCCKinCH14;
u8 CCK_index;
u8 OFDM_index[2];
u8 bDoneTxpower;
u8 CCK_index_HP;
u8 OFDM_index_HP[2];
u8 ThermalValue_HP[HP_THERMAL_NUM];
u8 ThermalValue_HP_index;
//for TxPwrTracking
s32 RegE94;
s32 RegE9C;
s32 RegEB4;
s32 RegEBC;
u32 TXPowerTrackingCallbackCnt; //cosa add for debug
u32 prv_traffic_idx; // edca turbo
/*
// for dm_RF_Saving
u8 initialize;
u32 rf_saving_Reg874;
u32 rf_saving_RegC70;
u32 rf_saving_Reg85C;
u32 rf_saving_RegA74;
*/
//for Antenna diversity
#ifdef CONFIG_ANTENNA_DIVERSITY
// SWAT_T DM_SWAT_Table;
#endif
#ifdef CONFIG_SW_ANTENNA_DIVERSITY
// _timer SwAntennaSwitchTimer;
/*
u64 lastTxOkCnt;
u64 lastRxOkCnt;
u64 TXByteCnt_A;
u64 TXByteCnt_B;
u64 RXByteCnt_A;
u64 RXByteCnt_B;
u8 DoubleComfirm;
u8 TrafficLoad;
*/
#endif
s32 OFDM_Pkt_Cnt;
u8 RSSI_Select;
// u8 DIG_Dynamic_MIN ;
//###### duplicate code,will move to ODM #########
// Add for Reading Initial Data Rate SEL Register 0x484 during watchdog. Using for fill tx desc. 2011.3.21 by Thomas
u8 INIDATA_RATE[32];
};
//============================================================
// function prototype
//============================================================
void rtl8723a_init_dm_priv(PADAPTER padapter);
void rtl8723a_deinit_dm_priv(PADAPTER padapter);
void rtl8723a_InitHalDm(PADAPTER padapter);
void rtl8723a_HalDmWatchDog(PADAPTER padapter);
#endif

849
include/rtl8723a_hal.h
View file

@ -1,849 +0,0 @@
/******************************************************************************
*
* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
*
******************************************************************************/
#ifndef __RTL8723A_HAL_H__
#define __RTL8723A_HAL_H__
#include "rtl8723a_spec.h"
#include "rtl8723a_pg.h"
#include "Hal8723APhyReg.h"
#include "Hal8723APhyCfg.h"
#include "rtl8723a_rf.h"
#ifdef CONFIG_BT_COEXIST
#include "rtl8723a_bt-coexist.h"
#endif
#include "rtl8723a_dm.h"
#include "rtl8723a_recv.h"
#include "rtl8723a_xmit.h"
#include "rtl8723a_cmd.h"
#ifdef DBG_CONFIG_ERROR_DETECT
#include "rtl8723a_sreset.h"
#endif
#include "rtw_efuse.h"
#include "../hal/OUTSRC/odm_precomp.h"
#if defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI)
//2TODO: We should define 8192S firmware related macro settings here!!
#define RTL819X_DEFAULT_RF_TYPE RF_1T2R
#define RTL819X_TOTAL_RF_PATH 2
//---------------------------------------------------------------------
// RTL8723S From file
//---------------------------------------------------------------------
#define RTL8723_FW_UMC_IMG "rtl8723S\\rtl8723fw.bin"
#define RTL8723_FW_UMC_B_IMG "rtl8723S\\rtl8723fw_B.bin"
#define RTL8723_PHY_REG "rtl8723S\\PHY_REG_1T.txt"
#define RTL8723_PHY_RADIO_A "rtl8723S\\radio_a_1T.txt"
#define RTL8723_PHY_RADIO_B "rtl8723S\\radio_b_1T.txt"
#define RTL8723_AGC_TAB "rtl8723S\\AGC_TAB_1T.txt"
#define RTL8723_PHY_MACREG "rtl8723S\\MAC_REG.txt"
#define RTL8723_PHY_REG_PG "rtl8723S\\PHY_REG_PG.txt"
#define RTL8723_PHY_REG_MP "rtl8723S\\PHY_REG_MP.txt"
//---------------------------------------------------------------------
// RTL8723S From header
//---------------------------------------------------------------------
// Fw Array
#define Rtl8723_FwImageArray Rtl8723SFwImgArray
#define Rtl8723_FwUMCBCutImageArrayWithBT Rtl8723SFwUMCBCutImgArrayWithBT
#define Rtl8723_FwUMCBCutImageArrayWithoutBT Rtl8723SFwUMCBCutImgArrayWithoutBT
#define Rtl8723_ImgArrayLength Rtl8723SImgArrayLength
#define Rtl8723_UMCBCutImgArrayWithBTLength Rtl8723SUMCBCutImgArrayWithBTLength
#define Rtl8723_UMCBCutImgArrayWithoutBTLength Rtl8723SUMCBCutImgArrayWithoutBTLength
#define Rtl8723_PHY_REG_Array_PG Rtl8723SPHY_REG_Array_PG
#define Rtl8723_PHY_REG_Array_PGLength Rtl8723SPHY_REG_Array_PGLength
#if MP_DRIVER == 1
#define Rtl8723E_FwBTImgArray Rtl8723EFwBTImgArray
#define Rtl8723E_FwBTImgArrayLength Rtl8723EBTImgArrayLength
#define Rtl8723_FwUMCBCutMPImageArray Rtl8723SFwUMCBCutMPImgArray
#define Rtl8723_UMCBCutMPImgArrayLength Rtl8723SUMCBCutMPImgArrayLength
#define Rtl8723_PHY_REG_Array_MP Rtl8723SPHY_REG_Array_MP
#define Rtl8723_PHY_REG_Array_MPLength Rtl8723SPHY_REG_Array_MPLength
#endif
#ifndef CONFIG_PHY_SETTING_WITH_ODM
// MAC/BB/PHY Array
#define Rtl8723_MAC_Array Rtl8723SMAC_2T_Array
//#define Rtl8723_AGCTAB_2TArray Rtl8723SAGCTAB_2TArray
#define Rtl8723_AGCTAB_1TArray Rtl8723SAGCTAB_1TArray
//#define Rtl8723_PHY_REG_2TArray Rtl8723SPHY_REG_2TArray
#define Rtl8723_PHY_REG_1TArray Rtl8723SPHY_REG_1TArray
//#define Rtl8723_RadioA_2TArray Rtl8723SRadioA_2TArray
#define Rtl8723_RadioA_1TArray Rtl8723SRadioA_1TArray
//#define Rtl8723_RadioB_2TArray Rtl8723SRadioB_2TArray
#define Rtl8723_RadioB_1TArray Rtl8723SRadioB_1TArray
// Array length
#define Rtl8723_MAC_ArrayLength Rtl8723SMAC_2T_ArrayLength
#define Rtl8723_AGCTAB_1TArrayLength Rtl8723SAGCTAB_1TArrayLength
#define Rtl8723_PHY_REG_1TArrayLength Rtl8723SPHY_REG_1TArrayLength
#define Rtl8723_RadioA_1TArrayLength Rtl8723SRadioA_1TArrayLength
#define Rtl8723_RadioB_1TArrayLength Rtl8723SRadioB_1TArrayLength
#endif // CONFIG_PHY_SETTING_WITH_ODM
#endif // CONFIG_SDIO_HCI
#ifdef CONFIG_USB_HCI
//2TODO: We should define 8192S firmware related macro settings here!!
#define RTL819X_DEFAULT_RF_TYPE RF_1T2R
#define RTL819X_TOTAL_RF_PATH 2
//TODO: The following need to check!!
#define RTL8723_FW_UMC_IMG "rtl8192CU\\rtl8723fw.bin"
#define RTL8723_FW_UMC_B_IMG "rtl8192CU\\rtl8723fw_B.bin"
#define RTL8723_PHY_REG "rtl8723S\\PHY_REG_1T.txt"
#define RTL8723_PHY_RADIO_A "rtl8723S\\radio_a_1T.txt"
#define RTL8723_PHY_RADIO_B "rtl8723S\\radio_b_1T.txt"
#define RTL8723_AGC_TAB "rtl8723S\\AGC_TAB_1T.txt"
#define RTL8723_PHY_MACREG "rtl8723S\\MAC_REG.txt"
#define RTL8723_PHY_REG_PG "rtl8723S\\PHY_REG_PG.txt"
#define RTL8723_PHY_REG_MP "rtl8723S\\PHY_REG_MP.txt"
//---------------------------------------------------------------------
// RTL8723S From header
//---------------------------------------------------------------------
// Fw Array
#define Rtl8723_FwImageArray Rtl8723UFwImgArray
#define Rtl8723_FwUMCBCutImageArrayWithBT Rtl8723UFwUMCBCutImgArrayWithBT
#define Rtl8723_FwUMCBCutImageArrayWithoutBT Rtl8723UFwUMCBCutImgArrayWithoutBT
#define Rtl8723_ImgArrayLength Rtl8723UImgArrayLength
#define Rtl8723_UMCBCutImgArrayWithBTLength Rtl8723UUMCBCutImgArrayWithBTLength
#define Rtl8723_UMCBCutImgArrayWithoutBTLength Rtl8723UUMCBCutImgArrayWithoutBTLength
#define Rtl8723_PHY_REG_Array_PG Rtl8723UPHY_REG_Array_PG
#define Rtl8723_PHY_REG_Array_PGLength Rtl8723UPHY_REG_Array_PGLength
#if MP_DRIVER == 1
#define Rtl8723E_FwBTImgArray Rtl8723EFwBTImgArray
#define Rtl8723E_FwBTImgArrayLength Rtl8723EBTImgArrayLength
#define Rtl8723_FwUMCBCutMPImageArray Rtl8723SFwUMCBCutMPImgArray
#define Rtl8723_UMCBCutMPImgArrayLength Rtl8723SUMCBCutMPImgArrayLength
#define Rtl8723_PHY_REG_Array_MP Rtl8723UPHY_REG_Array_MP
#define Rtl8723_PHY_REG_Array_MPLength Rtl8723UPHY_REG_Array_MPLength
#endif
#ifndef CONFIG_PHY_SETTING_WITH_ODM
// MAC/BB/PHY Array
#define Rtl8723_MAC_Array Rtl8723UMAC_2T_Array
//#define Rtl8723_AGCTAB_2TArray Rtl8723UAGCTAB_2TArray
#define Rtl8723_AGCTAB_1TArray Rtl8723UAGCTAB_1TArray
//#define Rtl8723_PHY_REG_2TArray Rtl8723UPHY_REG_2TArray
#define Rtl8723_PHY_REG_1TArray Rtl8723UPHY_REG_1TArray
//#define Rtl8723_RadioA_2TArray Rtl8723URadioA_2TArray
#define Rtl8723_RadioA_1TArray Rtl8723URadioA_1TArray
//#define Rtl8723_RadioB_2TArray Rtl8723URadioB_2TArray
#define Rtl8723_RadioB_1TArray Rtl8723URadioB_1TArray
// Array length
#define Rtl8723_MAC_ArrayLength Rtl8723UMAC_2T_ArrayLength
#define Rtl8723_AGCTAB_1TArrayLength Rtl8723UAGCTAB_1TArrayLength
#define Rtl8723_PHY_REG_1TArrayLength Rtl8723UPHY_REG_1TArrayLength
#define Rtl8723_RadioA_1TArrayLength Rtl8723URadioA_1TArrayLength
#define Rtl8723_RadioB_1TArrayLength Rtl8723URadioB_1TArrayLength
#endif
#endif
#define DRVINFO_SZ 4 // unit is 8bytes
#define PageNum_128(_Len) (u32)(((_Len)>>7) + ((_Len)&0x7F ? 1:0))
#define FW_8723A_SIZE 0x8000
#define FW_8723A_START_ADDRESS 0x1000
#define FW_8723A_END_ADDRESS 0x1FFF //0x5FFF
#define MAX_PAGE_SIZE 4096 // @ page : 4k bytes
#define IS_FW_HEADER_EXIST(_pFwHdr) ((le16_to_cpu(_pFwHdr->Signature)&0xFFF0) == 0x92C0 ||\
(le16_to_cpu(_pFwHdr->Signature)&0xFFF0) == 0x88C0 ||\
(le16_to_cpu(_pFwHdr->Signature)&0xFFF0) == 0x2300)
typedef enum _FIRMWARE_SOURCE {
FW_SOURCE_IMG_FILE = 0,
FW_SOURCE_HEADER_FILE = 1, //from header file
} FIRMWARE_SOURCE, *PFIRMWARE_SOURCE;
typedef struct _RT_FIRMWARE {
FIRMWARE_SOURCE eFWSource;
#ifdef CONFIG_EMBEDDED_FWIMG
u8* szFwBuffer;
#else
u8 szFwBuffer[FW_8723A_SIZE];
#endif
u32 ulFwLength;
#ifdef CONFIG_EMBEDDED_FWIMG
u8* szBTFwBuffer;
#else
u8 szBTFwBuffer[FW_8723A_SIZE];
#endif
u32 ulBTFwLength;
} RT_FIRMWARE, *PRT_FIRMWARE, RT_FIRMWARE_8723A, *PRT_FIRMWARE_8723A;
//
// This structure must be cared byte-ordering
//
// Added by tynli. 2009.12.04.
typedef struct _RT_8723A_FIRMWARE_HDR
{
// 8-byte alinment required
//--- LONG WORD 0 ----
u16 Signature; // 92C0: test chip; 92C, 88C0: test chip; 88C1: MP A-cut; 92C1: MP A-cut
u8 Category; // AP/NIC and USB/PCI
u8 Function; // Reserved for different FW function indcation, for further use when driver needs to download different FW in different conditions
u16 Version; // FW Version
u8 Subversion; // FW Subversion, default 0x00
u16 Rsvd1;
//--- LONG WORD 1 ----
u8 Month; // Release time Month field
u8 Date; // Release time Date field
u8 Hour; // Release time Hour field
u8 Minute; // Release time Minute field
u16 RamCodeSize; // The size of RAM code
u16 Rsvd2;
//--- LONG WORD 2 ----
u32 SvnIdx; // The SVN entry index
u32 Rsvd3;
//--- LONG WORD 3 ----
u32 Rsvd4;
u32 Rsvd5;
}RT_8723A_FIRMWARE_HDR, *PRT_8723A_FIRMWARE_HDR;
#define DRIVER_EARLY_INT_TIME 0x05
#define BCN_DMA_ATIME_INT_TIME 0x02
#ifdef CONFIG_USB_RX_AGGREGATION
typedef enum _USB_RX_AGG_MODE{
USB_RX_AGG_DISABLE,
USB_RX_AGG_DMA,
USB_RX_AGG_USB,
USB_RX_AGG_MIX
}USB_RX_AGG_MODE;
#define MAX_RX_DMA_BUFFER_SIZE 10240 // 10K for 8192C RX DMA buffer
#endif
// BK, BE, VI, VO, HCCA, MANAGEMENT, COMMAND, HIGH, BEACON.
#define MAX_TX_QUEUE 9
#define TX_SELE_HQ BIT(0) // High Queue
#define TX_SELE_LQ BIT(1) // Low Queue
#define TX_SELE_NQ BIT(2) // Normal Queue
// Note: We will divide number of page equally for each queue other than public queue!
#define TX_TOTAL_PAGE_NUMBER 0xF8
#define TX_PAGE_BOUNDARY (TX_TOTAL_PAGE_NUMBER + 1)
// For Normal Chip Setting
// (HPQ + LPQ + NPQ + PUBQ) shall be TX_TOTAL_PAGE_NUMBER
#define NORMAL_PAGE_NUM_PUBQ 0xE7
#define NORMAL_PAGE_NUM_HPQ 0x0C
#define NORMAL_PAGE_NUM_LPQ 0x02
#define NORMAL_PAGE_NUM_NPQ 0x02
// For Test Chip Setting
// (HPQ + LPQ + PUBQ) shall be TX_TOTAL_PAGE_NUMBER
#define TEST_PAGE_NUM_PUBQ 0x7E
// For Test Chip Setting
#define WMM_TEST_TX_TOTAL_PAGE_NUMBER 0xF5
#define WMM_TEST_TX_PAGE_BOUNDARY (WMM_TEST_TX_TOTAL_PAGE_NUMBER + 1) //F6
#define WMM_TEST_PAGE_NUM_PUBQ 0xA3
#define WMM_TEST_PAGE_NUM_HPQ 0x29
#define WMM_TEST_PAGE_NUM_LPQ 0x29
// Note: For Normal Chip Setting, modify later
#define WMM_NORMAL_TX_TOTAL_PAGE_NUMBER 0xF5
#define WMM_NORMAL_TX_PAGE_BOUNDARY (WMM_TEST_TX_TOTAL_PAGE_NUMBER + 1) //F6
#define WMM_NORMAL_PAGE_NUM_PUBQ 0xB0
#define WMM_NORMAL_PAGE_NUM_HPQ 0x29
#define WMM_NORMAL_PAGE_NUM_LPQ 0x1C
#define WMM_NORMAL_PAGE_NUM_NPQ 0x1C
//-------------------------------------------------------------------------
// Chip specific
//-------------------------------------------------------------------------
#define CHIP_BONDING_IDENTIFIER(_value) (((_value)>>22)&0x3)
#define CHIP_BONDING_92C_1T2R 0x1
#define CHIP_BONDING_88C_USB_MCARD 0x2
#define CHIP_BONDING_88C_USB_HP 0x1
#include "HalVerDef.h"
#include "hal_com.h"
//-------------------------------------------------------------------------
// Channel Plan
//-------------------------------------------------------------------------
enum ChannelPlan
{
CHPL_FCC = 0,
CHPL_IC = 1,
CHPL_ETSI = 2,
CHPL_SPAIN = 3,
CHPL_FRANCE = 4,
CHPL_MKK = 5,
CHPL_MKK1 = 6,
CHPL_ISRAEL = 7,
CHPL_TELEC = 8,
CHPL_GLOBAL = 9,
CHPL_WORLD = 10,
};
#define HAL_EFUSE_MEMORY
#define EFUSE_REAL_CONTENT_LEN 512
#define EFUSE_MAP_LEN 128
#define EFUSE_MAX_SECTION 16
#define EFUSE_IC_ID_OFFSET 506 //For some inferiority IC purpose. added by Roger, 2009.09.02.
#define AVAILABLE_EFUSE_ADDR(addr) (addr < EFUSE_REAL_CONTENT_LEN)
//
// <Roger_Notes>
// To prevent out of boundary programming case,
// leave 1byte and program full section
// 9bytes + 1byt + 5bytes and pre 1byte.
// For worst case:
// | 1byte|----8bytes----|1byte|--5bytes--|
// | | Reserved(14bytes) |
//
// PG data exclude header, dummy 6 bytes frome CP test and reserved 1byte.
#define EFUSE_OOB_PROTECT_BYTES 15
#define EFUSE_REAL_CONTENT_LEN_8723A 512
#define EFUSE_MAP_LEN_8723A 256
#define EFUSE_MAX_SECTION_8723A 32
//========================================================
// EFUSE for BT definition
//========================================================
#define EFUSE_BT_REAL_BANK_CONTENT_LEN 512
#define EFUSE_BT_REAL_CONTENT_LEN 1536 // 512*3
#define EFUSE_BT_MAP_LEN 1024 // 1k bytes
#define EFUSE_BT_MAX_SECTION 128 // 1024/8
#define EFUSE_PROTECT_BYTES_BANK 16
//
// <Roger_Notes> For RTL8723 WiFi/BT/GPS multi-function configuration. 2010.10.06.
//
typedef enum _RT_MULTI_FUNC {
RT_MULTI_FUNC_NONE = 0x00,
RT_MULTI_FUNC_WIFI = 0x01,
RT_MULTI_FUNC_BT = 0x02,
RT_MULTI_FUNC_GPS = 0x04,
} RT_MULTI_FUNC, *PRT_MULTI_FUNC;
//
// <Roger_Notes> For RTL8723 WiFi PDn/GPIO polarity control configuration. 2010.10.08.
//
typedef enum _RT_POLARITY_CTL {
RT_POLARITY_LOW_ACT = 0,
RT_POLARITY_HIGH_ACT = 1,
} RT_POLARITY_CTL, *PRT_POLARITY_CTL;
// For RTL8723 regulator mode. by tynli. 2011.01.14.
typedef enum _RT_REGULATOR_MODE {
RT_SWITCHING_REGULATOR = 0,
RT_LDO_REGULATOR = 1,
} RT_REGULATOR_MODE, *PRT_REGULATOR_MODE;
// Description: Determine the types of C2H events that are the same in driver and Fw.
// Fisrt constructed by tynli. 2009.10.09.
typedef enum _RTL8192C_C2H_EVT
{
C2H_DBG = 0,
C2H_TSF = 1,
C2H_AP_RPT_RSP = 2,
C2H_CCX_TX_RPT = 3, // The FW notify the report of the specific tx packet.
C2H_BT_RSSI = 4,
C2H_BT_OP_MODE = 5,
C2H_EXT_RA_RPT = 6,
C2H_HW_INFO_EXCH = 10,
C2H_C2H_H2C_TEST = 11,
C2H_BT_INFO = 12,
C2H_BT_MP_INFO = 15,
MAX_C2HEVENT
} RTL8192C_C2H_EVT;
typedef struct hal_data_8723a
{
HAL_VERSION VersionID;
RT_CUSTOMER_ID CustomerID;
u16 FirmwareVersion;
u16 FirmwareVersionRev;
u16 FirmwareSubVersion;
u16 FirmwareSignature;
//current WIFI_PHY values
u32 ReceiveConfig;
WIRELESS_MODE CurrentWirelessMode;
HT_CHANNEL_WIDTH CurrentChannelBW;
u8 CurrentChannel;
u8 nCur40MhzPrimeSC;// Control channel sub-carrier
u16 BasicRateSet;
//rf_ctrl
u8 rf_chip;
u8 rf_type;
u8 NumTotalRFPath;
u8 BoardType;
u8 CrystalCap;
//
// EEPROM setting.
//
u8 EEPROMVersion;
u16 EEPROMVID;
u16 EEPROMPID;
u16 EEPROMSVID;
u16 EEPROMSDID;
u8 EEPROMCustomerID;
u8 EEPROMSubCustomerID;
u8 EEPROMRegulatory;
u8 EEPROMThermalMeter;
u8 EEPROMBluetoothCoexist;
u8 EEPROMBluetoothType;
u8 EEPROMBluetoothAntNum;
u8 EEPROMBluetoothAntIsolation;
u8 EEPROMBluetoothRadioShared;
u8 bTXPowerDataReadFromEEPORM;
u8 bAPKThermalMeterIgnore;
u8 bIQKInitialized;
u8 bAntennaDetected;
u8 TxPwrLevelCck[RF_PATH_MAX][CHANNEL_MAX_NUMBER];
u8 TxPwrLevelHT40_1S[RF_PATH_MAX][CHANNEL_MAX_NUMBER]; // For HT 40MHZ pwr
u8 TxPwrLevelHT40_2S[RF_PATH_MAX][CHANNEL_MAX_NUMBER]; // For HT 40MHZ pwr
u8 TxPwrHt20Diff[RF_PATH_MAX][CHANNEL_MAX_NUMBER];// HT 20<->40 Pwr diff
u8 TxPwrLegacyHtDiff[RF_PATH_MAX][CHANNEL_MAX_NUMBER];// For HT<->legacy pwr diff
// For power group
u8 PwrGroupHT20[RF_PATH_MAX][CHANNEL_MAX_NUMBER];
u8 PwrGroupHT40[RF_PATH_MAX][CHANNEL_MAX_NUMBER];
u8 LegacyHTTxPowerDiff;// Legacy to HT rate power diff
// Read/write are allow for following hardware information variables
u8 framesync;
u32 framesyncC34;
u8 framesyncMonitor;
u8 DefaultInitialGain[4];
u8 pwrGroupCnt;
u32 MCSTxPowerLevelOriginalOffset[7][16];
u32 CCKTxPowerLevelOriginalOffset;
u32 AntennaTxPath; // Antenna path Tx
u32 AntennaRxPath; // Antenna path Rx
u8 ExternalPA;
u8 bLedOpenDrain; // Support Open-drain arrangement for controlling the LED. Added by Roger, 2009.10.16.
//u32 LedControlNum;
//u32 LedControlMode;
//u32 TxPowerTrackControl;
u8 b1x1RecvCombine; // for 1T1R receive combining
// For EDCA Turbo mode
// u8 bIsAnyNonBEPkts; // Adapter->recvpriv.bIsAnyNonBEPkts
// u8 bCurrentTurboEDCA;
// u8 bForcedDisableTurboEDCA;
// u8 bIsCurRDLState; // pdmpriv->prv_traffic_idx
u32 AcParam_BE; //Original parameter for BE, use for EDCA turbo.
//vivi, for tx power tracking, 20080407
//u16 TSSI_13dBm;
//u32 Pwr_Track;
// The current Tx Power Level
u8 CurrentCckTxPwrIdx;
u8 CurrentOfdm24GTxPwrIdx;
BB_REGISTER_DEFINITION_T PHYRegDef[4]; //Radio A/B/C/D
BOOLEAN bRFPathRxEnable[4]; // We support 4 RF path now.
u32 RfRegChnlVal[2];
u8 bCckHighPower;
//RDG enable
BOOLEAN bRDGEnable;
//for host message to fw
u8 LastHMEBoxNum;
u8 fw_ractrl;
u8 RegTxPause;
// Beacon function related global variable.
u32 RegBcnCtrlVal;
u8 RegFwHwTxQCtrl;
u8 RegReg542;
struct dm_priv dmpriv;
DM_ODM_T odmpriv;
//_lock odm_stainfo_lock;
#ifdef DBG_CONFIG_ERROR_DETECT
struct sreset_priv srestpriv;
#endif
#ifdef CONFIG_BT_COEXIST
u8 bBTMode;
// BT only.
BT30Info BtInfo;
// For bluetooth co-existance
BT_COEXIST_STR bt_coexist;
#endif
#ifdef CONFIG_ANTENNA_DIVERSITY
u8 CurAntenna;
// SW Antenna Switch
s32 RSSI_sum_A;
s32 RSSI_sum_B;
s32 RSSI_cnt_A;
s32 RSSI_cnt_B;
u8 RSSI_test;
u8 AntDivCfg;
#endif
u8 bDumpRxPkt;//for debug
u8 FwRsvdPageStartOffset; //2010.06.23. Added by tynli. Reserve page start offset except beacon in TxQ.
// 2010/08/09 MH Add CU power down mode.
u8 pwrdown;
// Add for dual MAC 0--Mac0 1--Mac1
u32 interfaceIndex;
u8 OutEpQueueSel;
u8 OutEpNumber;
// 2010/12/10 MH Add for USB aggreation mode dynamic shceme.
BOOLEAN UsbRxHighSpeedMode;
// 2010/11/22 MH Add for slim combo debug mode selective.
// This is used for fix the drawback of CU TSMC-A/UMC-A cut. HW auto suspend ability. Close BT clock.
BOOLEAN SlimComboDbg;
//
// Add For EEPROM Efuse switch and Efuse Shadow map Setting
//
u8 EepromOrEfuse;
// u8 EfuseMap[2][HWSET_MAX_SIZE_512]; //92C:256bytes, 88E:512bytes, we use union set (512bytes)
u16 EfuseUsedBytes;
u8 EfuseUsedPercentage;
#ifdef HAL_EFUSE_MEMORY
EFUSE_HAL EfuseHal;
#endif
// Interrupt relatd register information.
u32 SysIntrStatus;
u32 SysIntrMask;
//
// 2011/02/23 MH Add for 8723 mylti function definition. The define should be moved to an
// independent file in the future.
//
//------------------------8723-----------------------------------------//
RT_MULTI_FUNC MultiFunc; // For multi-function consideration.
RT_POLARITY_CTL PolarityCtl; // For Wifi PDn Polarity control.
RT_REGULATOR_MODE RegulatorMode; // switching regulator or LDO
//------------------------8723-----------------------------------------//
//
// 2011/02/23 MH Add for 8723 mylti function definition. The define should be moved to an
// independent file in the future.
BOOLEAN bMACFuncEnable;
#ifdef CONFIG_P2P
struct P2P_PS_Offload_t p2p_ps_offload;
#endif
//
// For USB Interface HAL related
//
#ifdef CONFIG_USB_HCI
u32 UsbBulkOutSize;
// Interrupt relatd register information.
u32 IntArray[2];
u32 IntrMask[2];
#endif
//
// For SDIO Interface HAL related
//
// Auto FSM to Turn On, include clock, isolation, power control for MAC only
u8 bMacPwrCtrlOn;
#if defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI)
//
// SDIO ISR Related
//
// u32 IntrMask[1];
// u32 IntrMaskToSet[1];
// LOG_INTERRUPT InterruptLog;
u32 sdio_himr;
u32 sdio_hisr;
//
// SDIO Tx FIFO related.
//
// HIQ, MID, LOW, PUB free pages; padapter->xmitpriv.free_txpg
u8 SdioTxFIFOFreePage[SDIO_TX_FREE_PG_QUEUE];
_lock SdioTxFIFOFreePageLock;
//
// SDIO Rx FIFO related.
//
u8 SdioRxFIFOCnt;
u16 SdioRxFIFOSize;
#endif
} HAL_DATA_8723A, *PHAL_DATA_8723A;
#if 0
#define HAL_DATA_TYPE HAL_DATA_8723A
#define PHAL_DATA_TYPE PHAL_DATA_8723A
#else
typedef struct hal_data_8723a HAL_DATA_TYPE, *PHAL_DATA_TYPE;
#endif
#define GET_HAL_DATA(__pAdapter) ((HAL_DATA_TYPE *)((__pAdapter)->HalData))
#define GET_RF_TYPE(priv) (GET_HAL_DATA(priv)->rf_type)
#define INCLUDE_MULTI_FUNC_BT(_Adapter) (GET_HAL_DATA(_Adapter)->MultiFunc & RT_MULTI_FUNC_BT)
#define INCLUDE_MULTI_FUNC_GPS(_Adapter) (GET_HAL_DATA(_Adapter)->MultiFunc & RT_MULTI_FUNC_GPS)
typedef struct rxreport_8723a
{
u32 pktlen:14;
u32 crc32:1;
u32 icverr:1;
u32 drvinfosize:4;
u32 security:3;
u32 qos:1;
u32 shift:2;
u32 physt:1;
u32 swdec:1;
u32 ls:1;
u32 fs:1;
u32 eor:1;
u32 own:1;
u32 macid:5;
u32 tid:4;
u32 hwrsvd:4;
u32 amsdu:1;
u32 paggr:1;
u32 faggr:1;
u32 a1fit:4;
u32 a2fit:4;
u32 pam:1;
u32 pwr:1;
u32 md:1;
u32 mf:1;
u32 type:2;
u32 mc:1;
u32 bc:1;
u32 seq:12;
u32 frag:4;
u32 nextpktlen:14;
u32 nextind:1;
u32 rsvd0831:1;
u32 rxmcs:6;
u32 rxht:1;
u32 gf:1;
u32 splcp:1;
u32 bw:1;
u32 htc:1;
u32 eosp:1;
u32 bssidfit:2;
u32 rsvd1214:16;
u32 unicastwake:1;
u32 magicwake:1;
u32 pattern0match:1;
u32 pattern1match:1;
u32 pattern2match:1;
u32 pattern3match:1;
u32 pattern4match:1;
u32 pattern5match:1;
u32 pattern6match:1;
u32 pattern7match:1;
u32 pattern8match:1;
u32 pattern9match:1;
u32 patternamatch:1;
u32 patternbmatch:1;
u32 patterncmatch:1;
u32 rsvd1613:19;
u32 tsfl;
u32 bassn:12;
u32 bavld:1;
u32 rsvd2413:19;
} RXREPORT, *PRXREPORT;
typedef struct phystatus_8723a
{
u32 rxgain_a:7;
u32 trsw_a:1;
u32 rxgain_b:7;
u32 trsw_b:1;
u32 chcorr_l:16;
u32 sigqualcck:8;
u32 cfo_a:8;
u32 cfo_b:8;
u32 chcorr_h:8;
u32 noisepwrdb_h:8;
u32 cfo_tail_a:8;
u32 cfo_tail_b:8;
u32 rsvd0824:8;
u32 rsvd1200:8;
u32 rxevm_a:8;
u32 rxevm_b:8;
u32 rxsnr_a:8;
u32 rxsnr_b:8;
u32 noisepwrdb_l:8;
u32 rsvd1616:8;
u32 postsnr_a:8;
u32 postsnr_b:8;
u32 csi_a:8;
u32 csi_b:8;
u32 targetcsi_a:8;
u32 targetcsi_b:8;
u32 sigevm:8;
u32 maxexpwr:8;
u32 exintflag:1;
u32 sgien:1;
u32 rxsc:2;
u32 idlelong:1;
u32 anttrainen:1;
u32 antselb:1;
u32 antsel:1;
} PHYSTATUS, *PPHYSTATUS;
// rtl8723a_hal_init.c
int FirmwareDownloadBT(IN PADAPTER Adapter, PRT_FIRMWARE_8723A pFirmware);
s32 rtl8723a_FirmwareDownload(PADAPTER padapter);
void rtl8723a_FirmwareSelfReset(PADAPTER padapter);
void rtl8723a_InitializeFirmwareVars(PADAPTER padapter);
void _8051Reset8723A(PADAPTER padapter);
void rtl8723a_InitAntenna_Selection(PADAPTER padapter);
void rtl8723a_DeinitAntenna_Selection(PADAPTER padapter);
void rtl8723a_CheckAntenna_Selection(PADAPTER padapter);
void rtl8723a_init_default_value(PADAPTER padapter);
s32 InitLLTTable(PADAPTER padapter, u32 boundary);
s32 CardDisableHWSM(PADAPTER padapter, u8 resetMCU);
s32 CardDisableWithoutHWSM(PADAPTER padapter);
// EFuse
u8 GetEEPROMSize8723A(PADAPTER padapter);
void Hal_InitPGData(PADAPTER padapter, u8 *PROMContent);
void Hal_EfuseParseIDCode(PADAPTER padapter, u8 *hwinfo);
void Hal_EfuseParseTxPowerInfo_8723A(PADAPTER padapter, u8 *PROMContent, BOOLEAN AutoLoadFail);
void Hal_EfuseParseBTCoexistInfo_8723A(PADAPTER padapter, u8 *hwinfo, BOOLEAN AutoLoadFail);
void Hal_EfuseParseEEPROMVer(PADAPTER padapter, u8 *hwinfo, BOOLEAN AutoLoadFail);
void rtl8723a_EfuseParseChnlPlan(PADAPTER padapter, u8 *hwinfo, BOOLEAN AutoLoadFail);
void Hal_EfuseParseCustomerID(PADAPTER padapter, u8 *hwinfo, BOOLEAN AutoLoadFail);
void Hal_EfuseParseAntennaDiversity(PADAPTER padapter, u8 *hwinfo, BOOLEAN AutoLoadFail);
void Hal_EfuseParseRateIndicationOption(PADAPTER padapter, u8 *hwinfo, BOOLEAN AutoLoadFail);
void Hal_EfuseParseXtal_8723A(PADAPTER pAdapter, u8 *hwinfo, u8 AutoLoadFail);
void Hal_EfuseParseThermalMeter_8723A(PADAPTER padapter, u8 *hwinfo, u8 AutoLoadFail);
//RT_CHANNEL_DOMAIN rtl8723a_HalMapChannelPlan(PADAPTER padapter, u8 HalChannelPlan);
//VERSION_8192C rtl8723a_ReadChipVersion(PADAPTER padapter);
//void rtl8723a_ReadBluetoothCoexistInfo(PADAPTER padapter, u8 *PROMContent, BOOLEAN AutoloadFail);
void Hal_InitChannelPlan(PADAPTER padapter);
void rtl8723a_set_hal_ops(struct hal_ops *pHalFunc);
void SetHwReg8723A(PADAPTER padapter, u8 variable, u8 *val);
void GetHwReg8723A(PADAPTER padapter, u8 variable, u8 *val);
#ifdef CONFIG_BT_COEXIST
void rtl8723a_SingleDualAntennaDetection(PADAPTER padapter);
#endif
// register
void SetBcnCtrlReg(PADAPTER padapter, u8 SetBits, u8 ClearBits);
void rtl8723a_InitBeaconParameters(PADAPTER padapter);
void rtl8723a_InitBeaconMaxError(PADAPTER padapter, u8 InfraMode);
void rtl8723a_start_thread(_adapter *padapter);
void rtl8723a_stop_thread(_adapter *padapter);
s32 c2h_id_filter_ccx_8723a(u8 id);
#if defined(CONFIG_CHECK_BT_HANG) && defined(CONFIG_BT_COEXIST)
void rtl8723a_init_checkbthang_workqueue(_adapter * padapter);
void rtl8723a_free_checkbthang_workqueue(_adapter * padapter);
void rtl8723a_cancel_checkbthang_workqueue(_adapter * padapter);
void rtl8723a_hal_check_bt_hang(_adapter * padapter);
#endif
#ifdef CONFIG_RF_GAIN_OFFSET
void Hal_ReadRFGainOffset(PADAPTER pAdapter,u8* hwinfo,BOOLEAN AutoLoadFail);
#endif //CONFIG_RF_GAIN_OFFSET
#endif

50
include/rtl8723a_led.h
View file

@ -1,50 +0,0 @@
/******************************************************************************
*
* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
*
******************************************************************************/
#ifndef __RTL8723A_LED_H__
#define __RTL8723A_LED_H__
#include <drv_conf.h>
#include <osdep_service.h>
#include <drv_types.h>
//================================================================================
// Interface to manipulate LED objects.
//================================================================================
#ifdef CONFIG_USB_HCI
void rtl8723au_InitSwLeds(PADAPTER padapter);
void rtl8723au_DeInitSwLeds(PADAPTER padapter);
#endif
#ifdef CONFIG_PCI_HCI
void rtl8723ae_gen_RefreshLedState(PADAPTER Adapter);
void rtl8723ae_InitSwLeds(PADAPTER padapter);
void rtl8723ae_DeInitSwLeds(PADAPTER padapter);
#endif
#ifdef CONFIG_SDIO_HCI
void rtl8723as_InitSwLeds(PADAPTER padapter);
void rtl8723as_DeInitSwLeds(PADAPTER padapter);
#endif
#ifdef CONFIG_GSPI_HCI
void rtl8723as_InitSwLeds(PADAPTER padapter);
void rtl8723as_DeInitSwLeds(PADAPTER padapter);
#endif
#endif

146
include/rtl8723a_pg.h
View file

@ -1,146 +0,0 @@
/******************************************************************************
*
* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
*
******************************************************************************/
#ifndef __RTL8723A_PG_H__
#define __RTL8723A_PG_H__
//====================================================
// EEPROM/Efuse PG Offset for 8723E/8723U/8723S
//====================================================
#define EEPROM_CCK_TX_PWR_INX_8723A 0x10
#define EEPROM_HT40_1S_TX_PWR_INX_8723A 0x16
#define EEPROM_HT20_TX_PWR_INX_DIFF_8723A 0x1C
#define EEPROM_OFDM_TX_PWR_INX_DIFF_8723A 0x1F
#define EEPROM_HT40_MAX_PWR_OFFSET_8723A 0x22
#define EEPROM_HT20_MAX_PWR_OFFSET_8723A 0x25
#define EEPROM_ChannelPlan_8723A 0x28
#define EEPROM_TSSI_A_8723A 0x29
#define EEPROM_THERMAL_METER_8723A 0x2A
#define RF_OPTION1_8723A 0x2B
#define RF_OPTION2_8723A 0x2C
#define RF_OPTION3_8723A 0x2D
#define RF_OPTION4_8723A 0x2E
#define EEPROM_VERSION_8723A 0x30
#define EEPROM_CustomID_8723A 0x31
#define EEPROM_SubCustomID_8723A 0x32
#define EEPROM_XTAL_K_8723A 0x33
#define EEPROM_Chipset_8723A 0x34
// RTL8723AE
#define EEPROM_VID_8723AE 0x49
#define EEPROM_DID_8723AE 0x4B
#define EEPROM_SVID_8723AE 0x4D
#define EEPROM_SMID_8723AE 0x4F
#define EEPROM_MAC_ADDR_8723AE 0x67
// RTL8723AU
#define EEPROM_MAC_ADDR_8723AU 0xC6
#define EEPROM_VID_8723AU 0xB7
#define EEPROM_PID_8723AU 0xB9
// RTL8723AS
#define EEPROM_MAC_ADDR_8723AS 0xAA
//====================================================
// EEPROM/Efuse Value Type
//====================================================
#define EETYPE_TX_PWR 0x0
//====================================================
// EEPROM/Efuse Default Value
//====================================================
#define EEPROM_Default_CrystalCap_8723A 0x20
//----------------------------------------------------------------------------
// EEPROM/EFUSE data structure definition.
//----------------------------------------------------------------------------
#define MAX_RF_PATH_NUM 2
#define MAX_CHNL_GROUP 3+9
typedef struct _TxPowerInfo
{
u8 CCKIndex[MAX_RF_PATH_NUM][MAX_CHNL_GROUP];
u8 HT40_1SIndex[MAX_RF_PATH_NUM][MAX_CHNL_GROUP];
u8 HT40_2SIndexDiff[MAX_RF_PATH_NUM][MAX_CHNL_GROUP];
u8 HT20IndexDiff[MAX_RF_PATH_NUM][MAX_CHNL_GROUP];
u8 OFDMIndexDiff[MAX_RF_PATH_NUM][MAX_CHNL_GROUP];
u8 HT40MaxOffset[MAX_RF_PATH_NUM][MAX_CHNL_GROUP];
u8 HT20MaxOffset[MAX_RF_PATH_NUM][MAX_CHNL_GROUP];
u8 TSSI_A[3];
u8 TSSI_B[3];
u8 TSSI_A_5G[3]; //5GL/5GM/5GH
u8 TSSI_B_5G[3];
} TxPowerInfo, *PTxPowerInfo;
#if 0
#define MAX_RF_PATH 4
#define MAX_CHNL_GROUP_24G 6
#define MAX_CHNL_GROUP_5G 14
// It must always set to 4, otherwise read efuse table secquence will be wrong.
#define MAX_TX_COUNT 4
typedef struct _TxPowerInfo24G
{
u8 IndexCCK_Base[MAX_RF_PATH][MAX_CHNL_GROUP_24G];
u8 IndexBW40_Base[MAX_RF_PATH][MAX_CHNL_GROUP_24G-1];
//If only one tx, only BW20 and OFDM are used.
s8 CCK_Diff[MAX_RF_PATH][MAX_TX_COUNT];
s8 OFDM_Diff[MAX_RF_PATH][MAX_TX_COUNT];
s8 BW20_Diff[MAX_RF_PATH][MAX_TX_COUNT];
s8 BW40_Diff[MAX_RF_PATH][MAX_TX_COUNT];
} TxPowerInfo24G, *PTxPowerInfo24G;
typedef struct _TxPowerInfo5G
{
u8 IndexBW40_Base[MAX_RF_PATH][MAX_CHNL_GROUP_5G];
//If only one tx, only BW20, OFDM, BW80 and BW160 are used.
s8 OFDM_Diff[MAX_RF_PATH][MAX_TX_COUNT];
s8 BW20_Diff[MAX_RF_PATH][MAX_TX_COUNT];
s8 BW40_Diff[MAX_RF_PATH][MAX_TX_COUNT];
s8 BW80_Diff[MAX_RF_PATH][MAX_TX_COUNT];
s8 BW160_Diff[MAX_RF_PATH][MAX_TX_COUNT];
} TxPowerInfo5G, *PTxPowerInfo5G;
#endif
typedef enum _BT_Ant_NUM
{
Ant_x2 = 0,
Ant_x1 = 1
} BT_Ant_NUM, *PBT_Ant_NUM;
typedef enum _BT_CoType
{
BT_2Wire = 0,
BT_ISSC_3Wire = 1,
BT_Accel = 2,
BT_CSR_BC4 = 3,
BT_CSR_BC8 = 4,
BT_RTL8756 = 5,
BT_RTL8723A = 6
} BT_CoType, *PBT_CoType;
typedef enum _BT_RadioShared
{
BT_Radio_Shared = 0,
BT_Radio_Individual = 1,
} BT_RadioShared, *PBT_RadioShared;
#endif

41
include/rtl8723a_recv.h
View file

@ -1,41 +0,0 @@
/******************************************************************************
*
* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
*
******************************************************************************/
#ifndef __RTL8723A_RECV_H__
#define __RTL8723A_RECV_H__
#include <rtl8192c_recv.h>
#if defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI)
#ifdef CONFIG_DIRECT_RECV
void rtl8723as_recv(PADAPTER padapter, struct recv_buf *precvbuf);
#endif
s32 rtl8723as_init_recv_priv(PADAPTER padapter);
void rtl8723as_free_recv_priv(PADAPTER padapter);
#endif
void rtl8192c_query_rx_phy_status(union recv_frame *prframe, struct phy_stat *pphy_stat);
void rtl8192c_process_phy_info(PADAPTER padapter, void *prframe);
#ifdef CONFIG_USB_HCI
void update_recvframe_attrib(union recv_frame *precvframe, struct recv_stat *prxstat);
void update_recvframe_phyinfo(union recv_frame *precvframe, struct phy_stat *pphy_info);
#endif
#endif

27
include/rtl8723a_rf.h
View file

@ -1,27 +0,0 @@
/******************************************************************************
*
* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
*
******************************************************************************/
#ifndef __RTL8723A_RF_H__
#define __RTL8723A_RF_H__
#include "rtl8192c_rf.h"
int PHY_RF6052_Config8723A( IN PADAPTER Adapter );
#endif

538
include/rtl8723a_spec.h
View file

@ -1,538 +0,0 @@
/******************************************************************************
*
* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
*******************************************************************************/
#ifndef __RTL8723A_SPEC_H__
#define __RTL8723A_SPEC_H__
#include <rtl8192c_spec.h>
//============================================================================
// 8723A Regsiter offset definition
//============================================================================
#define HAL_8723A_NAV_UPPER_UNIT 128 // micro-second
//-----------------------------------------------------
//
// 0x0000h ~ 0x00FFh System Configuration
//
//-----------------------------------------------------
#define REG_SYSON_REG_LOCK 0x001C
//-----------------------------------------------------
//
// 0x0100h ~ 0x01FFh MACTOP General Configuration
//
//-----------------------------------------------------
#define REG_FTIMR 0x0138
//-----------------------------------------------------
//
// 0x0200h ~ 0x027Fh TXDMA Configuration
//
//-----------------------------------------------------
//-----------------------------------------------------
//
// 0x0280h ~ 0x02FFh RXDMA Configuration
//
//-----------------------------------------------------
//-----------------------------------------------------
//
// 0x0300h ~ 0x03FFh PCIe
//
//-----------------------------------------------------
//-----------------------------------------------------
//
// 0x0400h ~ 0x047Fh Protocol Configuration
//
//-----------------------------------------------------
//#define REG_EARLY_MODE_CONTROL 0x4D0
#define REG_MACID_NO_LINK 0x4D0
//-----------------------------------------------------
//
// 0x0500h ~ 0x05FFh EDCA Configuration
//
//-----------------------------------------------------
//2 BCN_CTRL
#define DIS_ATIM BIT(0)
#define DIS_BCNQ_SUB BIT(1)
#define DIS_TSF_UDT BIT(4)
//-----------------------------------------------------
//
// 0x0600h ~ 0x07FFh WMAC Configuration
//
//-----------------------------------------------------
//
// Note:
// The NAV upper value is very important to WiFi 11n 5.2.3 NAV test. The default value is
// always too small, but the WiFi TestPlan test by 25,000 microseconds of NAV through sending
// CTS in the air. We must update this value greater than 25,000 microseconds to pass the item.
// The offset of NAV_UPPER in 8192C Spec is incorrect, and the offset should be 0x0652. Commented
// by SD1 Scott.
// By Bruce, 2011-07-18.
//
#define REG_NAV_UPPER 0x0652 // unit of 128
#define REG_BT_COEX_TABLE_1 0x06C0
#define REG_BT_COEX_TABLE_2 0x06C4
//============================================================================
// 8723 Regsiter Bit and Content definition
//============================================================================
//-----------------------------------------------------
//
// 0x0000h ~ 0x00FFh System Configuration
//
//-----------------------------------------------------
//2 SPS0_CTRL
//2 SYS_ISO_CTRL
//2 SYS_FUNC_EN
//2 APS_FSMCO
#define EN_WLON BIT(16)
//2 SYS_CLKR
//2 9346CR
//2 AFE_MISC
//2 SPS0_CTRL
//2 SPS_OCP_CFG
//2 SYSON_REG_LOCK
#define WLOCK_ALL BIT(0)
#define WLOCK_00 BIT(1)
#define WLOCK_04 BIT(2)
#define WLOCK_08 BIT(3)
#define WLOCK_40 BIT(4)
#define WLOCK_1C_B6 BIT(5)
#define R_DIS_PRST_1 BIT(6)
#define LOCK_ALL_EN BIT(7)
//2 RF_CTRL
//2 LDOA15_CTRL
//2 LDOV12D_CTRL
//2 AFE_XTAL_CTRL
//2 AFE_PLL_CTRL
//2 EFUSE_CTRL
//2 EFUSE_TEST (For RTL8723 partially)
//2 PWR_DATA
//2 CAL_TIMER
//2 ACLK_MON
//2 GPIO_MUXCFG
//2 GPIO_PIN_CTRL
//2 GPIO_INTM
//2 LEDCFG
//2 FSIMR
//2 FSISR
//2 HSIMR
// 8723 Host System Interrupt Mask Register (offset 0x58, 32 byte)
#define HSIMR_GPIO12_0_INT_EN BIT(0)
#define HSIMR_SPS_OCP_INT_EN BIT(5)
#define HSIMR_RON_INT_EN BIT(6)
#define HSIMR_PDNINT_EN BIT(7)
#define HSIMR_GPIO9_INT_EN BIT(25)
//2 HSISR
// 8723 Host System Interrupt Status Register (offset 0x5C, 32 byte)
#define HSISR_GPIO12_0_INT BIT(0)
#define HSISR_SPS_OCP_INT BIT(5)
#define HSISR_RON_INT BIT(6)
#define HSISR_PDNINT BIT(7)
#define HSISR_GPIO9_INT BIT(25)
// interrupt mask which needs to clear
#define MASK_HSISR_CLEAR (HSISR_GPIO12_0_INT |\
HSISR_SPS_OCP_INT |\
HSISR_RON_INT |\
HSISR_PDNINT |\
HSISR_GPIO9_INT)
//2 MCUFWDL
#define RAM_DL_SEL BIT7 // 1:RAM, 0:ROM
//2 HPON_FSM
//2 SYS_CFG
#define RTL_ID BIT(23) // TestChip ID, 1:Test(RLE); 0:MP(RL)
#define SPS_SEL BIT(24) // 1:LDO regulator mode; 0:Switching regulator mode
//-----------------------------------------------------
//
// 0x0100h ~ 0x01FFh MACTOP General Configuration
//
//-----------------------------------------------------
//2 Function Enable Registers
//2 CR
#define CALTMR_EN BIT(10)
//2 PBP - Page Size Register
//2 TX/RXDMA
//2 TRXFF_BNDY
//2 LLT_INIT
//2 BB_ACCESS_CTRL
//-----------------------------------------------------
//
// 0x0200h ~ 0x027Fh TXDMA Configuration
//
//-----------------------------------------------------
//2 RQPN
//2 TDECTRL
//2 TDECTL
//2 TXDMA_OFFSET_CHK
//-----------------------------------------------------
//
// 0x0400h ~ 0x047Fh Protocol Configuration
//
//-----------------------------------------------------
//2 FWHW_TXQ_CTRL
//2 INIRTSMCS_SEL
//2 SPEC SIFS
//2 RRSR
//2 ARFR
//2 AGGLEN_LMT_L
//2 RL
//2 DARFRC
//2 RARFRC
//-----------------------------------------------------
//
// 0x0500h ~ 0x05FFh EDCA Configuration
//
//-----------------------------------------------------
//2 EDCA setting
//2 EDCA_VO_PARAM
//2 SIFS_CCK
//2 SIFS_OFDM
//2 TBTT PROHIBIT
//2 REG_RD_CTRL
//2 BCN_CTRL
//2 ACMHWCTRL
//-----------------------------------------------------
//
// 0x0600h ~ 0x07FFh WMAC Configuration
//
//-----------------------------------------------------
//2 APSD_CTRL
//2 BWOPMODE
//2 TCR
//2 RCR
//2 RX_PKT_LIMIT
//2 RX_DLK_TIME
//2 MBIDCAMCFG
//2 AMPDU_MIN_SPACE
//2 RXERR_RPT
//2 SECCFG
//-----------------------------------------------------
//
// 0xFE00h ~ 0xFE55h RTL8723 SDIO Configuration
//
//-----------------------------------------------------
// I/O bus domain address mapping
#define SDIO_LOCAL_BASE 0x10250000
#define WLAN_IOREG_BASE 0x10260000
#define FIRMWARE_FIFO_BASE 0x10270000
#define TX_HIQ_BASE 0x10310000
#define TX_MIQ_BASE 0x10320000
#define TX_LOQ_BASE 0x10330000
#define RX_RX0FF_BASE 0x10340000
// SDIO host local register space mapping.
#define SDIO_LOCAL_MSK 0x0FFF
#define WLAN_IOREG_MSK 0x7FFF
#define WLAN_FIFO_MSK 0x1FFF // Aggregation Length[12:0]
#define WLAN_RX0FF_MSK 0x0003
#define SDIO_WITHOUT_REF_DEVICE_ID 0 // Without reference to the SDIO Device ID
#define SDIO_LOCAL_DEVICE_ID 0 // 0b[16], 000b[15:13]
#define WLAN_TX_HIQ_DEVICE_ID 4 // 0b[16], 100b[15:13]
#define WLAN_TX_MIQ_DEVICE_ID 5 // 0b[16], 101b[15:13]
#define WLAN_TX_LOQ_DEVICE_ID 6 // 0b[16], 110b[15:13]
#define WLAN_RX0FF_DEVICE_ID 7 // 0b[16], 111b[15:13]
#define WLAN_IOREG_DEVICE_ID 8 // 1b[16]
// SDIO Tx Free Page Index
#define HI_QUEUE_IDX 0
#define MID_QUEUE_IDX 1
#define LOW_QUEUE_IDX 2
#define PUBLIC_QUEUE_IDX 3
#define SDIO_MAX_TX_QUEUE 3 // HIQ, MIQ and LOQ
#define SDIO_MAX_RX_QUEUE 1
#define SDIO_REG_TX_CTRL 0x0000 // SDIO Tx Control
#define SDIO_REG_HIMR 0x0014 // SDIO Host Interrupt Mask
#define SDIO_REG_HISR 0x0018 // SDIO Host Interrupt Service Routine
#define SDIO_REG_HCPWM 0x0019 // HCI Current Power Mode
#define SDIO_REG_RX0_REQ_LEN 0x001C // RXDMA Request Length
#define SDIO_REG_FREE_TXPG 0x0020 // Free Tx Buffer Page
#define SDIO_REG_HCPWM1 0x0024 // HCI Current Power Mode 1
#define SDIO_REG_HCPWM2 0x0026 // HCI Current Power Mode 2
#define SDIO_REG_HTSFR_INFO 0x0030 // HTSF Informaion
#define SDIO_REG_HRPWM1 0x0080 // HCI Request Power Mode 1
#define SDIO_REG_HRPWM2 0x0082 // HCI Request Power Mode 2
#define SDIO_REG_HPS_CLKR 0x0084 // HCI Power Save Clock
#define SDIO_REG_HSUS_CTRL 0x0086 // SDIO HCI Suspend Control
#define SDIO_REG_HIMR_ON 0x0090 // SDIO Host Extension Interrupt Mask Always
#define SDIO_REG_HISR_ON 0x0091 // SDIO Host Extension Interrupt Status Always
#define SDIO_HIMR_DISABLED 0
// SDIO Host Interrupt Mask Register
#define SDIO_HIMR_RX_REQUEST_MSK BIT0
#define SDIO_HIMR_AVAL_MSK BIT1
#define SDIO_HIMR_TXERR_MSK BIT2
#define SDIO_HIMR_RXERR_MSK BIT3
#define SDIO_HIMR_TXFOVW_MSK BIT4
#define SDIO_HIMR_RXFOVW_MSK BIT5
#define SDIO_HIMR_TXBCNOK_MSK BIT6
#define SDIO_HIMR_TXBCNERR_MSK BIT7
#define SDIO_HIMR_BCNERLY_INT_MSK BIT16
#define SDIO_HIMR_C2HCMD_MSK BIT17
#define SDIO_HIMR_CPWM1_MSK BIT18
#define SDIO_HIMR_CPWM2_MSK BIT19
#define SDIO_HIMR_HSISR_IND_MSK BIT20
#define SDIO_HIMR_GTINT3_IND_MSK BIT21
#define SDIO_HIMR_GTINT4_IND_MSK BIT22
#define SDIO_HIMR_PSTIMEOUT_MSK BIT23
#define SDIO_HIMR_OCPINT_MSK BIT24
#define SDIO_HIMR_ATIMEND_MSK BIT25
#define SDIO_HIMR_ATIMEND_E_MSK BIT26
#define SDIO_HIMR_CTWEND_MSK BIT27
// SDIO Host Interrupt Service Routine
#define SDIO_HISR_RX_REQUEST BIT0
#define SDIO_HISR_AVAL BIT1
#define SDIO_HISR_TXERR BIT2
#define SDIO_HISR_RXERR BIT3
#define SDIO_HISR_TXFOVW BIT4
#define SDIO_HISR_RXFOVW BIT5
#define SDIO_HISR_TXBCNOK BIT6
#define SDIO_HISR_TXBCNERR BIT7
#define SDIO_HISR_BCNERLY_INT BIT16
#define SDIO_HISR_C2HCMD BIT17
#define SDIO_HISR_CPWM1 BIT18
#define SDIO_HISR_CPWM2 BIT19
#define SDIO_HISR_HSISR_IND BIT20
#define SDIO_HISR_GTINT3_IND BIT21
#define SDIO_HISR_GTINT4_IND BIT22
#define SDIO_HISR_PSTIMEOUT BIT23
#define SDIO_HISR_OCPINT BIT24
#define SDIO_HISR_ATIMEND BIT25
#define SDIO_HISR_ATIMEND_E BIT26
#define SDIO_HISR_CTWEND BIT27
#define MASK_SDIO_HISR_CLEAR (SDIO_HISR_TXERR |\
SDIO_HISR_RXERR |\
SDIO_HISR_TXFOVW |\
SDIO_HISR_RXFOVW |\
SDIO_HISR_TXBCNOK |\
SDIO_HISR_TXBCNERR |\
SDIO_HISR_C2HCMD |\
SDIO_HISR_CPWM1 |\
SDIO_HISR_CPWM2 |\
SDIO_HISR_HSISR_IND |\
SDIO_HISR_GTINT3_IND |\
SDIO_HISR_GTINT4_IND |\
SDIO_HISR_PSTIMEOUT |\
SDIO_HISR_OCPINT)
// SDIO HCI Suspend Control Register
#define HCI_RESUME_PWR_RDY BIT1
#define HCI_SUS_CTRL BIT0
// SDIO Tx FIFO related
#define SDIO_TX_FREE_PG_QUEUE 4 // The number of Tx FIFO free page
#define SDIO_TX_FIFO_PAGE_SZ 128
// vivi added for new cam search flow, 20091028
#define SCR_TxUseBroadcastDK BIT6 // Force Tx Use Broadcast Default Key
#define SCR_RxUseBroadcastDK BIT7 // Force Rx Use Broadcast Default Key
//----------------------------------------------------------------------------
// 8723 EFUSE
//----------------------------------------------------------------------------
#ifdef HWSET_MAX_SIZE
#undef HWSET_MAX_SIZE
#endif
#define HWSET_MAX_SIZE 256
//-----------------------------------------------------------------------------
//USB interrupt
//-----------------------------------------------------------------------------
#define UHIMR_TIMEOUT2 BIT31
#define UHIMR_TIMEOUT1 BIT30
#define UHIMR_PSTIMEOUT BIT29
#define UHIMR_GTINT4 BIT28
#define UHIMR_GTINT3 BIT27
#define UHIMR_TXBCNERR BIT26
#define UHIMR_TXBCNOK BIT25
#define UHIMR_TSF_BIT32_TOGGLE BIT24
#define UHIMR_BCNDMAINT3 BIT23
#define UHIMR_BCNDMAINT2 BIT22
#define UHIMR_BCNDMAINT1 BIT21
#define UHIMR_BCNDMAINT0 BIT20
#define UHIMR_BCNDOK3 BIT19
#define UHIMR_BCNDOK2 BIT18
#define UHIMR_BCNDOK1 BIT17
#define UHIMR_BCNDOK0 BIT16
#define UHIMR_HSISR_IND BIT15
#define UHIMR_BCNDMAINT_E BIT14
//RSVD BIT13
#define UHIMR_CTW_END BIT12
//RSVD BIT11
#define UHIMR_C2HCMD BIT10
#define UHIMR_CPWM2 BIT9
#define UHIMR_CPWM BIT8
#define UHIMR_HIGHDOK BIT7 // High Queue DMA OK Interrupt
#define UHIMR_MGNTDOK BIT6 // Management Queue DMA OK Interrupt
#define UHIMR_BKDOK BIT5 // AC_BK DMA OK Interrupt
#define UHIMR_BEDOK BIT4 // AC_BE DMA OK Interrupt
#define UHIMR_VIDOK BIT3 // AC_VI DMA OK Interrupt
#define UHIMR_VODOK BIT2 // AC_VO DMA Interrupt
#define UHIMR_RDU BIT1 // Receive Descriptor Unavailable
#define UHIMR_ROK BIT0 // Receive DMA OK Interrupt
// USB Host Interrupt Status Extension bit
#define UHIMR_BCNDMAINT7 BIT23
#define UHIMR_BCNDMAINT6 BIT22
#define UHIMR_BCNDMAINT5 BIT21
#define UHIMR_BCNDMAINT4 BIT20
#define UHIMR_BCNDOK7 BIT19
#define UHIMR_BCNDOK6 BIT18
#define UHIMR_BCNDOK5 BIT17
#define UHIMR_BCNDOK4 BIT16
// bit14-15: RSVD
#define UHIMR_ATIMEND_E BIT13
#define UHIMR_ATIMEND BIT12
#define UHIMR_TXERR BIT11
#define UHIMR_RXERR BIT10
#define UHIMR_TXFOVW BIT9
#define UHIMR_RXFOVW BIT8
// bit2-7: RSVD
#define UHIMR_OCPINT BIT1
// bit0: RSVD
#define REG_USB_HIMR 0xFE38
#define REG_USB_HIMRE 0xFE3C
#define REG_USB_HISR 0xFE78
#define REG_USB_HISRE 0xFE7C
#define USB_INTR_CPWM_OFFSET 16
#define USB_INTR_CONTENT_HISR_OFFSET 48
#define USB_INTR_CONTENT_HISRE_OFFSET 52
#define USB_INTR_CONTENT_LENGTH 56
#define USB_C2H_CMDID_OFFSET 0
#define USB_C2H_SEQ_OFFSET 1
#define USB_C2H_EVENT_OFFSET 2
//============================================================================
// General definitions
//============================================================================
#ifdef CONFIG_RF_GAIN_OFFSET
#define EEPROM_RF_GAIN_OFFSET 0x2F
#define EEPROM_RF_GAIN_VAL 0x1F6
#endif //CONFIG_RF_GAIN_OFFSET
#endif

33
include/rtl8723a_sreset.h
View file

@ -1,33 +0,0 @@
/******************************************************************************
*
* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
*
******************************************************************************/
#ifndef _RTL8188E_SRESET_H_
#define _RTL8188E_SRESET_H_
#include <drv_conf.h>
#include <osdep_service.h>
#include <drv_types.h>
#include <rtw_sreset.h>
#ifdef DBG_CONFIG_ERROR_DETECT
extern void rtl8723a_sreset_xmit_status_check(_adapter *padapter);
extern void rtl8723a_sreset_linked_status_check(_adapter *padapter);
#endif
#endif

238
include/rtl8723a_xmit.h
View file

@ -1,238 +0,0 @@
/******************************************************************************
*
* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
*
******************************************************************************/
#ifndef __RTL8723A_XMIT_H__
#define __RTL8723A_XMIT_H__
#include <rtl8192c_xmit.h>
//
//defined for TX DESC Operation
//
#define MAX_TID (15)
//OFFSET 0
#define OFFSET_SZ 0
#define OFFSET_SHT 16
#define BMC BIT(24)
#define LSG BIT(26)
#define FSG BIT(27)
#define OWN BIT(31)
//OFFSET 4
#define PKT_OFFSET_SZ 0
#define BK BIT(6)
#define QSEL_SHT 8
#define Rate_ID_SHT 16
#define NAVUSEHDR BIT(20)
#define PKT_OFFSET_SHT 26
#define HWPC BIT(31)
//OFFSET 8
#define AGG_EN BIT(29)
//OFFSET 12
#define SEQ_SHT 16
//OFFSET 16
#define QoS BIT(6)
#define HW_SEQ_EN BIT(7)
#define USERATE BIT(8)
#define DISDATAFB BIT(10)
#define DATA_SHORT BIT(24)
#define DATA_BW BIT(25)
//OFFSET 20
#define SGI BIT(6)
typedef struct txdesc_8723a
{
u32 pktlen:16;
u32 offset:8;
u32 bmc:1;
u32 htc:1;
u32 ls:1;
u32 fs:1;
u32 linip:1;
u32 noacm:1;
u32 gf:1;
u32 own:1;
u32 macid:5;
u32 agg_en:1;
u32 bk:1;
u32 rd_en:1;
u32 qsel:5;
u32 rd_nav_ext:1;
u32 lsig_txop_en:1;
u32 pifs:1;
u32 rate_id:4;
u32 navusehdr:1;
u32 en_desc_id:1;
u32 sectype:2;
u32 rsvd0424:2;
u32 pkt_offset:5; // unit: 8 bytes
u32 rsvd0431:1;
u32 rts_rc:6;
u32 data_rc:6;
u32 rsvd0812:2;
u32 bar_rty_th:2;
u32 rsvd0816:1;
u32 morefrag:1;
u32 raw:1;
u32 ccx:1;
u32 ampdu_density:3;
u32 bt_null:1;
u32 ant_sel_a:1;
u32 ant_sel_b:1;
u32 tx_ant_cck:2;
u32 tx_antl:2;
u32 tx_ant_ht:2;
u32 nextheadpage:8;
u32 tailpage:8;
u32 seq:12;
u32 cpu_handle:1;
u32 tag1:1;
u32 trigger_int:1;
u32 hwseq_en:1;
u32 rtsrate:5;
u32 ap_dcfe:1;
u32 hwseq_sel:2;
u32 userate:1;
u32 disrtsfb:1;
u32 disdatafb:1;
u32 cts2self:1;
u32 rtsen:1;
u32 hw_rts_en:1;
u32 port_id:1;
u32 rsvd1615:3;
u32 wait_dcts:1;
u32 cts2ap_en:1;
u32 data_sc:2;
u32 data_stbc:2;
u32 data_short:1;
u32 data_bw:1;
u32 rts_short:1;
u32 rts_bw:1;
u32 rts_sc:2;
u32 vcs_stbc:2;
u32 datarate:6;
u32 sgi:1;
u32 try_rate:1;
u32 data_ratefb_lmt:5;
u32 rts_ratefb_lmt:4;
u32 rty_lmt_en:1;
u32 data_rt_lmt:6;
u32 usb_txagg_num:8;
u32 txagg_a:5;
u32 txagg_b:5;
u32 use_max_len:1;
u32 max_agg_num:5;
u32 mcsg1_max_len:4;
u32 mcsg2_max_len:4;
u32 mcsg3_max_len:4;
u32 mcs7_sgi_max_len:4;
u32 checksum:16; // TxBuffSize(PCIe)/CheckSum(USB)
u32 mcsg4_max_len:4;
u32 mcsg5_max_len:4;
u32 mcsg6_max_len:4;
u32 mcs15_sgi_max_len:4;
}TXDESC, *PTXDESC;
#define txdesc_set_ccx_sw_8723a(txdesc, value) \
do { \
((struct txdesc_8723a *)(txdesc))->mcsg4_max_len = (((value)>>8) & 0x0f); \
((struct txdesc_8723a *)(txdesc))->mcs15_sgi_max_len= (((value)>>4) & 0x0f); \
((struct txdesc_8723a *)(txdesc))->mcsg6_max_len = ((value) & 0x0f); \
} while (0)
struct txrpt_ccx_8723a {
/* offset 0 */
u8 tag1:1;
u8 rsvd:4;
u8 int_bt:1;
u8 int_tri:1;
u8 int_ccx:1;
/* offset 1 */
u8 mac_id:5;
u8 pkt_drop:1;
u8 pkt_ok:1;
u8 bmc:1;
/* offset 2 */
u8 retry_cnt:6;
u8 lifetime_over:1;
u8 retry_over:1;
/* offset 3 */
u8 ccx_qtime0;
u8 ccx_qtime1;
/* offset 5 */
u8 final_data_rate;
/* offset 6 */
u8 sw1:4;
u8 qsel:4;
/* offset 7 */
u8 sw0;
};
#define txrpt_ccx_sw_8723a(txrpt_ccx) ((txrpt_ccx)->sw0 + ((txrpt_ccx)->sw1<<8))
#define txrpt_ccx_qtime_8723a(txrpt_ccx) ((txrpt_ccx)->ccx_qtime0+((txrpt_ccx)->ccx_qtime1<<8))
#ifdef CONFIG_XMIT_ACK
void dump_txrpt_ccx_8723a(void *buf);
void handle_txrpt_ccx_8723a(_adapter *adapter, void *buf);
#else
#define dump_txrpt_ccx_8723a(buf) do {} while(0)
#define handle_txrpt_ccx_8723a(adapter, buf) do {} while(0)
#endif //CONFIG_XMIT_ACK
void rtl8723a_update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem);
void rtl8723a_fill_fake_txdesc(PADAPTER padapter, u8 *pDesc, u32 BufferLen, u8 IsPsPoll, u8 IsBTQosNull);
#if defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI)
s32 rtl8723as_init_xmit_priv(PADAPTER padapter);
void rtl8723as_free_xmit_priv(PADAPTER padapter);
s32 rtl8723as_hal_xmit(PADAPTER padapter, struct xmit_frame *pxmitframe);
s32 rtl8723as_mgnt_xmit(PADAPTER padapter, struct xmit_frame *pmgntframe);
s32 rtl8723as_hal_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe);
s32 rtl8723as_xmit_buf_handler(PADAPTER padapter);
thread_return rtl8723as_xmit_thread(thread_context context);
#define hal_xmit_handler rtl8723as_xmit_buf_handler
#endif
#ifdef CONFIG_USB_HCI
s32 rtl8723au_hal_xmitframe_enqueue(_adapter *padapter, struct xmit_frame *pxmitframe);
s32 rtl8723au_xmit_buf_handler(PADAPTER padapter);
#define hal_xmit_handler rtl8723au_xmit_buf_handler
#endif
#endif

54
include/rtw_ap.h
View file

@ -28,38 +28,38 @@
#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, WLAN_BSSID_EX *pnetwork, u8 index, u8 *data, u8 len); void rtw_add_bcn_ie(struct adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index, u8 *data, u8 len);
void rtw_remove_bcn_ie(_adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index); void rtw_remove_bcn_ie(struct adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index);
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_ap_restore_network(_adapter *padapter); void rtw_ap_restore_network(struct adapter *padapter);
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_NATIVEAP_MLME #ifdef CONFIG_NATIVEAP_MLME
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
#endif #endif
void update_bmc_sta(_adapter *padapter); void update_bmc_sta(struct adapter *padapter);

2
include/rtw_br_ext.h
View file

@ -70,7 +70,7 @@ 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_

8
include/rtw_bt_mp.h
View file

@ -196,7 +196,7 @@ typedef enum _BT_REPORT_TYPE{
VOID VOID
MPTBT_Test( MPTBT_Test(
IN PADAPTER Adapter, IN struct adapter *Adapter,
IN u1Byte opCode, IN u1Byte opCode,
IN u1Byte byte1, IN u1Byte byte1,
IN u1Byte byte2, IN u1Byte byte2,
@ -205,7 +205,7 @@ MPTBT_Test(
NDIS_STATUS NDIS_STATUS
MPTBT_SendOidBT( MPTBT_SendOidBT(
IN PADAPTER pAdapter, IN struct adapter * pAdapter,
IN PVOID InformationBuffer, IN PVOID InformationBuffer,
IN ULONG InformationBufferLength, IN ULONG InformationBufferLength,
OUT PULONG BytesRead, OUT PULONG BytesRead,
@ -214,7 +214,7 @@ MPTBT_SendOidBT(
VOID VOID
MPTBT_FwC2hBtMpCtrl( MPTBT_FwC2hBtMpCtrl(
PADAPTER Adapter, struct adapter *Adapter,
pu1Byte tmpBuf, pu1Byte tmpBuf,
u1Byte length u1Byte length
); );
@ -222,7 +222,7 @@ MPTBT_FwC2hBtMpCtrl(
void MPh2c_timeout_handle(void *FunctionContext); void MPh2c_timeout_handle(void *FunctionContext);
VOID mptbt_BtControlProcess( VOID mptbt_BtControlProcess(
PADAPTER Adapter, struct adapter *Adapter,
PVOID pInBuf PVOID pInBuf
); );

108
include/rtw_cmd.h
View file

@ -40,7 +40,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;
@ -66,7 +66,7 @@
u32 rsp_cnt; u32 rsp_cnt;
u8 cmdthd_running; u8 cmdthd_running;
u8 stop_req; u8 stop_req;
_adapter *padapter; struct adapter *padapter;
}; };
#ifdef CONFIG_EVENT_THREAD_MODE #ifdef CONFIG_EVENT_THREAD_MODE
@ -140,7 +140,7 @@ extern struct evt_obj *rtw_dequeue_evt(_queue *queue);
extern void rtw_free_evt_obj(struct evt_obj *pcmd); extern void rtw_free_evt_obj(struct evt_obj *pcmd);
#endif #endif
void rtw_stop_cmd_thread(_adapter *adapter); void rtw_stop_cmd_thread(struct adapter *adapter);
thread_return rtw_cmd_thread(thread_context context); thread_return rtw_cmd_thread(thread_context context);
extern u32 rtw_init_cmd_priv (struct cmd_priv *pcmdpriv); extern u32 rtw_init_cmd_priv (struct cmd_priv *pcmdpriv);
@ -151,7 +151,7 @@ extern void rtw_free_evt_priv (struct evt_priv *pevtpriv);
extern void rtw_cmd_clr_isr(struct cmd_priv *pcmdpriv); extern void rtw_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
@ -926,81 +926,81 @@ 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, NDIS_802_11_SSID *ssid, int ssid_num, struct rtw_ieee80211_channel *ch, int ch_num); u8 rtw_sitesurvey_cmd(struct adapter *padapter, NDIS_802_11_SSID *ssid, int ssid_num, struct rtw_ieee80211_channel *ch, int ch_num);
extern u8 rtw_createbss_cmd(_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, bool enqueue); extern u8 rtw_setstakey_cmd(struct adapter *padapter, u8 *psta, u8 unicast_key, bool enqueue);
extern u8 rtw_clearstakey_cmd(_adapter *padapter, u8 *psta, u8 entry, u8 enqueue); extern u8 rtw_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, NDIS_802_11_NETWORK_INFRASTRUCTURE networktype, bool enqueue); extern u8 rtw_setopmode_cmd(struct adapter *padapter, NDIS_802_11_NETWORK_INFRASTRUCTURE networktype, bool enqueue);
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);
// add for CONFIG_IEEE80211W, none 11w also can use // add for CONFIG_IEEE80211W, none 11w also can use
extern u8 rtw_reset_securitypriv_cmd(_adapter*padapter); extern u8 rtw_reset_securitypriv_cmd(struct adapter*padapter);
extern u8 rtw_free_assoc_resources_cmd(_adapter *padapter); extern u8 rtw_free_assoc_resources_cmd(struct adapter *padapter);
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
#ifdef CONFIG_ANTENNA_DIVERSITY #ifdef CONFIG_ANTENNA_DIVERSITY
extern u8 rtw_antenna_select_cmd(_adapter*padapter, u8 antenna,u8 enqueue); extern u8 rtw_antenna_select_cmd(struct adapter*padapter, u8 antenna,u8 enqueue);
#endif #endif
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, PLED_871x pLed); extern u8 rtw_led_blink_cmd(struct adapter*padapter, PLED_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);
#ifdef CONFIG_DETECT_C2H_BY_POLLING #ifdef CONFIG_DETECT_C2H_BY_POLLING
extern u8 rtw_event_polling_cmd(_adapter*padapter); extern u8 rtw_event_polling_cmd(struct adapter*padapter);
#endif #endif
u8 rtw_drvextra_cmd_hdl(_adapter *padapter, unsigned char *pbuf); u8 rtw_drvextra_cmd_hdl(struct adapter *padapter, unsigned char *pbuf);
extern void rtw_survey_cmd_callback(_adapter *padapter, struct cmd_obj *pcmd); extern void rtw_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_setstaKey_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pcmd);
extern void rtw_setassocsta_cmdrsp_callback(_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(_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

Some files were not shown because too many files have changed in this diff Show more