skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2025-06-23 00:24:20 +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
Download patch file Download diff file Expand all files Collapse all files

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