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 for other PLATFORM_XX variables

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-10 21:20:38 -05:00
parent a3ca3380b5
commit bb27b28f6e
18 changed files with 4 additions and 652 deletions
Download patch file Download diff file Expand all files Collapse all files

20
os_dep/ioctl_cfg80211.c
View file

@ -2470,22 +2470,6 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,
goto exit;
}
#ifdef CONFIG_PLATFORM_MSTAR_TITANIA12
printk("MStar Android!\n");
if ((wdev_to_priv(padapter->rtw_wdev))->bandroid_scan == false)
{
#ifdef CONFIG_P2P
struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
#endif //CONFIG_P2P
{
ret = -EBUSY;
printk("Android hasn't attached yet!\n");
goto exit;
}
}
#endif
if (_FAIL == rtw_pwr_wakeup(padapter)) {
ret= -EPERM;
goto exit;
@ -2974,18 +2958,14 @@ void rtw_cfg80211_indicate_sta_assoc(_adapter *padapter, u8 *pmgmt_frame, uint f
#else //COMPAT_KERNEL_RELEASE
{
//to avoid WARN_ON(wdev->iftype != NL80211_IFTYPE_STATION) when calling cfg80211_send_rx_assoc()
#ifndef CONFIG_PLATFORM_MSTAR_TITANIA12
pwdev->iftype = NL80211_IFTYPE_STATION;
#endif //CONFIG_PLATFORM_MSTAR_TITANIA12
DBG_88E("iftype=%d before call cfg80211_send_rx_assoc()\n", pwdev->iftype);
rtw_cfg80211_send_rx_assoc(ndev, NULL, pmgmt_frame, frame_len);
DBG_88E("iftype=%d after call cfg80211_send_rx_assoc()\n", pwdev->iftype);
pwdev->iftype = NL80211_IFTYPE_AP;
//cfg80211_rx_action(padapter->pnetdev, freq, pmgmt_frame, frame_len, GFP_ATOMIC);
}
#endif //COMPAT_KERNEL_RELEASE
#endif /* defined(RTW_USE_CFG80211_STA_EVENT) */
}
void rtw_cfg80211_indicate_sta_disassoc(_adapter *padapter, unsigned char *da, unsigned short reason)

87
os_dep/ioctl_linux.c
View file

@ -687,13 +687,7 @@ static char *translate_scan(_adapter *padapter,
iwe.u.qual.qual = (u8)sq; // signal quality
#ifdef CONFIG_PLATFORM_ROCKCHIPS
iwe.u.qual.noise = -100; // noise level suggest by zhf@rockchips
#else
iwe.u.qual.noise = 0; // noise level
#endif //CONFIG_PLATFORM_ROCKCHIPS
//DBG_88E("iqual=%d, ilevel=%d, inoise=%d, iupdated=%d\n", iwe.u.qual.qual, iwe.u.qual.level , iwe.u.qual.noise, iwe.u.qual.updated);
start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_QUAL_LEN);
}
@ -718,13 +712,8 @@ static int wpa_set_auth_algs(struct net_device *dev, u32 value)
DBG_88E("wpa_set_auth_algs, AUTH_ALG_SHARED_KEY [value:0x%x]\n",value);
padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled;
#ifdef CONFIG_PLATFORM_MT53XX
padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeAutoSwitch;
padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_Auto;
#else
padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeShared;
padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_Shared;
#endif
}
else if (value & AUTH_ALG_OPEN_SYSTEM)
{
@ -732,13 +721,8 @@ static int wpa_set_auth_algs(struct net_device *dev, u32 value)
//padapter->securitypriv.ndisencryptstatus = Ndis802_11EncryptionDisabled;
if (padapter->securitypriv.ndisauthtype < Ndis802_11AuthModeWPAPSK)
{
#ifdef CONFIG_PLATFORM_MT53XX
padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeAutoSwitch;
padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_Auto;
#else
padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeOpen;
padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_Open;
#endif
}
}
@ -1513,26 +1497,9 @@ static int rtw_wx_get_sens(struct net_device *dev,
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
{
#ifdef CONFIG_PLATFORM_ROCKCHIPS
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
/*
* 20110311 Commented by Jeff
* For rockchip platform's wpa_driver_wext_get_rssi
*/
if (check_fwstate(pmlmepriv, _FW_LINKED) == true) {
//wrqu->sens.value=-padapter->recvpriv.signal_strength;
wrqu->sens.value=-padapter->recvpriv.rssi;
//DBG_88E("%s: %d\n", __func__, wrqu->sens.value);
wrqu->sens.fixed = 0; /* no auto select */
} else
#endif
{
wrqu->sens.value = 0;
wrqu->sens.fixed = 0; /* no auto select */
wrqu->sens.disabled = 1;
}
wrqu->sens.value = 0;
wrqu->sens.fixed = 0; /* no auto select */
wrqu->sens.disabled = 1;
return 0;
}
@ -2745,13 +2712,7 @@ static int rtw_wx_set_enc(struct net_device *dev,
{
DBG_88E("rtw_wx_set_enc():IW_ENCODE_OPEN\n");
padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled;//Ndis802_11EncryptionDisabled;
#ifdef CONFIG_PLATFORM_MT53XX
padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_Auto;
#else
padapter->securitypriv.dot11AuthAlgrthm= dot11AuthAlgrthm_Open;
#endif
padapter->securitypriv.dot11PrivacyAlgrthm=_NO_PRIVACY_;
padapter->securitypriv.dot118021XGrpPrivacy=_NO_PRIVACY_;
authmode = Ndis802_11AuthModeOpen;
@ -2761,13 +2722,7 @@ static int rtw_wx_set_enc(struct net_device *dev,
{
DBG_88E("rtw_wx_set_enc():IW_ENCODE_RESTRICTED\n");
padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled;
#ifdef CONFIG_PLATFORM_MT53XX
padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_Auto;
#else
padapter->securitypriv.dot11AuthAlgrthm= dot11AuthAlgrthm_Shared;
#endif
padapter->securitypriv.dot11PrivacyAlgrthm=_WEP40_;
padapter->securitypriv.dot118021XGrpPrivacy=_WEP40_;
authmode = Ndis802_11AuthModeShared;
@ -3409,14 +3364,6 @@ static int rtw_wx_set_mtk_wps_probe_ie(struct net_device *dev,
struct iw_request_info *a,
union iwreq_data *wrqu, char *b)
{
#ifdef CONFIG_PLATFORM_MT53XX
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_notice_,
("WLAN IOCTL: cmd_code=%x, fwstate=0x%x\n",
a->cmd, get_fwstate(pmlmepriv)));
#endif
return 0;
}
@ -3424,14 +3371,6 @@ static int rtw_wx_get_sensitivity(struct net_device *dev,
struct iw_request_info *info,
union iwreq_data *wrqu, char *buf)
{
#ifdef CONFIG_PLATFORM_MT53XX
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
// Modified by Albert 20110914
// This is in dbm format for MTK platform.
wrqu->qual.level = padapter->recvpriv.rssi;
DBG_88E(" level = %u\n", wrqu->qual.level);
#endif
return 0;
}
@ -3439,19 +3378,9 @@ static int rtw_wx_set_mtk_wps_ie(struct net_device *dev,
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
{
#ifdef CONFIG_PLATFORM_MT53XX
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
return rtw_set_wpa_ie(padapter, wrqu->data.pointer, wrqu->data.length);
#else
return 0;
#endif
}
/*
typedef int (*iw_handler)(struct net_device *dev, struct iw_request_info *info,
union iwreq_data *wrqu, char *extra);
*/
/*
* For all data larger than 16 octets, we need to use a
* pointer to memory allocated in user space.
@ -12379,7 +12308,6 @@ static const struct iw_priv_args rtw_private_args[] = {
SIOCIWFIRSTPRIV + 0x6,
IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "wps_start"
},
//for PLATFORM_MT53XX
{
SIOCIWFIRSTPRIV + 0x7,
IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "get_sensitivity"
@ -12393,7 +12321,6 @@ static const struct iw_priv_args rtw_private_args[] = {
IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "wps_assoc_req_ie"
},
//for RTK_DMP_PLATFORM
{
SIOCIWFIRSTPRIV + 0xA,
IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "channel_plan"
@ -12509,12 +12436,10 @@ static iw_handler rtw_private_handler[] =
rtw_set_pid, //0x05
rtw_wps_start, //0x06
// for PLATFORM_MT53XX
rtw_wx_get_sensitivity, //0x07
rtw_wx_set_mtk_wps_probe_ie, //0x08
rtw_wx_set_mtk_wps_ie, //0x09
// for RTK_DMP_PLATFORM
// Set Channel depend on the country code
rtw_wx_set_channel_plan, //0x0A
@ -12594,14 +12519,8 @@ static struct iw_statistics *rtw_get_wireless_stats(struct net_device *dev)
}
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14))
piwstats->qual.updated = IW_QUAL_ALL_UPDATED ;//|IW_QUAL_DBM;
#else
#ifdef RTK_DMP_PLATFORM
//IW_QUAL_DBM= 0x8, if driver use this flag, wireless extension will show value of dbm.
//remove this flag for show percentage 0~100
piwstats->qual.updated = 0x07;
#else
piwstats->qual.updated = 0x0f;
#endif
#endif
#ifdef CONFIG_SIGNAL_DISPLAY_DBM

61
os_dep/mlme_linux.c
View file

@ -26,57 +26,6 @@
#include <drv_types.h>
#include <mlme_osdep.h>
#ifdef RTK_DMP_PLATFORM
void Linkup_workitem_callback(struct work_struct *work)
{
struct mlme_priv *pmlmepriv = container_of(work, struct mlme_priv, Linkup_workitem);
_adapter *padapter = container_of(pmlmepriv, _adapter, mlmepriv);
_func_enter_;
RT_TRACE(_module_mlme_osdep_c_,_drv_info_,("+ Linkup_workitem_callback\n"));
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12))
kobject_uevent(&padapter->pnetdev->dev.kobj, KOBJ_LINKUP);
#else
kobject_hotplug(&padapter->pnetdev->class_dev.kobj, KOBJ_LINKUP);
#endif
_func_exit_;
}
void Linkdown_workitem_callback(struct work_struct *work)
{
struct mlme_priv *pmlmepriv = container_of(work, struct mlme_priv, Linkdown_workitem);
_adapter *padapter = container_of(pmlmepriv, _adapter, mlmepriv);
_func_enter_;
RT_TRACE(_module_mlme_osdep_c_,_drv_info_,("+ Linkdown_workitem_callback\n"));
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12))
kobject_uevent(&padapter->pnetdev->dev.kobj, KOBJ_LINKDOWN);
#else
kobject_hotplug(&padapter->pnetdev->class_dev.kobj, KOBJ_LINKDOWN);
#endif
_func_exit_;
}
#endif
/*
void sitesurvey_ctrl_handler(void *FunctionContext)
{
_adapter *adapter = (_adapter *)FunctionContext;
_sitesurvey_ctrl_handler(adapter);
_set_timer(&adapter->mlmepriv.sitesurveyctrl.sitesurvey_ctrl_timer, 3000);
}
*/
void rtw_join_timeout_handler (void *FunctionContext)
{
_adapter *adapter = (_adapter *)FunctionContext;
@ -127,10 +76,6 @@ void rtw_init_mlme_timer(_adapter *padapter)
_init_timer(&(pmlmepriv->set_scan_deny_timer), padapter->pnetdev, _rtw_set_scan_deny_timer_hdl, padapter);
#endif
#ifdef RTK_DMP_PLATFORM
_init_workitem(&(pmlmepriv->Linkup_workitem), Linkup_workitem_callback, padapter);
_init_workitem(&(pmlmepriv->Linkdown_workitem), Linkdown_workitem_callback, padapter);
#endif
#if defined(CONFIG_CHECK_BT_HANG) && defined(CONFIG_BT_COEXIST)
if (padapter->HalFunc.hal_init_checkbthang_workqueue)
padapter->HalFunc.hal_init_checkbthang_workqueue(padapter);
@ -152,9 +97,6 @@ _func_enter_;
if (adapter->pid[2] !=0)
rtw_signal_process(adapter->pid[2], SIGALRM);
#ifdef RTK_DMP_PLATFORM
_set_workitem(&adapter->mlmepriv.Linkup_workitem);
#endif
_func_exit_;
@ -238,9 +180,6 @@ _func_enter_;
rtw_indicate_wx_disassoc_event(adapter);
#ifdef RTK_DMP_PLATFORM
_set_workitem(&adapter->mlmepriv.Linkdown_workitem);
#endif
rtw_reset_securitypriv( adapter );
_func_exit_;

2
os_dep/os_intfs.c
View file

@ -1828,9 +1828,7 @@ int _netdev_open(struct net_device *pnetdev)
if (padapter->intf_start)
padapter->intf_start(padapter);
#ifndef RTK_DMP_PLATFORM
rtw_proc_init_one(pnetdev);
#endif
#ifdef CONFIG_IOCTL_CFG80211
rtw_cfg80211_init_wiphy(padapter);

25
os_dep/osdep_service.c
View file

@ -27,11 +27,6 @@
#include <recv_osdep.h>
#include <linux/vmalloc.h>
#include <rtw_ioctl_set.h>
#ifdef RTK_DMP_PLATFORM
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12))
#include <linux/pageremap.h>
#endif
#endif
/*
* Translate the OS dependent @param error_code to OS independent RTW_STATUS_CODE
@ -93,13 +88,7 @@ u8* _rtw_malloc(u32 sz)
{
u8 *pbuf=NULL;
#ifdef RTK_DMP_PLATFORM
if (sz > 0x4000)
pbuf = (u8 *)dvr_malloc(sz);
else
#endif
pbuf = kmalloc(sz,in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);
pbuf = kmalloc(sz,in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);
return pbuf;
}
@ -114,11 +103,6 @@ u8* _rtw_zmalloc(u32 sz)
void _rtw_mfree(u8 *pbuf, u32 sz)
{
#ifdef RTK_DMP_PLATFORM
if (sz > 0x4000)
dvr_free(pbuf);
else
#endif
kfree(pbuf);
}
@ -799,13 +783,6 @@ error:
}
#ifdef CONFIG_PLATFORM_SPRD
#ifdef do_div
#undef do_div
#endif
#include <asm-generic/div64.h>
#endif
u64 rtw_modular64(u64 x, u64 y)
{
return do_div(x, y);

8
os_dep/rtw_android.c
View file

@ -385,17 +385,9 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
break;
case ANDROID_WIFI_CMD_SCAN_ACTIVE:
//rtw_set_scan_mode((_adapter *)rtw_netdev_priv(net), SCAN_ACTIVE);
#ifdef CONFIG_PLATFORM_MSTAR_TITANIA12
#ifdef CONFIG_IOCTL_CFG80211
(wdev_to_priv(net->ieee80211_ptr))->bandroid_scan = true;
#endif //CONFIG_IOCTL_CFG80211
#endif //CONFIG_PLATFORM_MSTAR_TITANIA12
break;
case ANDROID_WIFI_CMD_SCAN_PASSIVE:
//rtw_set_scan_mode((_adapter *)rtw_netdev_priv(net), SCAN_PASSIVE);
break;
case ANDROID_WIFI_CMD_RSSI:
bytes_written = rtw_android_get_rssi(net, command, priv_cmd.total_len);
break;

78
os_dep/usb_intf.c
View file

@ -34,9 +34,6 @@
#include <usb_osintf.h>
#include <usb_hal.h>
#include <rtw_ioctl.h>
#ifdef CONFIG_PLATFORM_RTK_DMP
#include <asm/io.h>
#endif
#ifdef CONFIG_GLOBAL_UI_PID
int ui_pid[3] = {0, 0, 0};
@ -274,10 +271,6 @@ static struct specific_device_id specific_device_id_tbl[] = {
{.idVendor=0x0b05, .idProduct=0x1791, .flags=SPEC_DEV_ID_DISABLE_HT},
{.idVendor=0x13D3, .idProduct=0x3311, .flags=SPEC_DEV_ID_DISABLE_HT},
{.idVendor=0x13D3, .idProduct=0x3359, .flags=SPEC_DEV_ID_DISABLE_HT},//Russian customer -Azwave (8188CE-VAU g mode)
#ifdef RTK_DMP_PLATFORM
{.idVendor=USB_VENDER_ID_REALTEK, .idProduct=0x8111, .flags=SPEC_DEV_ID_ASSIGN_IFNAME}, // Realtek 5G dongle for WiFi Display
{.idVendor=0x2019, .idProduct=0xAB2D, .flags=SPEC_DEV_ID_ASSIGN_IFNAME}, // PCI-Abocom 5G dongle for WiFi Display
#endif /* RTK_DMP_PLATFORM */
{}
};
@ -727,17 +720,6 @@ static void process_spec_devid(const struct usb_device_id *pdid)
}
#endif
#ifdef RTK_DMP_PLATFORM
// Change the ifname to wlan10 when PC side WFD dongle plugin on DMP platform.
// It is used to distinguish between normal and PC-side wifi dongle/module.
if ((pdid->idVendor==vid) && (pdid->idProduct==pid) && (flags&SPEC_DEV_ID_ASSIGN_IFNAME))
{
extern char* ifname;
strncpy(ifname, "wlan10", 6);
//DBG_88E("%s()-%d: ifname=%s, vid=%04X, pid=%04X\n", __func__, __LINE__, ifname, vid, pid);
}
#endif /* RTK_DMP_PLATFORM */
}
}
@ -1266,17 +1248,6 @@ error_exit:
}
#endif
#ifdef CONFIG_PLATFORM_RTD2880B
extern void rtd2885_wlan_netlink_sendMsg(char *action_string, char *name);
#endif
#ifdef CONFIG_PLATFORM_ARM_SUNxI
#include <mach/sys_config.h>
extern int sw_usb_disable_hcd(__u32 usbc_no);
extern int sw_usb_enable_hcd(__u32 usbc_no);
static int usb_wifi_host = 2;
#endif
/*
* drv_init() - a device potentially for us
*
@ -1428,21 +1399,12 @@ static _adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
hostapd_mode_init(padapter);
#endif
#ifdef CONFIG_PLATFORM_RTD2880B
DBG_88E("wlan link up\n");
rtd2885_wlan_netlink_sendMsg("linkup", "8712");
#endif
//step 6. /* Tell the network stack we exist */
if (register_netdev(pnetdev) != 0) {
RT_TRACE(_module_hci_intfs_c_,_drv_err_,("register_netdev() failed\n"));
goto free_hal_data;
}
#ifdef RTK_DMP_PLATFORM
rtw_proc_init_one(pnetdev);
#endif
DBG_88E("bDriverStopped:%d, bSurpriseRemoved:%d, bup:%d, hw_init_completed:%d\n"
, padapter->bDriverStopped
, padapter->bSurpriseRemoved
@ -1534,12 +1496,6 @@ static void rtw_usb_if1_deinit(_adapter *if1)
if (pnetdev)
rtw_free_netdev(pnetdev);
#ifdef CONFIG_PLATFORM_RTD2880B
DBG_88E("wlan link down\n");
rtd2885_wlan_netlink_sendMsg("linkdown", "8712");
#endif
}
static void dump_usb_interface(struct usb_interface *usb_intf)
@ -1790,38 +1746,11 @@ extern int console_suspend_enabled;
static int __init rtw_drv_entry(void)
{
#ifdef CONFIG_PLATFORM_RTK_DMP
u32 tmp;
tmp=readl((volatile unsigned int*)0xb801a608);
tmp &= 0xffffff00;
tmp |= 0x55;
writel(tmp,(volatile unsigned int*)0xb801a608);//write dummy register for 1055
#endif
#ifdef CONFIG_PLATFORM_ARM_SUNxI
#ifndef CONFIG_RTL8723A
int ret = 0;
/* ----------get usb_wifi_usbc_num------------- */
ret = script_parser_fetch("usb_wifi_para", "usb_wifi_usbc_num", (int *)&usb_wifi_host, 64);
if (ret != 0){
DBG_88E("ERR: script_parser_fetch usb_wifi_usbc_num failed\n");
ret = -ENOMEM;
return ret;
}
DBG_88E("sw_usb_enable_hcd: usbc_num = %d\n", usb_wifi_host);
sw_usb_enable_hcd(usb_wifi_host);
#endif //CONFIG_RTL8723A
#endif //CONFIG_PLATFORM_ARM_SUNxI
RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+rtw_drv_entry\n"));
DBG_88E(DRV_NAME " driver version=%s\n", DRIVERVERSION);
DBG_88E("build time: %s %s\n", __DATE__, __TIME__);
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24))
//console_suspend_enabled=0;
#endif
rtw_suspend_lock_init();
_rtw_mutex_init(&usb_drv->hw_init_mutex);
@ -1852,13 +1781,6 @@ static void __exit rtw_drv_halt(void)
_rtw_mutex_free(&usb_drv->setch_mutex);
_rtw_mutex_free(&usb_drv->setbw_mutex);
#endif
#ifdef CONFIG_PLATFORM_ARM_SUNxI
#ifndef CONFIG_RTL8723A
DBG_88E("sw_usb_disable_hcd: usbc_num = %d\n", usb_wifi_host);
sw_usb_disable_hcd(usb_wifi_host);
#endif //ifndef CONFIG_RTL8723A
#endif //CONFIG_PLATFORM_ARM_SUNxI
DBG_88E("-rtw_drv_halt\n");
}