rtl8188eu: Remove RTK_DMP_PLATFORM

This is not selected.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-03-07 13:07:38 -06:00
parent cfd60faf5e
commit 10a995af18
7 changed files with 2 additions and 134 deletions

View file

@ -88,26 +88,15 @@ static void dm_CheckPbcGPIO(struct adapter *padapter)
/* After trigger PBC, the variable will be set to false */ /* After trigger PBC, the variable will be set to false */
DBG_8192C("CheckPbcGPIO - PBC is pressed\n"); DBG_8192C("CheckPbcGPIO - PBC is pressed\n");
#ifdef RTK_DMP_PLATFORM
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12))
kobject_uevent(&padapter->pnetdev->dev.kobj, KOBJ_NET_PBC);
#else
kobject_hotplug(&padapter->pnetdev->class_dev.kobj, KOBJ_NET_PBC);
#endif
#else
if ( padapter->pid[0] == 0 ) if ( padapter->pid[0] == 0 )
{ /* 0 is the default value and it means the application monitors the HW PBC doesn't privde its pid to driver. */ { /* 0 is the default value and it means the application monitors the HW PBC doesn't privde its pid to driver. */
return; return;
} }
rtw_signal_process(padapter->pid[0], SIGUSR1); rtw_signal_process(padapter->pid[0], SIGUSR1);
#endif
} }
} }
/* */
/* Initialize GPIO setting registers */ /* Initialize GPIO setting registers */
/* */
static void static void
dm_InitGPIOSetting( dm_InitGPIOSetting(
IN struct adapter *Adapter IN struct adapter *Adapter

View file

@ -518,13 +518,6 @@ struct mlme_priv {
u32 wfd_probe_resp_ie_len; u32 wfd_probe_resp_ie_len;
u32 wfd_go_probe_resp_ie_len; //for GO u32 wfd_go_probe_resp_ie_len; //for GO
u32 wfd_assoc_req_ie_len; u32 wfd_assoc_req_ie_len;
#endif
#ifdef RTK_DMP_PLATFORM
// DMP kobject_hotplug function signal need in passive level
_workitem Linkup_workitem;
_workitem Linkdown_workitem;
#endif #endif
}; };

View file

@ -9744,14 +9744,8 @@ static struct iw_statistics *rtw_get_wireless_stats(struct net_device *dev)
} }
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14))
piwstats->qual.updated = IW_QUAL_ALL_UPDATED ;/* IW_QUAL_DBM; */ 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 #else
piwstats->qual.updated = 0x0f; piwstats->qual.updated = 0x0f;
#endif
#endif #endif
return &padapter->iwstats; return &padapter->iwstats;

View file

@ -26,56 +26,6 @@
#include <drv_types.h> #include <drv_types.h>
#include <mlme_osdep.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);
struct adapter *padapter = container_of(pmlmepriv, struct adapter, mlmepriv);
;
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
;
}
void Linkdown_workitem_callback(struct work_struct *work)
{
struct mlme_priv *pmlmepriv = container_of(work, struct mlme_priv, Linkdown_workitem);
struct adapter *padapter = container_of(pmlmepriv, struct adapter, mlmepriv);
;
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
;
}
#endif
/*
void sitesurvey_ctrl_handler(void *FunctionContext)
{
struct adapter *adapter = (struct adapter *)FunctionContext;
_sitesurvey_ctrl_handler(adapter);
_set_timer(&adapter->mlmepriv.sitesurveyctrl.sitesurvey_ctrl_timer, 3000);
}
*/
void rtw_join_timeout_handler (void *FunctionContext) void rtw_join_timeout_handler (void *FunctionContext)
{ {
struct adapter *adapter = (struct adapter *)FunctionContext; struct adapter *adapter = (struct adapter *)FunctionContext;
@ -93,12 +43,6 @@ void _rtw_scan_timeout_handler (void *FunctionContext)
static void _dynamic_check_timer_handlder (void *FunctionContext) static void _dynamic_check_timer_handlder (void *FunctionContext)
{ {
struct adapter *adapter = (struct adapter *)FunctionContext; struct adapter *adapter = (struct adapter *)FunctionContext;
/* remove for MP power tracking DM.
#if (MP_DRIVER == 1)
if (adapter->registrypriv.mp_mode == 1)
return;
#endif
*/
rtw_dynamic_check_timer_handlder(adapter); rtw_dynamic_check_timer_handlder(adapter);
_set_timer(&adapter->mlmepriv.dynamic_chk_timer, 2000); _set_timer(&adapter->mlmepriv.dynamic_chk_timer, 2000);
@ -137,10 +81,6 @@ void rtw_init_mlme_timer(struct adapter *padapter)
_init_timer(&(pmlmepriv->event_polling_timer), padapter->pnetdev, _rtw_event_polling_timer_hdl, padapter); _init_timer(&(pmlmepriv->event_polling_timer), padapter->pnetdev, _rtw_event_polling_timer_hdl, padapter);
#endif #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 defined(CONFIG_CHECK_BT_HANG) && defined(CONFIG_BT_COEXIST)
if (padapter->HalFunc.hal_init_checkbthang_workqueue) if (padapter->HalFunc.hal_init_checkbthang_workqueue)
padapter->HalFunc.hal_init_checkbthang_workqueue(padapter); padapter->HalFunc.hal_init_checkbthang_workqueue(padapter);
@ -163,13 +103,6 @@ void rtw_os_indicate_connect(struct adapter *adapter)
if(adapter->pid[2] !=0) if(adapter->pid[2] !=0)
rtw_signal_process(adapter->pid[2], SIGALRM); rtw_signal_process(adapter->pid[2], SIGALRM);
#ifdef RTK_DMP_PLATFORM
_set_workitem(&adapter->mlmepriv.Linkup_workitem);
#endif
;
} }
void rtw_os_indicate_scan_done( struct adapter *padapter, bool aborted) void rtw_os_indicate_scan_done( struct adapter *padapter, bool aborted)
@ -255,9 +188,6 @@ void rtw_os_indicate_disconnect( struct adapter *adapter )
rtw_indicate_wx_disassoc_event(adapter); rtw_indicate_wx_disassoc_event(adapter);
#ifdef RTK_DMP_PLATFORM
_set_workitem(&adapter->mlmepriv.Linkdown_workitem);
#endif
/* modify for CONFIG_IEEE80211W, none 11w also can use the same command */ /* modify for CONFIG_IEEE80211W, none 11w also can use the same command */
rtw_reset_securitypriv_cmd(adapter); rtw_reset_securitypriv_cmd(adapter);

View file

@ -247,7 +247,6 @@ int _netdev_open(struct net_device *pnetdev);
int netdev_open (struct net_device *pnetdev); int netdev_open (struct net_device *pnetdev);
static int netdev_close (struct net_device *pnetdev); static int netdev_close (struct net_device *pnetdev);
/* ifdef RTK_DMP_PLATFORM */
#ifdef CONFIG_PROC_DEBUG #ifdef CONFIG_PROC_DEBUG
#define RTL8192C_PROC_NAME "rtl819xC" #define RTL8192C_PROC_NAME "rtl819xC"
#define RTL8192D_PROC_NAME "rtl819xD" #define RTL8192D_PROC_NAME "rtl819xD"
@ -1209,9 +1208,7 @@ int _netdev_open(struct net_device *pnetdev)
padapter->intf_start(padapter); padapter->intf_start(padapter);
} }
#ifndef RTK_DMP_PLATFORM
rtw_proc_init_one(pnetdev); rtw_proc_init_one(pnetdev);
#endif
rtw_cfg80211_init_wiphy(padapter); rtw_cfg80211_init_wiphy(padapter);

View file

@ -27,11 +27,6 @@
#include <recv_osdep.h> #include <recv_osdep.h>
#include <rtw_ioctl_set.h> #include <rtw_ioctl_set.h>
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#ifdef RTK_DMP_PLATFORM
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12))
#include <linux/pageremap.h>
#endif
#endif
#define RT_TAG '1178' #define RT_TAG '1178'
@ -99,11 +94,6 @@ u8* _rtw_malloc(u32 sz)
u8 *pbuf=NULL; 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; return pbuf;
@ -125,11 +115,6 @@ u8* _rtw_zmalloc(u32 sz)
void _rtw_mfree(u8 *pbuf, u32 sz) void _rtw_mfree(u8 *pbuf, u32 sz)
{ {
#ifdef RTK_DMP_PLATFORM
if(sz > 0x4000)
dvr_free(pbuf);
else
#endif
kfree(pbuf); kfree(pbuf);
} }

View file

@ -139,10 +139,6 @@ static struct specific_device_id specific_device_id_tbl[] = {
{.idVendor=0x0b05, .idProduct=0x1791, .flags=SPEC_DEV_ID_DISABLE_HT}, {.idVendor=0x0b05, .idProduct=0x1791, .flags=SPEC_DEV_ID_DISABLE_HT},
{.idVendor=0x13D3, .idProduct=0x3311, .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) */ {.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 */
{} {}
}; };
@ -503,18 +499,6 @@ static void process_spec_devid(const struct usb_device_id *pdid)
rtw_cbw40_enable = 0; rtw_cbw40_enable = 0;
rtw_ampdu_enable = 0; rtw_ampdu_enable = 0;
} }
#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_871X("%s()-%d: ifname=%s, vid=%04X, pid=%04X\n", __FUNCTION__, __LINE__, ifname, vid, pid); */
}
#endif /* RTK_DMP_PLATFORM */
} }
} }
@ -1321,10 +1305,6 @@ static int rtw_drv_init(struct usb_interface *pusb_intf, const struct usb_device
rtd2885_wlan_netlink_sendMsg("linkup", "8712"); rtd2885_wlan_netlink_sendMsg("linkup", "8712");
#endif #endif
#ifdef RTK_DMP_PLATFORM
rtw_proc_init_one(if1->pnetdev);
#endif
RT_TRACE(_module_hci_intfs_c_,_drv_err_,("-871x_drv - drv_init, success!\n")); RT_TRACE(_module_hci_intfs_c_,_drv_err_,("-871x_drv - drv_init, success!\n"));
status = _SUCCESS; status = _SUCCESS;