rtl8188eu: Remove XX_PLATFORM_YY

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-03-11 13:16:36 -05:00
parent 90df80d763
commit e542073502
8 changed files with 0 additions and 103 deletions

View file

@ -1425,11 +1425,6 @@ void rtw_scan_abort(struct adapter *adapter)
if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)) { if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)) {
if (!adapter->bDriverStopped && !adapter->bSurpriseRemoved) if (!adapter->bDriverStopped && !adapter->bSurpriseRemoved)
DBG_871X(FUNC_NDEV_FMT"waiting for scan_abort time out!\n", FUNC_NDEV_ARG(adapter->pnetdev)); DBG_871X(FUNC_NDEV_FMT"waiting for scan_abort time out!\n", FUNC_NDEV_ARG(adapter->pnetdev));
#ifdef CONFIG_PLATFORM_MSTAR
/* _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY); */
set_survey_timer(pmlmeext, 0);
_set_timer(&pmlmepriv->scan_to_timer, 50);
#endif
rtw_indicate_scan_done(adapter, true); rtw_indicate_scan_done(adapter, true);
} }
pmlmeext->scan_abort = false; pmlmeext->scan_abort = false;

View file

@ -654,14 +654,7 @@ void LeaveAllPowerSaveMode(IN struct adapter *Adapter)
adapter_to_dvobj(Adapter)->pusbdev->autosuspend_disabled = Adapter->bDisableAutosuspend;/* autosuspend disabled by the user */ adapter_to_dvobj(Adapter)->pusbdev->autosuspend_disabled = Adapter->bDisableAutosuspend;/* autosuspend disabled by the user */
#endif #endif
} }
else
#endif #endif
{
#if defined(CONFIG_PLATFORM_SPRD)
if(false == ips_leave(Adapter))
DBG_871X("======> ips_leave fail.............\n");
#endif /* CONFIG_PLATFORM_SPRD */
}
} }
} }

View file

@ -21,12 +21,6 @@
#define __DRV_CONF_H__ #define __DRV_CONF_H__
#include "autoconf.h" #include "autoconf.h"
//Older Android kernel doesn't has CONFIG_ANDROID defined,
//add this to force CONFIG_ANDROID defined
#ifdef CONFIG_PLATFORM_ANDROID
#define CONFIG_ANDROID
#endif
#if defined(CONFIG_HAS_EARLYSUSPEND) && defined (CONFIG_RESUME_IN_WORKQUEUE) #if defined(CONFIG_HAS_EARLYSUSPEND) && defined (CONFIG_RESUME_IN_WORKQUEUE)
#warning "You have CONFIG_HAS_EARLYSUSPEND enabled in your system, we disable CONFIG_RESUME_IN_WORKQUEUE automatically" #warning "You have CONFIG_HAS_EARLYSUSPEND enabled in your system, we disable CONFIG_RESUME_IN_WORKQUEUE automatically"
#undef CONFIG_RESUME_IN_WORKQUEUE #undef CONFIG_RESUME_IN_WORKQUEUE

View file

@ -45,11 +45,7 @@
#define RECV_BLK_CNT 16 #define RECV_BLK_CNT 16
#define RECV_BLK_TH RECV_BLK_CNT #define RECV_BLK_TH RECV_BLK_CNT
#ifdef CONFIG_PLATFORM_MSTAR
#define MAX_RECVBUF_SZ (8192) // 8K
#else
#define MAX_RECVBUF_SZ (15360) // 15k < 16k #define MAX_RECVBUF_SZ (15360) // 15k < 16k
#endif
#define RECV_BULK_IN_ADDR 0x80 #define RECV_BULK_IN_ADDR 0x80
#define RECV_INT_IN_ADDR 0x81 #define RECV_INT_IN_ADDR 0x81

View file

@ -2551,22 +2551,6 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,
goto exit; goto exit;
} }
#ifdef CONFIG_PLATFORM_MSTAR
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)) { if(_FAIL == rtw_pwr_wakeup(padapter)) {
ret= -EPERM; ret= -EPERM;
goto exit; goto exit;

View file

@ -1225,13 +1225,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) u64 rtw_modular64(u64 x, u64 y)
{ {
return do_div(x, y); return do_div(x, y);

View file

@ -389,49 +389,31 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
switch(cmd_num) { switch(cmd_num) {
case ANDROID_WIFI_CMD_STOP: case ANDROID_WIFI_CMD_STOP:
/* bytes_written = wl_android_wifi_off(net); */
break; break;
case ANDROID_WIFI_CMD_SCAN_ACTIVE: case ANDROID_WIFI_CMD_SCAN_ACTIVE:
/* rtw_set_scan_mode((struct adapter *)rtw_netdev_priv(net), SCAN_ACTIVE); */
#ifdef CONFIG_PLATFORM_MSTAR
(wdev_to_priv(net->ieee80211_ptr))->bandroid_scan = true;
#endif /* CONFIG_PLATFORM_MSTAR */
break; break;
case ANDROID_WIFI_CMD_SCAN_PASSIVE: case ANDROID_WIFI_CMD_SCAN_PASSIVE:
/* rtw_set_scan_mode((struct adapter *)rtw_netdev_priv(net), SCAN_PASSIVE); */
break; break;
case ANDROID_WIFI_CMD_RSSI: case ANDROID_WIFI_CMD_RSSI:
bytes_written = rtw_android_get_rssi(net, command, priv_cmd.total_len); bytes_written = rtw_android_get_rssi(net, command, priv_cmd.total_len);
break; break;
case ANDROID_WIFI_CMD_LINKSPEED: case ANDROID_WIFI_CMD_LINKSPEED:
bytes_written = rtw_android_get_link_speed(net, command, priv_cmd.total_len); bytes_written = rtw_android_get_link_speed(net, command, priv_cmd.total_len);
break; break;
case ANDROID_WIFI_CMD_MACADDR: case ANDROID_WIFI_CMD_MACADDR:
bytes_written = rtw_android_get_macaddr(net, command, priv_cmd.total_len); bytes_written = rtw_android_get_macaddr(net, command, priv_cmd.total_len);
break; break;
case ANDROID_WIFI_CMD_BLOCK: case ANDROID_WIFI_CMD_BLOCK:
bytes_written = rtw_android_set_block(net, command, priv_cmd.total_len); bytes_written = rtw_android_set_block(net, command, priv_cmd.total_len);
break; break;
case ANDROID_WIFI_CMD_RXFILTER_START: case ANDROID_WIFI_CMD_RXFILTER_START:
/* bytes_written = net_os_set_packet_filter(net, 1); */
break; break;
case ANDROID_WIFI_CMD_RXFILTER_STOP: case ANDROID_WIFI_CMD_RXFILTER_STOP:
/* bytes_written = net_os_set_packet_filter(net, 0); */
break; break;
case ANDROID_WIFI_CMD_RXFILTER_ADD: case ANDROID_WIFI_CMD_RXFILTER_ADD:
/* int filter_num = *(command + strlen(CMD_RXFILTER_ADD) + 1) - '0'; */
/* bytes_written = net_os_rxfilter_add_remove(net, true, filter_num); */
break; break;
case ANDROID_WIFI_CMD_RXFILTER_REMOVE: case ANDROID_WIFI_CMD_RXFILTER_REMOVE:
/* int filter_num = *(command + strlen(CMD_RXFILTER_REMOVE) + 1) - '0'; */
/* bytes_written = net_os_rxfilter_add_remove(net, false, filter_num); */
break; break;
case ANDROID_WIFI_CMD_BTCOEXSCAN_START: case ANDROID_WIFI_CMD_BTCOEXSCAN_START:
/* TBD: BTCOEXSCAN-START */ /* TBD: BTCOEXSCAN-START */
break; break;
@ -441,7 +423,6 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
case ANDROID_WIFI_CMD_BTCOEXMODE: case ANDROID_WIFI_CMD_BTCOEXMODE:
break; break;
case ANDROID_WIFI_CMD_SETSUSPENDOPT: case ANDROID_WIFI_CMD_SETSUSPENDOPT:
/* bytes_written = wl_android_set_suspendopt(net, command, priv_cmd.total_len); */
break; break;
case ANDROID_WIFI_CMD_SETBAND: case ANDROID_WIFI_CMD_SETBAND:
{ {
@ -454,41 +435,27 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
break; break;
} }
case ANDROID_WIFI_CMD_GETBAND: case ANDROID_WIFI_CMD_GETBAND:
/* bytes_written = wl_android_get_band(net, command, priv_cmd.total_len); */
break; break;
case ANDROID_WIFI_CMD_COUNTRY: case ANDROID_WIFI_CMD_COUNTRY:
bytes_written = rtw_android_set_country(net, command, priv_cmd.total_len); bytes_written = rtw_android_set_country(net, command, priv_cmd.total_len);
break; break;
#ifdef PNO_SUPPORT #ifdef PNO_SUPPORT
case ANDROID_WIFI_CMD_PNOSSIDCLR_SET: case ANDROID_WIFI_CMD_PNOSSIDCLR_SET:
/* bytes_written = dhd_dev_pno_reset(net); */
break; break;
case ANDROID_WIFI_CMD_PNOSETUP_SET: case ANDROID_WIFI_CMD_PNOSETUP_SET:
/* bytes_written = wl_android_set_pno_setup(net, command, priv_cmd.total_len); */
break; break;
case ANDROID_WIFI_CMD_PNOENABLE_SET: case ANDROID_WIFI_CMD_PNOENABLE_SET:
/* uint pfn_enabled = *(command + strlen(CMD_PNOENABLE_SET) + 1) - '0'; */
/* bytes_written = dhd_dev_pno_enable(net, pfn_enabled); */
break; break;
#endif #endif
case ANDROID_WIFI_CMD_P2P_DEV_ADDR: case ANDROID_WIFI_CMD_P2P_DEV_ADDR:
bytes_written = rtw_android_get_p2p_dev_addr(net, command, priv_cmd.total_len); bytes_written = rtw_android_get_p2p_dev_addr(net, command, priv_cmd.total_len);
break; break;
case ANDROID_WIFI_CMD_P2P_SET_NOA: case ANDROID_WIFI_CMD_P2P_SET_NOA:
/* int skip = strlen(CMD_P2P_SET_NOA) + 1; */
/* bytes_written = wl_cfg80211_set_p2p_noa(net, command + skip, priv_cmd.total_len - skip); */
break; break;
case ANDROID_WIFI_CMD_P2P_GET_NOA: case ANDROID_WIFI_CMD_P2P_GET_NOA:
/* bytes_written = wl_cfg80211_get_p2p_noa(net, command, priv_cmd.total_len); */
break; break;
case ANDROID_WIFI_CMD_P2P_SET_PS: case ANDROID_WIFI_CMD_P2P_SET_PS:
/* int skip = strlen(CMD_P2P_SET_PS) + 1; */
/* bytes_written = wl_cfg80211_set_p2p_ps(net, command + skip, priv_cmd.total_len - skip); */
break; break;
case ANDROID_WIFI_CMD_SET_AP_WPS_P2P_IE: case ANDROID_WIFI_CMD_SET_AP_WPS_P2P_IE:
{ {
int skip = strlen(android_wifi_cmd_str[ANDROID_WIFI_CMD_SET_AP_WPS_P2P_IE]) + 3; int skip = strlen(android_wifi_cmd_str[ANDROID_WIFI_CMD_SET_AP_WPS_P2P_IE]) + 3;

View file

@ -31,9 +31,6 @@
#include <usb_ops.h> #include <usb_ops.h>
#include <usb_osintf.h> #include <usb_osintf.h>
#include <usb_hal.h> #include <usb_hal.h>
#ifdef CONFIG_PLATFORM_RTK_DMP
#include <asm/io.h>
#endif
int ui_pid[3] = {0, 0, 0}; int ui_pid[3] = {0, 0, 0};
@ -918,10 +915,6 @@ error_exit:
} }
#endif #endif
#ifdef CONFIG_PLATFORM_RTD2880B
extern void rtd2885_wlan_netlink_sendMsg(char *action_string, char *name);
#endif
/* /*
* drv_init() - a device potentially for us * drv_init() - a device potentially for us
* *
@ -1124,12 +1117,6 @@ static void rtw_usb_if1_deinit(struct adapter *if1)
if(pnetdev) if(pnetdev)
rtw_free_netdev(pnetdev); rtw_free_netdev(pnetdev);
#ifdef CONFIG_PLATFORM_RTD2880B
DBG_871X("wlan link down\n");
rtd2885_wlan_netlink_sendMsg("linkdown", "8712");
#endif
} }
static void dump_usb_interface(struct usb_interface *usb_intf) static void dump_usb_interface(struct usb_interface *usb_intf)
@ -1272,11 +1259,6 @@ static int rtw_drv_init(struct usb_interface *pusb_intf, const struct usb_device
hostapd_mode_init(if1); hostapd_mode_init(if1);
#endif #endif
#ifdef CONFIG_PLATFORM_RTD2880B
DBG_871X("wlan link up\n");
rtd2885_wlan_netlink_sendMsg("linkup", "8712");
#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;
@ -1347,13 +1329,6 @@ extern int console_suspend_enabled;
static int __init rtw_drv_entry(void) 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
RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+rtw_drv_entry\n")); RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+rtw_drv_entry\n"));
DBG_871X(DRV_NAME " driver version=%s\n", DRIVERVERSION); DBG_871X(DRV_NAME " driver version=%s\n", DRIVERVERSION);