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

rtl8188eu: Remove dead code associated with CONFIG_INTEL_XXX

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-12 20:51:15 -05:00
parent 4c57c6047a
commit 6583d55cd1
16 changed files with 29 additions and 405 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Makefile
View file

@ -26,7 +26,6 @@ CONFIG_USB_AUTOSUSPEND = n
CONFIG_HW_PWRP_DETECTION = n
CONFIG_WIFI_TEST = n
CONFIG_BT_COEXIST = n
CONFIG_INTEL_WIDI = n
CONFIG_EFUSE_CONFIG_FILE = n
CONFIG_EXT_CLK = n
CONFIG_FTP_PROTECT = n
@ -128,10 +127,6 @@ ifeq ($(CONFIG_BT_COEXIST), y)
EXTRA_CFLAGS += -DCONFIG_BT_COEXIST
endif
ifeq ($(CONFIG_INTEL_WIDI), y)
EXTRA_CFLAGS += -DCONFIG_INTEL_WIDI
endif
ifeq ($(CONFIG_EFUSE_CONFIG_FILE), y)
EXTRA_CFLAGS += -DCONFIG_EFUSE_CONFIG_FILE
endif
@ -191,8 +186,6 @@ rtk_core := \
8188eu-y += $(rtk_core)
8188eu-$(CONFIG_INTEL_WIDI) += core/rtw_intel_widi.o
8188eu-y += $(_HAL_INTFS_FILES)
8188eu-y += $(_OS_INTFS_FILES)

6
core/rtw_cmd.c
View file

@ -2570,12 +2570,6 @@ u8 rtw_drvextra_cmd_hdl(_adapter *padapter, unsigned char *pbuf)
rtw_chk_hi_queue_hdl(padapter);
break;
#endif /* CONFIG_AP_MODE */
#ifdef CONFIG_INTEL_WIDI
case INTEl_WIDI_WK_CID:
intel_widi_wk_hdl(padapter, pdrvextra_cmd->type_size, pdrvextra_cmd->pbuf);
break;
#endif /* CONFIG_INTEL_WIDI */
case C2H_WK_CID:
c2h_evt_hdl(padapter, (struct c2h_evt_hdr *)pdrvextra_cmd->pbuf, NULL);
break;

80
core/rtw_mlme_ext.c
View file

@ -4083,16 +4083,9 @@ void issue_probersp_p2p(_adapter *padapter, unsigned char *da)
struct ieee80211_channel *ieee_ch = &pcfg80211_wdinfo->remain_on_ch_channel;
u8 listen_channel = (u8) ieee80211_frequency_to_channel(ieee_ch->center_freq);
#endif /* CONFIG_IOCTL_CFG80211 */
#ifdef CONFIG_INTEL_WIDI
u8 zero_array_check[L2SDTA_SERVICE_VE_LEN] = { 0x00 };
#endif /* CONFIG_INTEL_WIDI */
/* DBG_88E("%s\n", __func__); */
if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL)
{
return;
}
/* update attribute */
pattrib = &pmgntframe->attrib;
@ -4201,37 +4194,6 @@ void issue_probersp_p2p(_adapter *padapter, unsigned char *da)
/* Value: */
wpsie[wpsielen++] = WPS_VERSION_1; /* Version 1.0 */
#ifdef CONFIG_INTEL_WIDI
/* Commented by Kurt */
/* Appended WiDi info. only if we did issued_probereq_widi(), and then we saved ven. ext. in pmlmepriv->sa_ext. */
if ( _rtw_memcmp(pmlmepriv->sa_ext, zero_array_check, L2SDTA_SERVICE_VE_LEN) == false )
{
/* Sec dev type */
*(__be16 *) ( wpsie + wpsielen ) = cpu_to_be16( WPS_ATTR_SEC_DEV_TYPE_LIST );
wpsielen += 2;
/* Length: */
*(__be16 *) ( wpsie + wpsielen ) = cpu_to_be16( 0x0008 );
wpsielen += 2;
/* Value: */
/* Category ID */
*(__be16 *) ( wpsie + wpsielen ) = cpu_to_be16( WPS_PDT_CID_DISPLAYS );
wpsielen += 2;
/* OUI */
*(__be32 *) ( wpsie + wpsielen ) = cpu_to_be32( INTEL_DEV_TYPE_OUI );
wpsielen += 4;
*(_be16 *) ( wpsie + wpsielen ) = cpu_to_be16( WPS_PDT_SCID_WIDI_CONSUMER_SINK );
wpsielen += 2;
/* Vendor Extension */
_rtw_memcpy( wpsie + wpsielen, pmlmepriv->sa_ext, L2SDTA_SERVICE_VE_LEN );
wpsielen += L2SDTA_SERVICE_VE_LEN;
}
#endif /* CONFIG_INTEL_WIDI */
/* WiFi Simple Config State */
/* Type: */
*(__be16 *) ( wpsie + wpsielen ) = cpu_to_be16( WPS_ATTR_SIMPLE_CONF_STATE );
@ -4912,13 +4874,6 @@ static unsigned int on_action_public_p2p(union recv_frame *precv_frame)
result = process_p2p_group_negotation_req( pwdinfo, frame_body, len );
issue_p2p_GO_response( padapter, GetAddr2Ptr(pframe), frame_body, len, result );
#ifdef CONFIG_INTEL_WIDI
if ( (padapter->mlmepriv.widi_state == INTEL_WIDI_STATE_LISTEN) && (padapter->mlmepriv.widi_state != INTEL_WIDI_STATE_WFD_CONNECTION) )
{
padapter->mlmepriv.widi_state = INTEL_WIDI_STATE_WFD_CONNECTION;
intel_widi_wk_cmd(padapter, INTEL_WIDI_LISTEN_STOP_WK, NULL);
}
#endif /* CONFIG_INTEL_WIDI */
/* Commented by Albert 20110718 */
/* No matter negotiating or negotiation failure, the driver should set up the restore P2P state timer. */
@ -5066,11 +5021,6 @@ static unsigned int on_action_public_p2p(union recv_frame *precv_frame)
else
{
rtw_p2p_set_state(pwdinfo, P2P_STATE_RECV_INVITE_REQ_DISMATCH );
#ifdef CONFIG_INTEL_WIDI
_rtw_memcpy( pwdinfo->p2p_peer_device_addr, group_id.go_device_addr , ETH_ALEN );
rtw_p2p_set_role( pwdinfo, P2P_ROLE_CLIENT );
#endif /* CONFIG_INTEL_WIDI */
status_code = P2P_STATUS_FAIL_UNKNOWN_P2PGROUP;
}
}
@ -5127,13 +5077,6 @@ static unsigned int on_action_public_p2p(union recv_frame *precv_frame)
pwdinfo->inviteresp_info.token = frame_body[ 7 ];
issue_p2p_invitation_response( padapter, GetAddr2Ptr(pframe), pwdinfo->inviteresp_info.token, status_code );
}
#ifdef CONFIG_INTEL_WIDI
if ( (padapter->mlmepriv.widi_state == INTEL_WIDI_STATE_LISTEN) && (padapter->mlmepriv.widi_state != INTEL_WIDI_STATE_WFD_CONNECTION) )
{
padapter->mlmepriv.widi_state = INTEL_WIDI_STATE_WFD_CONNECTION;
intel_widi_wk_cmd(padapter, INTEL_WIDI_LISTEN_STOP_WK, NULL);
}
#endif /* CONFIG_INTEL_WIDI */
break;
}
case P2P_INVIT_RESP:
@ -5212,13 +5155,6 @@ static unsigned int on_action_public_p2p(union recv_frame *precv_frame)
rtw_p2p_set_state(pwdinfo, P2P_STATE_RX_PROVISION_DIS_REQ);
_set_timer( &pwdinfo->restore_p2p_state_timer, P2P_PROVISION_TIMEOUT );
#ifdef CONFIG_INTEL_WIDI
if ( (padapter->mlmepriv.widi_state == INTEL_WIDI_STATE_LISTEN) && (padapter->mlmepriv.widi_state != INTEL_WIDI_STATE_WFD_CONNECTION) )
{
padapter->mlmepriv.widi_state = INTEL_WIDI_STATE_WFD_CONNECTION;
intel_widi_wk_cmd(padapter, INTEL_WIDI_LISTEN_STOP_WK, NULL);
}
#endif /* CONFIG_INTEL_WIDI */
break;
case P2P_PROVISION_DISC_RESP:
@ -8300,14 +8236,6 @@ u8 collect_bss_info(_adapter *padapter, union recv_frame *precv_frame, WLAN_BSSI
}
#ifdef CONFIG_INTEL_WIDI
/* process_intel_widi_query_or_tigger(padapter, bssid); */
if (process_intel_widi_query_or_tigger(padapter, bssid))
{
return _FAIL;
}
#endif /* CONFIG_INTEL_WIDI */
#if defined(DBG_RX_SIGNAL_DISPLAY_PROCESSING) & 1
if (strcmp(bssid->Ssid.Ssid, DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) == 0) {
DBG_88E("Receiving %s(%pM, DSConfig:%u) from ch%u with ss:%3u, sq:%3u, RawRSSI:%3ld\n"
@ -8511,9 +8439,6 @@ unsigned int receive_disconnect(_adapter *padapter, unsigned char *MacAddr, unsi
{
pmlmeinfo->state = WIFI_FW_NULL_STATE;
report_del_sta_event(padapter, MacAddr, reason);
#ifdef CONFIG_INTEL_WIDI
process_intel_widi_disconnect(padapter, 1);
#endif /* CONFIG_INTEL_WIDI */
}
else if (pmlmeinfo->state & WIFI_FW_LINKING_STATE)
{
@ -9414,11 +9339,6 @@ void linked_status_chk(_adapter *padapter)
rx_chk_limit = 8;
#endif
#ifdef CONFIG_INTEL_WIDI
if (padapter->mlmepriv.widi_state != INTEL_WIDI_STATE_NONE)
rx_chk_limit = 1;
#endif
if ((psta = rtw_get_stainfo(pstapriv, pmlmeinfo->network.MacAddress)) != NULL)
{
bool is_p2p_enable = false;

26
core/rtw_p2p.c
View file

@ -1866,9 +1866,6 @@ u32 build_probe_resp_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
{
u8 p2pie[ MAX_P2P_IE_LEN] = { 0x00 };
u32 len=0, p2pielen = 0;
#ifdef CONFIG_INTEL_WIDI
u8 zero_array_check[L2SDTA_SERVICE_VE_LEN] = { 0x00 };
#endif /* CONFIG_INTEL_WIDI */
/* P2P OUI */
p2pielen = 0;
@ -1955,13 +1952,6 @@ u32 build_probe_resp_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
/* 21 -> P2P Device Address (6bytes) + Config Methods (2bytes) + Primary Device Type (8bytes) */
/* + NumofSecondDevType (1byte) + WPS Device Name ID field (2bytes) + WPS Device Name Len field (2bytes) */
/* u16*) ( p2pie + p2pielen ) = cpu_to_le16( 21 + pwdinfo->device_name_len ); */
#ifdef CONFIG_INTEL_WIDI
if ( _rtw_memcmp( pwdinfo->padapter->mlmepriv.sa_ext, zero_array_check, L2SDTA_SERVICE_VE_LEN ) == false )
{
RTW_PUT_LE16(p2pie + p2pielen, 21 + 8 + pwdinfo->device_name_len);
}
else
#endif /* CONFIG_INTEL_WIDI */
RTW_PUT_LE16(p2pie + p2pielen, 21 + pwdinfo->device_name_len);
p2pielen += 2;
@ -1993,22 +1983,6 @@ u32 build_probe_resp_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pbuf)
p2pielen += 2;
/* Number of Secondary Device Types */
#ifdef CONFIG_INTEL_WIDI
if ( _rtw_memcmp( pwdinfo->padapter->mlmepriv.sa_ext, zero_array_check, L2SDTA_SERVICE_VE_LEN ) == false )
{
p2pie[ p2pielen++ ] = 0x01;
RTW_PUT_BE16(p2pie + p2pielen, WPS_PDT_CID_DISPLAYS);
p2pielen += 2;
RTW_PUT_BE32(p2pie + p2pielen, INTEL_DEV_TYPE_OUI);
p2pielen += 4;
RTW_PUT_BE16(p2pie + p2pielen, P2P_SCID_WIDI_CONSUMER_SINK);
p2pielen += 2;
}
else
#endif /* CONFIG_INTEL_WIDI */
p2pie[ p2pielen++ ] = 0x00; /* No Secondary Device Type List */
/* Device Name */

52
core/rtw_recv.c
View file

@ -1455,63 +1455,11 @@ sint validate_recv_mgnt_frame(PADAPTER padapter, union recv_frame *precv_frame)
}
}
#ifdef CONFIG_INTEL_PROXIM
if (padapter->proximity.proxim_on==true)
{
struct rx_pkt_attrib * pattrib=&precv_frame->u.hdr.attrib;
struct recv_stat* prxstat=( struct recv_stat * ) precv_frame->u.hdr.rx_head ;
u8 * pda,*psa,*pbssid,*ptr;
ptr=precv_frame->u.hdr.rx_data;
pda = get_da(ptr);
psa = get_sa(ptr);
pbssid = get_hdr_bssid(ptr);
_rtw_memcpy(pattrib->dst, pda, ETH_ALEN);
_rtw_memcpy(pattrib->src, psa, ETH_ALEN);
_rtw_memcpy(pattrib->bssid, pbssid, ETH_ALEN);
switch (pattrib->to_fr_ds)
{
case 0:
_rtw_memcpy(pattrib->ra, pda, ETH_ALEN);
_rtw_memcpy(pattrib->ta, psa, ETH_ALEN);
break;
case 1:
_rtw_memcpy(pattrib->ra, pda, ETH_ALEN);
_rtw_memcpy(pattrib->ta, pbssid, ETH_ALEN);
break;
case 2:
_rtw_memcpy(pattrib->ra, pbssid, ETH_ALEN);
_rtw_memcpy(pattrib->ta, psa, ETH_ALEN);
break;
case 3:
_rtw_memcpy(pattrib->ra, GetAddr1Ptr(ptr), ETH_ALEN);
_rtw_memcpy(pattrib->ta, GetAddr2Ptr(ptr), ETH_ALEN);
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" case 3\n"));
break;
default:
break;
}
pattrib->priority=0;
pattrib->hdrlen = pattrib->to_fr_ds==3 ? 30 : 24;
padapter->proximity.proxim_rx(padapter,precv_frame);
}
#endif
mgt_dispatcher(padapter, precv_frame);
return _SUCCESS;
}
sint validate_recv_data_frame(_adapter *adapter, union recv_frame *precv_frame);
sint validate_recv_data_frame(_adapter *adapter, union recv_frame *precv_frame)
{
u8 bretry;

5
core/rtw_wlan_util.c
View file

@ -1718,11 +1718,6 @@ void update_tx_basic_rate(_adapter *padapter, u8 wirelessmode)
if (!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
return;
#endif /* CONFIG_P2P */
#ifdef CONFIG_INTEL_WIDI
if (padapter->mlmepriv.widi_state != INTEL_WIDI_STATE_NONE)
return;
#endif /* CONFIG_INTEL_WIDI */
_rtw_memset(supported_rates, 0, NDIS_802_11_LENGTH_RATES_EX);
if ((wirelessmode & WIRELESS_11B) && (wirelessmode == WIRELESS_11B)) {

106
hal/odm.c
View file

@ -3048,13 +3048,7 @@ odm_DynamicTxPowerInit(
#if (RTL8192C_SUPPORT==1)
#ifdef CONFIG_INTEL_PROXIM
if ((pHalData->BoardType == BOARD_USB_High_PA)||(Adapter->proximity.proxim_support==true))
#else
if (pHalData->BoardType == BOARD_USB_High_PA)
#endif
{
if (pHalData->BoardType == BOARD_USB_High_PA) {
odm_DynamicTxPowerSavePowerIndex(pDM_Odm);
pdmpriv->bDynamicTxPowerEnable = true;
}
@ -3342,81 +3336,35 @@ odm_DynamicTxPower_92C(
if (!pdmpriv->bDynamicTxPowerEnable)
return;
#ifdef CONFIG_INTEL_PROXIM
if (Adapter->proximity.proxim_on== true){
struct proximity_priv *prox_priv=Adapter->proximity.proximity_priv;
/* Intel set fixed tx power */
printk("\n %s Adapter->proximity.proxim_on=%d prox_priv->proxim_modeinfo->power_output=%d\n",__func__,Adapter->proximity.proxim_on,prox_priv->proxim_modeinfo->power_output);
if (prox_priv!=NULL){
if (prox_priv->proxim_modeinfo->power_output> 0) {
switch (prox_priv->proxim_modeinfo->power_output) {
case 1:
pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_100;
printk("TxHighPwrLevel_100\n");
break;
case 2:
pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_70;
printk("TxHighPwrLevel_70\n");
break;
case 3:
pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_50;
printk("TxHighPwrLevel_50\n");
break;
case 4:
pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_35;
printk("TxHighPwrLevel_35\n");
break;
case 5:
pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_15;
printk("TxHighPwrLevel_15\n");
break;
default:
pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_100;
printk("TxHighPwrLevel_100\n");
break;
}
}
}
} else
#endif
{
/* STA not connected and AP not connected */
if ((check_fwstate(pmlmepriv, _FW_LINKED) != true) &&
(pdmpriv->EntryMinUndecoratedSmoothedPWDB == 0)) {
pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_Normal;
/* STA not connected and AP not connected */
if ((check_fwstate(pmlmepriv, _FW_LINKED) != true) &&
(pdmpriv->EntryMinUndecoratedSmoothedPWDB == 0)) {
pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_Normal;
/* the LastDTPlvl should reset when disconnect, */
/* otherwise the tx power level wouldn't change when disconnect and connect again. */
/* Maddest 20091220. */
pdmpriv->LastDTPLvl=TxHighPwrLevel_Normal;
return;
}
if (check_fwstate(pmlmepriv, _FW_LINKED) == true) /* Default port */
{
UndecoratedSmoothedPWDB = pdmpriv->EntryMinUndecoratedSmoothedPWDB;
}
else /* associated entry pwdb */
{
UndecoratedSmoothedPWDB = pdmpriv->EntryMinUndecoratedSmoothedPWDB;
}
if (UndecoratedSmoothedPWDB >= TX_POWER_NEAR_FIELD_THRESH_LVL2)
{
pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_Level2;
}
else if ((UndecoratedSmoothedPWDB < (TX_POWER_NEAR_FIELD_THRESH_LVL2-3)) &&
(UndecoratedSmoothedPWDB >= TX_POWER_NEAR_FIELD_THRESH_LVL1) )
{
pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_Level1;
}
else if (UndecoratedSmoothedPWDB < (TX_POWER_NEAR_FIELD_THRESH_LVL1-5))
{
pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_Normal;
}
/* the LastDTPlvl should reset when disconnect, */
/* otherwise the tx power level wouldn't change when disconnect and connect again. */
/* Maddest 20091220. */
pdmpriv->LastDTPLvl=TxHighPwrLevel_Normal;
return;
}
if ( (pdmpriv->DynamicTxHighPowerLvl != pdmpriv->LastDTPLvl) )
if (check_fwstate(pmlmepriv, _FW_LINKED) == true) /* Default port */
{
UndecoratedSmoothedPWDB = pdmpriv->EntryMinUndecoratedSmoothedPWDB;
}
else /* associated entry pwdb */
{
UndecoratedSmoothedPWDB = pdmpriv->EntryMinUndecoratedSmoothedPWDB;
}
if (UndecoratedSmoothedPWDB >= TX_POWER_NEAR_FIELD_THRESH_LVL2)
pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_Level2;
else if ((UndecoratedSmoothedPWDB < (TX_POWER_NEAR_FIELD_THRESH_LVL2-3)) &&
(UndecoratedSmoothedPWDB >= TX_POWER_NEAR_FIELD_THRESH_LVL1) )
pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_Level1;
else if (UndecoratedSmoothedPWDB < (TX_POWER_NEAR_FIELD_THRESH_LVL1-5))
pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_Normal;
if ( (pdmpriv->DynamicTxHighPowerLvl != pdmpriv->LastDTPLvl) ) {
PHY_SetTxPowerLevel8192C(Adapter, pHalData->CurrentChannel);
if (pdmpriv->DynamicTxHighPowerLvl == TxHighPwrLevel_Normal) /* HP1 -> Normal or HP2 -> Normal */
odm_DynamicTxPowerRestorePowerIndex(pDM_Odm);

11
hal/rtl8188eu_xmit.c
View file

@ -399,16 +399,7 @@ if (padapter->registrypriv.mp_mode == 0)
else
ptxdesc->txdw5 |= cpu_to_le32(0x00300000);/* retry limit = 12 */
#ifdef CONFIG_INTEL_PROXIM
if ((padapter->proximity.proxim_on==true)&&(pattrib->intel_proxim==true)){
DBG_88E("\n %s pattrib->rate=%d\n",__func__,pattrib->rate);
ptxdesc->txdw5 |= cpu_to_le32( pattrib->rate);
}
else
#endif
{
ptxdesc->txdw5 |= cpu_to_le32(MRateToHwRate(pmlmeext->tx_rate));
}
ptxdesc->txdw5 |= cpu_to_le32(MRateToHwRate(pmlmeext->tx_rate));
}
else if ((pxmitframe->frame_tag&0x0f) == TXAGG_FRAMETAG)
{

8
hal/usb_halinit.c
View file

@ -3556,14 +3556,6 @@ static void UpdateHalRAMask8188EUsb(PADAPTER padapter, u32 mac_id, u8 rssi_level
mask |= ((raid<<28)&0xf0000000);
DBG_88E("update raid entry, mask=0x%x, arg=0x%x\n", mask, arg);
psta->ra_mask=mask;
#ifdef CONFIG_INTEL_PROXIM
if (padapter->proximity.proxim_on ==true){
arg &= ~BIT(6);
}
else {
arg |= BIT(6);
}
#endif /* CONFIG_INTEL_PROXIM */
mask |= ((raid<<28)&0xf0000000);
/* to do ,for 8188E-SMIC */

19
include/drv_types.h
View file

@ -290,18 +290,6 @@ typedef enum _DRIVER_STATE{
DRIVER_REPLACE_DONGLE = 2,
}DRIVER_STATE;
#ifdef CONFIG_INTEL_PROXIM
struct proxim {
bool proxim_support;
bool proxim_on;
void *proximity_priv;
int (*proxim_rx)(_adapter *padapter,
union recv_frame *precv_frame);
u8 (*proxim_get_var)(_adapter* padapter, u8 type);
};
#endif //CONFIG_INTEL_PROXIM
#ifdef CONFIG_MAC_LOOPBACK_DRIVER
typedef struct loopbackdata
{
@ -452,13 +440,6 @@ struct _ADAPTER{
struct br_ext_info ethBrExtInfo;
#endif // CONFIG_BR_EXT
#ifdef CONFIG_INTEL_PROXIM
/* intel Proximity, should be alloc mem
* in intel Proximity module and can only
* be used in intel Proximity mode */
struct proxim proximity;
#endif //CONFIG_INTEL_PROXIM
#ifdef CONFIG_MAC_LOOPBACK_DRIVER
PLOOPBACKDATA ploopback;
#endif

20
include/rtw_mlme.h
View file

@ -26,10 +26,6 @@
#include <drv_types.h>
#include <wlan_bssdef.h>
#ifdef CONFIG_INTEL_WIDI
#include <rtw_intel_widi.h>
#endif
#define MAX_BSS_CNT 128
//#define MAX_JOIN_TIME 2000
//#define MAX_JOIN_TIME 2500
@ -525,17 +521,6 @@ struct mlme_priv {
#endif
#ifdef CONFIG_INTEL_WIDI
int widi_state;
int listen_state;
_timer listen_timer;
ATOMIC_T rx_probe_rsp; // 1:receive probe respone from RDS source.
u8 *l2sdTaBuffer;
u8 channel_idx;
u8 group_cnt; //In WiDi 3.5, they specified another scan algo. for WFD/RDS co-existed
u8 sa_ext[L2SDTA_SERVICE_VE_LEN];
#endif // CONFIG_INTEL_WIDI
#ifdef CONFIG_FTP_PROTECT
u8 ftp_lock_flag;
#endif //CONFIG_FTP_PROTECT
@ -766,9 +751,4 @@ void _rtw_roaming(_adapter *padapter, struct wlan_network *tgt_network);
#endif
void rtw_stassoc_hw_rpt(_adapter *adapter,struct sta_info *psta);
#ifdef CONFIG_INTEL_PROXIM
void rtw_proxim_enable(_adapter *padapter);
void rtw_proxim_disable(_adapter *padapter);
void rtw_proxim_send_packet(_adapter *padapter,u8 *pbuf,u16 len,u8 hw_rate);
#endif //CONFIG_INTEL_PROXIM
#endif //__RTL871X_MLME_H_

4
include/rtw_pwrctrl.h
View file

@ -272,10 +272,6 @@ struct pwrctrl_priv
struct early_suspend early_suspend;
u8 do_late_resume;
#endif //CONFIG_HAS_EARLYSUSPEND
#ifdef CONFIG_INTEL_PROXIM
u8 stored_power_mgnt;
#endif
};
#define rtw_get_ips_mode_req(pwrctrlpriv) \

3
include/usb_hal.h
View file

@ -23,7 +23,4 @@
void rtl8188eu_set_hal_ops(_adapter * padapter);
#define hal_set_hal_ops rtl8188eu_set_hal_ops
#ifdef CONFIG_INTEL_PROXIM
extern _adapter *rtw_usb_get_sw_pointer(void);
#endif //CONFIG_INTEL_PROXIM
#endif //__USB_HAL_H__

57
os_dep/ioctl_linux.c
View file

@ -34,6 +34,7 @@
#include <rtw_mp_ioctl.h>
#include <usb_ops.h>
#include <rtw_version.h>
#include <rtl8188e_hal.h>
#ifdef CONFIG_MP_INCLUDED
#include <rtw_mp.h>
@ -3530,10 +3531,6 @@ static int rtw_wps_start(struct net_device *dev,
else if (u32wps_start == 3) // WPS Stop because of wps fail
rtw_led_control(padapter, LED_CTL_STOP_WPS_FAIL);
#ifdef CONFIG_INTEL_WIDI
process_intel_widi_wps_status(padapter, u32wps_start);
#endif //CONFIG_INTEL_WIDI
exit:
return ret;
}
@ -10136,45 +10133,8 @@ static int rtw_tdls_get(struct net_device *dev,
return 0;
}
#ifdef CONFIG_INTEL_WIDI
static int rtw_widi_set(struct net_device *dev,
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
{
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
process_intel_widi_cmd(padapter, extra);
return 0;
}
static int rtw_widi_set_probe_request(struct net_device *dev,
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
{
int ret = 0;
u8 *pbuf = NULL;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
#if 1
pbuf = rtw_malloc(sizeof(l2_msg_t));
if (pbuf)
{
_rtw_memcpy(pbuf, wrqu->data.pointer, wrqu->data.length);
intel_widi_wk_cmd(padapter, INTEL_WIDI_ISSUE_PROB_WK, pbuf);
}
#else
DBG_88E("[%s] len = %d\n", __func__,wrqu->data.length);
issue_probereq_widi(padapter, wrqu->data.pointer);
#endif
return ret;
}
#endif // CONFIG_INTEL_WIDI
#ifdef CONFIG_MAC_LOOPBACK_DRIVER
#include <rtl8188e_hal.h>
extern void rtl8188e_cal_txdesc_chksum(struct tx_desc *ptxdesc);
#define cal_txdesc_chksum rtl8188e_cal_txdesc_chksum
@ -10900,17 +10860,6 @@ static const struct iw_priv_args rtw_private_args[] = {
IW_PRIV_TYPE_CHAR | 40, IW_PRIV_TYPE_CHAR | 0x7FF, "test"
},
#ifdef CONFIG_INTEL_WIDI
{
SIOCIWFIRSTPRIV + 0x1E,
IW_PRIV_TYPE_CHAR | 64, 0, "widi_set"
},
{
SIOCIWFIRSTPRIV + 0x1F,
IW_PRIV_TYPE_CHAR | 128, 0, "widi_prob_req"
},
#endif // CONFIG_INTEL_WIDI
#ifdef CONFIG_MP_INCLUDED
{ SIOCIWFIRSTPRIV + 0x0E, IW_PRIV_TYPE_CHAR | 1024, 0 , ""}, //set
@ -10995,10 +10944,6 @@ static iw_handler rtw_private_handler[] =
rtw_mp_efuse_get, //0x1B
NULL, // 0x1C is reserved for hostapd
rtw_test, // 0x1D
#ifdef CONFIG_INTEL_WIDI
rtw_widi_set, //0x1E
rtw_widi_set_probe_request, //0x1F
#endif // CONFIG_INTEL_WIDI
};
#endif // #if defined(CONFIG_MP_INCLUDED) && defined(CONFIG_MP_IWPRIV_SUPPORT)

12
os_dep/os_intfs.c
View file

@ -1218,14 +1218,6 @@ _func_enter_;
rtw_hal_sreset_init(padapter);
#endif
#ifdef CONFIG_INTEL_WIDI
if (rtw_init_intel_widi(padapter) == _FAIL) {
DBG_88E("Can't rtw_init_intel_widi\n");
ret8=_FAIL;
goto exit;
}
#endif //CONFIG_INTEL_WIDI
#ifdef CONFIG_BR_EXT
_rtw_spinlock_init(&padapter->br_ext_lock);
#endif // CONFIG_BR_EXT
@ -1313,10 +1305,6 @@ u8 rtw_free_drv_sw(_adapter *padapter)
_rtw_spinlock_free(&padapter->br_ext_lock);
#endif // CONFIG_BR_EXT
#ifdef CONFIG_INTEL_WIDI
rtw_free_intel_widi(padapter);
#endif //CONFIG_INTEL_WIDI
free_mlme_ext_priv(&padapter->mlmeextpriv);
rtw_free_cmd_priv(&padapter->cmdpriv);

18
os_dep/usb_intf.c
View file

@ -1404,10 +1404,6 @@ static int rtw_drv_init(struct usb_interface *pusb_intf, const struct usb_device
goto free_dvobj;
}
#ifdef CONFIG_INTEL_PROXIM
rtw_sw_export=if1;
#endif
#ifdef CONFIG_GLOBAL_UI_PID
if (ui_pid[1]!=0) {
DBG_88E("ui_pid[1]:%d\n",ui_pid[1]);
@ -1473,11 +1469,6 @@ _func_enter_;
RT_TRACE(_module_hci_intfs_c_,_drv_err_,("-dev_remove()\n"));
DBG_88E("-r871xu_dev_remove, done\n");
#ifdef CONFIG_INTEL_PROXIM
rtw_sw_export=NULL;
#endif
#ifdef DBG_MEM_ALLOC
rtw_dump_mem_stat ();
#endif
@ -1519,14 +1510,5 @@ static void __exit rtw_drv_halt(void)
DBG_88E("-rtw_drv_halt\n");
}
module_init(rtw_drv_entry);
module_exit(rtw_drv_halt);
#ifdef CONFIG_INTEL_PROXIM
_adapter *rtw_usb_get_sw_pointer(void)
{
return rtw_sw_export;
}
EXPORT_SYMBOL(rtw_usb_get_sw_pointer);
#endif //CONFIG_INTEL_PROXIM