From 10a995af18358b9289f61f6c7fb643eaca4c4858 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Sat, 7 Mar 2015 13:07:38 -0600 Subject: [PATCH] rtl8188eu: Remove RTK_DMP_PLATFORM This is not selected. Signed-off-by: Larry Finger --- hal/rtl8188e_dm.c | 11 ------- include/rtw_mlme.h | 7 ----- os_dep/ioctl_linux.c | 6 ---- os_dep/mlme_linux.c | 70 ------------------------------------------ os_dep/os_intfs.c | 3 -- os_dep/osdep_service.c | 19 ++---------- os_dep/usb_intf.c | 20 ------------ 7 files changed, 2 insertions(+), 134 deletions(-) diff --git a/hal/rtl8188e_dm.c b/hal/rtl8188e_dm.c index d5dbd58..bc8a740 100755 --- a/hal/rtl8188e_dm.c +++ b/hal/rtl8188e_dm.c @@ -88,26 +88,15 @@ static void dm_CheckPbcGPIO(struct adapter *padapter) /* After trigger PBC, the variable will be set to false */ 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 ) { /* 0 is the default value and it means the application monitors the HW PBC doesn't privde its pid to driver. */ return; } rtw_signal_process(padapter->pid[0], SIGUSR1); -#endif } } -/* */ /* Initialize GPIO setting registers */ -/* */ static void dm_InitGPIOSetting( IN struct adapter *Adapter diff --git a/include/rtw_mlme.h b/include/rtw_mlme.h index bf67aee..79b700f 100755 --- a/include/rtw_mlme.h +++ b/include/rtw_mlme.h @@ -518,13 +518,6 @@ struct mlme_priv { u32 wfd_probe_resp_ie_len; u32 wfd_go_probe_resp_ie_len; //for GO 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 }; diff --git a/os_dep/ioctl_linux.c b/os_dep/ioctl_linux.c index 23df7cc..a29db3c 100755 --- a/os_dep/ioctl_linux.c +++ b/os_dep/ioctl_linux.c @@ -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)) 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 return &padapter->iwstats; diff --git a/os_dep/mlme_linux.c b/os_dep/mlme_linux.c index 87732ec..8ff44af 100755 --- a/os_dep/mlme_linux.c +++ b/os_dep/mlme_linux.c @@ -26,56 +26,6 @@ #include #include -#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) { 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) { 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); _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); #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); @@ -163,13 +103,6 @@ void rtw_os_indicate_connect(struct adapter *adapter) if(adapter->pid[2] !=0) 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) @@ -255,9 +188,6 @@ void rtw_os_indicate_disconnect( struct adapter *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 */ rtw_reset_securitypriv_cmd(adapter); diff --git a/os_dep/os_intfs.c b/os_dep/os_intfs.c index 7b6ab35..1d9aca2 100755 --- a/os_dep/os_intfs.c +++ b/os_dep/os_intfs.c @@ -247,7 +247,6 @@ int _netdev_open(struct net_device *pnetdev); int netdev_open (struct net_device *pnetdev); static int netdev_close (struct net_device *pnetdev); -/* ifdef RTK_DMP_PLATFORM */ #ifdef CONFIG_PROC_DEBUG #define RTL8192C_PROC_NAME "rtl819xC" #define RTL8192D_PROC_NAME "rtl819xD" @@ -1209,9 +1208,7 @@ int _netdev_open(struct net_device *pnetdev) padapter->intf_start(padapter); } -#ifndef RTK_DMP_PLATFORM rtw_proc_init_one(pnetdev); -#endif rtw_cfg80211_init_wiphy(padapter); diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c index 3725561..9409d36 100755 --- a/os_dep/osdep_service.c +++ b/os_dep/osdep_service.c @@ -27,11 +27,6 @@ #include #include #include -#ifdef RTK_DMP_PLATFORM -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)) -#include -#endif -#endif #define RT_TAG '1178' @@ -99,12 +94,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; } @@ -125,12 +115,7 @@ 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); + kfree(pbuf); } inline struct sk_buff *_rtw_skb_alloc(u32 sz) diff --git a/os_dep/usb_intf.c b/os_dep/usb_intf.c index 33885b5..573bdb4 100755 --- a/os_dep/usb_intf.c +++ b/os_dep/usb_intf.c @@ -139,10 +139,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 */ {} }; @@ -503,18 +499,6 @@ static void process_spec_devid(const struct usb_device_id *pdid) rtw_cbw40_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"); #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")); status = _SUCCESS;