diff --git a/os_dep/usb_intf.c b/os_dep/usb_intf.c index 573bdb4..8ce4642 100755 --- a/os_dep/usb_intf.c +++ b/os_dep/usb_intf.c @@ -936,21 +936,6 @@ error_exit: extern void rtd2885_wlan_netlink_sendMsg(char *action_string, char *name); #endif -#ifdef CONFIG_PLATFORM_ARM_SUNxI -#include -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 - -#ifdef CONFIG_PLATFORM_ARM_SUN6I -#include -extern int sw_usb_disable_hcd(__u32 usbc_no); -extern int sw_usb_enable_hcd(__u32 usbc_no); -extern void wifi_pm_power(int on); -static script_item_u item; -#endif - /* * drv_init() - a device potentially for us * @@ -1382,44 +1367,11 @@ static int __init rtw_drv_entry(void) tmp |= 0x55; writel(tmp,(volatile unsigned int*)0xb801a608);/* write dummy register for 1055 */ #endif -#ifdef CONFIG_PLATFORM_ARM_SUNxI - 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_8192C("ERR: script_parser_fetch usb_wifi_usbc_num failed\n"); - ret = -ENOMEM; - return ret; - } - DBG_8192C("sw_usb_enable_hcd: usbc_num = %d\n", usb_wifi_host); - sw_usb_enable_hcd(usb_wifi_host); -#endif /* CONFIG_PLATFORM_ARM_SUNxI */ - -#if defined CONFIG_PLATFORM_ARM_SUN6I - script_item_value_type_e type; - - type = script_get_item("wifi_para", "wifi_usbc_id", &item); - if(SCIRPT_ITEM_VALUE_TYPE_INT != type){ - printk("ERR: script_get_item wifi_usbc_id failed\n"); - return -ENOMEM; - } - - printk("sw_usb_enable_hcd: usbc_num = %d\n", item.val); - wifi_pm_power(1); - mdelay(10); - - sw_usb_enable_hcd(item.val); -#endif /* defined CONFIG_PLATFORM_ARM_SUN6I */ - RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+rtw_drv_entry\n")); DBG_871X(DRV_NAME " driver version=%s\n", DRIVERVERSION); DBG_871X("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(); usb_drv->drv_registered = true; @@ -1434,16 +1386,6 @@ static void __exit rtw_drv_halt(void) usb_drv->drv_registered = false; usb_deregister(&usb_drv->usbdrv); -#ifdef CONFIG_PLATFORM_ARM_SUNxI - DBG_8192C("sw_usb_disable_hcd: usbc_num = %d\n", usb_wifi_host); - sw_usb_disable_hcd(usb_wifi_host); -#endif /* CONFIG_PLATFORM_ARM_SUNxI */ - -#if defined CONFIG_PLATFORM_ARM_SUN6I - sw_usb_disable_hcd(item.val); - wifi_pm_power(0); -#endif /* defined CONFIG_PLATFORM_ARM_SUN6I */ - rtw_suspend_lock_uninit(); DBG_871X("-rtw_drv_halt\n");