diff --git a/Makefile b/Makefile index 0b4561c..cd78e1b 100644 --- a/Makefile +++ b/Makefile @@ -3,18 +3,18 @@ EXTRA_CFLAGS += -O1 #EXTRA_CFLAGS += -O3 #EXTRA_CFLAGS += -Wall #EXTRA_CFLAGS += -Wextra -#EXTRA_CFLAGS += -Werror #EXTRA_CFLAGS += -pedantic #EXTRA_CFLAGS += -Wshadow -Wpointer-arith -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -EXTRA_CFLAGS += -Wno-unused-variable -EXTRA_CFLAGS += -Wno-unused-value -EXTRA_CFLAGS += -Wno-unused-label -EXTRA_CFLAGS += -Wno-unused-parameter -EXTRA_CFLAGS += -Wno-unused-function -EXTRA_CFLAGS += -Wno-unused +#EXTRA_CFLAGS += -Wno-unused-variable +#EXTRA_CFLAGS += -Wno-unused-value +#EXTRA_CFLAGS += -Wno-unused-label +#EXTRA_CFLAGS += -Wno-unused-parameter +#EXTRA_CFLAGS += -Wno-unused-function +#EXTRA_CFLAGS += -Wno-unused +EXTRA_CFLAGS += -Werror -EXTRA_CFLAGS += -Wno-uninitialized +#EXTRA_CFLAGS += -Wno-uninitialized EXTRA_CFLAGS += -I$(src)/include diff --git a/core/rtw_ap.c b/core/rtw_ap.c index 62a3820..968a472 100644 --- a/core/rtw_ap.c +++ b/core/rtw_ap.c @@ -32,7 +32,7 @@ extern unsigned char WFD_OUI[]; void init_mlme_ap_info(_adapter *padapter) { - struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; + //struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct sta_priv *pstapriv = &padapter->stapriv; struct wlan_acl_pool *pacl_list = &pstapriv->acl_list; @@ -214,11 +214,12 @@ static void update_BCNTIM(_adapter *padapter) void rtw_add_bcn_ie(_adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index, u8 *data, u8 len) { + //FIXME dst_ie ielen PNDIS_802_11_VARIABLE_IEs pIE; u8 bmatch = _FALSE; u8 *pie = pnetwork->IEs; - u8 *p, *dst_ie, *premainder_ie=NULL, *pbackup_remainder_ie=NULL; - u32 i, offset, ielen, ie_offset, remainder_ielen = 0; + u8 *p, *dst_ie = NULL, *premainder_ie=NULL, *pbackup_remainder_ie=NULL; + u32 i, offset, ielen = 0, ie_offset, remainder_ielen = 0; for (i = sizeof(NDIS_802_11_FIXED_IEs); i < pnetwork->IELength;) { @@ -284,7 +285,8 @@ void rtw_add_bcn_ie(_adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index, u8 *d void rtw_remove_bcn_ie(_adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index) { - u8 *p, *dst_ie, *premainder_ie=NULL, *pbackup_remainder_ie=NULL; + //FIXME dst_ie + u8 *p, *dst_ie = NULL, *premainder_ie=NULL, *pbackup_remainder_ie=NULL; uint offset, ielen, ie_offset, remainder_ielen = 0; u8 *pie = pnetwork->IEs; @@ -361,12 +363,12 @@ void expire_timeout_chk(_adapter *padapter) { _irqL irqL; _list *phead, *plist; - u8 updated; + u8 updated = 0; struct sta_info *psta=NULL; struct sta_priv *pstapriv = &padapter->stapriv; - u8 chk_alive_num = 0; - char chk_alive_list[NUM_STA]; - int i; + //u8 chk_alive_num = 0; + //char chk_alive_list[NUM_STA]; + //int i; _enter_critical_bh(&pstapriv->auth_list_lock, &irqL); @@ -1052,7 +1054,7 @@ static void update_hw_ht_param(_adapter *padapter) { unsigned char max_AMPDU_len; unsigned char min_MPDU_spacing; - struct registry_priv *pregpriv = &padapter->registrypriv; + //struct registry_priv *pregpriv = &padapter->registrypriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); @@ -1443,13 +1445,13 @@ int rtw_check_beacon_data(_adapter *padapter, u8 *pbuf, int len) u8 channel, network_type, supportRate[NDIS_802_11_LENGTH_RATES_EX]; int supportRateNum = 0; u8 OUI1[] = {0x00, 0x50, 0xf2,0x01}; - u8 wps_oui[4]={0x0,0x50,0xf2,0x04}; + //u8 wps_oui[4]={0x0,0x50,0xf2,0x04}; u8 WMM_PARA_IE[] = {0x00, 0x50, 0xf2, 0x02, 0x01, 0x01}; struct registry_priv *pregistrypriv = &padapter->registrypriv; struct security_priv *psecuritypriv = &padapter->securitypriv; struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); WLAN_BSSID_EX *pbss_network = (WLAN_BSSID_EX *)&pmlmepriv->cur_network.network; - struct sta_priv *pstapriv = &padapter->stapriv; + //struct sta_priv *pstapriv = &padapter->stapriv; u8 *ie = pbss_network->IEs; @@ -1948,7 +1950,7 @@ int rtw_acl_remove_sta(_adapter *padapter, u8 *addr) { _irqL irqL; _list *plist, *phead; - int i, ret=0; + int ret=0; struct rtw_wlan_acl_node *paclnode; struct sta_priv *pstapriv = &padapter->stapriv; struct wlan_acl_pool *pacl_list = &pstapriv->acl_list; @@ -2776,8 +2778,8 @@ u8 ap_free_sta(_adapter *padapter, struct sta_info *psta, bool active, u16 reaso { _irqL irqL; u8 beacon_updated = _FALSE; - struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); - struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); + //struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); + //struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct sta_priv *pstapriv = &padapter->stapriv; if(!psta) @@ -2997,7 +2999,7 @@ void rtw_ap_restore_network(_adapter *padapter) { struct mlme_priv *mlmepriv = &padapter->mlmepriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; - struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); + //struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct sta_priv * pstapriv = &padapter->stapriv; struct sta_info *psta; struct security_priv* psecuritypriv=&(padapter->securitypriv); diff --git a/core/rtw_br_ext.c b/core/rtw_br_ext.c index 54bd47d..5daaccf 100644 --- a/core/rtw_br_ext.c +++ b/core/rtw_br_ext.c @@ -308,7 +308,7 @@ static int update_nd_link_layer_addr(unsigned char *data, int len, unsigned char } -static void convert_ipv6_mac_to_mc(struct sk_buff *skb) +static inline void convert_ipv6_mac_to_mc(struct sk_buff *skb) { struct ipv6hdr *iph = (struct ipv6hdr *)(skb->data + ETH_HLEN); unsigned char *dst_mac = skb->data; diff --git a/core/rtw_cmd.c b/core/rtw_cmd.c index b09f831..b27b1f3 100644 --- a/core/rtw_cmd.c +++ b/core/rtw_cmd.c @@ -686,9 +686,9 @@ u8 rtw_sitesurvey_cmd(_adapter *padapter, NDIS_802_11_SSID *ssid, int ssid_num, struct sitesurvey_parm *psurveyPara; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -#ifdef CONFIG_P2P - struct wifidirect_info *pwdinfo= &(padapter->wdinfo); -#endif //CONFIG_P2P +//#ifdef CONFIG_P2P +// struct wifidirect_info *pwdinfo= &(padapter->wdinfo); +//#endif //CONFIG_P2P _func_enter_; @@ -1507,8 +1507,8 @@ u8 rtw_clearstakey_cmd(_adapter *padapter, u8 *psta, u8 entry, u8 enqueue) struct set_stakey_parm *psetstakey_para; struct cmd_priv *pcmdpriv=&padapter->cmdpriv; struct set_stakey_rsp *psetstakey_rsp = NULL; - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; - struct security_priv *psecuritypriv = &padapter->securitypriv; + //struct mlme_priv *pmlmepriv = &padapter->mlmepriv; + //struct security_priv *psecuritypriv = &padapter->securitypriv; struct sta_info* sta = (struct sta_info* )psta; u8 res=_SUCCESS; @@ -1919,7 +1919,7 @@ u8 rtw_set_csa_cmd(_adapter*padapter, u8 new_ch_no) { struct cmd_obj* pcmdobj; struct SetChannelSwitch_param*setChannelSwitch_param; - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; + //struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; u8 res=_SUCCESS; @@ -1955,10 +1955,10 @@ _func_exit_; u8 rtw_tdls_cmd(_adapter *padapter, u8 *addr, u8 option) { - struct cmd_obj* pcmdobj; - struct TDLSoption_param *TDLSoption; - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; - struct cmd_priv *pcmdpriv = &padapter->cmdpriv; + //struct cmd_obj* pcmdobj; + //struct TDLSoption_param *TDLSoption; + //struct mlme_priv *pmlmepriv = &padapter->mlmepriv; + //struct cmd_priv *pcmdpriv = &padapter->cmdpriv; u8 res=_SUCCESS; @@ -1988,10 +1988,8 @@ _func_enter_; init_h2fwcmd_w_parm_no_rsp(pcmdobj, TDLSoption, GEN_CMD_CODE(_TDLS)); res = rtw_enqueue_cmd(pcmdpriv, pcmdobj); -#endif //CONFIG_TDLS - exit: - +#endif //CONFIG_TDLS _func_exit_; diff --git a/core/rtw_ieee80211.c b/core/rtw_ieee80211.c index 8e4bc02..c7ef65d 100644 --- a/core/rtw_ieee80211.c +++ b/core/rtw_ieee80211.c @@ -1574,7 +1574,7 @@ static uint rtw_p2p_attr_remove(u8 *ie, uint ielen_ori, u8 attr_id) u8 *target_attr; u32 target_attr_len; uint ielen = ielen_ori; - int index=0; + //int index=0; while(1) { target_attr=rtw_get_p2p_attr(ie, ielen, attr_id, NULL, &target_attr_len); @@ -1615,7 +1615,7 @@ void rtw_WLAN_BSSID_EX_remove_p2p_attr(WLAN_BSSID_EX *bss_ex, u8 attr_id) { u8 *p2p_ie; uint p2p_ielen, p2p_ielen_ori; - int cnt; + //int cnt; if( (p2p_ie=rtw_get_p2p_ie(bss_ex->IEs+_FIXED_IE_LENGTH_, bss_ex->IELength-_FIXED_IE_LENGTH_, NULL, &p2p_ielen_ori)) ) { @@ -1972,7 +1972,7 @@ int rtw_action_frame_parse(const u8 *frame, u32 frame_len, u8* category, u8 *act { const u8 *frame_body = frame + sizeof(struct rtw_ieee80211_hdr_3addr); u16 fc; - u8 c, a; + u8 c, a = 0; fc = le16_to_cpu(((struct rtw_ieee80211_hdr_3addr *)frame)->frame_ctl); diff --git a/core/rtw_ioctl_set.c b/core/rtw_ioctl_set.c index edece1c..392325a 100644 --- a/core/rtw_ioctl_set.c +++ b/core/rtw_ioctl_set.c @@ -387,7 +387,7 @@ u8 rtw_set_802_11_ssid(_adapter* padapter, NDIS_802_11_SSID *ssid) { _irqL irqL; u8 status = _SUCCESS; - u32 cur_time = 0; + //u32 cur_time = 0; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct wlan_network *pnetwork = &pmlmepriv->cur_network; @@ -1356,8 +1356,8 @@ int rtw_set_scan_mode(_adapter *adapter, RT_SCAN_TYPE scan_mode) */ int rtw_set_channel_plan(_adapter *adapter, u8 channel_plan) { - struct registry_priv *pregistrypriv = &adapter->registrypriv; - struct mlme_priv *pmlmepriv = &adapter->mlmepriv; + //struct registry_priv *pregistrypriv = &adapter->registrypriv; + //struct mlme_priv *pmlmepriv = &adapter->mlmepriv; //handle by cmd_thread to sync with scan operation return rtw_set_chplan_cmd(adapter, channel_plan, 1); diff --git a/core/rtw_mlme.c b/core/rtw_mlme.c index c05b535..b05ebe8 100644 --- a/core/rtw_mlme.c +++ b/core/rtw_mlme.c @@ -653,13 +653,13 @@ _func_exit_; void update_network(WLAN_BSSID_EX *dst, WLAN_BSSID_EX *src, _adapter * padapter, bool update_ie) { - u8 ss_ori = dst->PhyInfo.SignalStrength; - u8 sq_ori = dst->PhyInfo.SignalQuality; + //u8 ss_ori = dst->PhyInfo.SignalStrength; + //u8 sq_ori = dst->PhyInfo.SignalQuality; long rssi_ori = dst->Rssi; - u8 ss_smp = src->PhyInfo.SignalStrength; + //u8 ss_smp = src->PhyInfo.SignalStrength; u8 sq_smp = src->PhyInfo.SignalQuality; - long rssi_smp = src->Rssi; + //long rssi_smp = src->Rssi; u8 ss_final; u8 sq_final; @@ -911,8 +911,8 @@ _func_exit_; void rtw_add_network(_adapter *adapter, WLAN_BSSID_EX *pnetwork); void rtw_add_network(_adapter *adapter, WLAN_BSSID_EX *pnetwork) { - _irqL irqL; - struct mlme_priv *pmlmepriv = &(((_adapter *)adapter)->mlmepriv); + //_irqL irqL; + //struct mlme_priv *pmlmepriv = &(((_adapter *)adapter)->mlmepriv); //_queue *queue = &(pmlmepriv->scanned_queue); _func_enter_; @@ -1382,7 +1382,7 @@ _func_exit_; void rtw_indicate_connect(_adapter *padapter) { struct mlme_priv *pmlmepriv = &padapter->mlmepriv; - struct xmit_priv *pxmitpriv = &padapter->xmitpriv; + //struct xmit_priv *pxmitpriv = &padapter->xmitpriv; _func_enter_; @@ -1440,11 +1440,11 @@ _func_exit_; void rtw_indicate_disconnect( _adapter *padapter ) { struct mlme_priv *pmlmepriv = &padapter->mlmepriv; - struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); - struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); - WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network); - struct sta_info *psta; - struct sta_priv *pstapriv = &padapter->stapriv; + //struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); + //struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); + //WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network); + //struct sta_info *psta; + //struct sta_priv *pstapriv = &padapter->stapriv; _func_enter_; @@ -1508,7 +1508,7 @@ inline void rtw_indicate_scan_done( _adapter *padapter, bool aborted) void rtw_scan_abort(_adapter *adapter) { - u32 cnt=0; + //u32 cnt=0; u32 start; struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); struct mlme_ext_priv *pmlmeext = &(adapter->mlmeextpriv); @@ -1963,7 +1963,7 @@ _func_exit_; u8 search_max_mac_id(_adapter *padapter) { - u8 mac_id, aid; + u8 mac_id = 0; #if (RATE_ADAPTIVE_SUPPORT==1) //for 88E RA struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); @@ -2438,7 +2438,7 @@ void rtw_scan_timeout_handler (_adapter *adapter) static void rtw_auto_scan_handler(_adapter *padapter) { struct mlme_priv *pmlmepriv = &padapter->mlmepriv; - struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv; + //struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv; //auto site survey per 60sec if(pmlmepriv->scan_interval >0) @@ -2756,7 +2756,7 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv ) _queue *queue = &(pmlmepriv->scanned_queue); struct wlan_network *pnetwork = NULL; struct wlan_network *candidate = NULL; - u8 bSupportAntDiv = _FALSE; + //u8 bSupportAntDiv = _FALSE; _func_enter_; @@ -3300,16 +3300,16 @@ static int rtw_append_pmkid(_adapter *Adapter,int iEntry, u8 *ie, uint ie_len) } sint rtw_restruct_sec_ie(_adapter *adapter,u8 *in_ie, u8 *out_ie, uint in_len) { - u8 authmode, securitytype, match; - u8 sec_ie[255], uncst_oui[4], bkup_ie[255]; - u8 wpa_oui[4]={0x0, 0x50, 0xf2, 0x01}; - uint ielength, cnt, remove_cnt; + u8 authmode; + //u8 sec_ie[255], uncst_oui[4], bkup_ie[255]; + //u8 wpa_oui[4]={0x0, 0x50, 0xf2, 0x01}; + uint ielength; int iEntry; struct mlme_priv *pmlmepriv = &adapter->mlmepriv; struct security_priv *psecuritypriv=&adapter->securitypriv; uint ndisauthmode=psecuritypriv->ndisauthtype; - uint ndissecuritytype = psecuritypriv->ndisencryptstatus; + //uint ndissecuritytype = psecuritypriv->ndisencryptstatus; _func_enter_; diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c index 839cb8f..92a65bc 100644 --- a/core/rtw_mlme_ext.c +++ b/core/rtw_mlme_ext.c @@ -574,7 +574,7 @@ void free_mlme_ext_priv (struct mlme_ext_priv *pmlmeext) } } -static u8 cmp_pkt_chnl_diff(_adapter *padapter,u8* pframe,uint packet_len) +static inline u8 cmp_pkt_chnl_diff(_adapter *padapter,u8* pframe,uint packet_len) { // if the channel is same, return 0. else return channel differential uint len; u8 channel; @@ -810,7 +810,7 @@ unsigned int OnProbeReq(_adapter *padapter, union recv_frame *precv_frame) #ifdef CONFIG_P2P struct wifidirect_info *pwdinfo = &(padapter->wdinfo); - struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib; + //struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib; u8 wifi_test_chk_rate = 1; if ( !rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE) && @@ -1034,10 +1034,10 @@ _issue_probersp: unsigned int OnProbeRsp(_adapter *padapter, union recv_frame *precv_frame) { - struct sta_info *psta; + //struct sta_info *psta; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; - struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); - struct sta_priv *pstapriv = &padapter->stapriv; + //struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); + //struct sta_priv *pstapriv = &padapter->stapriv; u8 *pframe = precv_frame->u.hdr.rx_data; #ifdef CONFIG_P2P struct wifidirect_info *pwdinfo = &padapter->wdinfo; @@ -2323,7 +2323,7 @@ unsigned int OnAssocRsp(_adapter *padapter, union recv_frame *precv_frame) //WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network); u8 *pframe = precv_frame->u.hdr.rx_data; uint pkt_len = precv_frame->u.hdr.len; - PNDIS_802_11_VARIABLE_IEs pWapiIE = NULL; + //PNDIS_802_11_VARIABLE_IEs pWapiIE = NULL; DBG_871X("%s\n", __FUNCTION__); @@ -2480,7 +2480,7 @@ unsigned int OnDeAuth(_adapter *padapter, union recv_frame *precv_frame) psta = rtw_get_stainfo(pstapriv, GetAddr2Ptr(pframe)); if(psta) { - u8 updated; + u8 updated = 0; _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); if(rtw_is_list_empty(&psta->asoc_list)==_FALSE) @@ -2555,7 +2555,7 @@ unsigned int OnDisassoc(_adapter *padapter, union recv_frame *precv_frame) psta = rtw_get_stainfo(pstapriv, GetAddr2Ptr(pframe)); if(psta) { - u8 updated; + u8 updated = 0; _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); if(rtw_is_list_empty(&psta->asoc_list)==_FALSE) @@ -2655,7 +2655,7 @@ unsigned int on_action_spct(_adapter *padapter, union recv_frame *precv_frame) struct sta_info *psta = NULL; struct sta_priv *pstapriv = &padapter->stapriv; u8 *pframe = precv_frame->u.hdr.rx_data; - uint frame_len = precv_frame->u.hdr.len; + //uint frame_len = precv_frame->u.hdr.len; u8 *frame_body = (u8 *)(pframe + sizeof(struct rtw_ieee80211_hdr_3addr)); u8 category; u8 action; @@ -2843,7 +2843,7 @@ static int get_reg_classes_full_count(struct p2p_channels channel_list) { return cnt; } -static void get_channel_cnt_24g_5gl_5gh( struct mlme_ext_priv *pmlmeext, u8* p24g_cnt, u8* p5gl_cnt, u8* p5gh_cnt ) +static inline void get_channel_cnt_24g_5gl_5gh( struct mlme_ext_priv *pmlmeext, u8* p24g_cnt, u8* p5gl_cnt, u8* p5gh_cnt ) { int i = 0; @@ -2878,8 +2878,9 @@ void issue_p2p_GO_request(_adapter *padapter, u8* raddr) u32 p2poui = cpu_to_be32(P2POUI); u8 oui_subtype = P2P_GO_NEGO_REQ; u8 wpsie[ 255 ] = { 0x00 }, p2pie[ 255 ] = { 0x00 }; - u8 wpsielen = 0, p2pielen = 0, i; - u8 channel_cnt_24g = 0, channel_cnt_5gl = 0, channel_cnt_5gh = 0; + u8 wpsielen = 0, p2pielen = 0; + //u8 wpsielen = 0, p2pielen = 0, i; + //u8 channel_cnt_24g = 0, channel_cnt_5gl = 0, channel_cnt_5gh = 0; u16 len_channellist_attr = 0; #ifdef CONFIG_WFD u32 wfdielen = 0; @@ -2892,7 +2893,7 @@ void issue_p2p_GO_request(_adapter *padapter, u8* raddr) unsigned short *fctrl; struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); - struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); + //struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct wifidirect_info *pwdinfo = &( padapter->wdinfo); @@ -3323,11 +3324,11 @@ void issue_p2p_GO_response(_adapter *padapter, u8* raddr, u8* frame_body,uint le u32 p2poui = cpu_to_be32(P2POUI); u8 oui_subtype = P2P_GO_NEGO_RESP; u8 wpsie[ 255 ] = { 0x00 }, p2pie[ 255 ] = { 0x00 }; - u8 p2pielen = 0, i; + u8 p2pielen = 0; uint wpsielen = 0; u16 wps_devicepassword_id = 0x0000; uint wps_devicepassword_id_len = 0; - u8 channel_cnt_24g = 0, channel_cnt_5gl = 0, channel_cnt_5gh; + //u8 channel_cnt_24g = 0, channel_cnt_5gl = 0, channel_cnt_5gh; u16 len_channellist_attr = 0; struct xmit_frame *pmgntframe; @@ -3337,7 +3338,7 @@ void issue_p2p_GO_response(_adapter *padapter, u8* raddr, u8* frame_body,uint le unsigned short *fctrl; struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); - struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); + //struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct wifidirect_info *pwdinfo = &( padapter->wdinfo); #ifdef CONFIG_WFD @@ -3803,8 +3804,8 @@ void issue_p2p_GO_confirm(_adapter *padapter, u8* raddr, u8 result) u8 action = P2P_PUB_ACTION_ACTION; u32 p2poui = cpu_to_be32(P2POUI); u8 oui_subtype = P2P_GO_NEGO_CONF; - u8 wpsie[ 255 ] = { 0x00 }, p2pie[ 255 ] = { 0x00 }; - u8 wpsielen = 0, p2pielen = 0; + u8 p2pie[ 255 ] = { 0x00 }; + u8 p2pielen = 0; struct xmit_frame *pmgntframe; struct pkt_attrib *pattrib; @@ -3813,7 +3814,7 @@ void issue_p2p_GO_confirm(_adapter *padapter, u8* raddr, u8 result) unsigned short *fctrl; struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); - struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); + //struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct wifidirect_info *pwdinfo = &( padapter->wdinfo); #ifdef CONFIG_WFD u32 wfdielen = 0; @@ -4024,9 +4025,9 @@ void issue_p2p_invitation_request(_adapter *padapter, u8* raddr ) u32 p2poui = cpu_to_be32(P2POUI); u8 oui_subtype = P2P_INVIT_REQ; u8 p2pie[ 255 ] = { 0x00 }; - u8 p2pielen = 0, i; + u8 p2pielen = 0; u8 dialogToken = 3; - u8 channel_cnt_24g = 0, channel_cnt_5gl = 0, channel_cnt_5gh = 0; + //u8 channel_cnt_24g = 0, channel_cnt_5gl = 0, channel_cnt_5gh = 0; u16 len_channellist_attr = 0; #ifdef CONFIG_WFD u32 wfdielen = 0; @@ -4045,7 +4046,7 @@ void issue_p2p_invitation_request(_adapter *padapter, u8* raddr ) unsigned short *fctrl; struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); - struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); + //struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct wifidirect_info *pwdinfo = &( padapter->wdinfo); @@ -4365,8 +4366,8 @@ void issue_p2p_invitation_response(_adapter *padapter, u8* raddr, u8 dialogToken u32 p2poui = cpu_to_be32(P2POUI); u8 oui_subtype = P2P_INVIT_RESP; u8 p2pie[ 255 ] = { 0x00 }; - u8 p2pielen = 0, i; - u8 channel_cnt_24g = 0, channel_cnt_5gl = 0, channel_cnt_5gh = 0; + u8 p2pielen = 0; + //u8 channel_cnt_24g = 0, channel_cnt_5gl = 0, channel_cnt_5gh = 0; u16 len_channellist_attr = 0; #ifdef CONFIG_CONCURRENT_MODE _adapter *pbuddy_adapter = padapter->pbuddy_adapter; @@ -4385,7 +4386,7 @@ void issue_p2p_invitation_response(_adapter *padapter, u8* raddr, u8 dialogToken unsigned short *fctrl; struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); - struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); + //struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct wifidirect_info *pwdinfo = &( padapter->wdinfo); @@ -4657,7 +4658,7 @@ void issue_p2p_provision_request(_adapter *padapter, u8* pssid, u8 ussidlen, u8* unsigned short *fctrl; struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); - struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); + //struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct wifidirect_info *pwdinfo = &(padapter->wdinfo); @@ -4781,7 +4782,7 @@ void issue_probersp_p2p(_adapter *padapter, unsigned char *da) unsigned char *mac; struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); - struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); + //struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); //WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network); u16 beacon_interval = 100; @@ -5129,11 +5130,11 @@ int _issue_probereq_p2p(_adapter *padapter, u8 *da, int wait_ack) struct rtw_ieee80211_hdr *pwlanhdr; unsigned short *fctrl; unsigned char *mac; - unsigned char bssrate[NumRates]; + //unsigned char bssrate[NumRates]; struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); - struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); - int bssrate_len = 0; + //struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); + //int bssrate_len = 0; u8 bc_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; struct wifidirect_info *pwdinfo = &(padapter->wdinfo); u8 wpsie[255] = { 0x00 }, p2pie[ 255 ] = { 0x00 }; @@ -5471,7 +5472,9 @@ int issue_probereq_p2p_ex(_adapter *adapter, u8 *da, int try_cnt, int wait_ms) { int ret; int i = 0; +#ifdef CONFIG_DEBUG u32 start = rtw_get_current_time(); +#endif do { @@ -5553,7 +5556,7 @@ unsigned int on_action_public_p2p(union recv_frame *precv_frame) u8 dialogToken=0; #ifdef CONFIG_P2P u8 *p2p_ie; - u32 p2p_ielen, wps_ielen; + u32 p2p_ielen; struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); u8 result = P2P_STATUS_SUCCESS; u8 empty_addr[ETH_ALEN] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; @@ -5962,7 +5965,7 @@ unsigned int on_action_public_vendor(union recv_frame *precv_frame) { unsigned int ret = _FAIL; u8 *pframe = precv_frame->u.hdr.rx_data; - uint frame_len = precv_frame->u.hdr.len; + //uint frame_len = precv_frame->u.hdr.len; u8 *frame_body = pframe + sizeof(struct rtw_ieee80211_hdr_3addr); if (_rtw_memcmp(frame_body + 2, P2P_OUI, 4) == _TRUE) { @@ -6003,7 +6006,7 @@ unsigned int on_action_public(_adapter *padapter, union recv_frame *precv_frame) { unsigned int ret = _FAIL; u8 *pframe = precv_frame->u.hdr.rx_data; - uint frame_len = precv_frame->u.hdr.len; + //uint frame_len = precv_frame->u.hdr.len; u8 *frame_body = pframe + sizeof(struct rtw_ieee80211_hdr_3addr); u8 category, action; @@ -6694,7 +6697,7 @@ void issue_probersp(_adapter *padapter, unsigned char *da, u8 is_valid_p2p_probe #ifdef CONFIG_P2P struct wifidirect_info *pwdinfo = &(padapter->wdinfo); #ifdef CONFIG_WFD - u32 wfdielen = 0; + //u32 wfdielen = 0; #endif //CONFIG_WFD #endif //CONFIG_P2P @@ -6976,7 +6979,7 @@ int _issue_probereq(_adapter *padapter, NDIS_802_11_SSID *pssid, u8 *da, int wai struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); - struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); + //struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); int bssrate_len = 0; u8 bc_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; @@ -7086,7 +7089,9 @@ int issue_probereq_ex(_adapter *padapter, NDIS_802_11_SSID *pssid, u8 *da, { int ret; int i = 0; +#ifdef CONFIG_DEBUG u32 start = rtw_get_current_time(); +#endif do { @@ -8069,7 +8074,9 @@ int issue_nulldata(_adapter *padapter, unsigned char *da, unsigned int power_mod { int ret; int i = 0; +#ifdef CONFIG_DEBUG u32 start = rtw_get_current_time(); +#endif struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); @@ -8203,7 +8210,9 @@ int issue_qos_nulldata(_adapter *padapter, unsigned char *da, u16 tid, int try_c { int ret; int i = 0; +#ifdef CONFIG_DEBUG u32 start = rtw_get_current_time(); +#endif struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); @@ -8331,7 +8340,9 @@ int issue_deauth_ex(_adapter *padapter, u8 *da, unsigned short reason, int try_c { int ret; int i = 0; +#ifdef CONFIG_DEBUG u32 start = rtw_get_current_time(); +#endif do { @@ -8370,17 +8381,17 @@ exit: void issue_action_spct_ch_switch(_adapter *padapter, u8 *ra, u8 new_ch, u8 ch_offset) { - _irqL irqL; - _list *plist, *phead; + //_irqL irqL; + //_list *plist, *phead; struct xmit_frame *pmgntframe; struct pkt_attrib *pattrib; unsigned char *pframe; struct rtw_ieee80211_hdr *pwlanhdr; unsigned short *fctrl; struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; + //struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); - struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); + //struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); DBG_871X(FUNC_NDEV_FMT" ra="MAC_FMT", ch:%u, offset:%u\n", @@ -8941,8 +8952,8 @@ void site_survey(_adapter *padapter) #endif //CONFIG_CONCURRENT_MODE struct wifidirect_info *pwdinfo= &(padapter->wdinfo); - static unsigned char prev_survey_channel = 0; - static unsigned int p2p_scan_count = 0; + //static unsigned char prev_survey_channel = 0; + //static unsigned int p2p_scan_count = 0; if ( ( pwdinfo->rx_invitereq_info.scan_op_ch_only ) || ( pwdinfo->p2p_info.scan_op_ch_only ) ) { @@ -10628,8 +10639,8 @@ void _linked_info_dump(_adapter *padapter) u8 chk_ap_is_alive(_adapter *padapter, struct sta_info *psta) { u8 ret = _FALSE; - struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; - struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); + //struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; + //struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); #ifdef DBG_EXPIRATION_CHK DBG_871X(FUNC_ADPT_FMT" rx:"STA_PKTS_FMT", beacon:%llu, probersp_to_self:%llu" @@ -12110,7 +12121,7 @@ void change_band_update_ie(_adapter *padapter, WLAN_BSSID_EX *pnetwork) { u8 network_type,rate_len, total_rate_len,remainder_rate_len; struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); - struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); + //struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); u8 erpinfo=0x4; //DBG_871X("%s\n", __FUNCTION__); @@ -13061,7 +13072,7 @@ void concurrent_chk_joinbss_done(_adapter *padapter, int join_res) u8 set_ch_hdl(_adapter *padapter, u8 *pbuf) { struct set_ch_parm *set_ch_parm; - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; + //struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; if(!pbuf) @@ -13085,7 +13096,7 @@ u8 set_ch_hdl(_adapter *padapter, u8 *pbuf) u8 set_chplan_hdl(_adapter *padapter, unsigned char *pbuf) { struct SetChannelPlan_param *setChannelPlan_param; - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; + //struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; if(!pbuf) @@ -13119,9 +13130,9 @@ u8 set_csa_hdl(_adapter *padapter, unsigned char *pbuf) { #ifdef CONFIG_DFS struct SetChannelSwitch_param *setChannelSwitch_param; - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; - struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; - struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; + //struct mlme_priv *pmlmepriv = &padapter->mlmepriv; + //struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; + //struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; u8 new_ch_no; u8 gval8 = 0x00, sval8 = 0xff; diff --git a/core/rtw_mp.c b/core/rtw_mp.c index 74069e4..78553bc 100644 --- a/core/rtw_mp.c +++ b/core/rtw_mp.c @@ -208,7 +208,7 @@ static int init_mp_priv_by_os(struct mp_priv *pmp_priv) #endif #ifdef PLATFORM_LINUX -static int init_mp_priv_by_os(struct mp_priv *pmp_priv) +static inline int init_mp_priv_by_os(struct mp_priv *pmp_priv) { int i, res; struct mp_xmit_frame *pmp_xmitframe; @@ -615,8 +615,8 @@ static void disable_dm(PADAPTER padapter) #ifndef CONFIG_RTL8723A u8 v8; #endif - HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); - struct dm_priv *pdmpriv = &pHalData->dmpriv; + //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); + //struct dm_priv *pdmpriv = &pHalData->dmpriv; //3 1. disable firmware dynamic mechanism @@ -886,19 +886,19 @@ static VOID mpt_AdjustRFRegByRateByChan92CU(PADAPTER pAdapter, u8 RateIdx, u8 Ch * 01/09/2009 MHC Add CCK modification for 40MHZ. Suggestion from SD3. * *---------------------------------------------------------------------------*/ -static void mpt_SwitchRfSetting(PADAPTER pAdapter) +static inline void mpt_SwitchRfSetting(PADAPTER pAdapter) { Hal_mpt_SwitchRfSetting(pAdapter); } /*---------------------------hal\rtl8192c\MPT_Phy.c---------------------------*/ /*---------------------------hal\rtl8192c\MPT_HelperFunc.c---------------------------*/ -static void MPT_CCKTxPowerAdjust(PADAPTER Adapter, BOOLEAN bInCH14) +static inline void MPT_CCKTxPowerAdjust(PADAPTER Adapter, BOOLEAN bInCH14) { Hal_MPT_CCKTxPowerAdjust(Adapter,bInCH14); } -static void MPT_CCKTxPowerAdjustbyIndex(PADAPTER pAdapter, BOOLEAN beven) +static inline void MPT_CCKTxPowerAdjustbyIndex(PADAPTER pAdapter, BOOLEAN beven) { Hal_MPT_CCKTxPowerAdjustbyIndex(pAdapter,beven); } @@ -926,12 +926,12 @@ void SetBandwidth(PADAPTER pAdapter) } -static void SetCCKTxPower(PADAPTER pAdapter, u8 *TxPower) +static inline void SetCCKTxPower(PADAPTER pAdapter, u8 *TxPower) { Hal_SetCCKTxPower(pAdapter,TxPower); } -static void SetOFDMTxPower(PADAPTER pAdapter, u8 *TxPower) +static inline void SetOFDMTxPower(PADAPTER pAdapter, u8 *TxPower) { Hal_SetOFDMTxPower(pAdapter,TxPower); } @@ -949,9 +949,9 @@ void SetAntennaPathPower(PADAPTER pAdapter) int SetTxPower(PADAPTER pAdapter) { - HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); + //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); u1Byte CurrChannel; - BOOLEAN bResult = _TRUE; + //BOOLEAN bResult = _TRUE; PMPT_CONTEXT pMptCtx = &(pAdapter->mppriv.MptCtx); u1Byte rf, TxPower[2]; @@ -1011,12 +1011,12 @@ s32 SetThermalMeter(PADAPTER pAdapter, u8 target_ther) return Hal_SetThermalMeter( pAdapter, target_ther); } -static void TriggerRFThermalMeter(PADAPTER pAdapter) +static inline void TriggerRFThermalMeter(PADAPTER pAdapter) { Hal_TriggerRFThermalMeter(pAdapter); } -static u8 ReadRFThermalMeter(PADAPTER pAdapter) +static inline u8 ReadRFThermalMeter(PADAPTER pAdapter) { return Hal_ReadRFThermalMeter(pAdapter); } @@ -1289,7 +1289,7 @@ void fill_tx_desc_8812a(PADAPTER padapter) u32 pkt_size = pattrib->last_txcmdsz; s32 bmcast = IS_MCAST(pattrib->ra); - u8 data_rate,pwr_status,offset; + u8 offset; SET_TX_DESC_FIRST_SEG_8812(pDesc, 1); SET_TX_DESC_LAST_SEG_8812(pDesc, 1); @@ -1369,7 +1369,7 @@ void fill_tx_desc_8723b(PADAPTER padapter) void SetPacketTx(PADAPTER padapter) { u8 *ptr, *pkt_start, *pkt_end; - u32 pkt_size,offset; + u32 pkt_size; struct tx_desc *desc; struct rtw_ieee80211_hdr *hdr; u8 payload; @@ -1668,7 +1668,7 @@ void _rtw_mp_xmit_priv (struct xmit_priv *pxmitpriv) { int i,res; _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; u32 max_xmit_extbuf_size = MAX_XMIT_EXTBUF_SZ; @@ -1962,14 +1962,14 @@ mpt_ProQueryCalTxPower_8188E( ) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); - u1Byte TxCount=TX_1S, i = 0; //default set to 1S + u1Byte TxCount=TX_1S; //default set to 1S //PMGNT_INFO pMgntInfo = &(pAdapter->MgntInfo); - ULONG TxPower = 1, PwrGroup=0, PowerDiffByRate=0; - ULONG TxPowerCCK = 1, TxPowerOFDM = 1, TxPowerBW20 = 1, TxPowerBW40 = 1 ; + ULONG TxPower = 1, PowerDiffByRate=0; + //ULONG TxPowerCCK = 1, TxPowerOFDM = 1, TxPowerBW20 = 1, TxPowerBW40 = 1 ; PMPT_CONTEXT pMptCtx = &(pAdapter->mppriv.MptCtx); u1Byte CurrChannel = pHalData->CurrentChannel; u1Byte index = (CurrChannel -1); - u1Byte rf_path=(RfPath), rfPath; + u1Byte rf_path=(RfPath); u1Byte limit = 0, rate = 0; if(HAL_IsLegalChannel(pAdapter, CurrChannel) == FALSE) @@ -2067,10 +2067,10 @@ ULONG mpt_ProQueryCalTxPower( ) { - HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); - ULONG TxPower = 1, PwrGroup=0, PowerDiffByRate=0; + //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); + ULONG TxPower = 1; PMPT_CONTEXT pMptCtx = &(pAdapter->mppriv.MptCtx); - u1Byte limit = 0, rate = 0; + u1Byte rate = 0; rate=pMptCtx->MptRateIndex; if ( IS_HARDWARE_TYPE_8188E(pAdapter) || IS_HARDWARE_TYPE_8192E(pAdapter) )//|| IS_HARDWARE_TYPE_8723B(pAdapter)) diff --git a/core/rtw_p2p.c b/core/rtw_p2p.c index b2e1ba2..f7df9f4 100644 --- a/core/rtw_p2p.c +++ b/core/rtw_p2p.c @@ -298,7 +298,7 @@ static void issue_p2p_provision_resp(struct wifidirect_info *pwdinfo, u8* raddr, unsigned short *fctrl; struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); - struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); + //struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) @@ -2931,8 +2931,8 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram u8 attr_content = 0x00; u32 attr_contentlen = 0; u8 operatingch_info[5] = { 0x00 }; - uint ch_cnt = 0; - u8 ch_content[100] = { 0x00 }; + //uint ch_cnt = 0; + //u8 ch_content[100] = { 0x00 }; u8 groupid[ 38 ]; u16 cap_attr; u8 peer_ch_list[100] = { 0x00 }; @@ -3291,7 +3291,7 @@ void p2p_concurrent_handler( _adapter* padapter ); void restore_p2p_state_handler( _adapter* padapter ) { struct wifidirect_info *pwdinfo = &padapter->wdinfo; - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; + //struct mlme_priv *pmlmepriv = &padapter->mlmepriv; _func_enter_; @@ -3498,7 +3498,7 @@ static void ro_ch_handler(_adapter *padapter) { struct cfg80211_wifidirect_info *pcfg80211_wdinfo = &padapter->cfg80211_wdinfo; struct wifidirect_info *pwdinfo = &padapter->wdinfo; - struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; + //struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; _func_enter_; @@ -3547,7 +3547,7 @@ _func_exit_; static void ro_ch_timer_process (void *FunctionContext) { _adapter *adapter = (_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__); @@ -3558,12 +3558,12 @@ static void ro_ch_timer_process (void *FunctionContext) p2p_protocol_wk_cmd( adapter, P2P_RO_CH_WK); } -static void rtw_change_p2pie_op_ch(_adapter *padapter, const u8 *frame_body, u32 len, u8 ch) +static inline void rtw_change_p2pie_op_ch(_adapter *padapter, const u8 *frame_body, u32 len, u8 ch) { u8 *ies, *p2p_ie; u32 ies_len, p2p_ielen; - PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; - struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; + //PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; + //struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; ies = (u8*)(frame_body + _PUBLIC_ACTION_IE_OFFSET_); ies_len = len - _PUBLIC_ACTION_IE_OFFSET_; @@ -3587,12 +3587,12 @@ 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 inline void rtw_change_p2pie_ch_list(_adapter *padapter, const u8 *frame_body, u32 len, u8 ch) { u8 *ies, *p2p_ie; u32 ies_len, p2p_ielen; - PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; - struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; + //PADAPTER pbuddy_adapter = padapter->pbuddy_adapter; + //struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv; ies = (u8*)(frame_body + _PUBLIC_ACTION_IE_OFFSET_); ies_len = len - _PUBLIC_ACTION_IE_OFFSET_; @@ -3627,7 +3627,7 @@ 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 inline bool rtw_chk_p2pie_ch_list_with_buddy(_adapter *padapter, const u8 *frame_body, u32 len) { bool fit = _FALSE; #ifdef CONFIG_CONCURRENT_MODE @@ -3677,7 +3677,7 @@ static bool rtw_chk_p2pie_ch_list_with_buddy(_adapter *padapter, const u8 *frame return fit; } -static bool rtw_chk_p2pie_op_ch_with_buddy(_adapter *padapter, const u8 *frame_body, u32 len) +static inline bool rtw_chk_p2pie_op_ch_with_buddy(_adapter *padapter, const u8 *frame_body, u32 len) { bool fit = _FALSE; #ifdef CONFIG_CONCURRENT_MODE @@ -3712,7 +3712,7 @@ static bool rtw_chk_p2pie_op_ch_with_buddy(_adapter *padapter, const u8 *frame_b return fit; } -static void rtw_cfg80211_adjust_p2pie_channel(_adapter *padapter, const u8 *frame_body, u32 len) +static inline void rtw_cfg80211_adjust_p2pie_channel(_adapter *padapter, const u8 *frame_body, u32 len) { #ifdef CONFIG_CONCURRENT_MODE u8 *ies, *p2p_ie; @@ -3773,7 +3773,7 @@ void rtw_append_wfd_ie(_adapter *padapter, u8 *buf, u32* len) unsigned char *frame_body; u8 category, action, OUI_Subtype, dialogToken=0; u32 wfdielen = 0; - struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(padapter->rtw_wdev); + //struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(padapter->rtw_wdev); frame_body = (unsigned char *)(buf + sizeof(struct rtw_ieee80211_hdr_3addr)); category = frame_body[0]; @@ -3891,7 +3891,7 @@ u8 *dump_p2p_attr_ch_list(u8 *p2p_ie, uint p2p_ielen, u8 *buf, u32 buf_len) int w_sz = 0; u8 ch_cnt = 0; u8 ch_list[40]; - bool continuous = _FALSE; + //bool continuous = _FALSE; if ((pattr=rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_CH_LIST, NULL, &attr_contentlen))!=NULL) { int i, j; @@ -4238,7 +4238,7 @@ void rtw_init_cfg80211_wifidirect_info( _adapter* padapter) void p2p_protocol_wk_hdl(_adapter *padapter, int intCmdType) { - struct wifidirect_info *pwdinfo= &(padapter->wdinfo); + //struct wifidirect_info *pwdinfo= &(padapter->wdinfo); _func_enter_; @@ -4597,7 +4597,7 @@ static void pre_tx_scan_timer_process (void *FunctionContext) struct wifidirect_info *pwdinfo = &adapter->wdinfo; _irqL irqL; struct mlme_priv *pmlmepriv = &adapter->mlmepriv; - u8 _status = 0; + //u8 _status = 0; if(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) return; @@ -4987,12 +4987,12 @@ int rtw_p2p_enable(_adapter *padapter, enum P2P_ROLE role) { int ret = _SUCCESS; struct wifidirect_info *pwdinfo= &(padapter->wdinfo); - struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; + //struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; if (role == P2P_ROLE_DEVICE || role == P2P_ROLE_CLIENT|| role == P2P_ROLE_GO) { - u8 channel, ch_offset; - u16 bwmode; + //u8 channel, ch_offset; + //u16 bwmode; #ifdef CONFIG_CONCURRENT_MODE _adapter *pbuddy_adapter = padapter->pbuddy_adapter; diff --git a/core/rtw_pwrctrl.c b/core/rtw_pwrctrl.c index ab995d6..95ac064 100644 --- a/core/rtw_pwrctrl.c +++ b/core/rtw_pwrctrl.c @@ -130,7 +130,7 @@ bool rtw_pwr_unassociated_idle(_adapter *adapter) #ifdef CONFIG_P2P struct wifidirect_info *pwdinfo = &(adapter->wdinfo); #ifdef CONFIG_IOCTL_CFG80211 - struct cfg80211_wifidirect_info *pcfg80211_wdinfo = &adapter->cfg80211_wdinfo; + //struct cfg80211_wifidirect_info *pcfg80211_wdinfo = &adapter->cfg80211_wdinfo; #endif #endif @@ -160,7 +160,7 @@ bool rtw_pwr_unassociated_idle(_adapter *adapter) #ifdef CONFIG_P2P struct wifidirect_info *b_pwdinfo = &(buddy->wdinfo); #ifdef CONFIG_IOCTL_CFG80211 - struct cfg80211_wifidirect_info *b_pcfg80211_wdinfo = &buddy->cfg80211_wdinfo; + //struct cfg80211_wifidirect_info *b_pcfg80211_wdinfo = &buddy->cfg80211_wdinfo; #endif #endif @@ -206,10 +206,12 @@ exit: void rtw_ps_processor(_adapter*padapter) { #ifdef CONFIG_P2P - struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); + //struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); #endif //CONFIG_P2P struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; +#ifdef CONFIG_DEBUG struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +#endif #ifdef SUPPORT_HW_RFOFF_DETECTED rt_rf_power_state rfpwrstate; #endif //SUPPORT_HW_RFOFF_DETECTED @@ -666,8 +668,8 @@ s32 LPS_RF_ON_check(PADAPTER padapter, u32 delay_ms) void LPS_Enter(PADAPTER padapter) { struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; - struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); - _adapter *buddy = padapter->pbuddy_adapter; + //struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); + //_adapter *buddy = padapter->pbuddy_adapter; _func_enter_; @@ -735,8 +737,8 @@ void LPS_Leave(PADAPTER padapter) #define LPS_LEAVE_TIMEOUT_MS 100 struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; - u32 start_time; - u8 bAwake = _FALSE; + //u32 start_time; + //u8 bAwake = _FALSE; _func_enter_; diff --git a/core/rtw_recv.c b/core/rtw_recv.c index 659bbb5..609b1e8 100644 --- a/core/rtw_recv.c +++ b/core/rtw_recv.c @@ -716,7 +716,8 @@ _func_exit_; union recv_frame * portctrl(_adapter *adapter,union recv_frame * precv_frame); union recv_frame * portctrl(_adapter *adapter,union recv_frame * precv_frame) { - u8 *psta_addr, *ptr; + //FIXME psta_addr + u8 *psta_addr = NULL, *ptr; uint auth_alg; struct recv_frame_hdr *pfhdr; struct sta_info *psta; @@ -1817,7 +1818,7 @@ sint validate_recv_data_frame(_adapter *adapter, union recv_frame *precv_frame) struct sta_info *psta = NULL; u8 *ptr = precv_frame->u.hdr.rx_data; struct rx_pkt_attrib *pattrib = & precv_frame->u.hdr.attrib; - struct sta_priv *pstapriv = &adapter->stapriv; + //struct sta_priv *pstapriv = &adapter->stapriv; struct security_priv *psecuritypriv = &adapter->securitypriv; sint ret = _SUCCESS; #ifdef CONFIG_TDLS @@ -3254,7 +3255,7 @@ int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe) } -_success_exit: +//_success_exit: return _SUCCESS; @@ -3372,7 +3373,7 @@ int recv_func_prehandle(_adapter *padapter, union recv_frame *rframe) { int ret = _SUCCESS; struct rx_pkt_attrib *pattrib = &rframe->u.hdr.attrib; - struct recv_priv *precvpriv = &padapter->recvpriv; + //struct recv_priv *precvpriv = &padapter->recvpriv; _queue *pfree_recv_queue = &padapter->recvpriv.free_recv_queue; #ifdef CONFIG_MP_INCLUDED @@ -3416,7 +3417,7 @@ int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe) { int ret = _SUCCESS; union recv_frame *orig_prframe = prframe; - struct rx_pkt_attrib *pattrib = &prframe->u.hdr.attrib; + //struct rx_pkt_attrib *pattrib = &prframe->u.hdr.attrib; struct recv_priv *precvpriv = &padapter->recvpriv; _queue *pfree_recv_queue = &padapter->recvpriv.free_recv_queue; @@ -3573,7 +3574,9 @@ int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe) } #endif // CONFIG_80211N_HT +#ifdef CONFIG_TDLS _exit_recv_func: +#endif return ret; _recv_data_drop: @@ -3587,7 +3590,7 @@ int recv_func(_adapter *padapter, union recv_frame *rframe) { int ret; struct rx_pkt_attrib *prxattrib = &rframe->u.hdr.attrib; - struct recv_priv *recvpriv = &padapter->recvpriv; + //struct recv_priv *recvpriv = &padapter->recvpriv; struct security_priv *psecuritypriv=&padapter->securitypriv; struct mlme_priv *mlmepriv = &padapter->mlmepriv; @@ -3595,7 +3598,7 @@ int recv_func(_adapter *padapter, union recv_frame *rframe) if (check_fwstate(mlmepriv, WIFI_STATION_STATE) && psecuritypriv->busetkipkey) { union recv_frame *pending_frame; - _irqL irqL; + //_irqL irqL; while((pending_frame=rtw_alloc_recvframe(&padapter->recvpriv.uc_swdec_pending_queue))) { if (recv_func_posthandle(padapter, pending_frame) == _SUCCESS) diff --git a/core/rtw_security.c b/core/rtw_security.c index 304216a..a6b8556 100644 --- a/core/rtw_security.c +++ b/core/rtw_security.c @@ -941,13 +941,6 @@ static void next_key(u8 *key, sint round); static void byte_sub(u8 *in, u8 *out); static void shift_row(u8 *in, u8 *out); static void mix_column(u8 *in, u8 *out); -#ifndef PLATFORM_FREEBSD -static void add_round_key( u8 *shiftrow_in, - u8 *mcol_in, - u8 *block_in, - sint round, - u8 *out); -#endif //PLATFORM_FREEBSD static void aes128k128d(u8 *key, u8 *data, u8 *ciphertext); @@ -1918,7 +1911,7 @@ u32 rtw_aes_decrypt(_adapter *padapter, u8 *precvframe) sint length; - u32 prwskeylen; + //u32 prwskeylen; u8 *pframe,*prwskey; //, *payload,*iv struct sta_info *stainfo; struct rx_pkt_attrib *prxattrib = &((union recv_frame *)precvframe)->u.hdr.attrib; @@ -2153,7 +2146,7 @@ static u8 os_strlen(const char *s) return p - s; } -static int os_memcmp(void *s1, void *s2, u8 n) +static inline int os_memcmp(void *s1, void *s2, u8 n) { unsigned char *p1 = s1, *p2 = s2; @@ -2256,7 +2249,7 @@ static void hmac_sha256_vector(u8 *key, size_t key_len, size_t num_elem, * given key. */ #ifndef PLATFORM_FREEBSD //Baron -static void sha256_prf(u8 *key, size_t key_len, char *label, +static inline void sha256_prf(u8 *key, size_t key_len, char *label, u8 *data, size_t data_len, u8 *buf, size_t buf_len) { u16 counter = 1; @@ -2683,7 +2676,7 @@ static int omac1_aes_128_vector(u8 *key, size_t num_elem, * OMAC1 was standardized with the name CMAC by NIST in a Special Publication * (SP) 800-38B. */ -static int omac1_aes_128(u8 *key, u8 *data, size_t data_len, u8 *mac) +static inline int omac1_aes_128(u8 *key, u8 *data, size_t data_len, u8 *mac) { return omac1_aes_128_vector(key, 1, &data, &data_len, mac); } diff --git a/core/rtw_sreset.c b/core/rtw_sreset.c index 9598e96..b99c247 100644 --- a/core/rtw_sreset.c +++ b/core/rtw_sreset.c @@ -114,11 +114,11 @@ bool sreset_inprogress(_adapter *padapter) void sreset_restore_security_station(_adapter *padapter) { - u8 EntryId = 0; + //u8 EntryId = 0; struct mlme_priv *mlmepriv = &padapter->mlmepriv; struct sta_priv * pstapriv = &padapter->stapriv; struct sta_info *psta; - struct security_priv* psecuritypriv=&(padapter->securitypriv); + //struct security_priv* psecuritypriv=&(padapter->securitypriv); struct mlme_ext_info *pmlmeinfo = &padapter->mlmeextpriv.mlmext_info; { @@ -239,8 +239,8 @@ void sreset_restore_network_station(_adapter *padapter) void sreset_restore_network_status(_adapter *padapter) { struct mlme_priv *mlmepriv = &padapter->mlmepriv; - struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; - struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); + //struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; + //struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); if (check_fwstate(mlmepriv, WIFI_STATION_STATE)) { DBG_871X(FUNC_ADPT_FMT" fwstate:0x%08x - WIFI_STATION_STATE\n", FUNC_ADPT_ARG(padapter), get_fwstate(mlmepriv)); diff --git a/core/rtw_sta_mgt.c b/core/rtw_sta_mgt.c index 56ff1fe..98095bb 100644 --- a/core/rtw_sta_mgt.c +++ b/core/rtw_sta_mgt.c @@ -316,7 +316,7 @@ _func_exit_; //struct sta_info *rtw_alloc_stainfo(_queue *pfree_sta_queue, unsigned char *hwaddr) struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr) { - _irqL irqL, irqL2; + _irqL irqL2; uint tmp_aid; s32 index; _list *phash_list; diff --git a/core/rtw_vht.c b/core/rtw_vht.c index 2f5949a..990ac7f 100644 --- a/core/rtw_vht.c +++ b/core/rtw_vht.c @@ -353,7 +353,7 @@ void VHT_operation_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) struct ht_priv *phtpriv = &pmlmepriv->htpriv; struct vht_priv *pvhtpriv = &pmlmepriv->vhtpriv; struct registry_priv *pregistrypriv = &padapter->registrypriv; - struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; + //struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; if(pIE==NULL) return; @@ -372,7 +372,7 @@ u32 rtw_build_vht_operation_ie(_adapter *padapter, u8 *pbuf, u8 channel) //struct registry_priv *pregistrypriv = &padapter->registrypriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct vht_priv *pvhtpriv = &pmlmepriv->vhtpriv; - struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; + //struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; u8 ChnlWidth, center_freq; u32 len = 0; u8 operation[5]; @@ -527,9 +527,9 @@ u32 rtw_build_vht_cap_ie(_adapter *padapter, u8 *pbuf) u32 rtw_restructure_vht_ie(_adapter *padapter, u8 *in_ie, u8 *out_ie, uint in_len, uint *pout_len) { u32 ielen, out_len; - u8 cap_len, notify_len, operation_bw, supported_chnl_width; + u8 cap_len, notify_len, operation_bw = CHANNEL_WIDTH_MAX, supported_chnl_width; u8 *p, *pframe; - struct registry_priv *pregistrypriv = &padapter->registrypriv; + //struct registry_priv *pregistrypriv = &padapter->registrypriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct vht_priv *pvhtpriv = &pmlmepriv->vhtpriv; diff --git a/core/rtw_wlan_util.c b/core/rtw_wlan_util.c index 47cde2c..a3fe2a4 100644 --- a/core/rtw_wlan_util.c +++ b/core/rtw_wlan_util.c @@ -477,7 +477,7 @@ void Switch_DM_Func(_adapter *padapter, u32 mode, u8 enable) } -static void Set_NETYPE1_MSR(_adapter *padapter, u8 type) +static inline void Set_NETYPE1_MSR(_adapter *padapter, u8 type) { rtw_hal_set_hwreg(padapter, HW_VAR_MEDIA_STATUS1, (u8 *)(&type)); } @@ -565,7 +565,7 @@ u8 rtw_get_center_ch(u8 channel, u8 chnl_bw, u8 chnl_offset) void SelectChannel(_adapter *padapter, unsigned char channel) { - struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; + //struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; #ifdef CONFIG_DUALMAC_CONCURRENT //saved channel info @@ -587,7 +587,7 @@ void SelectChannel(_adapter *padapter, unsigned char channel) void SetBWMode(_adapter *padapter, unsigned short bwmode, unsigned char channel_offset) { - struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; + //struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; #ifdef CONFIG_DUALMAC_CONCURRENT //saved bw info @@ -612,7 +612,7 @@ void SetBWMode(_adapter *padapter, unsigned short bwmode, unsigned char channel_ void set_channel_bwmode(_adapter *padapter, unsigned char channel, unsigned char channel_offset, unsigned short bwmode) { u8 center_ch, chnl_offset80 = HAL_PRIME_CHNL_OFFSET_DONT_CARE; - struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; + //struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; if ( padapter->bNotifyChannelChange ) { @@ -944,10 +944,10 @@ void flush_all_cam_entry(_adapter *padapter) #if defined(CONFIG_P2P) && defined(CONFIG_WFD) int WFD_info_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) { - struct registry_priv *pregpriv = &padapter->registrypriv; - struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); - struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; - struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); + //struct registry_priv *pregpriv = &padapter->registrypriv; + //struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); + //struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; + //struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct wifidirect_info *pwdinfo; u8 wfd_ie[ 128 ] = { 0x00 }; u32 wfd_ielen = 0; @@ -1018,7 +1018,7 @@ int WMM_param_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) void WMMOnAssocRsp(_adapter *padapter) { - u8 ACI, ACM, AIFS, ECWMin, ECWMax, aSifsTime; + u8 ACI, ACM, AIFS, ECWMin = 0, ECWMax, aSifsTime; u8 acm_mask; u16 TXOP; u32 acParm, i; @@ -1279,7 +1279,7 @@ void HT_caps_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct ht_priv *phtpriv = &pmlmepriv->htpriv; - struct registry_priv *pregistrypriv = &padapter->registrypriv; + //struct registry_priv *pregistrypriv = &padapter->registrypriv; if(pIE==NULL) return; @@ -1559,7 +1559,8 @@ int rtw_check_bcn_info(ADAPTER *Adapter, u8 *pframe, u32 packet_len) u32 wpa_ielen = 0; u8 *pbssid = GetAddr3Ptr(pframe); u32 hidden_ssid = 0; - u8 cur_network_type, network_type=0; + //u8 cur_network_type, network_type=0; + //u8 cur_network_type; struct HT_info_element *pht_info = NULL; struct rtw_ieee80211_ht_cap *pht_cap = NULL; u32 bcn_channel; @@ -2636,7 +2637,7 @@ void rtw_alloc_macid(_adapter *padapter, struct sta_info *psta) void rtw_release_macid(_adapter *padapter, struct sta_info *psta) { - int i; + //int i; _irqL irqL; u8 bc_addr[ETH_ALEN] = {0xff,0xff,0xff,0xff,0xff,0xff}; struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter); @@ -2772,7 +2773,7 @@ static _adapter *pbuddy_padapter = NULL; int rtw_handle_dualmac(_adapter *adapter, bool init) { int status = _SUCCESS; - struct dvobj_priv *dvobj = adapter_to_dvobj(adapter); + //struct dvobj_priv *dvobj = adapter_to_dvobj(adapter); if(adapter->chip_type != RTL8192D) goto exit; diff --git a/core/rtw_xmit.c b/core/rtw_xmit.c index b56bd6d..7a40634 100644 --- a/core/rtw_xmit.c +++ b/core/rtw_xmit.c @@ -1024,7 +1024,7 @@ static s32 xmitframe_addmic(_adapter *padapter, struct xmit_frame *pxmitframe){ u8 *pframe, *payload,mic[8]; struct mic_data micdata; //struct sta_info *stainfo; - struct qos_priv *pqospriv= &(padapter->mlmepriv.qospriv); + //struct qos_priv *pqospriv= &(padapter->mlmepriv.qospriv); struct pkt_attrib *pattrib = &pxmitframe->attrib; struct security_priv *psecuritypriv=&padapter->securitypriv; struct xmit_priv *pxmitpriv=&padapter->xmitpriv; @@ -2583,8 +2583,9 @@ exit: s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitframe) { + //FIXME queue _irqL irqL; - _queue *queue; + _queue *queue = NULL; _adapter *padapter = pxmitpriv->adapter; _pkt *pndis_pkt = NULL; @@ -2745,7 +2746,7 @@ _func_enter_; if(pregpriv->wifi_spec==1) { - int j, tmp, acirp_cnt[4]; + int j; #if 0 if(flagsattrib; - struct sta_priv *pstapriv = &padapter->stapriv; + //struct sta_priv *pstapriv = &padapter->stapriv; struct hw_xmit *phwxmits = padapter->xmitpriv.hwxmits; sint res = _SUCCESS; @@ -3080,7 +3081,7 @@ _func_exit_; int rtw_br_client_tx(_adapter *padapter, struct sk_buff **pskb) { struct sk_buff *skb = *pskb; - struct xmit_priv *pxmitpriv = &padapter->xmitpriv; + //struct xmit_priv *pxmitpriv = &padapter->xmitpriv; _irqL irqL; //if(check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == _TRUE) { diff --git a/hal/OUTSRC/odm.c b/hal/OUTSRC/odm.c index a2cbde1..c35f2ef 100644 --- a/hal/OUTSRC/odm.c +++ b/hal/OUTSRC/odm.c @@ -1147,7 +1147,7 @@ if ( *(pDM_Odm->mp_mode) != 1) { if(pDM_Odm->LinkedInterval == 2) { - PADAPTER pAdapter = pDM_Odm->Adapter; + //PADAPTER pAdapter = pDM_Odm->Adapter; //mark out IQK flow to prevent tx stuck. by Maddest 20130306 //PHY_IQCalibrate_8821A(pAdapter, FALSE); @@ -1738,8 +1738,8 @@ odm_BasicDbgMessage IN PDM_ODM_T pDM_Odm ) { - PFALSE_ALARM_STATISTICS FalseAlmCnt = &(pDM_Odm->FalseAlmCnt); - pDIG_T pDM_DigTable = &pDM_Odm->DM_DigTable; + //PFALSE_ALARM_STATISTICS FalseAlmCnt = &(pDM_Odm->FalseAlmCnt); + //pDIG_T pDM_DigTable = &pDM_Odm->DM_DigTable; ODM_RT_TRACE(pDM_Odm,ODM_COMP_COMMON, ODM_DBG_LOUD, ("odm_BasicDbgMsg==>\n")); ODM_RT_TRACE(pDM_Odm,ODM_COMP_COMMON, ODM_DBG_LOUD, ("bLinked = %d, RSSI_Min = %d, CurrentIGI = 0x%x \n", @@ -2079,8 +2079,8 @@ odm_DynamicATCSwitch_init( IN PDM_ODM_T pDM_Odm ) { - PADAPTER Adapter = pDM_Odm->Adapter; - HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); + //PADAPTER Adapter = pDM_Odm->Adapter; + //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); #if (DM_ODM_SUPPORT_TYPE == ODM_WIN ) @@ -2096,12 +2096,12 @@ odm_DynamicATCSwitch( IN PDM_ODM_T pDM_Odm ) { - PADAPTER Adapter = pDM_Odm->Adapter; - HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); - u1Byte CrystalCap,ATC_status_temp = 0; - u4Byte packet_count; - int CFO_kHz_A,CFO_kHz_B,CFO_ave = 0, Adjust_Xtal = 0; - int CFO_ave_diff; + //PADAPTER Adapter = pDM_Odm->Adapter; + //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); + //u1Byte CrystalCap,ATC_status_temp = 0; + //u4Byte packet_count; + //int CFO_kHz_A,CFO_kHz_B,CFO_ave = 0, Adjust_Xtal = 0; + //int CFO_ave_diff; #if (DM_ODM_SUPPORT_TYPE == ODM_WIN ) @@ -2315,8 +2315,8 @@ odm_Adaptivity( { s4Byte TH_H_dmc, TH_L_dmc; s4Byte TH_H, TH_L, Diff, IGI_target; - u4Byte value32; - BOOLEAN EDCCA_State; + //u4Byte value32; + BOOLEAN EDCCA_State = 0; #if (DM_ODM_SUPPORT_TYPE == ODM_WIN) PADAPTER pAdapter = pDM_Odm->Adapter; @@ -2657,7 +2657,7 @@ odm_DIG( { pDIG_T pDM_DigTable = &pDM_Odm->DM_DigTable; PFALSE_ALARM_STATISTICS pFalseAlmCnt = &pDM_Odm->FalseAlmCnt; - pRXHP_T pRX_HP_Table = &pDM_Odm->DM_RXHP_Table; + //pRXHP_T pRX_HP_Table = &pDM_Odm->DM_RXHP_Table; u1Byte DIG_Dynamic_MIN; u1Byte DIG_MaxOfMin; BOOLEAN FirstConnect, FirstDisConnect; @@ -5391,7 +5391,7 @@ odm_RSSIMonitorCheckMP( // //sherry move from DUSC to here 20110517 // -static VOID +static inline VOID FindMinimumRSSI_Dmsp( IN PADAPTER pAdapter ) diff --git a/hal/OUTSRC/odm.h b/hal/OUTSRC/odm.h index 53ff5fa..6b40865 100644 --- a/hal/OUTSRC/odm.h +++ b/hal/OUTSRC/odm.h @@ -1799,8 +1799,8 @@ extern u1Byte CCKSwingTable_Ch14_New [CCK_TABLE_SIZE][8]; extern u4Byte TxScalingTable_Jaguar[TXSCALE_TABLE_SIZE]; // <20121018, Kordan> In case fail to read TxPowerTrack.txt, we use the table of 88E as the default table. -static u1Byte DeltaSwingTableIdx_2GA_P_8188E[] = {0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9}; -static u1Byte DeltaSwingTableIdx_2GA_N_8188E[] = {0, 0, 0, 2, 2, 3, 3, 4, 4, 4, 4, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 10, 10, 10, 11, 11, 11, 11}; +static const u1Byte DeltaSwingTableIdx_2GA_P_8188E[] = {0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 7, 7, 8, 8, 8, 9, 9, 9, 9, 9}; +static const u1Byte DeltaSwingTableIdx_2GA_N_8188E[] = {0, 0, 0, 2, 2, 3, 3, 4, 4, 4, 4, 5, 5, 6, 6, 7, 7, 7, 7, 8, 8, 9, 9, 10, 10, 10, 11, 11, 11, 11}; // // check Sta pointer valid or not diff --git a/hal/OUTSRC/odm_HWConfig.c b/hal/OUTSRC/odm_HWConfig.c index 8c58340..da3f068 100644 --- a/hal/OUTSRC/odm_HWConfig.c +++ b/hal/OUTSRC/odm_HWConfig.c @@ -86,7 +86,7 @@ odm_SignalScaleMapping_92CSeries_patch_RT_CID_819x_Lenovo( s4Byte CurrSig ) { - s4Byte RetSig; + s4Byte RetSig = 0; #if (DM_ODM_SUPPORT_TYPE == ODM_WIN) //if(pDM_Odm->SupportInterface == ODM_ITRF_PCIE) { @@ -142,7 +142,7 @@ odm_SignalScaleMapping_92CSeries_patch_RT_CID_819x_Netcore( s4Byte CurrSig ) { - s4Byte RetSig; + s4Byte RetSig = 0; #if (DM_ODM_SUPPORT_TYPE == ODM_WIN) //if(pDM_Odm->SupportInterface == ODM_ITRF_USB) { @@ -203,7 +203,7 @@ odm_SignalScaleMapping_92CSeries( IN s4Byte CurrSig ) { - s4Byte RetSig; + s4Byte RetSig = 0; #if (DEV_BUS_TYPE == RT_PCI_INTERFACE) if(pDM_Odm->SupportInterface == ODM_ITRF_PCIE) { @@ -325,7 +325,7 @@ static u1Byte odm_SQ_process_patch_RT_CID_819x_Lenovo( IN u1Byte RSSI ) { - u1Byte SQ; + u1Byte SQ = 0; #if (DM_ODM_SUPPORT_TYPE & ODM_WIN) if(isCCKrate){ @@ -542,7 +542,7 @@ odm_RxPhyStatus92CSeries_Parsing( IN PODM_PACKET_INFO_T pPktinfo ) { - SWAT_T *pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table; + //SWAT_T *pDM_SWAT_Table = &pDM_Odm->DM_SWAT_Table; u1Byte i, Max_spatial_stream; s1Byte rx_pwr[4], rx_pwr_all=0; u1Byte EVM, PWDB_ALL = 0, PWDB_ALL_BT; diff --git a/hal/OUTSRC/rtl8812a/HalHWImg8812A_BB.c b/hal/OUTSRC/rtl8812a/HalHWImg8812A_BB.c index 1d0859e..3a6413d 100644 --- a/hal/OUTSRC/rtl8812a/HalHWImg8812A_BB.c +++ b/hal/OUTSRC/rtl8812a/HalHWImg8812A_BB.c @@ -465,8 +465,8 @@ ODM_ReadAndConfig_MP_8812A_AGC_TAB( u4Byte hex = 0; u4Byte i = 0; - u2Byte count = 0; - pu4Byte ptr_array = NULL; + //u2Byte count = 0; + //pu4Byte ptr_array = NULL; u1Byte platform = pDM_Odm->SupportPlatform; u1Byte _interface = pDM_Odm->SupportInterface; u1Byte board = pDM_Odm->BoardType; @@ -661,8 +661,8 @@ ODM_ReadAndConfig_MP_8812A_AGC_TAB_DIFF( u4Byte hex = 0; u4Byte i = 0; - u2Byte count = 0; - pu4Byte ptr_array = NULL; + //u2Byte count = 0; + //pu4Byte ptr_array = NULL; u1Byte platform = pDM_Odm->SupportPlatform; u1Byte _interface = pDM_Odm->SupportInterface; u1Byte board = pDM_Odm->BoardType; @@ -966,8 +966,8 @@ ODM_ReadAndConfig_MP_8812A_PHY_REG( u4Byte hex = 0; u4Byte i = 0; - u2Byte count = 0; - pu4Byte ptr_array = NULL; + //u2Byte count = 0; + //pu4Byte ptr_array = NULL; u1Byte platform = pDM_Odm->SupportPlatform; u1Byte _interface = pDM_Odm->SupportInterface; u1Byte board = pDM_Odm->BoardType; @@ -1047,8 +1047,8 @@ ODM_ReadAndConfig_MP_8812A_PHY_REG_MP( u4Byte hex = 0; u4Byte i = 0; - u2Byte count = 0; - pu4Byte ptr_array = NULL; + //u2Byte count = 0; + //pu4Byte ptr_array = NULL; u1Byte platform = pDM_Odm->SupportPlatform; u1Byte _interface = pDM_Odm->SupportInterface; u1Byte board = pDM_Odm->BoardType; @@ -1159,8 +1159,8 @@ ODM_ReadAndConfig_MP_8812A_PHY_REG_PG( { u4Byte hex = 0; u4Byte i = 0; - u2Byte count = 0; - pu4Byte ptr_array = NULL; + //u2Byte count = 0; + //pu4Byte ptr_array = NULL; u1Byte platform = pDM_Odm->SupportPlatform; u1Byte _interface = pDM_Odm->SupportInterface; u1Byte board = pDM_Odm->BoardType; @@ -1259,8 +1259,8 @@ ODM_ReadAndConfig_MP_8812A_PHY_REG_PG_ASUS( u4Byte hex = 0; u4Byte i = 0; - u2Byte count = 0; - pu4Byte ptr_array = NULL; + //u2Byte count = 0; + //pu4Byte ptr_array = NULL; u1Byte platform = pDM_Odm->SupportPlatform; u1Byte _interface = pDM_Odm->SupportInterface; u1Byte board = pDM_Odm->BoardType; @@ -1373,8 +1373,8 @@ ODM_ReadAndConfig_MP_8812A_PHY_REG_PG_NEC( u4Byte hex = 0; u4Byte i = 0; - u2Byte count = 0; - pu4Byte ptr_array = NULL; + //u2Byte count = 0; + //pu4Byte ptr_array = NULL; u1Byte platform = pDM_Odm->SupportPlatform; u1Byte _interface = pDM_Odm->SupportInterface; u1Byte board = pDM_Odm->BoardType; diff --git a/hal/OUTSRC/rtl8812a/HalHWImg8812A_BB.h b/hal/OUTSRC/rtl8812a/HalHWImg8812A_BB.h index 0a7d0d3..1de383f 100644 --- a/hal/OUTSRC/rtl8812a/HalHWImg8812A_BB.h +++ b/hal/OUTSRC/rtl8812a/HalHWImg8812A_BB.h @@ -22,7 +22,7 @@ #ifndef __INC_MP_BB_HW_IMG_8812A_H #define __INC_MP_BB_HW_IMG_8812A_H -static BOOLEAN CheckCondition(const u4Byte Condition, const u4Byte Hex); +//static BOOLEAN CheckCondition(const u4Byte Condition, const u4Byte Hex); /****************************************************************************** * AGC_TAB.TXT diff --git a/hal/OUTSRC/rtl8812a/HalHWImg8812A_MAC.c b/hal/OUTSRC/rtl8812a/HalHWImg8812A_MAC.c index b924251..7d35fde 100644 --- a/hal/OUTSRC/rtl8812a/HalHWImg8812A_MAC.c +++ b/hal/OUTSRC/rtl8812a/HalHWImg8812A_MAC.c @@ -168,8 +168,8 @@ ODM_ReadAndConfig_MP_8812A_MAC_REG( u4Byte hex = 0; u4Byte i = 0; - u2Byte count = 0; - pu4Byte ptr_array = NULL; + //u2Byte count = 0; + //pu4Byte ptr_array = NULL; u1Byte platform = pDM_Odm->SupportPlatform; u1Byte _interface = pDM_Odm->SupportInterface; u1Byte board = pDM_Odm->BoardType; diff --git a/hal/OUTSRC/rtl8812a/HalHWImg8812A_MAC.h b/hal/OUTSRC/rtl8812a/HalHWImg8812A_MAC.h index f21bba1..e41bc27 100644 --- a/hal/OUTSRC/rtl8812a/HalHWImg8812A_MAC.h +++ b/hal/OUTSRC/rtl8812a/HalHWImg8812A_MAC.h @@ -22,7 +22,7 @@ #ifndef __INC_MP_MAC_HW_IMG_8812A_H #define __INC_MP_MAC_HW_IMG_8812A_H -static BOOLEAN CheckCondition(const u4Byte Condition, const u4Byte Hex); +//static BOOLEAN CheckCondition(const u4Byte Condition, const u4Byte Hex); /****************************************************************************** * MAC_REG.TXT diff --git a/hal/OUTSRC/rtl8812a/HalHWImg8812A_RF.c b/hal/OUTSRC/rtl8812a/HalHWImg8812A_RF.c index e7bbb07..eee6b81 100644 --- a/hal/OUTSRC/rtl8812a/HalHWImg8812A_RF.c +++ b/hal/OUTSRC/rtl8812a/HalHWImg8812A_RF.c @@ -535,8 +535,8 @@ ODM_ReadAndConfig_MP_8812A_RadioA( u4Byte hex = 0; u4Byte i = 0; - u2Byte count = 0; - pu4Byte ptr_array = NULL; + //u2Byte count = 0; + //pu4Byte ptr_array = NULL; u1Byte platform = pDM_Odm->SupportPlatform; u1Byte _interface = pDM_Odm->SupportInterface; u1Byte board = pDM_Odm->BoardType; @@ -1064,8 +1064,8 @@ ODM_ReadAndConfig_MP_8812A_RadioB( u4Byte hex = 0; u4Byte i = 0; - u2Byte count = 0; - pu4Byte ptr_array = NULL; + //u2Byte count = 0; + //pu4Byte ptr_array = NULL; u1Byte platform = pDM_Odm->SupportPlatform; u1Byte _interface = pDM_Odm->SupportInterface; u1Byte board = pDM_Odm->BoardType; diff --git a/hal/OUTSRC/rtl8812a/HalHWImg8812A_RF.h b/hal/OUTSRC/rtl8812a/HalHWImg8812A_RF.h index c73ee50..728285c 100644 --- a/hal/OUTSRC/rtl8812a/HalHWImg8812A_RF.h +++ b/hal/OUTSRC/rtl8812a/HalHWImg8812A_RF.h @@ -22,7 +22,7 @@ #ifndef __INC_MP_RF_HW_IMG_8812A_H #define __INC_MP_RF_HW_IMG_8812A_H -static BOOLEAN CheckCondition(const u4Byte Condition, const u4Byte Hex); +//static BOOLEAN CheckCondition(const u4Byte Condition, const u4Byte Hex); /****************************************************************************** * RadioA.TXT diff --git a/hal/OUTSRC/rtl8812a/HalHWImg8812A_TestChip_BB.c b/hal/OUTSRC/rtl8812a/HalHWImg8812A_TestChip_BB.c index 33e6629..d65c9c3 100644 --- a/hal/OUTSRC/rtl8812a/HalHWImg8812A_TestChip_BB.c +++ b/hal/OUTSRC/rtl8812a/HalHWImg8812A_TestChip_BB.c @@ -461,8 +461,8 @@ ODM_ReadAndConfig_TC_8812A_AGC_TAB( u4Byte hex = 0; u4Byte i = 0; - u2Byte count = 0; - pu4Byte ptr_array = NULL; + //u2Byte count = 0; + //pu4Byte ptr_array = NULL; u1Byte platform = pDM_Odm->SupportPlatform; u1Byte _interface = pDM_Odm->SupportInterface; u1Byte board = pDM_Odm->BoardType; @@ -587,8 +587,8 @@ ODM_ReadAndConfig_TC_8812A_AGC_TAB_DIFF( u4Byte hex = 0; u4Byte i = 0; - u2Byte count = 0; - pu4Byte ptr_array = NULL; + //u2Byte count = 0; + //pu4Byte ptr_array = NULL; u1Byte platform = pDM_Odm->SupportPlatform; u1Byte _interface = pDM_Odm->SupportInterface; u1Byte board = pDM_Odm->BoardType; @@ -892,8 +892,8 @@ ODM_ReadAndConfig_TC_8812A_PHY_REG( u4Byte hex = 0; u4Byte i = 0; - u2Byte count = 0; - pu4Byte ptr_array = NULL; + //u2Byte count = 0; + //pu4Byte ptr_array = NULL; u1Byte platform = pDM_Odm->SupportPlatform; u1Byte _interface = pDM_Odm->SupportInterface; u1Byte board = pDM_Odm->BoardType; @@ -971,8 +971,8 @@ ODM_ReadAndConfig_TC_8812A_PHY_REG_MP( u4Byte hex = 0; u4Byte i = 0; - u2Byte count = 0; - pu4Byte ptr_array = NULL; + //u2Byte count = 0; + //pu4Byte ptr_array = NULL; u1Byte platform = pDM_Odm->SupportPlatform; u1Byte _interface = pDM_Odm->SupportInterface; u1Byte board = pDM_Odm->BoardType; @@ -1083,8 +1083,8 @@ ODM_ReadAndConfig_TC_8812A_PHY_REG_PG( { u4Byte hex = 0; u4Byte i = 0; - u2Byte count = 0; - pu4Byte ptr_array = NULL; + //u2Byte count = 0; + //pu4Byte ptr_array = NULL; u1Byte platform = pDM_Odm->SupportPlatform; u1Byte _interface = pDM_Odm->SupportInterface; u1Byte board = pDM_Odm->BoardType; diff --git a/hal/OUTSRC/rtl8812a/HalHWImg8812A_TestChip_MAC.c b/hal/OUTSRC/rtl8812a/HalHWImg8812A_TestChip_MAC.c index 3755cb3..3f6ed01 100644 --- a/hal/OUTSRC/rtl8812a/HalHWImg8812A_TestChip_MAC.c +++ b/hal/OUTSRC/rtl8812a/HalHWImg8812A_TestChip_MAC.c @@ -168,8 +168,8 @@ ODM_ReadAndConfig_TC_8812A_MAC_REG( u4Byte hex = 0; u4Byte i = 0; - u2Byte count = 0; - pu4Byte ptr_array = NULL; + //u2Byte count = 0; + //pu4Byte ptr_array = NULL; u1Byte platform = pDM_Odm->SupportPlatform; u1Byte _interface = pDM_Odm->SupportInterface; u1Byte board = pDM_Odm->BoardType; diff --git a/hal/OUTSRC/rtl8812a/HalHWImg8812A_TestChip_RF.c b/hal/OUTSRC/rtl8812a/HalHWImg8812A_TestChip_RF.c index 9ab7042..9b3a11b 100644 --- a/hal/OUTSRC/rtl8812a/HalHWImg8812A_TestChip_RF.c +++ b/hal/OUTSRC/rtl8812a/HalHWImg8812A_TestChip_RF.c @@ -533,8 +533,8 @@ ODM_ReadAndConfig_TC_8812A_RadioA( u4Byte hex = 0; u4Byte i = 0; - u2Byte count = 0; - pu4Byte ptr_array = NULL; + //u2Byte count = 0; + //pu4Byte ptr_array = NULL; u1Byte platform = pDM_Odm->SupportPlatform; u1Byte _interface = pDM_Odm->SupportInterface; u1Byte board = pDM_Odm->BoardType; @@ -1062,8 +1062,8 @@ ODM_ReadAndConfig_TC_8812A_RadioB( u4Byte hex = 0; u4Byte i = 0; - u2Byte count = 0; - pu4Byte ptr_array = NULL; + //u2Byte count = 0; + //pu4Byte ptr_array = NULL; u1Byte platform = pDM_Odm->SupportPlatform; u1Byte _interface = pDM_Odm->SupportInterface; u1Byte board = pDM_Odm->BoardType; diff --git a/hal/OUTSRC/rtl8812a/HalPhyRf_8812A.c b/hal/OUTSRC/rtl8812a/HalPhyRf_8812A.c index 6fa1b11..cbc2026 100644 --- a/hal/OUTSRC/rtl8812a/HalPhyRf_8812A.c +++ b/hal/OUTSRC/rtl8812a/HalPhyRf_8812A.c @@ -43,7 +43,7 @@ void DoIQK_8812A( { #if !(DM_ODM_SUPPORT_TYPE & ODM_AP) PADAPTER Adapter = pDM_Odm->Adapter; - HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); + //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); #endif ODM_ResetIQKResult(pDM_Odm); @@ -111,8 +111,8 @@ ODM_TxPwrTrackSetPwr8812A( u1Byte PwrTrackingLimit = 26; //+1.0dB u1Byte TxRate = 0xFF; s1Byte Final_OFDM_Swing_Index = 0; - s1Byte Final_CCK_Swing_Index = 0; - u1Byte i = 0; + //s1Byte Final_CCK_Swing_Index = 0; + //u1Byte i = 0; #if 0 #if (MP_DRIVER==1) @@ -707,7 +707,7 @@ void _IQK_Tx_8812A( BOOLEAN TX0IQKOK = FALSE, RX0IQKOK = FALSE; int TX_X1[10], TX_Y1[10], RX_X1[10], RX_Y1[10]; BOOLEAN TX1IQKOK = FALSE, RX1IQKOK = FALSE, VDF_enable = FALSE; - int i, k, VDF_Y[3], VDF_X[3], Tx_dt[3], Rx_dt[3], ii, dx = 0, dy = 0, TX_finish = 0, RX_finish = 0, dt = 0; + int i, k, VDF_Y[3], VDF_X[3], Tx_dt[3], Rx_dt[3], ii, dx = 0, dy = 0, TX_finish = 0, RX_finish = 0; PODM_RF_CAL_T pRFCalibrateInfo = &(pDM_Odm->RFCalibrateInfo); ODM_RT_TRACE(pDM_Odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD, ("BandWidth = %d, ExtPA5G = %d, ExtPA2G = %d\n", *pDM_Odm->pBandWidth, pDM_Odm->ExtPA5G, pDM_Odm->ExtPA)); @@ -2087,7 +2087,7 @@ PHY_LCCalibrate_8812A( #if !(DM_ODM_SUPPORT_TYPE & ODM_AP) PADAPTER pAdapter = pDM_Odm->Adapter; - HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); + //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); #if (MP_DRIVER == 1) diff --git a/hal/OUTSRC/rtl8821a/HalHWImg8821A_BB.c b/hal/OUTSRC/rtl8821a/HalHWImg8821A_BB.c index a5faa3f..d9e8da8 100644 --- a/hal/OUTSRC/rtl8821a/HalHWImg8821A_BB.c +++ b/hal/OUTSRC/rtl8821a/HalHWImg8821A_BB.c @@ -261,8 +261,8 @@ ODM_ReadAndConfig_MP_8821A_AGC_TAB( u4Byte hex = 0; u4Byte i = 0; - u2Byte count = 0; - pu4Byte ptr_array = NULL; + //u2Byte count = 0; + //pu4Byte ptr_array = NULL; u1Byte platform = pDM_Odm->SupportPlatform; u1Byte _interface = pDM_Odm->SupportInterface; u1Byte board = pDM_Odm->BoardType; @@ -506,8 +506,8 @@ ODM_ReadAndConfig_MP_8821A_PHY_REG( u4Byte hex = 0; u4Byte i = 0; - u2Byte count = 0; - pu4Byte ptr_array = NULL; + //u2Byte count = 0; + //pu4Byte ptr_array = NULL; u1Byte platform = pDM_Odm->SupportPlatform; u1Byte _interface = pDM_Odm->SupportInterface; u1Byte board = pDM_Odm->BoardType; @@ -618,8 +618,8 @@ ODM_ReadAndConfig_MP_8821A_PHY_REG_PG( { u4Byte hex = 0; u4Byte i = 0; - u2Byte count = 0; - pu4Byte ptr_array = NULL; + //u2Byte count = 0; + //pu4Byte ptr_array = NULL; u1Byte platform = pDM_Odm->SupportPlatform; u1Byte _interface = pDM_Odm->SupportInterface; u1Byte board = pDM_Odm->BoardType; diff --git a/hal/OUTSRC/rtl8821a/HalHWImg8821A_BB.h b/hal/OUTSRC/rtl8821a/HalHWImg8821A_BB.h index 4d208f8..5b4f3a7 100644 --- a/hal/OUTSRC/rtl8821a/HalHWImg8821A_BB.h +++ b/hal/OUTSRC/rtl8821a/HalHWImg8821A_BB.h @@ -22,7 +22,7 @@ #ifndef __INC_MP_BB_HW_IMG_8821A_H #define __INC_MP_BB_HW_IMG_8821A_H -static BOOLEAN CheckCondition(const u4Byte Condition, const u4Byte Hex); +//static BOOLEAN CheckCondition(const u4Byte Condition, const u4Byte Hex); /****************************************************************************** * AGC_TAB.TXT diff --git a/hal/OUTSRC/rtl8821a/HalHWImg8821A_MAC.c b/hal/OUTSRC/rtl8821a/HalHWImg8821A_MAC.c index bbc9dce..841f750 100644 --- a/hal/OUTSRC/rtl8821a/HalHWImg8821A_MAC.c +++ b/hal/OUTSRC/rtl8821a/HalHWImg8821A_MAC.c @@ -166,8 +166,8 @@ ODM_ReadAndConfig_MP_8821A_MAC_REG( u4Byte hex = 0; u4Byte i = 0; - u2Byte count = 0; - pu4Byte ptr_array = NULL; + //u2Byte count = 0; + //pu4Byte ptr_array = NULL; u1Byte platform = pDM_Odm->SupportPlatform; u1Byte _interface = pDM_Odm->SupportInterface; u1Byte board = pDM_Odm->BoardType; diff --git a/hal/OUTSRC/rtl8821a/HalHWImg8821A_MAC.h b/hal/OUTSRC/rtl8821a/HalHWImg8821A_MAC.h index e623dc5..14e0872 100644 --- a/hal/OUTSRC/rtl8821a/HalHWImg8821A_MAC.h +++ b/hal/OUTSRC/rtl8821a/HalHWImg8821A_MAC.h @@ -22,7 +22,7 @@ #ifndef __INC_MP_MAC_HW_IMG_8821A_H #define __INC_MP_MAC_HW_IMG_8821A_H -static BOOLEAN CheckCondition(const u4Byte Condition, const u4Byte Hex); +//static BOOLEAN CheckCondition(const u4Byte Condition, const u4Byte Hex); /****************************************************************************** * MAC_REG.TXT diff --git a/hal/OUTSRC/rtl8821a/HalHWImg8821A_RF.c b/hal/OUTSRC/rtl8821a/HalHWImg8821A_RF.c index c637c67..5416601 100644 --- a/hal/OUTSRC/rtl8821a/HalHWImg8821A_RF.c +++ b/hal/OUTSRC/rtl8821a/HalHWImg8821A_RF.c @@ -669,8 +669,8 @@ ODM_ReadAndConfig_MP_8821A_RadioA( u4Byte hex = 0; u4Byte i = 0; - u2Byte count = 0; - pu4Byte ptr_array = NULL; + //u2Byte count = 0; + //pu4Byte ptr_array = NULL; u1Byte platform = pDM_Odm->SupportPlatform; u1Byte _interface = pDM_Odm->SupportInterface; u1Byte board = pDM_Odm->BoardType; diff --git a/hal/OUTSRC/rtl8821a/HalHWImg8821A_RF.h b/hal/OUTSRC/rtl8821a/HalHWImg8821A_RF.h index ae541ff..221f996 100644 --- a/hal/OUTSRC/rtl8821a/HalHWImg8821A_RF.h +++ b/hal/OUTSRC/rtl8821a/HalHWImg8821A_RF.h @@ -22,7 +22,7 @@ #ifndef __INC_MP_RF_HW_IMG_8821A_H #define __INC_MP_RF_HW_IMG_8821A_H -static BOOLEAN CheckCondition(const u4Byte Condition, const u4Byte Hex); +//static BOOLEAN CheckCondition(const u4Byte Condition, const u4Byte Hex); /****************************************************************************** * RadioA.TXT diff --git a/hal/OUTSRC/rtl8821a/HalHWImg8821A_TestChip_BB.c b/hal/OUTSRC/rtl8821a/HalHWImg8821A_TestChip_BB.c index 06b751e..4a5436c 100644 --- a/hal/OUTSRC/rtl8821a/HalHWImg8821A_TestChip_BB.c +++ b/hal/OUTSRC/rtl8821a/HalHWImg8821A_TestChip_BB.c @@ -244,8 +244,8 @@ ODM_ReadAndConfig_TC_8821A_AGC_TAB( u4Byte hex = 0; u4Byte i = 0; - u2Byte count = 0; - pu4Byte ptr_array = NULL; + //u2Byte count = 0; + //pu4Byte ptr_array = NULL; u1Byte platform = pDM_Odm->SupportPlatform; u1Byte _interface = pDM_Odm->SupportInterface; u1Byte board = pDM_Odm->BoardType; @@ -488,8 +488,8 @@ ODM_ReadAndConfig_TC_8821A_PHY_REG( u4Byte hex = 0; u4Byte i = 0; - u2Byte count = 0; - pu4Byte ptr_array = NULL; + //u2Byte count = 0; + //pu4Byte ptr_array = NULL; u1Byte platform = pDM_Odm->SupportPlatform; u1Byte _interface = pDM_Odm->SupportInterface; u1Byte board = pDM_Odm->BoardType; @@ -600,8 +600,8 @@ ODM_ReadAndConfig_TC_8821A_PHY_REG_PG( { u4Byte hex = 0; u4Byte i = 0; - u2Byte count = 0; - pu4Byte ptr_array = NULL; + //u2Byte count = 0; + //pu4Byte ptr_array = NULL; u1Byte platform = pDM_Odm->SupportPlatform; u1Byte _interface = pDM_Odm->SupportInterface; u1Byte board = pDM_Odm->BoardType; diff --git a/hal/OUTSRC/rtl8821a/HalHWImg8821A_TestChip_MAC.c b/hal/OUTSRC/rtl8821a/HalHWImg8821A_TestChip_MAC.c index 99a836a..046d9bc 100644 --- a/hal/OUTSRC/rtl8821a/HalHWImg8821A_TestChip_MAC.c +++ b/hal/OUTSRC/rtl8821a/HalHWImg8821A_TestChip_MAC.c @@ -163,8 +163,8 @@ ODM_ReadAndConfig_TC_8821A_MAC_REG( u4Byte hex = 0; u4Byte i = 0; - u2Byte count = 0; - pu4Byte ptr_array = NULL; + //u2Byte count = 0; + //pu4Byte ptr_array = NULL; u1Byte platform = pDM_Odm->SupportPlatform; u1Byte _interface = pDM_Odm->SupportInterface; u1Byte board = pDM_Odm->BoardType; diff --git a/hal/OUTSRC/rtl8821a/HalHWImg8821A_TestChip_RF.c b/hal/OUTSRC/rtl8821a/HalHWImg8821A_TestChip_RF.c index bbc2e24..76f880c 100644 --- a/hal/OUTSRC/rtl8821a/HalHWImg8821A_TestChip_RF.c +++ b/hal/OUTSRC/rtl8821a/HalHWImg8821A_TestChip_RF.c @@ -373,8 +373,8 @@ ODM_ReadAndConfig_TC_8821A_RadioA( u4Byte hex = 0; u4Byte i = 0; - u2Byte count = 0; - pu4Byte ptr_array = NULL; + //u2Byte count = 0; + //pu4Byte ptr_array = NULL; u1Byte platform = pDM_Odm->SupportPlatform; u1Byte _interface = pDM_Odm->SupportInterface; u1Byte board = pDM_Odm->BoardType; diff --git a/hal/OUTSRC/rtl8821a/HalPhyRf_8821A.c b/hal/OUTSRC/rtl8821a/HalPhyRf_8821A.c index 534186f..eed79e6 100644 --- a/hal/OUTSRC/rtl8821a/HalPhyRf_8821A.c +++ b/hal/OUTSRC/rtl8821a/HalPhyRf_8821A.c @@ -105,7 +105,7 @@ void DoIQK_8821A( { #if !(DM_ODM_SUPPORT_TYPE & ODM_AP) PADAPTER Adapter = pDM_Odm->Adapter; - HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); + //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); #endif ODM_ResetIQKResult(pDM_Odm); @@ -155,8 +155,8 @@ ODM_TxPwrTrackSetPwr8821A( u1Byte PwrTrackingLimit = 26; //+1.0dB u1Byte TxRate = 0xFF; s1Byte Final_OFDM_Swing_Index = 0; - s1Byte Final_CCK_Swing_Index = 0; - u1Byte i = 0; + //s1Byte Final_CCK_Swing_Index = 0; + //u1Byte i = 0; u4Byte finalBbSwingIdx[1]; diff --git a/hal/hal_com.c b/hal/hal_com.c index 08a90fe..c83931e 100644 --- a/hal/hal_com.c +++ b/hal/hal_com.c @@ -316,7 +316,7 @@ static VOID _ThreeOutPipeMapping( } } -static VOID _FourOutPipeMapping( +static inline VOID _FourOutPipeMapping( IN PADAPTER pAdapter, IN BOOLEAN bWIFICfg ) diff --git a/hal/led/hal_usb_led.c b/hal/led/hal_usb_led.c index 36130ee..27da708 100644 --- a/hal/led/hal_usb_led.c +++ b/hal/led/hal_usb_led.c @@ -691,7 +691,7 @@ SwLedBlink4( { _adapter *padapter = pLed->padapter; struct led_priv *ledpriv = &(padapter->ledpriv); - struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); + //struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); PLED_USB pLed1 = &(ledpriv->SwLed1); u8 bStopBlinking = _FALSE; @@ -953,7 +953,7 @@ SwLedBlink5( ) { _adapter *padapter = pLed->padapter; - struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); + //struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); u8 bStopBlinking = _FALSE; // Change LED according to BlinkingLedState specified. @@ -1071,8 +1071,8 @@ SwLedBlink6( ) { _adapter *padapter = pLed->padapter; - struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); - u8 bStopBlinking = _FALSE; + //struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); + //u8 bStopBlinking = _FALSE; // Change LED according to BlinkingLedState specified. if( pLed->BlinkingLedState == RTW_LED_ON ) @@ -1921,7 +1921,7 @@ SwLedBlink12( ) { PADAPTER Adapter = pLed->padapter; - struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv); + //struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv); BOOLEAN bStopBlinking = _FALSE; // Change LED according to BlinkingLedState specified. @@ -2007,8 +2007,8 @@ SwLedBlink13( ) { PADAPTER Adapter = pLed->padapter; - struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv); - BOOLEAN bStopBlinking = _FALSE; + //struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv); + //BOOLEAN bStopBlinking = _FALSE; static u8 LinkBlinkCnt=0; // Change LED according to BlinkingLedState specified. @@ -3392,7 +3392,7 @@ SwLedControlMode6( ) { struct led_priv *ledpriv = &(padapter->ledpriv); - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; + //struct mlme_priv *pmlmepriv = &padapter->mlmepriv; PLED_USB pLed0 = &(ledpriv->SwLed0); switch(LedAction) @@ -3585,7 +3585,7 @@ SwLedControlMode8( ) { struct led_priv *ledpriv = &(Adapter->ledpriv); - struct mlme_priv *pmlmepriv = &Adapter->mlmepriv; + //struct mlme_priv *pmlmepriv = &Adapter->mlmepriv; PLED_USB pLed0 = &(ledpriv->SwLed0); switch(LedAction) @@ -4193,7 +4193,7 @@ SwLedControlMode11( ) { struct led_priv *ledpriv = &(Adapter->ledpriv); - struct mlme_priv *pmlmepriv = &Adapter->mlmepriv; + //struct mlme_priv *pmlmepriv = &Adapter->mlmepriv; PLED_USB pLed = &(ledpriv->SwLed0); switch(LedAction) @@ -4302,7 +4302,7 @@ SwLedControlMode12( ) { struct led_priv *ledpriv = &(Adapter->ledpriv); - struct mlme_priv *pmlmepriv = &Adapter->mlmepriv; + //struct mlme_priv *pmlmepriv = &Adapter->mlmepriv; PLED_USB pLed = &(ledpriv->SwLed0); switch(LedAction) @@ -4392,7 +4392,7 @@ SwLedControlMode13( ) { struct led_priv *ledpriv = &(Adapter->ledpriv); - struct mlme_priv *pmlmepriv = &Adapter->mlmepriv; + //struct mlme_priv *pmlmepriv = &Adapter->mlmepriv; PLED_USB pLed = &(ledpriv->SwLed0); RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("Led control mode 13 CurrLedState %d, LedAction %d\n", pLed->CurrLedState,LedAction)); diff --git a/hal/rtl8812a/rtl8812a_cmd.c b/hal/rtl8812a/rtl8812a_cmd.c index dd6a77b..064a0d6 100644 --- a/hal/rtl8812a/rtl8812a_cmd.c +++ b/hal/rtl8812a/rtl8812a_cmd.c @@ -185,7 +185,7 @@ u8 rtl8812_h2c_msg_hdl(_adapter *padapter, unsigned char *pbuf) u8 rtl8812_set_rssi_cmd(_adapter*padapter, u8 *param) { u8 res=_SUCCESS; - HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); + //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); _func_enter_; *((u32*) param ) = cpu_to_le32( *((u32*) param ) ); @@ -571,7 +571,7 @@ void ConstructPSPoll(_adapter *padapter, u8 *pframe, u32 *pLength) { struct rtw_ieee80211_hdr *pwlanhdr; u16 *fctrl; - u32 pktlen; + //u32 pktlen; struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); @@ -718,7 +718,7 @@ CheckFwRsvdPageContent( ) { HAL_DATA_TYPE* pHalData = GET_HAL_DATA(Adapter); - u32 MaxBcnPageNum; + //u32 MaxBcnPageNum; if(pHalData->FwRsvdPageStartOffset != 0) { @@ -741,7 +741,7 @@ GetTxBufferRsvdPageNum8812( IN BOOLEAN bWoWLANBoundary ) { - HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); + //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); u8 RsvdPageNum=0; u8 TxPageBndy= LAST_ENTRY_OF_TX_PKT_BUFFER_8812; // default reseved 1 page for the IC type which is undefined. @@ -1113,7 +1113,7 @@ _func_exit_; void rtl8812_set_p2p_ps_offload_cmd(_adapter* padapter, u8 p2p_ps_state) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); - struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; + //struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); u8 *p2p_ps_offload = (u8 *)&pHalData->p2p_ps_offload; u8 i; diff --git a/hal/rtl8812a/rtl8812a_dm.c b/hal/rtl8812a/rtl8812a_dm.c index c8d7ed2..bbf00e1 100644 --- a/hal/rtl8812a/rtl8812a_dm.c +++ b/hal/rtl8812a/rtl8812a_dm.c @@ -37,7 +37,7 @@ //============================================================ -static VOID +static inline VOID dm_CheckProtection( IN PADAPTER Adapter ) @@ -247,7 +247,7 @@ dm_InitGPIOSetting( IN PADAPTER Adapter ) { - PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); + //PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); u8 tmp1byte; @@ -515,7 +515,7 @@ rtl8812_InitHalDm( PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); struct dm_priv *pdmpriv = &pHalData->dmpriv; PDM_ODM_T pDM_Odm = &(pHalData->odmpriv); - u8 i; + //u8 i; #ifdef CONFIG_USB_HCI dm_InitGPIOSetting(Adapter); @@ -541,8 +541,8 @@ rtl8812_HalDmWatchDog( BOOLEAN bFwPSAwake = _TRUE; u8 hw_init_completed = _FALSE; PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); - struct dm_priv *pdmpriv = &pHalData->dmpriv; - PDM_ODM_T pDM_Odm = &(pHalData->odmpriv); + //struct dm_priv *pdmpriv = &pHalData->dmpriv; + //PDM_ODM_T pDM_Odm = &(pHalData->odmpriv); #ifdef CONFIG_CONCURRENT_MODE PADAPTER pbuddy_adapter = Adapter->pbuddy_adapter; #endif //CONFIG_CONCURRENT_MODE @@ -661,9 +661,9 @@ void rtl8812_init_dm_priv(IN PADAPTER Adapter) void rtl8812_deinit_dm_priv(IN PADAPTER Adapter) { - PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); - struct dm_priv *pdmpriv = &pHalData->dmpriv; - PDM_ODM_T podmpriv = &pHalData->odmpriv; + //PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); + //struct dm_priv *pdmpriv = &pHalData->dmpriv; + //PDM_ODM_T podmpriv = &pHalData->odmpriv; //_rtw_spinlock_free(&pHalData->odm_stainfo_lock); #ifdef CONFIG_SW_ANTENNA_DIVERSITY //_cancel_timer_ex(&pdmpriv->SwAntennaSwitchTimer); diff --git a/hal/rtl8812a/rtl8812a_hal_init.c b/hal/rtl8812a/rtl8812a_hal_init.c index 8ba772e..930faaf 100644 --- a/hal/rtl8812a/rtl8812a_hal_init.c +++ b/hal/rtl8812a/rtl8812a_hal_init.c @@ -529,7 +529,7 @@ s32 InitLLTTable8812(PADAPTER padapter, u8 txpktbuf_bndy) s32 status = _FAIL; u32 i; u32 Last_Entry_Of_TxPktBuf = LAST_ENTRY_OF_TX_PKT_BUFFER_8812; - HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); + //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); #if defined(CONFIG_IOL_LLT) if(1 || rtw_IOL_applied(padapter)) @@ -793,7 +793,7 @@ _PageWrite_8812( return _BlockWrite_8812(padapter,buffer,size); } -static VOID +static inline VOID _FillDummy_8812( u8* pFwBuf, u32* pFwLen @@ -899,7 +899,7 @@ static s32 _FWFreeToGo8812(PADAPTER padapter) { u32 counter = 0; u32 value32; - u8 value8; + //u8 value8; // polling CheckSum report do { @@ -951,8 +951,8 @@ FirmwareDownload8812( u32 fwdl_start_time; PHAL_DATA_TYPE pHalData = GET_HAL_DATA(Adapter); - u8 *pFwImageFileName; - u8 *pucMappedFile = NULL; + //u8 *pFwImageFileName; + //u8 *pucMappedFile = NULL; PRT_FIRMWARE_8812 pFirmware = NULL; u8 *pFwHdr = NULL; u8 *pFirmwareBuf; @@ -2193,7 +2193,7 @@ rtl8812_EfusePowerSwitch( Hal_EfusePowerSwitch8812A(pAdapter, bWrite, PwrState); } -static BOOLEAN +static inline BOOLEAN Hal_EfuseSwitchToBank8812A( IN PADAPTER pAdapter, IN u1Byte bank, @@ -2789,7 +2789,7 @@ hal_EfusePgPacketRead_8812A( u8 hoffset = 0,hworden = 0; u8 tmpidx = 0; u8 tmpdata[8]; - u8 max_section = 0; + //u8 max_section = 0; u8 tmp_header = 0; if(data==NULL) @@ -3553,8 +3553,8 @@ void rtl8812_GetHalODMVar( PVOID pValue1, BOOLEAN bSet) { - HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); - PDM_ODM_T podmpriv = &pHalData->odmpriv; + //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); + //PDM_ODM_T podmpriv = &pHalData->odmpriv; switch(eVariable){ case HAL_ODM_STA_INFO: break; @@ -3693,7 +3693,7 @@ void InitPGData8812A(PADAPTER padapter) { PEEPROM_EFUSE_PRIV pEEPROM; u32 i; - u16 val16; + //u16 val16; pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter); @@ -4083,7 +4083,7 @@ static void StopTxBeacon(_adapter *padapter) void SetBeaconRelatedRegisters8812A(PADAPTER padapter) { u32 value32; - HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); + //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); u32 bcn_ctrl_reg = REG_BCN_CTRL; @@ -4438,7 +4438,7 @@ 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 inline void hw_var_set_correct_tsf(PADAPTER Adapter, u8 variable, u8* val) { #ifdef CONFIG_CONCURRENT_MODE u64 tsf; @@ -4533,7 +4533,7 @@ static void hw_var_set_correct_tsf(PADAPTER Adapter, u8 variable, u8* val) #endif } -static void hw_var_set_mlme_disconnect(PADAPTER Adapter, u8 variable, u8* val) +static inline void hw_var_set_mlme_disconnect(PADAPTER Adapter, u8 variable, u8* val) { #ifdef CONFIG_CONCURRENT_MODE @@ -4664,7 +4664,7 @@ static void hw_var_set_mlme_sitesurvey(PADAPTER Adapter, u8 variable, u8* val) } } -static void hw_var_set_mlme_join(PADAPTER Adapter, u8 variable, u8* val) +static inline void hw_var_set_mlme_join(PADAPTER Adapter, u8 variable, u8* val) { #ifdef CONFIG_CONCURRENT_MODE u8 RetryLimit = 0x30; @@ -4796,7 +4796,7 @@ _func_enter_; case HW_VAR_BASIC_RATE: { u16 BrateCfg = 0; - u8 RateIndex = 0; + //u8 RateIndex = 0; // 2007.01.16, by Emily // Select RRSR (in Legacy-OFDM and CCK) @@ -5567,7 +5567,7 @@ void GetHwReg8812A(PADAPTER padapter, u8 variable, u8 *pval) PDM_ODM_T podmpriv; u8 val8; u16 val16; - u32 val32; + //u32 val32; _func_enter_; diff --git a/hal/rtl8812a/rtl8812a_mp.c b/hal/rtl8812a/rtl8812a_mp.c index 3364e33..fdb5793 100644 --- a/hal/rtl8812a/rtl8812a_mp.c +++ b/hal/rtl8812a/rtl8812a_mp.c @@ -27,7 +27,7 @@ s32 Hal_SetPowerTracking(PADAPTER padapter, u8 enable) { BOOLEAN bResult = TRUE; - PMPT_CONTEXT pMptCtx = &(padapter->mppriv.MptCtx); + //PMPT_CONTEXT pMptCtx = &(padapter->mppriv.MptCtx); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); pHalData->TxPowerTrackControl = (u1Byte)enable; @@ -43,19 +43,19 @@ void Hal_GetPowerTracking(PADAPTER padapter, u8 *enable) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); - struct dm_priv *pdmpriv = &pHalData->dmpriv; + //struct dm_priv *pdmpriv = &pHalData->dmpriv; PDM_ODM_T pDM_Odm = &(pHalData->odmpriv); *enable = pDM_Odm->RFCalibrateInfo.TxPowerTrackControl; } -static void Hal_disable_dm(PADAPTER padapter) +static inline void Hal_disable_dm(PADAPTER padapter) { u8 v8; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); - struct dm_priv *pdmpriv = &pHalData->dmpriv; + //struct dm_priv *pdmpriv = &pHalData->dmpriv; PDM_ODM_T pDM_Odm = &(pHalData->odmpriv); @@ -97,10 +97,10 @@ void Hal_mpt_SwitchRfSetting(PADAPTER pAdapter) { //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); struct mp_priv *pmp = &pAdapter->mppriv; - u1Byte ChannelToSw = pmp->channel; - ULONG ulRateIdx = pmp->rateidx; - ULONG ulbandwidth = pmp->bandwidth; - HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); + //u1Byte ChannelToSw = pmp->channel; + //ULONG ulRateIdx = pmp->rateidx; + //ULONG ulbandwidth = pmp->bandwidth; + //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); // <20120525, Kordan> Dynamic mechanism for APK, asked by Dennis. pmp->MptCtx.backup0x52_RF_A = (u1Byte)PHY_QueryRFReg(pAdapter, RF_PATH_A, RF_0x52, 0x000F0); @@ -118,7 +118,7 @@ void Hal_MPT_CCKTxPowerAdjust(PADAPTER Adapter, BOOLEAN bInCH14) u32 TempVal = 0, TempVal2 = 0, TempVal3 = 0; u32 CurrCCKSwingVal = 0, CCKSwingIndex = 12; u8 i; - HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); + //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); // get current cck swing value and check 0xa22 & 0xa23 later to match the table. @@ -196,14 +196,14 @@ void Hal_MPT_CCKTxPowerAdjust(PADAPTER Adapter, BOOLEAN bInCH14) void Hal_MPT_CCKTxPowerAdjustbyIndex(PADAPTER pAdapter, BOOLEAN beven) { s32 TempCCk; - u8 CCK_index, CCK_index_old; + u8 CCK_index, CCK_index_old = 0; u8 Action = 0; //0: no action, 1: even->odd, 2:odd->even - u8 TimeOut = 100; + //u8 TimeOut = 100; s32 i = 0; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); PMPT_CONTEXT pMptCtx = &pAdapter->mppriv.MptCtx; - struct dm_priv *pdmpriv = &pHalData->dmpriv; + //struct dm_priv *pdmpriv = &pHalData->dmpriv; PDM_ODM_T pDM_Odm = &(pHalData->odmpriv); @@ -317,12 +317,12 @@ void Hal_SetChannel(PADAPTER pAdapter) HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); struct mp_priv *pmp = &pAdapter->mppriv; - struct dm_priv *pdmpriv = &pHalData->dmpriv; + //struct dm_priv *pdmpriv = &pHalData->dmpriv; PDM_ODM_T pDM_Odm = &(pHalData->odmpriv); u8 channel = pmp->channel; - u8 bandwidth = pmp->bandwidth; - u8 rate = pmp->rateidx; + //u8 bandwidth = pmp->bandwidth; + //u8 rate = pmp->rateidx; // set RF channel register @@ -386,8 +386,8 @@ void Hal_SetOFDMTxPower(PADAPTER pAdapter, u8 *TxPower) { u32 TxAGC = 0; u8 tmpval = 0; - PMPT_CONTEXT pMptCtx = &pAdapter->mppriv.MptCtx; - HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); + //PMPT_CONTEXT pMptCtx = &pAdapter->mppriv.MptCtx; + //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); // HT Tx-rf(A) @@ -595,15 +595,15 @@ void Hal_SetAntenna(PADAPTER pAdapter) HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); PMPT_CONTEXT pMptCtx = &pAdapter->mppriv.MptCtx; R_ANTENNA_SELECT_OFDM *p_ofdm_tx; /* OFDM Tx register */ - R_ANTENNA_SELECT_CCK *p_cck_txrx; + //R_ANTENNA_SELECT_CCK *p_cck_txrx; - u8 r_rx_antenna_ofdm = 0, r_ant_select_cck_val = 0; - u8 chgTx = 0, chgRx = 0; - u32 r_ant_sel_cck_val = 0, r_ant_select_ofdm_val = 0, r_ofdm_tx_en_val = 0; + //u8 r_rx_antenna_ofdm = 0, r_ant_select_cck_val = 0; + //u8 chgTx = 0, chgRx = 0; + u32 r_ant_select_ofdm_val = 0; p_ofdm_tx = (R_ANTENNA_SELECT_OFDM *)&r_ant_select_ofdm_val; - p_cck_txrx = (R_ANTENNA_SELECT_CCK *)&r_ant_select_cck_val; + //p_cck_txrx = (R_ANTENNA_SELECT_CCK *)&r_ant_select_cck_val; switch (pAdapter->mppriv.antenna_tx) { @@ -736,7 +736,7 @@ void Hal_GetThermalMeter(PADAPTER pAdapter, u8 *value) void Hal_SetSingleCarrierTx(PADAPTER pAdapter, u8 bStart) { - HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); + //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); pAdapter->mppriv.MptCtx.bSingleCarrier = bStart; if (bStart)// Start Single Carrier. { @@ -1028,7 +1028,7 @@ void Hal_SetCCKContinuousTx(PADAPTER pAdapter, u8 bStart) void Hal_SetOFDMContinuousTx(PADAPTER pAdapter, u8 bStart) { - HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); + //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); if (bStart) { RT_TRACE(_module_mp_, _drv_info_, ("SetOFDMContinuousTx: test start\n")); diff --git a/hal/rtl8812a/rtl8812a_phycfg.c b/hal/rtl8812a/rtl8812a_phycfg.c index 8cae628..ab305ed 100644 --- a/hal/rtl8812a/rtl8812a_phycfg.c +++ b/hal/rtl8812a/rtl8812a_phycfg.c @@ -790,11 +790,12 @@ PHY_ConvertPowerLimitToPowerIndex( IN PADAPTER Adapter ) { + //FIXME baseIndex5G baseIndex2_4G HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); u8 BW40PwrBasedBm2_4G, BW40PwrBasedBm5G; u8 regulation, bw, channel, rateSection, group; - u8 baseIndex2_4G; - u8 baseIndex5G; + u8 baseIndex2_4G = 0; + u8 baseIndex5G = 0; s8 tempValue = 0, tempPwrLmt = 0; u8 rfPath = 0; @@ -1198,7 +1199,7 @@ PHY_GetPowerLimitValue( { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); s16 band = -1, regulation = -1, bandwidth = -1, - rfPath = -1, rateSection = -1, channelGroup = -1; + rateSection = -1, channelGroup = -1; u8 powerLimit = MAX_POWER_INDEX; if ( ( Adapter->registrypriv.RegEnableTxPowerLimit == 0 && pHalData->EEPROMRegulatory != 1 ) || @@ -1353,8 +1354,9 @@ PHY_StorePwrByRateIndexVhtSeries( IN u32 Data ) { + //FIXME rf_path HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); - u8 rf_path, rate_section; + u8 rf_path = 0, rate_section; // // For VHT series TX power by rate table. @@ -1468,8 +1470,9 @@ VOID phy_PreprocessVHTPGDataFromExactToRelativeValue( IN u32* pData ) { + //FIXME rf_path HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); - u8 rf_path, rate_section, BaseValue = 0; + u8 rf_path = 0, rate_section, BaseValue = 0; // // For VHT series TX power by rate table. // VHT TX power by rate off setArray = @@ -2210,16 +2213,16 @@ storePwrIndexDiffRateOffset( } } -static u8 +static inline u8 phy_DbmToTxPwrIdx( IN PADAPTER Adapter, IN WIRELESS_MODE WirelessMode, IN int PowerInDbm ) { - HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); + //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); u8 TxPwrIdx = 0; - s32 Offset = 0; + //s32 Offset = 0; #if 0 // @@ -2268,7 +2271,7 @@ phy_DbmToTxPwrIdx( return TxPwrIdx; } -static int +static inline int phy_TxPwrIdxToDbm( IN PADAPTER Adapter, IN WIRELESS_MODE WirelessMode, @@ -2310,9 +2313,9 @@ PHY_GetTxPowerLevel8812( OUT u32* powerlevel ) { - HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); - u8 TxPwrLevel = 0; - int TxPwrDbm; + //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); + //u8 TxPwrLevel = 0; + //int TxPwrDbm; #if 0 // // Because the Tx power indexes are different, we report the maximum of them to @@ -4397,7 +4400,7 @@ PHY_HandleSwChnlAndSetBW8812( u8 tmpnCur40MhzPrimeSC = pHalData->nCur40MhzPrimeSC; u8 tmpnCur80MhzPrimeSC = pHalData->nCur80MhzPrimeSC; u8 tmpCenterFrequencyIndex1 =pHalData->CurrentCenterFrequencyIndex1; - struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv; + //struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv; //DBG_871X("=> PHY_HandleSwChnlAndSetBW8812: bSwitchChannel %d, bSetBandWidth %d \n",bSwitchChannel,bSetBandWidth); diff --git a/hal/rtl8812a/rtl8812a_rf6052.c b/hal/rtl8812a/rtl8812a_rf6052.c index 7be424b..9e6ae80 100644 --- a/hal/rtl8812a/rtl8812a_rf6052.c +++ b/hal/rtl8812a/rtl8812a_rf6052.c @@ -42,7 +42,7 @@ PHY_RF6052SetBandwidth8812( IN PADAPTER Adapter, IN CHANNEL_WIDTH Bandwidth) //20M or 40M { - HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); + //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); switch(Bandwidth) { @@ -296,7 +296,7 @@ static void writeOFDMPowerReg8812( IN u32* pValue ) { - HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); + //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); u2Byte RegOffset_A[6] = { rTxAGC_A_Ofdm18_Ofdm6_JAguar, @@ -451,7 +451,7 @@ PHY_RF6052SetOFDMTxPower8812( IN u8* pPowerLevelBW40, IN u8 Channel) { - u32 writeVal[2], powerBase0[2], powerBase1[2], pwrtrac_value; + u32 writeVal[2], powerBase0[2], powerBase1[2]; u8 index = 0; diff --git a/hal/rtl8812a/rtl8812a_rxdesc.c b/hal/rtl8812a/rtl8812a_rxdesc.c index 002b90e..2971be1 100644 --- a/hal/rtl8812a/rtl8812a_rxdesc.c +++ b/hal/rtl8812a/rtl8812a_rxdesc.c @@ -22,7 +22,7 @@ //#include #include -static s32 translate2dbm(u8 signal_strength_idx) +static inline s32 translate2dbm(u8 signal_strength_idx) { s32 signal_power; // in dBm. @@ -37,7 +37,7 @@ static s32 translate2dbm(u8 signal_strength_idx) static void process_rssi(_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; #ifdef CONFIG_NEW_SIGNAL_STAT_PROCESS struct signal_stat * signal_stat = &padapter->recvpriv.signal_strength_data; @@ -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) { - u32 last_evm=0, tmpVal; + //u32 last_evm=0, tmpVal; struct rx_pkt_attrib *pattrib; #ifdef CONFIG_NEW_SIGNAL_STAT_PROCESS struct signal_stat * signal_stat; @@ -230,7 +230,7 @@ void rtl8812_query_rx_phy_status( PODM_PHY_INFO_T pPHYInfo = (PODM_PHY_INFO_T)(&pattrib->phy_info); u8 *wlanhdr; ODM_PACKET_INFO_T pkt_info; - u8 *sa; + u8 *sa = NULL; struct sta_priv *pstapriv; struct sta_info *psta; //_irqL irqL; diff --git a/hal/rtl8812a/usb/rtl8812au_xmit.c b/hal/rtl8812a/usb/rtl8812au_xmit.c index d8bc7ad..e0c2f8b 100644 --- a/hal/rtl8812a/usb/rtl8812au_xmit.c +++ b/hal/rtl8812a/usb/rtl8812au_xmit.c @@ -26,7 +26,7 @@ s32 rtl8812au_init_xmit_priv(_adapter *padapter) { struct xmit_priv *pxmitpriv = &padapter->xmitpriv; - HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); + //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); #ifdef PLATFORM_LINUX tasklet_init(&pxmitpriv->xmit_tasklet, @@ -47,10 +47,10 @@ void rtl8812au_free_xmit_priv(_adapter *padapter) static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz ,u8 bagg_pkt) { int pull=0; - uint qsel; - u8 data_rate,pwr_status,offset; + //uint qsel; + u8 offset = 0; _adapter *padapter = pxmitframe->padapter; - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; + //struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct pkt_attrib *pattrib = &pxmitframe->attrib; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); struct dm_priv *pdmpriv = &pHalData->dmpriv; @@ -81,7 +81,7 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz ,u8 bag //DBG_8192C("%s==> pkt_len=%d,bagg_pkt=%02x\n",__FUNCTION__,sz,bagg_pkt); SET_TX_DESC_PKT_SIZE_8812(ptxdesc, sz); - offset = TXDESC_SIZE + OFFSET_SZ; + //offset = TXDESC_SIZE + OFFSET_SZ; #ifdef CONFIG_TX_EARLY_MODE if(bagg_pkt){ diff --git a/hal/rtl8812a/usb/usb_halinit.c b/hal/rtl8812a/usb/usb_halinit.c index 36e79ff..a1e96c7 100644 --- a/hal/rtl8812a/usb/usb_halinit.c +++ b/hal/rtl8812a/usb/usb_halinit.c @@ -29,7 +29,7 @@ #endif -static void _dbg_dump_macreg(_adapter *padapter) +static inline void _dbg_dump_macreg(_adapter *padapter) { u32 offset = 0; u32 val32 = 0; @@ -673,7 +673,7 @@ _InitQueuePriority_8812AUsb( -static VOID +static inline VOID _InitHardwareDropIncorrectBulkOut_8812A( IN PADAPTER Adapter ) @@ -951,7 +951,7 @@ usb_AggSettingRxUpdate_8812A( #ifdef CONFIG_USB_RX_AGGREGATION HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); u8 valueDMA; - u8 valueUSB; + //u8 valueUSB; valueDMA = rtw_read8(Adapter, REG_TRXDMA_CTRL); @@ -1180,7 +1180,7 @@ _InitOperationMode_8812A( // Set CCK and OFDM Block "ON" -static VOID _BBTurnOnBlock( +static inline VOID _BBTurnOnBlock( IN PADAPTER Adapter ) { @@ -1192,7 +1192,7 @@ static VOID _BBTurnOnBlock( PHY_SetBBReg(Adapter, rFPGA0_RFMOD, bOFDMEn, 0x1); } -static VOID _RfPowerSave( +static inline VOID _RfPowerSave( IN PADAPTER Adapter ) { @@ -1259,7 +1259,7 @@ _InitAntenna_Selection_8812A(IN PADAPTER Adapter) // If Efuse 0x0e bit1 is not enabled, we can not support selective suspend for Minicard and // slim card. // -static VOID +static inline VOID HalDetectSelectiveSuspendMode( IN PADAPTER Adapter ) @@ -1313,7 +1313,7 @@ HalDetectSelectiveSuspendMode( * When Who Remark * 08/23/2010 MHC HW suspend mode switch test.. *---------------------------------------------------------------------------*/ -static VOID +static inline VOID HwSuspendModeEnable_8812AU( IN PADAPTER pAdapter, IN u8 Type @@ -1357,7 +1357,7 @@ HwSuspendModeEnable_8812AU( } // HwSuspendModeEnable92Cu rt_rf_power_state RfOnOffDetect(IN PADAPTER pAdapter ) { - HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); + //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(pAdapter); u8 val8; rt_rf_power_state rfpowerstate = rf_off; @@ -1390,19 +1390,21 @@ void _ps_close_RF(_adapter *padapter){ u32 rtl8812au_hal_init(PADAPTER Adapter) { u8 value8 = 0, u1bRegCR; - u16 value16; + //u16 value16; u8 txpktbuf_bndy; u32 status = _SUCCESS; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); struct pwrctrl_priv *pwrctrlpriv = &Adapter->pwrctrlpriv; struct registry_priv *pregistrypriv = &Adapter->registrypriv; - rt_rf_power_state eRfPowerStateToSet; + //rt_rf_power_state eRfPowerStateToSet; #ifdef CONFIG_BT_COEXIST struct btcoexist_priv *pbtpriv = &(pHalData->bt_coexist); #endif +#ifdef CONFIG_DEBUG u32 init_start_time = rtw_get_current_time(); +#endif #ifdef DBG_HAL_INIT_PROFILING @@ -1962,10 +1964,11 @@ CardDisableRTL8812AU( IN PADAPTER Adapter ) { + //FIXME val8 u8 u1bTmp; - u8 val8; - u16 val16; - u32 val32; + u8 val8 = 0; + //u16 val16; + //u32 val32; //DBG_871X("CardDisableRTL8188EU\n"); @@ -2073,7 +2076,7 @@ unsigned int rtl8812au_inirp_init(PADAPTER Adapter) u8 i; struct recv_buf *precvbuf; uint status; - struct dvobj_priv *pdev= adapter_to_dvobj(Adapter); + //struct dvobj_priv *pdev= adapter_to_dvobj(Adapter); struct intf_hdl * pintfhdl=&Adapter->iopriv.intf; struct recv_priv *precvpriv = &(Adapter->recvpriv); u32 (*_read_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pmem); @@ -2245,7 +2248,7 @@ hal_InitPGData_8812A( EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter); // HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); u32 i; - u16 value16; + //u16 value16; if(_FALSE == pEEPROM->bautoload_fail_flag) { // autoload OK. @@ -2552,7 +2555,7 @@ ReadAdapterInfo8812AU( IN PADAPTER Adapter ) { - HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); + //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); DBG_871X("====> ReadAdapterInfo8812AU\n"); @@ -2595,9 +2598,9 @@ void UpdateInterruptMask8812AU(PADAPTER padapter,u8 bHIMR0 ,u32 AddMSR, u32 Remo void SetHwReg8812AU(PADAPTER Adapter, u8 variable, u8* val) { - HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); - struct dm_priv *pdmpriv = &pHalData->dmpriv; - DM_ODM_T *podmpriv = &pHalData->odmpriv; + //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); + //struct dm_priv *pdmpriv = &pHalData->dmpriv; + //DM_ODM_T *podmpriv = &pHalData->odmpriv; _func_enter_; switch(variable) @@ -2659,8 +2662,8 @@ _func_exit_; void GetHwReg8812AU(PADAPTER Adapter, u8 variable, u8* val) { - HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); - DM_ODM_T *podmpriv = &pHalData->odmpriv; + //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); + //DM_ODM_T *podmpriv = &pHalData->odmpriv; _func_enter_; switch(variable) @@ -2684,7 +2687,7 @@ SetHalDefVar8812AUsb( IN PVOID pValue ) { - HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); + //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); u8 bResult = _SUCCESS; switch(eVariable) @@ -2708,7 +2711,7 @@ GetHalDefVar8812AUsb( IN PVOID pValue ) { - HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); + //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); u8 bResult = _SUCCESS; switch(eVariable) diff --git a/hal/rtl8812a/usb/usb_ops_linux.c b/hal/rtl8812a/usb/usb_ops_linux.c index c00c34e..4db8037 100644 --- a/hal/rtl8812a/usb/usb_ops_linux.c +++ b/hal/rtl8812a/usb/usb_ops_linux.c @@ -416,7 +416,7 @@ _func_exit_; } #endif -static s32 pre_recv_entry(union recv_frame *precvframe, u8 *pphy_status) +static inline s32 pre_recv_entry(union recv_frame *precvframe, u8 *pphy_status) { s32 ret=_SUCCESS; #ifdef CONFIG_CONCURRENT_MODE @@ -590,7 +590,7 @@ _pkt *pskb u8 *pphy_status = NULL; union recv_frame *precvframe = NULL; struct rx_pkt_attrib *pattrib = NULL; - HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); + //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); struct recv_priv *precvpriv = &padapter->recvpriv; _queue *pfree_recv_queue = &precvpriv->free_recv_queue; @@ -937,8 +937,8 @@ void rtl8812au_recv_tasklet(void *priv) static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs) { - _irqL irqL; - uint isevt, *pbuf; + //_irqL irqL; + //uint isevt, *pbuf; struct recv_buf *precvbuf = (struct recv_buf *)purb->context; _adapter *padapter =(_adapter *)precvbuf->adapter; struct recv_priv *precvpriv = &padapter->recvpriv; @@ -1052,7 +1052,7 @@ _func_exit_; static u32 usb_read_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem) { - _irqL irqL; + //_irqL irqL; int err; unsigned int pipe; SIZE_PTR tmpaddr=0; diff --git a/include/drv_types.h b/include/drv_types.h index 0ac6dfa..3889612 100644 --- a/include/drv_types.h +++ b/include/drv_types.h @@ -489,7 +489,7 @@ struct dvobj_priv }; #ifdef PLATFORM_LINUX -static struct device *dvobj_to_dev(struct dvobj_priv *dvobj) +static inline struct device *dvobj_to_dev(struct dvobj_priv *dvobj) { /* todo: get interface type from dvobj and the return the dev accordingly */ #ifdef RTW_DVOBJ_CHIP_HW_TYPE diff --git a/include/osdep_intf.h b/include/osdep_intf.h index 450dccd..6ad79ea 100644 --- a/include/osdep_intf.h +++ b/include/osdep_intf.h @@ -115,8 +115,8 @@ u16 rtw_recv_select_queue(struct sk_buff *skb); void rtw_proc_init_one(struct net_device *dev); void rtw_proc_remove_one(struct net_device *dev); #else //!CONFIG_PROC_DEBUG -static void rtw_proc_init_one(struct net_device *dev){} -static void rtw_proc_remove_one(struct net_device *dev){} +static inline void rtw_proc_init_one(struct net_device *dev){} +static inline void rtw_proc_remove_one(struct net_device *dev){} #endif //!CONFIG_PROC_DEBUG #endif //PLATFORM_LINUX diff --git a/include/rtw_android.h b/include/rtw_android.h index 3faa08d..124661c 100644 --- a/include/rtw_android.h +++ b/include/rtw_android.h @@ -79,8 +79,8 @@ int wifi_set_power(int on, unsigned long msec); int wifi_get_mac_addr(unsigned char *buf); void *wifi_get_country_code(char *ccode); #else -static int rtw_android_wifictrl_func_add(void) { return 0; } -static void rtw_android_wifictrl_func_del(void) {} +static inline int rtw_android_wifictrl_func_add(void) { return 0; } +static inline void rtw_android_wifictrl_func_del(void) {} #endif /* defined(RTW_ENABLE_WIFI_CONTROL_FUNC) */ #endif //__RTW_ANDROID_H__ diff --git a/include/rtw_br_ext.h b/include/rtw_br_ext.h index c8d7801..ebada84 100644 --- a/include/rtw_br_ext.h +++ b/include/rtw_br_ext.h @@ -24,9 +24,9 @@ #define CL_IPV6_PASS 1 #define MACADDRLEN 6 #define _DEBUG_ERR DBG_8192C -#define _DEBUG_INFO //DBG_8192C +#define _DEBUG_INFO DBG_8192C #define DEBUG_WARN DBG_8192C -#define DEBUG_INFO //DBG_8192C +#define DEBUG_INFO DBG_8192C #define DEBUG_ERR DBG_8192C //#define GET_MY_HWADDR ((GET_MIB(priv))->dot11OperationEntry.hwaddr) #define GET_MY_HWADDR(padapter) ((padapter)->eeprompriv.mac_addr) diff --git a/include/rtw_recv.h b/include/rtw_recv.h index 4445f63..edd4970 100644 --- a/include/rtw_recv.h +++ b/include/rtw_recv.h @@ -71,21 +71,21 @@ #define RX_CMD_QUEUE 1 #define RX_MAX_QUEUE 2 -static u8 SNAP_ETH_TYPE_IPX[2] = {0x81, 0x37}; +static const u8 SNAP_ETH_TYPE_IPX[2] = {0x81, 0x37}; -static u8 SNAP_ETH_TYPE_APPLETALK_AARP[2] = {0x80, 0xf3}; -static u8 SNAP_ETH_TYPE_APPLETALK_DDP[2] = {0x80, 0x9b}; -static u8 SNAP_ETH_TYPE_TDLS[2] = {0x89, 0x0d}; -static u8 SNAP_HDR_APPLETALK_DDP[3] = {0x08, 0x00, 0x07}; // Datagram Delivery Protocol +static const u8 SNAP_ETH_TYPE_APPLETALK_AARP[2] = {0x80, 0xf3}; +static const u8 SNAP_ETH_TYPE_APPLETALK_DDP[2] = {0x80, 0x9b}; +static const u8 SNAP_ETH_TYPE_TDLS[2] = {0x89, 0x0d}; +static const u8 SNAP_HDR_APPLETALK_DDP[3] = {0x08, 0x00, 0x07}; // Datagram Delivery Protocol -static u8 oui_8021h[] = {0x00, 0x00, 0xf8}; -static u8 oui_rfc1042[]= {0x00,0x00,0x00}; +static const u8 oui_8021h[] = {0x00, 0x00, 0xf8}; +static const u8 oui_rfc1042[]= {0x00,0x00,0x00}; #define MAX_SUBFRAME_COUNT 64 -static u8 rtw_rfc1042_header[] = +static const u8 rtw_rfc1042_header[] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 }; /* Bridge-Tunnel header (for EtherTypes ETH_P_AARP and ETH_P_IPX) */ -static u8 rtw_bridge_tunnel_header[] = +static const u8 rtw_bridge_tunnel_header[] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 }; //for Rx reordering buffer control diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c index 001cc3e..3544364 100644 --- a/os_dep/linux/ioctl_cfg80211.c +++ b/os_dep/linux/ioctl_cfg80211.c @@ -260,7 +260,7 @@ exit: void rtw_spt_band_free(struct ieee80211_supported_band *spt_band) { - u32 size; + u32 size = 0; if(!spt_band) return; @@ -382,7 +382,7 @@ static int rtw_cfg80211_inform_bss(_adapter *padapter, struct wlan_network *pnet u8 *notify_ie; size_t notify_ielen; s32 notify_signal; - u8 buf[MAX_BSSINFO_LEN], *pbuf; + u8 *buf, *pbuf; size_t len,bssinf_len=0; struct rtw_ieee80211_hdr *pwlanhdr; unsigned short *fctrl; @@ -392,6 +392,9 @@ static int rtw_cfg80211_inform_bss(_adapter *padapter, struct wlan_network *pnet struct wiphy *wiphy = wdev->wiphy; struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); + buf = rtw_zmalloc(MAX_BSSINFO_LEN); + if (!buf) + return -ENOMEM; //DBG_8192C("%s\n", __func__); @@ -692,7 +695,7 @@ void rtw_cfg80211_indicate_disconnect(_adapter *padapter) static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_param *param, u32 param_len) { int ret = 0; - u32 wep_key_idx, wep_key_len,wep_total_len; + u32 wep_key_idx, wep_key_len; struct sta_info *psta = NULL, *pbcmc_sta = NULL; _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &padapter->mlmepriv; @@ -982,7 +985,7 @@ exit: static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param *param, u32 param_len) { int ret = 0; - u32 wep_key_idx, wep_key_len,wep_total_len; + u32 wep_key_idx, wep_key_len; _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct security_priv *psecuritypriv = &padapter->securitypriv; @@ -1249,7 +1252,9 @@ static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev, u32 param_len; struct ieee_param *param = NULL; int ret=0; +#ifdef CONFIG_DEBUG struct wireless_dev *rtw_wdev = wiphy_to_wdev(wiphy); +#endif _adapter *padapter = wiphy_to_adapter(wiphy); struct mlme_priv *pmlmepriv = &padapter->mlmepriv; @@ -1731,14 +1736,14 @@ void rtw_cfg80211_surveydone_event_callback(_adapter *padapter) struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); _queue *queue = &(pmlmepriv->scanned_queue); struct wlan_network *pnetwork = NULL; - u32 cnt=0; - u32 wait_for_surveydone; - sint wait_status; + //u32 cnt=0; + //u32 wait_for_surveydone; + //sint wait_status; #ifdef CONFIG_P2P - struct wifidirect_info* pwdinfo = &padapter->wdinfo; + //struct wifidirect_info* pwdinfo = &padapter->wdinfo; #endif //CONFIG_P2P - struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(padapter->rtw_wdev); - struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; + //struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(padapter->rtw_wdev); + //struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; #ifdef CONFIG_DEBUG_CFG80211 DBG_8192C("%s\n", __func__); @@ -1785,7 +1790,7 @@ static int rtw_cfg80211_set_probe_req_wpsp2pie(_adapter *padapter, char *buf, in u32 p2p_ielen = 0; u8 *p2p_ie; u32 wfd_ielen = 0; - u8 *wfd_ie; + //u8 *wfd_ie; struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); #ifdef CONFIG_DEBUG_CFG80211 @@ -1895,17 +1900,17 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy NDIS_802_11_SSID ssid[RTW_SSID_SCAN_AMOUNT]; struct rtw_ieee80211_channel ch[RTW_CHANNEL_SCAN_AMOUNT]; _irqL irqL; - u8 *wps_ie=NULL; - uint wps_ielen=0; - u8 *p2p_ie=NULL; - uint p2p_ielen=0; + //u8 *wps_ie=NULL; + //uint wps_ielen=0; + //u8 *p2p_ie=NULL; + //uint p2p_ielen=0; u8 survey_times=3; #ifdef CONFIG_P2P struct wifidirect_info *pwdinfo= &(padapter->wdinfo); #endif //CONFIG_P2P struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(padapter->rtw_wdev); struct cfg80211_ssid *ssids = request->ssids; - int social_channel = 0, j = 0; + int social_channel = 0; bool need_indicate_scan_done = _FALSE; #ifdef CONFIG_CONCURRENT_MODE PADAPTER pbuddy_adapter = NULL; @@ -2347,7 +2352,7 @@ static int rtw_cfg80211_set_key_mgt(struct security_priv *psecuritypriv, u32 key static int rtw_cfg80211_set_wpa_ie(_adapter *padapter, const u8 *pie, size_t ielen) { u8 *buf=NULL, *pos=NULL; - u32 left; + //u32 left; int group_cipher = 0, pairwise_cipher = 0; int ret = 0; int wpa_ielen=0; @@ -2521,7 +2526,7 @@ static int rtw_cfg80211_set_wpa_ie(_adapter *padapter, const u8 *pie, size_t iel #ifdef CONFIG_WFD {//check wfd_ie for assoc req; uint wfd_ielen=0; - u8 *wfd_ie; + //u8 *wfd_ie; struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); if(rtw_get_wfd_ie(buf, ielen, NULL, &wfd_ielen)) @@ -3105,10 +3110,10 @@ static int cfg80211_rtw_flush_pmksa(struct wiphy *wiphy, #ifdef CONFIG_AP_MODE void rtw_cfg80211_indicate_sta_assoc(_adapter *padapter, u8 *pmgmt_frame, uint frame_len) { - s32 freq; - int channel; - struct wireless_dev *pwdev = padapter->rtw_wdev; - struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); + //s32 freq; + //int channel; + //struct wireless_dev *pwdev = padapter->rtw_wdev; + //struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct net_device *ndev = padapter->pnetdev; DBG_8192C("%s(padapter=%p,%s)\n", __func__, padapter, ndev->name); @@ -3169,15 +3174,15 @@ void rtw_cfg80211_indicate_sta_assoc(_adapter *padapter, u8 *pmgmt_frame, uint f void rtw_cfg80211_indicate_sta_disassoc(_adapter *padapter, unsigned char *da, unsigned short reason) { - s32 freq; - int channel; - u8 *pmgmt_frame; - uint frame_len; - struct rtw_ieee80211_hdr *pwlanhdr; - unsigned short *fctrl; - u8 mgmt_buf[128] = {0}; - struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); - struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); + //s32 freq; + //int channel; + //u8 *pmgmt_frame; + //uint frame_len; + //struct rtw_ieee80211_hdr *pwlanhdr; + //unsigned short *fctrl; + //u8 mgmt_buf[128] = {0}; + //struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); + //struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct net_device *ndev = padapter->pnetdev; DBG_8192C("%s(padapter=%p,%s)\n", __func__, padapter, ndev->name); @@ -3411,7 +3416,7 @@ fail: } -static void rtw_cfg80211_monitor_if_set_multicast_list(struct net_device *ndev) +static inline void rtw_cfg80211_monitor_if_set_multicast_list(struct net_device *ndev) { DBG_8192C("%s\n", __func__); } @@ -3631,7 +3636,7 @@ static int rtw_add_beacon(_adapter *adapter, const u8 *head, size_t head_len, co u8 *pbuf = NULL; uint len, wps_ielen=0; uint p2p_ielen=0; - u8 *p2p_ie; + //u8 *p2p_ie; u8 got_p2p_ie = _FALSE; struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); //struct sta_priv *pstapriv = &padapter->stapriv; @@ -3783,7 +3788,7 @@ static int cfg80211_rtw_start_ap(struct wiphy *wiphy, struct net_device *ndev, if(0) DBG_871X(FUNC_ADPT_FMT" ssid:(%s,%d), from ie:(%s,%d)\n", FUNC_ADPT_ARG(adapter), - settings->ssid, settings->ssid_len, + settings->ssid, (int)settings->ssid_len, pbss_network->Ssid.Ssid, pbss_network->Ssid.SsidLength); _rtw_memcpy(pbss_network->Ssid.Ssid, (void *)settings->ssid, settings->ssid_len); @@ -3851,7 +3856,7 @@ static int cfg80211_rtw_del_station(struct wiphy *wiphy, struct net_device *ndev int ret=0; _irqL irqL; _list *phead, *plist; - u8 updated; + u8 updated = 0; struct sta_info *psta = NULL; _adapter *padapter = (_adapter *)rtw_netdev_priv(ndev); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); @@ -3961,7 +3966,7 @@ static int cfg80211_rtw_dump_station(struct wiphy *wiphy, struct net_device *nde static int cfg80211_rtw_change_bss(struct wiphy *wiphy, struct net_device *ndev, struct bss_parameters *params) { - u8 i; + //u8 i; DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); /* @@ -3981,7 +3986,7 @@ static int cfg80211_rtw_change_bss(struct wiphy *wiphy, struct net_device *ndev, } -static int cfg80211_rtw_set_channel(struct wiphy *wiphy +static inline int cfg80211_rtw_set_channel(struct wiphy *wiphy #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) , struct net_device *ndev #endif @@ -3994,7 +3999,7 @@ static int cfg80211_rtw_set_channel(struct wiphy *wiphy return 0; } -static int cfg80211_rtw_auth(struct wiphy *wiphy, struct net_device *ndev, +static inline int cfg80211_rtw_auth(struct wiphy *wiphy, struct net_device *ndev, struct cfg80211_auth_request *req) { DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); @@ -4002,7 +4007,7 @@ static int cfg80211_rtw_auth(struct wiphy *wiphy, struct net_device *ndev, return 0; } -static int cfg80211_rtw_assoc(struct wiphy *wiphy, struct net_device *ndev, +static inline int cfg80211_rtw_assoc(struct wiphy *wiphy, struct net_device *ndev, struct cfg80211_assoc_request *req) { DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); @@ -4016,7 +4021,7 @@ void rtw_cfg80211_rx_action_p2p(_adapter *padapter, u8 *pmgmt_frame, uint frame_ int type; s32 freq; int channel; - struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); + //struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); u8 category, action; channel = rtw_get_oper_ch(padapter); @@ -4056,7 +4061,7 @@ void rtw_cfg80211_rx_p2p_action_public(_adapter *padapter, u8 *pmgmt_frame, uint int type; s32 freq; int channel; - struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); + //struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); u8 category, action; channel = rtw_get_oper_ch(padapter); @@ -4100,8 +4105,8 @@ void rtw_cfg80211_rx_action(_adapter *adapter, u8 *frame, uint frame_len, const { s32 freq; int channel; - struct mlme_ext_priv *pmlmeext = &(adapter->mlmeextpriv); - struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(adapter->rtw_wdev); + //struct mlme_ext_priv *pmlmeext = &(adapter->mlmeextpriv); + //struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(adapter->rtw_wdev); u8 category, action; channel = rtw_get_oper_ch(adapter); @@ -4164,7 +4169,7 @@ void rtw_cfg80211_issue_p2p_provision_request(_adapter *padapter, const u8 *buf, unsigned short *fctrl; struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); - struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); + //struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct wifidirect_info *pwdinfo = &(padapter->wdinfo); u8 *frame_body = (unsigned char *)(buf + sizeof(struct rtw_ieee80211_hdr_3addr)); @@ -4374,7 +4379,7 @@ static s32 cfg80211_rtw_remain_on_channel(struct wiphy *wiphy, { s32 err = 0; _adapter *padapter = wiphy_to_adapter(wiphy); - struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(padapter->rtw_wdev); + //struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(padapter->rtw_wdev); struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct wifidirect_info *pwdinfo = &padapter->wdinfo; struct cfg80211_wifidirect_info *pcfg80211_wdinfo = &padapter->cfg80211_wdinfo; @@ -4537,9 +4542,9 @@ static s32 cfg80211_rtw_cancel_remain_on_channel(struct wiphy *wiphy, { s32 err = 0; _adapter *padapter = wiphy_to_adapter(wiphy); - struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(padapter->rtw_wdev); + //struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(padapter->rtw_wdev); struct wifidirect_info *pwdinfo = &padapter->wdinfo; - struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; + //struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; struct cfg80211_wifidirect_info *pcfg80211_wdinfo = &padapter->cfg80211_wdinfo; DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter)); @@ -4590,11 +4595,11 @@ static int _cfg80211_rtw_mgmt_tx(_adapter *padapter, u8 tx_ch, const u8 *buf, si int ret = _FAIL; bool ack = _TRUE; struct rtw_ieee80211_hdr *pwlanhdr; - struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(padapter->rtw_wdev); + //struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(padapter->rtw_wdev); struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); - struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); + //struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); - struct wifidirect_info *pwdinfo = &padapter->wdinfo; + //struct wifidirect_info *pwdinfo = &padapter->wdinfo; //struct cfg80211_wifidirect_info *pcfg80211_wdinfo = &padapter->cfg80211_wdinfo; if(_FAIL == rtw_pwr_wakeup(padapter)) { @@ -4759,12 +4764,12 @@ static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy, { #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) || defined(COMPAT_KERNEL_RELEASE) struct ieee80211_channel *chan = params->chan; - bool offchan = params->offchan; - unsigned int wait = params->wait; + //bool offchan = params->offchan; + //unsigned int wait = params->wait; const u8 *buf = params->buf; size_t len = params->len; - bool no_cck = params->no_cck; - bool dont_wait_for_ack = params->dont_wait_for_ack; + //bool no_cck = params->no_cck; + //bool dont_wait_for_ack = params->dont_wait_for_ack; #endif _adapter *padapter = (_adapter *)wiphy_to_adapter(wiphy); struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(padapter->rtw_wdev); @@ -4776,7 +4781,9 @@ static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy, u8 tx_ch = (u8)ieee80211_frequency_to_channel(chan->center_freq); u8 category, action; int type = (-1); +#ifdef CONFIG_DEBUG u32 start = rtw_get_current_time(); +#endif /* cookie generation */ *cookie = (unsigned long) buf; @@ -4863,7 +4870,7 @@ static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy, #endif u16 frame_type, bool reg) { - _adapter *adapter = wiphy_to_adapter(wiphy); + //_adapter *adapter = wiphy_to_adapter(wiphy); #ifdef CONFIG_DEBUG_CFG80211 DBG_871X(FUNC_ADPT_FMT" frame_type:%x, reg:%d\n", FUNC_ADPT_ARG(adapter), @@ -4885,7 +4892,7 @@ static int rtw_cfg80211_set_beacon_wpsp2pie(struct net_device *ndev, char *buf, u8 wps_oui[8]={0x0,0x50,0xf2,0x04}; u8 *p2p_ie; u32 wfd_ielen = 0; - u8 *wfd_ie; + //u8 *wfd_ie; _adapter *padapter = (_adapter *)rtw_netdev_priv(ndev); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); @@ -4997,7 +5004,7 @@ static int rtw_cfg80211_set_probe_resp_wpsp2pie(struct net_device *net, char *bu u32 p2p_ielen = 0; u8 *p2p_ie; u32 wfd_ielen = 0; - u8 *wfd_ie; + //u8 *wfd_ie; _adapter *padapter = (_adapter *)rtw_netdev_priv(net); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); diff --git a/os_dep/linux/ioctl_linux.c b/os_dep/linux/ioctl_linux.c index 818234b..322727f 100644 --- a/os_dep/linux/ioctl_linux.c +++ b/os_dep/linux/ioctl_linux.c @@ -88,7 +88,7 @@ static int hex2num_i(char c) return -1; } -static int hex2byte_i(const char *hex) +static inline int hex2byte_i(const char *hex) { int a, b; a = hex2num_i(*hex++); @@ -127,9 +127,9 @@ static int hwaddr_aton_i(const char *txt, u8 *addr) return 0; } -static void indicate_wx_custom_event(_adapter *padapter, char *msg) +static inline void indicate_wx_custom_event(_adapter *padapter, char *msg) { - u8 *buff, *p; + u8 *buff; union iwreq_data wrqu; if (strlen(msg) > IW_CUSTOM_MAX) { @@ -156,7 +156,7 @@ static void indicate_wx_custom_event(_adapter *padapter, char *msg) } -static void request_wps_pbc_event(_adapter *padapter) +static inline void request_wps_pbc_event(_adapter *padapter) { u8 *buff, *p; union iwreq_data wrqu; @@ -216,7 +216,7 @@ void rtw_request_wps_pbc_event(_adapter *padapter) void indicate_wx_scan_complete_event(_adapter *padapter) { union iwreq_data wrqu; - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; + //struct mlme_priv *pmlmepriv = &padapter->mlmepriv; _rtw_memset(&wrqu, 0, sizeof(union iwreq_data)); @@ -302,11 +302,11 @@ static char *translate_scan(_adapter *padapter, char *p; u16 max_rate=0, rate, ht_cap=_FALSE, vht_cap = _FALSE; u32 i = 0; - char *current_val; - long rssi; + //char *current_val; + //long rssi; u8 bw_40MHz=0, short_GI=0, bw_160MHz=0, vht_highest_rate = 0; u16 mcs_rate=0, vht_data_rate=0; - struct registry_priv *pregpriv = &padapter->registrypriv; + //struct registry_priv *pregpriv = &padapter->registrypriv; #ifdef CONFIG_P2P struct wifidirect_info *pwdinfo = &padapter->wdinfo; #endif //CONFIG_P2P @@ -1061,7 +1061,7 @@ _func_exit_; static int rtw_set_wpa_ie(_adapter *padapter, char *pie, unsigned short ielen) { u8 *buf=NULL, *pos=NULL; - u32 left; + //u32 left; int group_cipher = 0, pairwise_cipher = 0; int ret = 0; u8 null_addr[]= {0,0,0,0,0,0}; @@ -1247,7 +1247,7 @@ static int rtw_wx_get_name(struct net_device *dev, union iwreq_data *wrqu, char *extra) { _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); - u16 cap; + //u16 cap; u32 ht_ielen = 0; char *p; u8 ht_cap=_FALSE, vht_cap=_FALSE; @@ -1475,7 +1475,7 @@ static int rtw_wx_set_pmkid(struct net_device *dev, _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); u8 j,blInserted = _FALSE; int intReturn = _FALSE; - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; + //struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct security_priv *psecuritypriv = &padapter->securitypriv; struct iw_pmksa* pPMK = ( struct iw_pmksa* ) extra; u8 strZeroMacAddress[ ETH_ALEN ] = { 0x00 }; @@ -2358,9 +2358,9 @@ static int rtw_wx_set_essid(struct net_device *dev, _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &padapter->mlmepriv; _queue *queue = &pmlmepriv->scanned_queue; - struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; + //struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; _list *phead; - s8 status = _TRUE; + //s8 status = _TRUE; struct wlan_network *pnetwork = NULL; NDIS_802_11_AUTHENTICATION_MODE authmode; NDIS_802_11_SSID ndis_ssid; @@ -3093,11 +3093,11 @@ static int rtw_wx_set_auth(struct net_device *dev, { _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); struct iw_param *param = (struct iw_param*)&(wrqu->param); - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; - struct security_priv *psecuritypriv = &padapter->securitypriv; - struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; - struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); - u32 value = param->value; + //struct mlme_priv *pmlmepriv = &padapter->mlmepriv; + //struct security_priv *psecuritypriv = &padapter->securitypriv; + //struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; + //struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); + //u32 value = param->value; int ret = 0; switch (param->flags & IW_AUTH_INDEX) { @@ -3561,9 +3561,11 @@ static int rtw_wx_set_channel_plan(struct net_device *dev, union iwreq_data *wrqu, char *extra) { _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); - struct registry_priv *pregistrypriv = &padapter->registrypriv; + //struct registry_priv *pregistrypriv = &padapter->registrypriv; +#ifdef CONFIG_DEBUG struct mlme_priv *pmlmepriv = &padapter->mlmepriv; - extern int rtw_channel_plan; +#endif + //extern int rtw_channel_plan; u8 channel_plan_req = (u8) (*((int *)wrqu)); #if 0 @@ -3968,7 +3970,7 @@ static int rtw_get_ap_info(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - int bssid_match, ret = 0; + int ret = 0; u32 cnt=0, wpa_ielen; _irqL irqL; _list *plist, *phead; @@ -4167,11 +4169,11 @@ static int rtw_wext_p2p_enable(struct net_device *dev, int ret = 0; _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); - struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); - struct iw_point *pdata = &wrqu->data; + //struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); + //struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo= &(padapter->wdinfo); struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; - struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; + //struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; enum P2P_ROLE init_role = P2P_ROLE_DISABLE; if(*extra == '0' ) @@ -4251,8 +4253,8 @@ static int rtw_p2p_set_go_nego_ssid(struct net_device *dev, int ret = 0; _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); - struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); - struct iw_point *pdata = &wrqu->data; + //struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); + //struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo= &(padapter->wdinfo); DBG_871X( "[%s] ssid = %s, len = %zu\n", __FUNCTION__, extra, strlen( extra ) ); @@ -4470,7 +4472,7 @@ static int rtw_p2p_get_status(struct net_device *dev, int ret = 0; _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); - struct iw_point *pdata = &wrqu->data; + //struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); #ifdef CONFIG_CONCURRENT_MODE _adapter *pbuddy_adapter = padapter->pbuddy_adapter; @@ -4508,7 +4510,7 @@ static int rtw_p2p_get_req_cm(struct net_device *dev, int ret = 0; _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); - struct iw_point *pdata = &wrqu->data; + //struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); sprintf( extra, "\n\nCM=%s\n", pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req ); @@ -4525,7 +4527,7 @@ static int rtw_p2p_get_role(struct net_device *dev, int ret = 0; _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); - struct iw_point *pdata = &wrqu->data; + //struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); @@ -4547,7 +4549,7 @@ static int rtw_p2p_get_peer_ifaddr(struct net_device *dev, int ret = 0; _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); - struct iw_point *pdata = &wrqu->data; + //struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); @@ -4571,7 +4573,7 @@ static int rtw_p2p_get_peer_devaddr(struct net_device *dev, int ret = 0; _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); - struct iw_point *pdata = &wrqu->data; + //struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); DBG_871X( "[%s] Role = %d, Status = %d, peer addr = %.2X:%.2X:%.2X:%.2X:%.2X:%.2X\n", __FUNCTION__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo), @@ -4595,7 +4597,7 @@ static int rtw_p2p_get_peer_devaddr_by_invitation(struct net_device *dev, int ret = 0; _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); - struct iw_point *pdata = &wrqu->data; + //struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); DBG_871X( "[%s] Role = %d, Status = %d, peer addr = %.2X:%.2X:%.2X:%.2X:%.2X:%.2X\n", __FUNCTION__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo), @@ -4619,7 +4621,7 @@ static int rtw_p2p_get_groupid(struct net_device *dev, int ret = 0; _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); - struct iw_point *pdata = &wrqu->data; + //struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); sprintf( extra, "\n%.2X:%.2X:%.2X:%.2X:%.2X:%.2X %s", @@ -4640,7 +4642,7 @@ static int rtw_p2p_get_op_ch(struct net_device *dev, int ret = 0; _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); - struct iw_point *pdata = &wrqu->data; + //struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); @@ -4745,7 +4747,7 @@ static int rtw_p2p_get_peer_wfd_port(struct net_device *dev, int ret = 0; _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); - struct iw_point *pdata = &wrqu->data; + //struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); DBG_871X( "[%s] p2p_state = %d\n", __FUNCTION__, rtw_p2p_state(pwdinfo) ); @@ -4765,7 +4767,7 @@ static int rtw_p2p_get_peer_wfd_preferred_connection(struct net_device *dev, int ret = 0; _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); - struct iw_point *pdata = &wrqu->data; + //struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); sprintf( extra, "\n\nwfd_pc=%d\n", pwdinfo->wfd_info->wfd_pc ); @@ -4784,7 +4786,7 @@ static int rtw_p2p_get_peer_wfd_session_available(struct net_device *dev, int ret = 0; _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); - struct iw_point *pdata = &wrqu->data; + //struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); sprintf( extra, "\n\nwfd_sa=%d\n", pwdinfo->wfd_info->peer_session_avail ); @@ -5141,7 +5143,7 @@ static int rtw_p2p_connect(struct net_device *dev, struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); u8 peerMAC[ ETH_ALEN ] = { 0x00 }; int jj,kk; - u8 peerMACStr[ ETH_ALEN * 2 ] = { 0x00 }; + //u8 peerMACStr[ ETH_ALEN * 2 ] = { 0x00 }; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; _irqL irqL; _list *plist, *phead; @@ -5259,7 +5261,7 @@ static int rtw_p2p_connect(struct net_device *dev, DBG_871X( "[%s] Not Found in Scanning Queue~\n", __FUNCTION__ ); ret = -1; } -exit: +//exit: return ret; } @@ -5270,16 +5272,16 @@ static int rtw_p2p_invite_req(struct net_device *dev, int ret = 0; _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); - struct iw_point *pdata = &wrqu->data; + //struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); int jj,kk; - u8 peerMACStr[ ETH_ALEN * 2 ] = { 0x00 }; + //u8 peerMACStr[ ETH_ALEN * 2 ] = { 0x00 }; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; _list *plist, *phead; _queue *queue = &(pmlmepriv->scanned_queue); struct wlan_network *pnetwork = NULL; uint uintPeerChannel = 0; - u8 attr_content[50] = { 0x00 }, _status = 0; + u8 attr_content[50] = { 0x00 }; u8 *p2pie; uint p2pielen = 0, attr_contentlen = 0; _irqL irqL; @@ -5492,20 +5494,20 @@ static int rtw_p2p_set_persistent(struct net_device *dev, int ret = 0; _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); - struct iw_point *pdata = &wrqu->data; + //struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); - int jj,kk; - u8 peerMACStr[ ETH_ALEN * 2 ] = { 0x00 }; - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; - _list *plist, *phead; - _queue *queue = &(pmlmepriv->scanned_queue); - struct wlan_network *pnetwork = NULL; - uint uintPeerChannel = 0; - u8 attr_content[50] = { 0x00 }, _status = 0; - u8 *p2pie; - uint p2pielen = 0, attr_contentlen = 0; - _irqL irqL; - struct tx_invite_req_info* pinvite_req_info = &pwdinfo->invitereq_info; + //int jj,kk; + //u8 peerMACStr[ ETH_ALEN * 2 ] = { 0x00 }; + //struct mlme_priv *pmlmepriv = &padapter->mlmepriv; + //_list *plist, *phead; + //_queue *queue = &(pmlmepriv->scanned_queue); + //struct wlan_network *pnetwork = NULL; + //uint uintPeerChannel = 0; + //u8 attr_content[50] = { 0x00 }, _status = 0; + //u8 *p2pie; + //uint p2pielen = 0, attr_contentlen = 0; + //_irqL irqL; + //struct tx_invite_req_info* pinvite_req_info = &pwdinfo->invitereq_info; #ifdef CONFIG_CONCURRENT_MODE _adapter *pbuddy_adapter = padapter->pbuddy_adapter; struct mlme_priv *pbuddy_mlmepriv = &pbuddy_adapter->mlmepriv; @@ -5513,7 +5515,7 @@ static int rtw_p2p_set_persistent(struct net_device *dev, #endif // CONFIG_CONCURRENT_MODE #ifdef CONFIG_WFD - struct wifi_display_info* pwfd_info = pwdinfo->wfd_info; + //struct wifi_display_info* pwfd_info = pwdinfo->wfd_info; #endif // CONFIG_WFD // Commented by Albert 20120328 @@ -5545,7 +5547,7 @@ static int rtw_p2p_set_persistent(struct net_device *dev, } printk( "[%s] persistent_supported = %d\n", __FUNCTION__, pwdinfo->persistent_supported ); -exit: +//exit: return ret; @@ -5559,16 +5561,16 @@ static int rtw_p2p_set_pc(struct net_device *dev, int ret = 0; _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); - struct iw_point *pdata = &wrqu->data; + //struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); u8 peerMAC[ ETH_ALEN ] = { 0x00 }; int jj,kk; - u8 peerMACStr[ ETH_ALEN * 2 ] = { 0x00 }; + //u8 peerMACStr[ ETH_ALEN * 2 ] = { 0x00 }; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; _list *plist, *phead; _queue *queue = &(pmlmepriv->scanned_queue); struct wlan_network *pnetwork = NULL; - u8 attr_content[50] = { 0x00 }, _status = 0; + u8 attr_content[50] = { 0x00 }; u8 *p2pie; uint p2pielen = 0, attr_contentlen = 0; _irqL irqL; @@ -5683,7 +5685,7 @@ static int rtw_p2p_set_pc(struct net_device *dev, DBG_871X( "[%s] NOT Found in the Scanning Queue!\n", __FUNCTION__ ); } -exit: +//exit: return ret; @@ -5696,7 +5698,7 @@ static int rtw_p2p_set_wfd_device_type(struct net_device *dev, int ret = 0; _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); - struct iw_point *pdata = &wrqu->data; + //struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); struct wifi_display_info *pwfd_info = pwdinfo->wfd_info; @@ -5716,7 +5718,7 @@ static int rtw_p2p_set_wfd_device_type(struct net_device *dev, pwfd_info->wfd_device_type = WFD_DEVINFO_PSINK; } -exit: +//exit: return ret; @@ -5777,9 +5779,9 @@ static int rtw_p2p_set_sa(struct net_device *dev, int ret = 0; _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); - struct iw_point *pdata = &wrqu->data; + //struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); - struct wifi_display_info *pwfd_info = pwdinfo->wfd_info; + //struct wifi_display_info *pwfd_info = pwdinfo->wfd_info; DBG_871X( "[%s] data = %s\n", __FUNCTION__, extra ); @@ -5805,7 +5807,7 @@ static int rtw_p2p_set_sa(struct net_device *dev, } printk( "[%s] session available = %d\n", __FUNCTION__, pwdinfo->session_available ); -exit: +//exit: return ret; @@ -5821,13 +5823,13 @@ static int rtw_p2p_prov_disc(struct net_device *dev, struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); u8 peerMAC[ ETH_ALEN ] = { 0x00 }; int jj,kk; - u8 peerMACStr[ ETH_ALEN * 2 ] = { 0x00 }; + //u8 peerMACStr[ ETH_ALEN * 2 ] = { 0x00 }; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; _list *plist, *phead; _queue *queue = &(pmlmepriv->scanned_queue); struct wlan_network *pnetwork = NULL; uint uintPeerChannel = 0; - u8 attr_content[100] = { 0x00 }, _status = 0; + u8 attr_content[100] = { 0x00 }; u8 *p2pie; uint p2pielen = 0, attr_contentlen = 0; _irqL irqL; @@ -6148,11 +6150,11 @@ static int rtw_p2p_set(struct net_device *dev, int ret = 0; #ifdef CONFIG_P2P - _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); - struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); - struct iw_point *pdata = &wrqu->data; - struct wifidirect_info *pwdinfo= &(padapter->wdinfo); - struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; + //_adapter *padapter = (_adapter *)rtw_netdev_priv(dev); + //struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); + //struct iw_point *pdata = &wrqu->data; + //struct wifidirect_info *pwdinfo= &(padapter->wdinfo); + //struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; DBG_871X( "[%s] extra = %s\n", __FUNCTION__, extra ); @@ -6271,10 +6273,10 @@ static int rtw_p2p_get(struct net_device *dev, #ifdef CONFIG_P2P _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); - struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); - struct iw_point *pdata = &wrqu->data; - struct wifidirect_info *pwdinfo= &(padapter->wdinfo); - struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; + //struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); + //struct iw_point *pdata = &wrqu->data; + //struct wifidirect_info *pwdinfo= &(padapter->wdinfo); + //struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; if ( padapter->bShowGetP2PState ) { @@ -6356,7 +6358,7 @@ static int rtw_p2p_get2(struct net_device *dev, if (copy_from_user(buffer, wrqu->data.pointer, wrqu->data.length)) { - ret - EFAULT; + ret = -EFAULT; goto bad; } @@ -6618,7 +6620,9 @@ static int rtw_dbg_port(struct net_device *dev, struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +#ifdef CONFIG_DEBUG struct security_priv *psecuritypriv = &padapter->securitypriv; +#endif struct wlan_network *cur_network = &(pmlmepriv->cur_network); struct sta_priv *pstapriv = &padapter->stapriv; @@ -6959,8 +6963,10 @@ static int rtw_dbg_port(struct net_device *dev, break; case 0x08: { +#ifdef CONFIG_DEBUG struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct recv_priv *precvpriv = &padapter->recvpriv; +#endif DBG_871X("free_xmitbuf_cnt=%d, free_xmitframe_cnt=%d" ", free_xmit_extbuf_cnt=%d, free_xframe_ext_cnt=%d" @@ -7129,7 +7135,9 @@ static int rtw_dbg_port(struct net_device *dev, #endif case 0x14: //get wifi_spec { +#ifdef CONFIG_DEBUG struct registry_priv *pregpriv = &padapter->registrypriv; +#endif DBG_871X("get wifi_spec=%d\n",pregpriv->wifi_spec); } @@ -7297,7 +7305,7 @@ static int rtw_dbg_port(struct net_device *dev, static int wpa_set_param(struct net_device *dev, u8 name, u32 value) { uint ret=0; - u32 flags; + //u32 flags; _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); switch (name){ @@ -7886,7 +7894,7 @@ static int rtw_hostapd_sta_flush(struct net_device *dev) static int rtw_add_sta(struct net_device *dev, struct ieee_param *param) { - _irqL irqL; + //_irqL irqL; int ret=0; struct sta_info *psta = NULL; _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); @@ -7999,7 +8007,7 @@ static int rtw_del_sta(struct net_device *dev, struct ieee_param *param) psta = rtw_get_stainfo(pstapriv, param->sta_addr); if(psta) { - u8 updated; + u8 updated = 0; //DBG_871X("free psta=%p, aid=%d\n", psta, psta->aid); @@ -8178,7 +8186,7 @@ static int rtw_set_wps_beacon(struct net_device *dev, struct ieee_param *param, _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); - struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); + //struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); int ie_len; DBG_871X("%s, len=%d\n", __FUNCTION__, len); @@ -8564,7 +8572,7 @@ static int rtw_wx_set_priv(struct net_device *dev, int ret = 0; int len = 0; char *ext; - int i; + //int i; _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); struct iw_point *dwrq = (struct iw_point*)awrq; @@ -8771,7 +8779,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, struct iw_point *wrqu; u8 *PROMContent = pEEPROM->efuse_eeprom_data; - u8 ips_mode,lps_mode; + u8 ips_mode = 0, lps_mode = 0; struct pwrctrl_priv *pwrctrlpriv ; u8 *data = NULL; u8 *rawdata = NULL; @@ -9346,7 +9354,7 @@ static int rtw_mp_efuse_set(struct net_device *dev, PHAL_DATA_TYPE pHalData; PEFUSE_HAL pEfuseHal; - u8 ips_mode,lps_mode; + u8 ips_mode = 0, lps_mode = 0; u32 i, jj, kk; u8 *setdata = NULL; u8 *ShadowMapBT = NULL; @@ -10212,7 +10220,7 @@ static int rtw_mp_start(struct net_device *dev, struct iw_request_info *info, struct iw_point *wrqu, char *extra) { - u8 val8; + //u8 val8; PADAPTER padapter = rtw_netdev_priv(dev); if(padapter->registrypriv.mp_mode ==0) @@ -10848,7 +10856,7 @@ static int rtw_mp_reset_stats(struct net_device *dev, struct iw_point *wrqu, char *extra) { struct mp_priv *pmp_priv; - struct pkt_attrib *pattrib; + //struct pkt_attrib *pattrib; PADAPTER padapter = rtw_netdev_priv(dev); pmp_priv = &padapter->mppriv; @@ -10871,7 +10879,7 @@ static int rtw_mp_dump(struct net_device *dev, struct iw_point *wrqu, char *extra) { struct mp_priv *pmp_priv; - struct pkt_attrib *pattrib; + //struct pkt_attrib *pattrib; u32 value; u8 rf_type,path_nums = 0; u32 i,j=1,path; @@ -10899,7 +10907,7 @@ static int rtw_mp_dump(struct net_device *dev, if((j++)%4 == 0) DBG_871X("\n"); } - i,j=1; + j=1; rtw_hal_get_hwreg(padapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type)); DBG_871X("\n======= RF REG =======\n"); @@ -11015,7 +11023,7 @@ static int rtw_mp_QueryDrv(struct net_device *dev, } /* update Tx AGC offset */ -static int rtw_mp_antBdiff(struct net_device *dev, +static inline int rtw_mp_antBdiff(struct net_device *dev, struct iw_request_info *info, struct iw_point *wrqu, char *extra) { @@ -11382,7 +11390,7 @@ return 0; #endif //#if defined(CONFIG_MP_INCLUDED) && defined(CONFIG_MP_IWPRIV_SUPPORT) -static int rtw_wfd_tdls_enable(struct net_device *dev, +static inline int rtw_wfd_tdls_enable(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { @@ -11410,7 +11418,7 @@ static int rtw_wfd_tdls_enable(struct net_device *dev, return ret; } -static int rtw_tdls_weaksec(struct net_device *dev, +static inline int rtw_tdls_weaksec(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { @@ -11437,7 +11445,7 @@ static int rtw_tdls_weaksec(struct net_device *dev, } -static int rtw_tdls_enable(struct net_device *dev, +static inline int rtw_tdls_enable(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { @@ -11506,7 +11514,7 @@ static int rtw_tdls_enable(struct net_device *dev, return ret; } -static int rtw_tdls_setup(struct net_device *dev, +static inline int rtw_tdls_setup(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { @@ -11552,7 +11560,7 @@ static int rtw_tdls_setup(struct net_device *dev, return ret; } -static int rtw_tdls_teardown(struct net_device *dev, +static inline int rtw_tdls_teardown(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { @@ -11584,7 +11592,7 @@ static int rtw_tdls_teardown(struct net_device *dev, return ret; } -static int rtw_tdls_discovery(struct net_device *dev, +static inline int rtw_tdls_discovery(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { @@ -11605,7 +11613,7 @@ static int rtw_tdls_discovery(struct net_device *dev, return ret; } -static int rtw_tdls_ch_switch(struct net_device *dev, +static inline int rtw_tdls_ch_switch(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { @@ -11636,7 +11644,7 @@ static int rtw_tdls_ch_switch(struct net_device *dev, return ret; } -static int rtw_tdls_pson(struct net_device *dev, +static inline int rtw_tdls_pson(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { @@ -11665,7 +11673,7 @@ static int rtw_tdls_pson(struct net_device *dev, return ret; } -static int rtw_tdls_psoff(struct net_device *dev, +static inline int rtw_tdls_psoff(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { @@ -11694,7 +11702,7 @@ static int rtw_tdls_psoff(struct net_device *dev, return ret; } -static int rtw_tdls_setip(struct net_device *dev, +static inline int rtw_tdls_setip(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { @@ -11870,7 +11878,7 @@ static int rtw_wfd_tdls_status(struct net_device *dev, } -static int rtw_tdls_ch_switch_off(struct net_device *dev, +static inline int rtw_tdls_ch_switch_off(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { @@ -12631,7 +12639,7 @@ static int rtw_test( u8 *pbuf, *pch; char *ptmp; u8 *delim = ","; - PADAPTER padapter = rtw_netdev_priv(dev); + //PADAPTER padapter = rtw_netdev_priv(dev); DBG_871X("+%s\n", __func__); diff --git a/os_dep/linux/os_intfs.c b/os_dep/linux/os_intfs.c index 37d6511..a05181b 100644 --- a/os_dep/linux/os_intfs.c +++ b/os_dep/linux/os_intfs.c @@ -1719,7 +1719,7 @@ static const struct net_device_ops rtw_netdev_ops = { int rtw_init_netdev_name(struct net_device *pnetdev, const char *ifname) { - _adapter *padapter = rtw_netdev_priv(pnetdev); + //_adapter *padapter = rtw_netdev_priv(pnetdev); #ifdef CONFIG_EASY_REPLACEMENT struct net_device *TargetNetdev = NULL; @@ -2227,7 +2227,7 @@ void rtw_cancel_all_timer(_adapter *padapter) u8 rtw_free_drv_sw(_adapter *padapter) { - struct net_device *pnetdev = (struct net_device*)padapter->pnetdev; + //struct net_device *pnetdev = (struct net_device*)padapter->pnetdev; RT_TRACE(_module_os_intfs_c_,_drv_info_,("==>rtw_free_drv_sw")); @@ -3292,7 +3292,9 @@ netdev_open_error: int rtw_ips_pwr_up(_adapter *padapter) { int result; +#ifdef CONFIG_DEBUG u32 start_time = rtw_get_current_time(); +#endif DBG_871X("===> rtw_ips_pwr_up..............\n"); rtw_reset_drv_sw(padapter); @@ -3307,7 +3309,9 @@ int rtw_ips_pwr_up(_adapter *padapter) void rtw_ips_pwr_down(_adapter *padapter) { +#ifdef CONFIG_DEBUG u32 start_time = rtw_get_current_time(); +#endif DBG_871X("===> rtw_ips_pwr_down...................\n"); padapter->bCardDisableWOHSM = _TRUE; @@ -3320,8 +3324,8 @@ void rtw_ips_pwr_down(_adapter *padapter) #endif void rtw_ips_dev_unload(_adapter *padapter) { - struct net_device *pnetdev= (struct net_device*)padapter->pnetdev; - struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); + //struct net_device *pnetdev= (struct net_device*)padapter->pnetdev; + //struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); DBG_871X("====> %s...\n",__FUNCTION__); rtw_hal_set_hwreg(padapter, HW_VAR_FIFO_CLEARN_UP, 0); diff --git a/os_dep/linux/recv_linux.c b/os_dep/linux/recv_linux.c index 387da00..cf7dc0c 100644 --- a/os_dep/linux/recv_linux.c +++ b/os_dep/linux/recv_linux.c @@ -164,8 +164,8 @@ int rtw_os_recvbuf_resource_alloc(_adapter *padapter, struct recv_buf *precvbuf) int res=_SUCCESS; #ifdef CONFIG_USB_HCI - struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter); - struct usb_device *pusbd = pdvobjpriv->pusbdev; + //struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter); + //struct usb_device *pusbd = pdvobjpriv->pusbdev; precvbuf->irp_pending = _FALSE; precvbuf->purb = usb_alloc_urb(0, GFP_KERNEL); @@ -394,7 +394,7 @@ void rtw_os_recv_indicate_pkt(_adapter *padapter, _pkt *pkt, struct rx_pkt_attri void rtw_handle_tkip_mic_err(_adapter *padapter,u8 bgroup) { #ifdef CONFIG_IOCTL_CFG80211 - enum nl80211_key_type key_type; + enum nl80211_key_type key_type = 0; #endif union iwreq_data wrqu; struct iw_michaelmicfailure ev; @@ -549,7 +549,7 @@ int rtw_recv_indicatepkt(_adapter *padapter, union recv_frame *precv_frame) struct recv_priv *precvpriv; _queue *pfree_recv_queue; _pkt *skb; - struct mlme_priv*pmlmepriv = &padapter->mlmepriv; + //struct mlme_priv*pmlmepriv = &padapter->mlmepriv; struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib; _func_enter_; @@ -613,7 +613,7 @@ _func_enter_; rtw_os_recv_indicate_pkt(padapter, skb, pattrib); -_recv_indicatepkt_end: +//_recv_indicatepkt_end: precv_frame->u.hdr.pkt = NULL; // pointers to NULL before rtw_free_recvframe() diff --git a/os_dep/linux/rtw_android.c b/os_dep/linux/rtw_android.c index e972a7f..12026ca 100644 --- a/os_dep/linux/rtw_android.c +++ b/os_dep/linux/rtw_android.c @@ -252,8 +252,8 @@ int rtw_android_get_rssi(struct net_device *net, char *command, int total_len) int rtw_android_get_link_speed(struct net_device *net, char *command, int total_len) { _adapter *padapter = (_adapter *)rtw_netdev_priv(net); - struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); - struct wlan_network *pcur_network = &pmlmepriv->cur_network; + //struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); + //struct wlan_network *pcur_network = &pmlmepriv->cur_network; int bytes_written = 0; u16 link_speed = 0; @@ -265,7 +265,7 @@ int rtw_android_get_link_speed(struct net_device *net, char *command, int total_ int rtw_android_get_macaddr(struct net_device *net, char *command, int total_len) { - _adapter *adapter = (_adapter *)rtw_netdev_priv(net); + //_adapter *adapter = (_adapter *)rtw_netdev_priv(net); int bytes_written = 0; bytes_written = snprintf(command, total_len, "Macaddr = "MAC_FMT, MAC_ARG(net->dev_addr)); @@ -285,7 +285,7 @@ int rtw_android_set_country(struct net_device *net, char *command, int total_len int rtw_android_get_p2p_dev_addr(struct net_device *net, char *command, int total_len) { - int ret; + //int ret; int bytes_written = 0; //We use the same address as our HW MAC address @@ -297,7 +297,7 @@ int rtw_android_get_p2p_dev_addr(struct net_device *net, char *command, int tota int rtw_android_set_block(struct net_device *net, char *command, int total_len) { - int ret; + //int ret; _adapter *adapter = (_adapter *)rtw_netdev_priv(net); char *block_value = command + strlen(android_wifi_cmd_str[ANDROID_WIFI_CMD_BLOCK]) + 1; diff --git a/os_dep/linux/usb_intf.c b/os_dep/linux/usb_intf.c index 0a86145..bd17209 100644 --- a/os_dep/linux/usb_intf.c +++ b/os_dep/linux/usb_intf.c @@ -431,7 +431,7 @@ static u8 rtw_deinit_intf_priv(struct dvobj_priv *dvobj) static struct dvobj_priv *usb_dvobj_init(struct usb_interface *usb_intf) { int i; - u8 val8; + //u8 val8; int status = _FAIL; struct dvobj_priv *pdvobjpriv; struct usb_device_descriptor *pdev_desc; @@ -802,8 +802,8 @@ static void usb_intf_stop(_adapter *padapter) static void rtw_dev_unload(_adapter *padapter) { - struct net_device *pnetdev= (struct net_device*)padapter->pnetdev; - u8 val8; + //struct net_device *pnetdev= (struct net_device*)padapter->pnetdev; + //u8 val8; RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+rtw_dev_unload\n")); if(padapter->bup == _TRUE) @@ -1032,13 +1032,15 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message) struct net_device *pnetdev = padapter->pnetdev; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; - struct usb_device *usb_dev = interface_to_usbdev(pusb_intf); + //struct usb_device *usb_dev = interface_to_usbdev(pusb_intf); #ifdef CONFIG_WOWLAN struct wowlan_ioctl_param poidparam; #endif // CONFIG_WOWLAN int ret = 0; +#ifdef CONFIG_DEBUG u32 start_time = rtw_get_current_time(); +#endif _func_enter_; @@ -1147,7 +1149,7 @@ static int rtw_resume(struct usb_interface *pusb_intf) { struct dvobj_priv *dvobj = usb_get_intfdata(pusb_intf); _adapter *padapter = dvobj->if1; - struct net_device *pnetdev = padapter->pnetdev; + //struct net_device *pnetdev = padapter->pnetdev; struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; int ret = 0; @@ -1176,10 +1178,13 @@ static int rtw_resume(struct usb_interface *pusb_intf) int rtw_resume_process(_adapter *padapter) { + //FIXME pwrpriv struct net_device *pnetdev; - struct pwrctrl_priv *pwrpriv; + struct pwrctrl_priv *pwrpriv = NULL; int ret = -1; +#ifdef CONFIG_DEBUG u32 start_time = rtw_get_current_time(); +#endif #ifdef CONFIG_BT_COEXIST u8 pm_cnt; #endif //#ifdef CONFIG_BT_COEXIST @@ -1588,7 +1593,7 @@ _adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj, free_hal_data: if(status != _SUCCESS && padapter->HalData) rtw_mfree(padapter->HalData, sizeof(*(padapter->HalData))); -free_wdev: +//free_wdev: if(status != _SUCCESS) { #ifdef CONFIG_IOCTL_CFG80211 rtw_wdev_unregister(padapter->rtw_wdev); @@ -1678,16 +1683,18 @@ static void rtw_usb_if1_deinit(_adapter *if1) } -static void dump_usb_interface(struct usb_interface *usb_intf) +static inline void dump_usb_interface(struct usb_interface *usb_intf) { int i; - u8 val8; + //u8 val8; struct usb_device *udev = interface_to_usbdev(usb_intf); +#ifdef CONFIG_DEBUG struct usb_device_descriptor *dev_desc = &udev->descriptor; struct usb_host_config *act_conf = udev->actconfig; struct usb_config_descriptor *act_conf_desc = &act_conf->desc; +#endif struct usb_host_interface *host_iface; struct usb_interface_descriptor *iface_desc; @@ -1799,7 +1806,7 @@ static void dump_usb_interface(struct usb_interface *usb_intf) static int rtw_drv_init(struct usb_interface *pusb_intf, const struct usb_device_id *pdid) { _adapter *if1 = NULL, *if2 = NULL; - int status; + int status = _FAIL; struct dvobj_priv *dvobj; #ifdef CONFIG_MULTI_VIR_IFACES int i; @@ -1878,7 +1885,9 @@ free_if2: rtw_drv_if2_free(if2); #endif } +#ifdef CONFIG_CONCURRENT_MODE free_if1: +#endif if (status != _SUCCESS && if1) { rtw_usb_if1_deinit(if1); } @@ -1897,8 +1906,8 @@ static void rtw_dev_remove(struct usb_interface *pusb_intf) { struct dvobj_priv *dvobj = usb_get_intfdata(pusb_intf); _adapter *padapter = dvobj->if1; - struct net_device *pnetdev = padapter->pnetdev; - struct mlme_priv *pmlmepriv= &padapter->mlmepriv; + //struct net_device *pnetdev = padapter->pnetdev; + //struct mlme_priv *pmlmepriv= &padapter->mlmepriv; _func_enter_; @@ -2005,7 +2014,7 @@ static int __init rtw_drv_entry(void) RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+rtw_drv_entry\n")); DBG_871X(DRV_NAME " driver version=%s\n", DRIVERVERSION); - DBG_871X("build time: %s %s\n", __DATE__, __TIME__); + //DBG_871X("build time: %s %s\n", __DATE__, __TIME__); #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)) //console_suspend_enabled=0; diff --git a/os_dep/linux/usb_ops_linux.c b/os_dep/linux/usb_ops_linux.c index 4d0e72e..d510860 100644 --- a/os_dep/linux/usb_ops_linux.c +++ b/os_dep/linux/usb_ops_linux.c @@ -30,7 +30,7 @@ int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u16 inde unsigned int pipe; int status = 0; - u32 tmp_buflen=0; + //u32 tmp_buflen=0; u8 reqtype; u8 *pIo_buf; int vendorreq_times = 0; @@ -38,7 +38,7 @@ int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u16 inde #ifdef CONFIG_USB_VENDOR_REQ_BUFFER_DYNAMIC_ALLOCATE u8 *tmp_buf; #else // use stack memory - u8 tmp_buf[MAX_USB_IO_CTL_SIZE]; + //u8 tmp_buf[MAX_USB_IO_CTL_SIZE]; #endif #ifdef CONFIG_CONCURRENT_MODE @@ -359,7 +359,7 @@ static void usb_bulkout_zero_complete(struct urb *purb, struct pt_regs *regs) } -static u32 usb_bulkout_zero(struct intf_hdl *pintfhdl, u32 addr) +static inline u32 usb_bulkout_zero(struct intf_hdl *pintfhdl, u32 addr) { int pipe, status, len; u32 ret; @@ -456,7 +456,7 @@ void usb_read_port_cancel(struct intf_hdl *pintfhdl) static void usb_write_port_complete(struct urb *purb, struct pt_regs *regs) { _irqL irqL; - int i; + //int i; struct xmit_buf *pxmitbuf = (struct xmit_buf *)purb->context; //struct xmit_frame *pxmitframe = (struct xmit_frame *)pxmitbuf->priv_data; //_adapter *padapter = pxmitframe->padapter; @@ -611,7 +611,7 @@ u32 usb_write_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem) _irqL irqL; unsigned int pipe; int status; - u32 ret = _FAIL, bwritezero = _FALSE; + u32 ret = _FAIL; PURB purb = NULL; _adapter *padapter = (_adapter *)pintfhdl->padapter; struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter); @@ -619,7 +619,7 @@ u32 usb_write_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem) struct xmit_buf *pxmitbuf = (struct xmit_buf *)wmem; struct xmit_frame *pxmitframe = (struct xmit_frame *)pxmitbuf->priv_data; struct usb_device *pusbd = pdvobj->pusbdev; - struct pkt_attrib *pattrib = &pxmitframe->attrib; + //struct pkt_attrib *pattrib = &pxmitframe->attrib; _func_enter_; diff --git a/os_dep/linux/xmit_linux.c b/os_dep/linux/xmit_linux.c index a90b48b..00e3b07 100644 --- a/os_dep/linux/xmit_linux.c +++ b/os_dep/linux/xmit_linux.c @@ -230,7 +230,7 @@ void rtw_os_xmit_complete(_adapter *padapter, struct xmit_frame *pxframe) void rtw_os_xmit_schedule(_adapter *padapter) { - _adapter *pri_adapter = padapter; + //_adapter *pri_adapter = padapter; #if defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI) if(!padapter) @@ -374,7 +374,7 @@ int rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev) #endif // CONFIG_TX_MCAST2UNI s32 res = 0; #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,35)) - u16 queue; + //u16 queue; #endif _func_enter_;