mirrors/rtl8812au
1
0
Fork 0
mirror of https://github.com/aircrack-ng/rtl8812au.git synced 2025-01-05 21:56:08 +00:00
Code Releases Activity

More USB VID/PID

Browse Source 
* Added 1 more ASUS USB VID/PID
* Removed some spaces
This commit is contained in:
Christian B 2017-12-06 14:34:02 +01:00 committed by GitHub
parent 083a5592e0
commit fe041fa1ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
os_dep/linux/usb_intf.c
View File

@ -42,12 +42,10 @@ extern int rtw_ampdu_enable;/* for enable tx_ampdu */
int ui_pid[3] = {0, 0, 0}; int ui_pid[3] = {0, 0, 0};
#endif #endif
extern int pm_netdev_open(struct net_device *pnetdev, u8 bnormal); extern int pm_netdev_open(struct net_device *pnetdev, u8 bnormal);
static int rtw_suspend(struct usb_interface *intf, pm_message_t message); static int rtw_suspend(struct usb_interface *intf, pm_message_t message);
static int rtw_resume(struct usb_interface *intf); static int rtw_resume(struct usb_interface *intf);
static int rtw_drv_init(struct usb_interface *pusb_intf, const struct usb_device_id *pdid); static int rtw_drv_init(struct usb_interface *pusb_intf, const struct usb_device_id *pdid);
static void rtw_dev_remove(struct usb_interface *pusb_intf); static void rtw_dev_remove(struct usb_interface *pusb_intf);
@ -85,13 +83,11 @@ static void rtw_dev_shutdown(struct device *dev)
#define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
#define USB_DEVICE_ID_MATCH_INT_NUMBER 0x0400 #define USB_DEVICE_ID_MATCH_INT_NUMBER 0x0400
#define USB_DEVICE_ID_MATCH_INT_INFO \ #define USB_DEVICE_ID_MATCH_INT_INFO \
(USB_DEVICE_ID_MATCH_INT_CLASS | \ (USB_DEVICE_ID_MATCH_INT_CLASS | \
USB_DEVICE_ID_MATCH_INT_SUBCLASS | \ USB_DEVICE_ID_MATCH_INT_SUBCLASS | \
USB_DEVICE_ID_MATCH_INT_PROTOCOL) USB_DEVICE_ID_MATCH_INT_PROTOCOL)
#define USB_DEVICE_AND_INTERFACE_INFO(vend, prod, cl, sc, pr) \ #define USB_DEVICE_AND_INTERFACE_INFO(vend, prod, cl, sc, pr) \
.match_flags = USB_DEVICE_ID_MATCH_INT_INFO \ .match_flags = USB_DEVICE_ID_MATCH_INT_INFO \
| USB_DEVICE_ID_MATCH_DEVICE, \ | USB_DEVICE_ID_MATCH_DEVICE, \
@ -125,10 +121,8 @@ static void rtw_dev_shutdown(struct device *dev)
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
#endif #endif
#define USB_VENDER_ID_REALTEK 0x0BDA #define USB_VENDER_ID_REALTEK 0x0BDA
/* DID_USB_v916_20130116 */ /* DID_USB_v916_20130116 */
static struct usb_device_id rtw_usb_id_tbl[] = { static struct usb_device_id rtw_usb_id_tbl[] = {
#ifdef CONFIG_RTL8188E #ifdef CONFIG_RTL8188E
@ -227,6 +221,7 @@ static struct usb_device_id rtw_usb_id_tbl[] = {
{USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8813), .driver_info = RTL8814A}, {USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8813), .driver_info = RTL8814A},
{USB_DEVICE(0x2001, 0x331A), .driver_info = RTL8814A}, /* D-Link - D-Link */ {USB_DEVICE(0x2001, 0x331A), .driver_info = RTL8814A}, /* D-Link - D-Link */
{USB_DEVICE(0x0B05, 0x1817), .driver_info = RTL8814A}, /* ASUS - ASUSTeK */ {USB_DEVICE(0x0B05, 0x1817), .driver_info = RTL8814A}, /* ASUS - ASUSTeK */
{USB_DEVICE(0x0B05, 0x1852), .driver_info = RTL8814A}, /* ASUS - ASUSTeK */
{USB_DEVICE(0x056E, 0x400B), .driver_info = RTL8814A}, /* ELECOM - ELECOM */ {USB_DEVICE(0x056E, 0x400B), .driver_info = RTL8814A}, /* ELECOM - ELECOM */
{USB_DEVICE(0x056E, 0x400D), .driver_info = RTL8814A}, /* ELECOM - ELECOM */ {USB_DEVICE(0x056E, 0x400D), .driver_info = RTL8814A}, /* ELECOM - ELECOM */
{USB_DEVICE(0x7392, 0xA834), .driver_info = RTL8814A}, /* Edimax - Edimax */ {USB_DEVICE(0x7392, 0xA834), .driver_info = RTL8814A}, /* Edimax - Edimax */
@ -355,7 +350,6 @@ static u8 rtw_init_intf_priv(struct dvobj_priv *dvobj)
_rtw_mutex_init(&dvobj->usb_vendor_req_mutex); _rtw_mutex_init(&dvobj->usb_vendor_req_mutex);
#endif #endif
#ifdef CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC #ifdef CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC
dvobj->usb_alloc_vendor_req_buf = rtw_zmalloc(MAX_USB_IO_CTL_SIZE); dvobj->usb_alloc_vendor_req_buf = rtw_zmalloc(MAX_USB_IO_CTL_SIZE);
if (dvobj->usb_alloc_vendor_req_buf == NULL) { if (dvobj->usb_alloc_vendor_req_buf == NULL) {
@ -457,13 +451,10 @@ static struct dvobj_priv *usb_dvobj_init(struct usb_interface *usb_intf, const s
struct usb_endpoint_descriptor *pendp_desc; struct usb_endpoint_descriptor *pendp_desc;
struct usb_device *pusbd; struct usb_device *pusbd;
pdvobjpriv = devobj_init(); pdvobjpriv = devobj_init();
if (pdvobjpriv == NULL) if (pdvobjpriv == NULL)
goto exit; goto exit;
pdvobjpriv->pusbintf = usb_intf ; pdvobjpriv->pusbintf = usb_intf ;
pusbd = pdvobjpriv->pusbdev = interface_to_usbdev(usb_intf); pusbd = pdvobjpriv->pusbdev = interface_to_usbdev(usb_intf);
usb_set_intfdata(usb_intf, pdvobjpriv); usb_set_intfdata(usb_intf, pdvobjpriv);
@ -721,7 +712,6 @@ u8 rtw_set_hal_ops(_adapter *padapter)
rtl8723du_set_hal_ops(padapter); rtl8723du_set_hal_ops(padapter);
#endif /* CONFIG_RTL8723D */ #endif /* CONFIG_RTL8723D */
#ifdef CONFIG_RTL8821C #ifdef CONFIG_RTL8821C
if (rtw_get_chip_type(padapter) == RTL8821C) { if (rtw_get_chip_type(padapter) == RTL8821C) {
if (rtl8821cu_set_hal_ops(padapter) == _FAIL) if (rtl8821cu_set_hal_ops(padapter) == _FAIL)
@ -903,7 +893,6 @@ int rtw_hw_resume(_adapter *padapter)
pwrpriv->bips_processing = _FALSE; pwrpriv->bips_processing = _FALSE;
_exit_pwrlock(&pwrpriv->lock); _exit_pwrlock(&pwrpriv->lock);
return 0; return 0;
error_exit: error_exit:
RTW_INFO("%s, Open net dev failed\n", __FUNCTION__); RTW_INFO("%s, Open net dev failed\n", __FUNCTION__);
@ -919,7 +908,6 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
PADAPTER padapter; PADAPTER padapter;
int ret = 0; int ret = 0;
dvobj = usb_get_intfdata(pusb_intf); dvobj = usb_get_intfdata(pusb_intf);
pwrpriv = dvobj_to_pwrctl(dvobj); pwrpriv = dvobj_to_pwrctl(dvobj);
pdbgpriv = &dvobj->drv_dbg; pdbgpriv = &dvobj->drv_dbg;
@ -959,7 +947,6 @@ int rtw_resume_process(_adapter *padapter)
struct dvobj_priv *pdvobj = padapter->dvobj; struct dvobj_priv *pdvobj = padapter->dvobj;
struct debug_priv *pdbgpriv = &pdvobj->drv_dbg; struct debug_priv *pdbgpriv = &pdvobj->drv_dbg;
if (pwrpriv->bInSuspend == _FALSE) { if (pwrpriv->bInSuspend == _FALSE) {
pdbgpriv->dbg_resume_error_cnt++; pdbgpriv->dbg_resume_error_cnt++;
RTW_INFO("%s bInSuspend = %d\n", __FUNCTION__, pwrpriv->bInSuspend); RTW_INFO("%s bInSuspend = %d\n", __FUNCTION__, pwrpriv->bInSuspend);
@ -1019,7 +1006,6 @@ int rtw_resume_process(_adapter *padapter)
} }
#endif/* CONFIG_AUTOSUSPEND */ #endif/* CONFIG_AUTOSUSPEND */
return ret; return ret;
} }
@ -1032,7 +1018,6 @@ static int rtw_resume(struct usb_interface *pusb_intf)
struct mlme_ext_priv *pmlmeext; struct mlme_ext_priv *pmlmeext;
int ret = 0; int ret = 0;
dvobj = usb_get_intfdata(pusb_intf); dvobj = usb_get_intfdata(pusb_intf);
pwrpriv = dvobj_to_pwrctl(dvobj); pwrpriv = dvobj_to_pwrctl(dvobj);
pdbgpriv = &dvobj->drv_dbg; pdbgpriv = &dvobj->drv_dbg;
@ -1071,8 +1056,6 @@ static int rtw_resume(struct usb_interface *pusb_intf)
return ret; return ret;
} }
#ifdef CONFIG_AUTOSUSPEND #ifdef CONFIG_AUTOSUSPEND
void autosuspend_enter(_adapter *padapter) void autosuspend_enter(_adapter *padapter)
{ {
@ -1218,7 +1201,6 @@ _adapter *rtw_usb_primary_adapter_init(struct dvobj_priv *dvobj,
padapter->dvobj = dvobj; padapter->dvobj = dvobj;
rtw_set_drv_stopped(padapter);/*init*/ rtw_set_drv_stopped(padapter);/*init*/
dvobj->padapters[dvobj->iface_nums++] = padapter; dvobj->padapters[dvobj->iface_nums++] = padapter;
@ -1241,7 +1223,6 @@ _adapter *rtw_usb_primary_adapter_init(struct dvobj_priv *dvobj,
if (rtw_set_hal_ops(padapter) == _FAIL) if (rtw_set_hal_ops(padapter) == _FAIL)
goto free_hal_data; goto free_hal_data;
padapter->intf_start = &usb_intf_start; padapter->intf_start = &usb_intf_start;
padapter->intf_stop = &usb_intf_stop; padapter->intf_stop = &usb_intf_stop;
@ -1465,7 +1446,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
status = _SUCCESS; status = _SUCCESS;
#if 0 /* not used now */ #if 0 /* not used now */
@ -1504,7 +1484,6 @@ static void rtw_dev_remove(struct usb_interface *pusb_intf)
struct net_device *pnetdev = padapter->pnetdev; struct net_device *pnetdev = padapter->pnetdev;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
RTW_INFO("+rtw_dev_remove\n"); RTW_INFO("+rtw_dev_remove\n");
dvobj->processing_dev_remove = _TRUE; dvobj->processing_dev_remove = _TRUE;
@ -1557,12 +1536,10 @@ static void rtw_dev_remove(struct usb_interface *pusb_intf)
RTW_INFO("-r871xu_dev_remove, done\n"); RTW_INFO("-r871xu_dev_remove, done\n");
#ifdef CONFIG_INTEL_PROXIM #ifdef CONFIG_INTEL_PROXIM
rtw_sw_export = NULL; rtw_sw_export = NULL;
#endif #endif
return; return;
} }
@ -1629,7 +1606,6 @@ static void __exit rtw_drv_halt(void)
rtw_mstat_dump(RTW_DBGDUMP); rtw_mstat_dump(RTW_DBGDUMP);
} }
module_init(rtw_drv_entry); module_init(rtw_drv_entry);
module_exit(rtw_drv_halt); module_exit(rtw_drv_halt);