skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2025-05-08 14:33:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Convert typedef for _adapter, etc.

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-26 20:08:39 -05:00
parent e8012b9521
commit 2bd2f4b4c8
99 changed files with 2239 additions and 2251 deletions
Download patch file Download diff file Expand all files Collapse all files

266
os_dep/ioctl_linux.c
View file

File diff suppressed because it is too large Load diff

32
os_dep/mlme_linux.c
View file

@ -27,21 +27,21 @@
void rtw_join_timeout_handler (void *FunctionContext)
{
_adapter *adapter = (_adapter *)FunctionContext;
struct adapter *adapter = (struct adapter *)FunctionContext;
_rtw_join_timeout_handler(adapter);
}
void _rtw_scan_timeout_handler (void *FunctionContext)
{
_adapter *adapter = (_adapter *)FunctionContext;
struct adapter *adapter = (struct adapter *)FunctionContext;
rtw_scan_timeout_handler(adapter);
}
static void _dynamic_check_timer_handlder (void *FunctionContext)
{
_adapter *adapter = (_adapter *)FunctionContext;
struct adapter *adapter = (struct adapter *)FunctionContext;
#if (MP_DRIVER == 1)
if (adapter->registrypriv.mp_mode == 1)
@ -52,7 +52,7 @@ if (adapter->registrypriv.mp_mode == 1)
_set_timer(&adapter->mlmepriv.dynamic_chk_timer, 2000);
}
void rtw_init_mlme_timer(_adapter *padapter)
void rtw_init_mlme_timer(struct adapter *padapter)
{
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -68,7 +68,7 @@ void rtw_init_mlme_timer(_adapter *padapter)
#endif
}
void rtw_os_indicate_connect(_adapter *adapter)
void rtw_os_indicate_connect(struct adapter *adapter)
{
_func_enter_;
@ -84,15 +84,15 @@ _func_exit_;
}
extern void indicate_wx_scan_complete_event(_adapter *padapter);
void rtw_os_indicate_scan_done( _adapter *padapter, bool aborted)
extern void indicate_wx_scan_complete_event(struct adapter *padapter);
void rtw_os_indicate_scan_done( struct adapter *padapter, bool aborted)
{
indicate_wx_scan_complete_event(padapter);
}
static struct rt_pmkid_list backupPMKIDList[ NUM_PMKID_CACHE ];
void rtw_reset_securitypriv( _adapter *adapter )
void rtw_reset_securitypriv( struct adapter *adapter )
{
u8 backupPMKIDIndex = 0;
u8 backupTKIPCountermeasure = 0x00;
@ -146,7 +146,7 @@ void rtw_reset_securitypriv( _adapter *adapter )
}
}
void rtw_os_indicate_disconnect( _adapter *adapter )
void rtw_os_indicate_disconnect( struct adapter *adapter )
{
_func_enter_;
@ -160,7 +160,7 @@ _func_exit_;
}
void rtw_report_sec_ie(_adapter *adapter,u8 authmode,u8 *sec_ie)
void rtw_report_sec_ie(struct adapter *adapter,u8 authmode,u8 *sec_ie)
{
uint len;
u8 *buff,*p,i;
@ -210,14 +210,14 @@ _func_exit_;
static void _survey_timer_hdl (void *FunctionContext)
{
_adapter *padapter = (_adapter *)FunctionContext;
struct adapter *padapter = (struct adapter *)FunctionContext;
survey_timer_hdl(padapter);
}
static void _link_timer_hdl (void *FunctionContext)
{
_adapter *padapter = (_adapter *)FunctionContext;
struct adapter *padapter = (struct adapter *)FunctionContext;
link_timer_hdl(padapter);
}
@ -227,13 +227,13 @@ static void _addba_timer_hdl(void *FunctionContext)
addba_timer_hdl(psta);
}
void init_addba_retry_timer(_adapter *padapter, struct sta_info *psta)
void init_addba_retry_timer(struct adapter *padapter, struct sta_info *psta)
{
_init_timer(&psta->addba_retry_timer, padapter->pnetdev, _addba_timer_hdl, psta);
}
void init_mlme_ext_timer(_adapter *padapter)
void init_mlme_ext_timer(struct adapter *padapter)
{
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -243,7 +243,7 @@ void init_mlme_ext_timer(_adapter *padapter)
#ifdef CONFIG_AP_MODE
void rtw_indicate_sta_assoc_event(_adapter *padapter, struct sta_info *psta)
void rtw_indicate_sta_assoc_event(struct adapter *padapter, struct sta_info *psta)
{
union iwreq_data wrqu;
struct sta_priv *pstapriv = &padapter->stapriv;
@ -267,7 +267,7 @@ void rtw_indicate_sta_assoc_event(_adapter *padapter, struct sta_info *psta)
wireless_send_event(padapter->pnetdev, IWEVREGISTERED, &wrqu, NULL);
}
void rtw_indicate_sta_disassoc_event(_adapter *padapter, struct sta_info *psta)
void rtw_indicate_sta_disassoc_event(struct adapter *padapter, struct sta_info *psta)
{
union iwreq_data wrqu;
struct sta_priv *pstapriv = &padapter->stapriv;

63
os_dep/os_intfs.c
View file

@ -219,7 +219,7 @@ void rtw_proc_init_one(struct net_device *dev)
{
struct proc_dir_entry *dir_dev = NULL;
struct proc_dir_entry *entry=NULL;
_adapter *padapter = rtw_netdev_priv(dev);
struct adapter *padapter = rtw_netdev_priv(dev);
u8 rf_type;
if (rtw_proc == NULL) {
@ -335,7 +335,7 @@ void rtw_proc_init_one(struct net_device *dev)
}
entry = create_proc_read_entry("adapter_state", S_IFREG | S_IRUGO,
dir_dev, proc_get_adapter_state, dev);
dir_dev, proc_getstruct adapter_state, dev);
if (!entry) {
pr_info("Unable to create_proc_read_entry!\n");
return;
@ -506,7 +506,7 @@ void rtw_proc_init_one(struct net_device *dev)
void rtw_proc_remove_one(struct net_device *dev)
{
struct proc_dir_entry *dir_dev = NULL;
_adapter *padapter = rtw_netdev_priv(dev);
struct adapter *padapter = rtw_netdev_priv(dev);
u8 rf_type;
dir_dev = padapter->dir_dev;
@ -576,7 +576,7 @@ void rtw_proc_remove_one(struct net_device *dev)
}
#endif
static uint loadparam( _adapter *padapter, struct net_device *pnetdev)
static uint loadparam( struct adapter *padapter, struct net_device *pnetdev)
{
uint status = _SUCCESS;
@ -664,7 +664,7 @@ _func_exit_;
static int rtw_net_set_mac_address(struct net_device *pnetdev, void *p)
{
_adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
struct sockaddr *addr = p;
if (padapter->bup == false)
@ -675,7 +675,7 @@ static int rtw_net_set_mac_address(struct net_device *pnetdev, void *p)
static struct net_device_stats *rtw_net_get_stats(struct net_device *pnetdev)
{
_adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
struct recv_priv *precvpriv = &(padapter->recvpriv);
@ -725,7 +725,7 @@ static unsigned int rtw_classify8021d(struct sk_buff *skb)
static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb)
{
_adapter *padapter = rtw_netdev_priv(dev);
struct adapter *padapter = rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
skb->priority = rtw_classify8021d(skb);
@ -777,7 +777,7 @@ static const struct net_device_ops rtw_netdev_ops = {
int rtw_init_netdev_name(struct net_device *pnetdev, const char *ifname)
{
_adapter *padapter = rtw_netdev_priv(pnetdev);
struct adapter *padapter = rtw_netdev_priv(pnetdev);
if (dev_alloc_name(pnetdev, ifname) < 0)
RT_TRACE(_module_os_intfs_c_,_drv_err_,("dev_alloc_name, fail!\n"));
@ -786,17 +786,17 @@ int rtw_init_netdev_name(struct net_device *pnetdev, const char *ifname)
return 0;
}
struct net_device *rtw_init_netdev(_adapter *old_padapter)
struct net_device *rtw_init_netdev(struct adapter *old_padapter)
{
_adapter *padapter;
struct adapter *padapter;
struct net_device *pnetdev;
RT_TRACE(_module_os_intfs_c_,_drv_info_,("+init_net_dev\n"));
if (old_padapter != NULL)
pnetdev = rtw_alloc_etherdev_with_old_priv(sizeof(_adapter), (void *)old_padapter);
pnetdev = rtw_alloc_etherdev_with_old_priv(sizeof(struct adapter), (void *)old_padapter);
else
pnetdev = rtw_alloc_etherdev(sizeof(_adapter));
pnetdev = rtw_alloc_etherdev(sizeof(struct adapter));
if (!pnetdev)
return NULL;
@ -830,7 +830,7 @@ struct net_device *rtw_init_netdev(_adapter *old_padapter)
return pnetdev;
}
u32 rtw_start_drv_threads(_adapter *padapter)
u32 rtw_start_drv_threads(struct adapter *padapter)
{
u32 _status = _SUCCESS;
@ -846,7 +846,7 @@ u32 rtw_start_drv_threads(_adapter *padapter)
return _status;
}
void rtw_stop_drv_threads (_adapter *padapter)
void rtw_stop_drv_threads (struct adapter *padapter)
{
RT_TRACE(_module_os_intfs_c_,_drv_info_,("+rtw_stop_drv_threads\n"));
@ -858,7 +858,7 @@ void rtw_stop_drv_threads (_adapter *padapter)
rtw_hal_stop_thread(padapter);
}
static u8 rtw_init_default_value(_adapter *padapter)
static u8 rtw_init_default_value(struct adapter *padapter)
{
u8 ret = _SUCCESS;
struct registry_priv* pregistrypriv = &padapter->registrypriv;
@ -911,7 +911,7 @@ static u8 rtw_init_default_value(_adapter *padapter)
return ret;
}
u8 rtw_reset_drv_sw(_adapter *padapter)
u8 rtw_reset_drv_sw(struct adapter *padapter)
{
u8 ret8=_SUCCESS;
struct mlme_priv *pmlmepriv= &padapter->mlmepriv;
@ -942,7 +942,7 @@ u8 rtw_reset_drv_sw(_adapter *padapter)
return ret8;
}
u8 rtw_init_drv_sw(_adapter *padapter)
u8 rtw_init_drv_sw(struct adapter *padapter)
{
u8 ret8=_SUCCESS;
@ -1027,14 +1027,14 @@ exit:
}
#ifdef CONFIG_WOWLAN
void rtw_cancel_dynamic_chk_timer(_adapter *padapter)
void rtw_cancel_dynamic_chk_timer(struct adapter *padapter)
{
_cancel_timer_ex(&padapter->mlmepriv.dynamic_chk_timer);
RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel dynamic_chk_timer!\n"));
}
#endif
void rtw_cancel_all_timer(_adapter *padapter)
void rtw_cancel_all_timer(struct adapter *padapter)
{
RT_TRACE(_module_os_intfs_c_,_drv_info_,("+rtw_cancel_all_timer\n"));
@ -1062,7 +1062,7 @@ void rtw_cancel_all_timer(_adapter *padapter)
rtw_hal_dm_deinit(padapter);
}
u8 rtw_free_drv_sw(_adapter *padapter)
u8 rtw_free_drv_sw(struct adapter *padapter)
{
struct net_device *pnetdev = (struct net_device*)padapter->pnetdev;
@ -1115,10 +1115,9 @@ u8 rtw_free_drv_sw(_adapter *padapter)
padapter->rereg_nd_name_priv.old_pnetdev = NULL;
}
// clear pbuddy_adapter to avoid access wrong pointer.
if (padapter->pbuddy_adapter != NULL) {
// clear pbuddystruct adapter to avoid access wrong pointer.
if (padapter->pbuddy_adapter != NULL)
padapter->pbuddy_adapter->pbuddy_adapter = NULL;
}
RT_TRACE(_module_os_intfs_c_,_drv_info_,("-rtw_free_drv_sw\n"));
@ -1127,7 +1126,7 @@ u8 rtw_free_drv_sw(_adapter *padapter)
void netdev_br_init(struct net_device *netdev)
{
_adapter *adapter = (_adapter *)rtw_netdev_priv(netdev);
struct adapter *adapter = (struct adapter *)rtw_netdev_priv(netdev);
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35))
rcu_read_lock();
@ -1173,7 +1172,7 @@ void netdev_br_init(struct net_device *netdev)
int _netdev_open(struct net_device *pnetdev)
{
uint status;
_adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv;
RT_TRACE(_module_os_intfs_c_,_drv_info_,("+88eu_drv - dev_open\n"));
@ -1252,7 +1251,7 @@ netdev_open_error:
int netdev_open(struct net_device *pnetdev)
{
int ret;
_adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
_enter_critical_mutex(padapter->hw_init_mutex, NULL);
ret = _netdev_open(pnetdev);
@ -1261,7 +1260,7 @@ int netdev_open(struct net_device *pnetdev)
return ret;
}
static int ips_netdrv_open(_adapter *padapter)
static int ips_netdrv_open(struct adapter *padapter)
{
int status = _SUCCESS;
padapter->net_closed = false;
@ -1292,7 +1291,7 @@ netdev_open_error:
}
int rtw_ips_pwr_up(_adapter *padapter)
int rtw_ips_pwr_up(struct adapter *padapter)
{
int result;
u32 start_time = rtw_get_current_time();
@ -1307,7 +1306,7 @@ int rtw_ips_pwr_up(_adapter *padapter)
return result;
}
void rtw_ips_pwr_down(_adapter *padapter)
void rtw_ips_pwr_down(struct adapter *padapter)
{
u32 start_time = rtw_get_current_time();
DBG_88E("===> rtw_ips_pwr_down...................\n");
@ -1322,7 +1321,7 @@ void rtw_ips_pwr_down(_adapter *padapter)
DBG_88E("<=== rtw_ips_pwr_down..................... in %dms\n", rtw_get_passing_time_ms(start_time));
}
void rtw_ips_dev_unload(_adapter *padapter)
void rtw_ips_dev_unload(struct adapter *padapter)
{
struct net_device *pnetdev= (struct net_device*)padapter->pnetdev;
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
@ -1345,13 +1344,13 @@ int pm_netdev_open(struct net_device *pnetdev,u8 bnormal)
if (true == bnormal)
status = netdev_open(pnetdev);
else
status = (_SUCCESS == ips_netdrv_open((_adapter *)rtw_netdev_priv(pnetdev)))?(0):(-1);
status = (_SUCCESS == ips_netdrv_open((struct adapter *)rtw_netdev_priv(pnetdev)))?(0):(-1);
return status;
}
static int netdev_close(struct net_device *pnetdev)
{
_adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
RT_TRACE(_module_os_intfs_c_,_drv_info_,("+88eu_drv - drv_close\n"));

2
os_dep/osdep_service.c
View file

@ -667,7 +667,7 @@ RETURN:
* Jeff: this function should be called under ioctl (rtnl_lock is accquired) while
* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
*/
int rtw_change_ifname(_adapter *padapter, const char *ifname)
int rtw_change_ifname(struct adapter *padapter, const char *ifname)
{
struct net_device *pnetdev;
struct net_device *cur_pnetdev = padapter->pnetdev;

18
os_dep/recv_linux.c
View file

@ -30,7 +30,7 @@
#include <usb_ops.h>
//init os related resource in struct recv_priv
int rtw_os_recv_resource_init(struct recv_priv *precvpriv, _adapter *padapter)
int rtw_os_recv_resource_init(struct recv_priv *precvpriv, struct adapter *padapter)
{
int res=_SUCCESS;
@ -38,7 +38,7 @@ int rtw_os_recv_resource_init(struct recv_priv *precvpriv, _adapter *padapter)
}
//alloc os related resource in union recv_frame
int rtw_os_recv_resource_alloc(_adapter *padapter, union recv_frame *precvframe)
int rtw_os_recv_resource_alloc(struct adapter *padapter, union recv_frame *precvframe)
{
int res=_SUCCESS;
@ -56,7 +56,7 @@ void rtw_os_recv_resource_free(struct recv_priv *precvpriv)
//alloc os related resource in struct recv_buf
int rtw_os_recvbuf_resource_alloc(_adapter *padapter, struct recv_buf *precvbuf)
int rtw_os_recvbuf_resource_alloc(struct adapter *padapter, struct recv_buf *precvbuf)
{
int res=_SUCCESS;
struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);
@ -84,7 +84,7 @@ int rtw_os_recvbuf_resource_alloc(_adapter *padapter, struct recv_buf *precvbuf)
}
//free os related resource in struct recv_buf
int rtw_os_recvbuf_resource_free(_adapter *padapter, struct recv_buf *precvbuf)
int rtw_os_recvbuf_resource_free(struct adapter *padapter, struct recv_buf *precvbuf)
{
if (precvbuf->purb)
usb_free_urb(precvbuf->purb);
@ -95,7 +95,7 @@ int rtw_os_recvbuf_resource_free(_adapter *padapter, struct recv_buf *precvbuf)
return _SUCCESS;
}
void rtw_handle_tkip_mic_err(_adapter *padapter,u8 bgroup)
void rtw_handle_tkip_mic_err(struct adapter *padapter,u8 bgroup)
{
union iwreq_data wrqu;
struct iw_michaelmicfailure ev;
@ -138,11 +138,11 @@ void rtw_handle_tkip_mic_err(_adapter *padapter,u8 bgroup)
wireless_send_event( padapter->pnetdev, IWEVMICHAELMICFAILURE, &wrqu, (char*) &ev );
}
void rtw_hostapd_mlme_rx(_adapter *padapter, union recv_frame *precv_frame)
void rtw_hostapd_mlme_rx(struct adapter *padapter, union recv_frame *precv_frame)
{
}
int rtw_recv_indicatepkt(_adapter *padapter, union recv_frame *precv_frame)
int rtw_recv_indicatepkt(struct adapter *padapter, union recv_frame *precv_frame)
{
struct recv_priv *precvpriv;
struct __queue *pfree_recv_queue;
@ -258,7 +258,7 @@ _func_exit_;
}
void rtw_os_read_port(_adapter *padapter, struct recv_buf *precvbuf)
void rtw_os_read_port(struct adapter *padapter, struct recv_buf *precvbuf)
{
struct recv_priv *precvpriv = &padapter->recvpriv;
@ -284,7 +284,7 @@ void _rtw_reordering_ctrl_timeout_handler(void *FunctionContext)
void rtw_init_recv_timer(struct recv_reorder_ctrl *preorder_ctrl)
{
_adapter *padapter = preorder_ctrl->padapter;
struct adapter *padapter = preorder_ctrl->padapter;
_init_timer(&(preorder_ctrl->reordering_ctrl_timer), padapter->pnetdev, _rtw_reordering_ctrl_timeout_handler, preorder_ctrl);

10
os_dep/rtw_android.c
View file

@ -98,7 +98,7 @@ int rtw_android_cmdstr_to_num(char *cmdstr)
static int rtw_android_get_rssi(struct net_device *net, char *command, int total_len)
{
_adapter *padapter = (_adapter *)rtw_netdev_priv(net);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(net);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct wlan_network *pcur_network = &pmlmepriv->cur_network;
int bytes_written = 0;
@ -113,7 +113,7 @@ static int rtw_android_get_rssi(struct net_device *net, char *command, int total
static int rtw_android_get_link_speed(struct net_device *net, char *command, int total_len)
{
_adapter *padapter = (_adapter *)rtw_netdev_priv(net);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(net);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct wlan_network *pcur_network = &pmlmepriv->cur_network;
int bytes_written = 0;
@ -127,7 +127,7 @@ static int rtw_android_get_link_speed(struct net_device *net, char *command, int
static int rtw_android_get_macaddr(struct net_device *net, char *command, int total_len)
{
_adapter *adapter = (_adapter *)rtw_netdev_priv(net);
struct adapter *adapter = (struct adapter *)rtw_netdev_priv(net);
int bytes_written = 0;
bytes_written = snprintf(command, total_len, "Macaddr = %pM", net->dev_addr);
@ -136,7 +136,7 @@ static int rtw_android_get_macaddr(struct net_device *net, char *command, int to
static int rtw_android_set_country(struct net_device *net, char *command, int total_len)
{
_adapter *adapter = (_adapter *)rtw_netdev_priv(net);
struct adapter *adapter = (struct adapter *)rtw_netdev_priv(net);
char *country_code = command + strlen(android_wifi_cmd_str[ANDROID_WIFI_CMD_COUNTRY]) + 1;
int ret;
@ -160,7 +160,7 @@ static int rtw_android_get_p2p_dev_addr(struct net_device *net, char *command, i
static int rtw_android_set_block(struct net_device *net, char *command, int total_len)
{
int ret;
_adapter *adapter = (_adapter *)rtw_netdev_priv(net);
struct adapter *adapter = (struct adapter *)rtw_netdev_priv(net);
char *block_value = command + strlen(android_wifi_cmd_str[ANDROID_WIFI_CMD_BLOCK]) + 1;
return 0;

36
os_dep/usb_intf.c
View file

@ -38,7 +38,7 @@ int ui_pid[3] = {0, 0, 0};
static int rtw_suspend(struct usb_interface *intf, pm_message_t message);
static int rtw_resume(struct usb_interface *intf);
int rtw_resume_process(_adapter *padapter);
int rtw_resume_process(struct adapter *padapter);
static int rtw_drv_init(struct usb_interface *pusb_intf,const struct usb_device_id *pdid);
@ -356,13 +356,13 @@ _func_enter_;
_func_exit_;
}
static void decide_chip_type_by_usb_device_id(_adapter *padapter, const struct usb_device_id *pdid)
static void decide_chip_type_by_usb_device_id(struct adapter *padapter, const struct usb_device_id *pdid)
{
padapter->chip_type = NULL_CHIP_TYPE;
hal_set_hw_type(padapter);
}
static void usb_intf_start(_adapter *padapter)
static void usb_intf_start(struct adapter *padapter)
{
RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+usb_intf_start\n"));
@ -373,7 +373,7 @@ static void usb_intf_start(_adapter *padapter)
}
static void usb_intf_stop(_adapter *padapter)
static void usb_intf_stop(struct adapter *padapter)
{
RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+usb_intf_stop\n"));
@ -398,7 +398,7 @@ static void usb_intf_stop(_adapter *padapter)
}
static void rtw_dev_unload(_adapter *padapter)
static void rtw_dev_unload(struct adapter *padapter)
{
struct net_device *pnetdev= (struct net_device*)padapter->pnetdev;
u8 val8;
@ -480,7 +480,7 @@ static void process_spec_devid(const struct usb_device_id *pdid)
}
}
int rtw_hw_suspend(_adapter *padapter )
int rtw_hw_suspend(struct adapter *padapter )
{
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
struct usb_interface *pusb_intf = adapter_to_dvobj(padapter)->pusbintf;
@ -554,7 +554,7 @@ error_exit:
}
int rtw_hw_resume(_adapter *padapter)
int rtw_hw_resume(struct adapter *padapter)
{
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
struct usb_interface *pusb_intf = adapter_to_dvobj(padapter)->pusbintf;
@ -607,7 +607,7 @@ error_exit:
static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
{
struct dvobj_priv *dvobj = usb_get_intfdata(pusb_intf);
_adapter *padapter = dvobj->if1;
struct adapter *padapter = dvobj->if1;
struct net_device *pnetdev = padapter->pnetdev;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
@ -700,7 +700,7 @@ exit:
static int rtw_resume(struct usb_interface *pusb_intf)
{
struct dvobj_priv *dvobj = usb_get_intfdata(pusb_intf);
_adapter *padapter = dvobj->if1;
struct adapter *padapter = dvobj->if1;
struct net_device *pnetdev = padapter->pnetdev;
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
int ret = 0;
@ -712,7 +712,7 @@ static int rtw_resume(struct usb_interface *pusb_intf)
return ret;
}
int rtw_resume_process(_adapter *padapter)
int rtw_resume_process(struct adapter *padapter)
{
struct net_device *pnetdev;
struct pwrctrl_priv *pwrpriv;
@ -770,16 +770,16 @@ exit:
* We accept the new device by returning 0.
*/
static _adapter *rtw_sw_export = NULL;
static struct adapter *rtw_sw_export = NULL;
static _adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
struct usb_interface *pusb_intf, const struct usb_device_id *pdid)
{
_adapter *padapter = NULL;
struct adapter *padapter = NULL;
struct net_device *pnetdev = NULL;
int status = _FAIL;
if ((padapter = (_adapter *)rtw_zvmalloc(sizeof(*padapter))) == NULL) {
if ((padapter = (struct adapter *)rtw_zvmalloc(sizeof(*padapter))) == NULL) {
goto exit;
}
padapter->dvobj = dvobj;
@ -891,7 +891,7 @@ exit:
return padapter;
}
static void rtw_usb_if1_deinit(_adapter *if1)
static void rtw_usb_if1_deinit(struct adapter *if1)
{
struct net_device *pnetdev = if1->pnetdev;
struct mlme_priv *pmlmepriv= &if1->mlmepriv;
@ -1063,7 +1063,7 @@ static void dump_usb_interface(struct usb_interface *usb_intf)
static int rtw_drv_init(struct usb_interface *pusb_intf, const struct usb_device_id *pdid)
{
int i;
_adapter *if1 = NULL, *if2 = NULL;
struct adapter *if1 = NULL, *if2 = NULL;
int status;
struct dvobj_priv *dvobj;
@ -1080,7 +1080,7 @@ static int rtw_drv_init(struct usb_interface *pusb_intf, const struct usb_device
}
if ((if1 = rtw_usb_if1_init(dvobj, pusb_intf, pdid)) == NULL) {
DBG_88E("rtw_init_primary_adapter Failed!\n");
DBG_88E("rtw_init_primarystruct adapter Failed!\n");
goto free_dvobj;
}
@ -1111,7 +1111,7 @@ exit:
static void rtw_dev_remove(struct usb_interface *pusb_intf)
{
struct dvobj_priv *dvobj = usb_get_intfdata(pusb_intf);
_adapter *padapter = dvobj->if1;
struct adapter *padapter = dvobj->if1;
struct net_device *pnetdev = padapter->pnetdev;
struct mlme_priv *pmlmepriv= &padapter->mlmepriv;

10
os_dep/usb_ops_linux.c
View file

@ -80,7 +80,7 @@ static u32 usb_bulkout_zero(struct intf_hdl *pintfhdl, u32 addr)
unsigned char *pbuf;
struct zero_bulkout_context *pcontext;
struct urb * purb = NULL;
_adapter *padapter = (_adapter *)pintfhdl->padapter;
struct adapter *padapter = (struct adapter *)pintfhdl->padapter;
struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter);
struct usb_device *pusbd = pdvobj->pusbdev;
@ -135,7 +135,7 @@ void usb_read_port_cancel(struct intf_hdl *pintfhdl)
{
int i;
struct recv_buf *precvbuf;
_adapter *padapter = pintfhdl->padapter;
struct adapter *padapter = pintfhdl->padapter;
precvbuf = (struct recv_buf *)padapter->recvpriv.precv_buf;
DBG_88E("%s\n", __func__);
@ -158,7 +158,7 @@ static void usb_write_port_complete(struct urb *purb, struct pt_regs *regs)
unsigned long irqL;
int i;
struct xmit_buf *pxmitbuf = (struct xmit_buf *)purb->context;
_adapter *padapter = pxmitbuf->padapter;
struct adapter *padapter = pxmitbuf->padapter;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
_func_enter_;
@ -256,7 +256,7 @@ u32 usb_write_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem)
int status;
u32 ret = _FAIL, bwritezero = false;
struct urb * purb = NULL;
_adapter *padapter = (_adapter *)pintfhdl->padapter;
struct adapter *padapter = (struct adapter *)pintfhdl->padapter;
struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter);
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
struct xmit_buf *pxmitbuf = (struct xmit_buf *)wmem;
@ -360,7 +360,7 @@ _func_exit_;
void usb_write_port_cancel(struct intf_hdl *pintfhdl)
{
int i, j;
_adapter *padapter = pintfhdl->padapter;
struct adapter *padapter = pintfhdl->padapter;
struct xmit_buf *pxmitbuf = (struct xmit_buf *)padapter->xmitpriv.pxmitbuf;
DBG_88E("%s\n", __func__);

18
os_dep/xmit_linux.c
View file

@ -87,7 +87,7 @@ void rtw_set_tx_chksum_offload(struct sk_buff *pkt, struct pkt_attrib *pattrib)
{
}
int rtw_os_xmit_resource_alloc(_adapter *padapter, struct xmit_buf *pxmitbuf,u32 alloc_sz)
int rtw_os_xmit_resource_alloc(struct adapter *padapter, struct xmit_buf *pxmitbuf,u32 alloc_sz)
{
int i;
struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);
@ -112,7 +112,7 @@ int rtw_os_xmit_resource_alloc(_adapter *padapter, struct xmit_buf *pxmitbuf,u32
return _SUCCESS;
}
void rtw_os_xmit_resource_free(_adapter *padapter, struct xmit_buf *pxmitbuf,u32 free_sz)
void rtw_os_xmit_resource_free(struct adapter *padapter, struct xmit_buf *pxmitbuf,u32 free_sz)
{
int i;
struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter);
@ -134,7 +134,7 @@ void rtw_os_xmit_resource_free(_adapter *padapter, struct xmit_buf *pxmitbuf,u32
#define WMM_XMIT_THRESHOLD (NR_XMITFRAME*2/5)
void rtw_os_pkt_complete(_adapter *padapter, struct sk_buff *pkt)
void rtw_os_pkt_complete(struct adapter *padapter, struct sk_buff *pkt)
{
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
u16 queue;
@ -159,7 +159,7 @@ void rtw_os_pkt_complete(_adapter *padapter, struct sk_buff *pkt)
dev_kfree_skb_any(pkt);
}
void rtw_os_xmit_complete(_adapter *padapter, struct xmit_frame *pxframe)
void rtw_os_xmit_complete(struct adapter *padapter, struct xmit_frame *pxframe)
{
if (pxframe->pkt)
{
@ -173,9 +173,9 @@ void rtw_os_xmit_complete(_adapter *padapter, struct xmit_frame *pxframe)
pxframe->pkt = NULL;
}
void rtw_os_xmit_schedule(_adapter *padapter)
void rtw_os_xmit_schedule(struct adapter *padapter)
{
_adapter *pri_adapter = padapter;
struct adapter *pri_adapter = padapter;
unsigned long irqL;
struct xmit_priv *pxmitpriv;
@ -193,7 +193,7 @@ void rtw_os_xmit_schedule(_adapter *padapter)
_exit_critical_bh(&pxmitpriv->lock, &irqL);
}
static void rtw_check_xmit_resource(_adapter *padapter, struct sk_buff *pkt)
static void rtw_check_xmit_resource(struct adapter *padapter, struct sk_buff *pkt)
{
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,35))
@ -221,7 +221,7 @@ static void rtw_check_xmit_resource(_adapter *padapter, struct sk_buff *pkt)
#endif
}
static int rtw_mlcst2unicst(_adapter *padapter, struct sk_buff *skb)
static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb)
{
struct sta_priv *pstapriv = &padapter->stapriv;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@ -275,7 +275,7 @@ static int rtw_mlcst2unicst(_adapter *padapter, struct sk_buff *skb)
int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev)
{
_adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
s32 res = 0;