skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2024-09-20 08:07:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Remove typedefs from include/rtw_mp_ioctl.h

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-22 22:39:52 -05:00
parent 48f49d413c
commit dd4a02b2ff
3 changed files with 29 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
core/rtw_mp_ioctl.c
View file

@ -826,7 +826,7 @@ NDIS_STATUS oid_rt_pro8711_join_bss_hdl(struct oid_par_priv *poid_par_priv)
/* */ /* */
NDIS_STATUS oid_rt_pro_read_register_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_pro_read_register_hdl(struct oid_par_priv *poid_par_priv)
{ {
pRW_Reg RegRWStruct; struct mp_rw_reg * RegRWStruct;
u32 offset, width; u32 offset, width;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER Adapter = (PADAPTER)(poid_par_priv->adapter_context);
@ -839,7 +839,7 @@ _func_enter_;
if (poid_par_priv->type_of_oid != QUERY_OID) if (poid_par_priv->type_of_oid != QUERY_OID)
return NDIS_STATUS_NOT_ACCEPTED; return NDIS_STATUS_NOT_ACCEPTED;
RegRWStruct = (pRW_Reg)poid_par_priv->information_buf; RegRWStruct = (struct mp_rw_reg *)poid_par_priv->information_buf;
offset = RegRWStruct->offset; offset = RegRWStruct->offset;
width = RegRWStruct->width; width = RegRWStruct->width;
@ -875,7 +875,7 @@ _func_exit_;
/* */ /* */
NDIS_STATUS oid_rt_pro_write_register_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_pro_write_register_hdl(struct oid_par_priv *poid_par_priv)
{ {
pRW_Reg RegRWStruct; struct mp_rw_reg *RegRWStruct;
u32 offset, width, value; u32 offset, width, value;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context); PADAPTER padapter = (PADAPTER)(poid_par_priv->adapter_context);
@ -888,7 +888,7 @@ _func_enter_;
if (poid_par_priv->type_of_oid != SET_OID) if (poid_par_priv->type_of_oid != SET_OID)
return NDIS_STATUS_NOT_ACCEPTED; return NDIS_STATUS_NOT_ACCEPTED;
RegRWStruct = (pRW_Reg)poid_par_priv->information_buf; RegRWStruct = (struct mp_rw_reg *)poid_par_priv->information_buf;
offset = RegRWStruct->offset; offset = RegRWStruct->offset;
width = RegRWStruct->width; width = RegRWStruct->width;
value = RegRWStruct->value; value = RegRWStruct->value;
@ -1132,7 +1132,7 @@ NDIS_STATUS oid_rt_pro_rx_packet_type_hdl(struct oid_par_priv *poid_par_priv)
/* */ /* */
NDIS_STATUS oid_rt_pro_read_efuse_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_pro_read_efuse_hdl(struct oid_par_priv *poid_par_priv)
{ {
PEFUSE_ACCESS_STRUCT pefuse; struct efuse_access_struct * pefuse;
u8 *data; u8 *data;
u16 addr = 0, cnts = 0, max_available_size = 0; u16 addr = 0, cnts = 0, max_available_size = 0;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
@ -1143,10 +1143,10 @@ _func_enter_;
if (poid_par_priv->type_of_oid != QUERY_OID) if (poid_par_priv->type_of_oid != QUERY_OID)
return NDIS_STATUS_NOT_ACCEPTED; return NDIS_STATUS_NOT_ACCEPTED;
if (poid_par_priv->information_buf_len < sizeof(EFUSE_ACCESS_STRUCT)) if (poid_par_priv->information_buf_len < sizeof(struct efuse_access_struct))
return NDIS_STATUS_INVALID_LENGTH; return NDIS_STATUS_INVALID_LENGTH;
pefuse = (PEFUSE_ACCESS_STRUCT)poid_par_priv->information_buf; pefuse = (struct efuse_access_struct *)poid_par_priv->information_buf;
addr = pefuse->start_addr; addr = pefuse->start_addr;
cnts = pefuse->cnts; cnts = pefuse->cnts;
data = pefuse->data; data = pefuse->data;
@ -1177,7 +1177,7 @@ _func_exit_;
/* */ /* */
NDIS_STATUS oid_rt_pro_write_efuse_hdl(struct oid_par_priv *poid_par_priv) NDIS_STATUS oid_rt_pro_write_efuse_hdl(struct oid_par_priv *poid_par_priv)
{ {
PEFUSE_ACCESS_STRUCT pefuse; struct efuse_access_struct * pefuse;
u8 *data; u8 *data;
u16 addr = 0, cnts = 0, max_available_size = 0; u16 addr = 0, cnts = 0, max_available_size = 0;
NDIS_STATUS status = NDIS_STATUS_SUCCESS; NDIS_STATUS status = NDIS_STATUS_SUCCESS;
@ -1189,7 +1189,7 @@ _func_enter_;
if (poid_par_priv->type_of_oid != SET_OID) if (poid_par_priv->type_of_oid != SET_OID)
return NDIS_STATUS_NOT_ACCEPTED; return NDIS_STATUS_NOT_ACCEPTED;
pefuse = (PEFUSE_ACCESS_STRUCT)poid_par_priv->information_buf; pefuse = (struct efuse_access_struct *)poid_par_priv->information_buf;
addr = pefuse->start_addr; addr = pefuse->start_addr;
cnts = pefuse->cnts; cnts = pefuse->cnts;
data = pefuse->data; data = pefuse->data;
@ -1440,14 +1440,14 @@ NDIS_STATUS oid_rt_pro_set_pkt_test_mode_hdl(struct oid_par_priv *poid_par_priv)
unsigned int mp_ioctl_xmit_packet_hdl(struct oid_par_priv *poid_par_priv) unsigned int mp_ioctl_xmit_packet_hdl(struct oid_par_priv *poid_par_priv)
{ {
PMP_XMIT_PARM pparm; struct mp_xmit_parm * pparm;
PADAPTER padapter; PADAPTER padapter;
struct mp_priv *pmp_priv; struct mp_priv *pmp_priv;
struct pkt_attrib *pattrib; struct pkt_attrib *pattrib;
RT_TRACE(_module_mp_, _drv_notice_, ("+%s\n", __func__)); RT_TRACE(_module_mp_, _drv_notice_, ("+%s\n", __func__));
pparm = (PMP_XMIT_PARM)poid_par_priv->information_buf; pparm = (struct mp_xmit_parm *)poid_par_priv->information_buf;
padapter = (PADAPTER)poid_par_priv->adapter_context; padapter = (PADAPTER)poid_par_priv->adapter_context;
pmp_priv = &padapter->mppriv; pmp_priv = &padapter->mppriv;

39
include/rtw_mp_ioctl.h
View file

@ -28,53 +28,44 @@
#include <rtw_mp.h> #include <rtw_mp.h>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
typedef struct CFG_DBG_MSG_STRUCT { struct cfg_dbg_msg_struct {
u32 DebugLevel; u32 DebugLevel;
u32 DebugComponent_H32; u32 DebugComponent_H32;
u32 DebugComponent_L32; u32 DebugComponent_L32;
}CFG_DBG_MSG_STRUCT,*PCFG_DBG_MSG_STRUCT; };
typedef struct _RW_REG { struct mp_rw_reg {
u32 offset; u32 offset;
u32 width; u32 width;
u32 value; u32 value;
}mp_rw_reg,RW_Reg, *pRW_Reg; };
//for OID_RT_PRO_READ16_EEPROM & OID_RT_PRO_WRITE16_EEPROM struct efuse_access_struct {
typedef struct _EEPROM_RW_PARAM {
u32 offset;
u16 value;
}eeprom_rw_param,EEPROM_RWParam, *pEEPROM_RWParam;
typedef struct _EFUSE_ACCESS_STRUCT_ {
u16 start_addr; u16 start_addr;
u16 cnts; u16 cnts;
u8 data[0]; u8 data[0];
}EFUSE_ACCESS_STRUCT, *PEFUSE_ACCESS_STRUCT; };
typedef struct _BURST_RW_REG { struct burst_rw_reg {
u32 offset; u32 offset;
u32 len; u32 len;
u8 Data[256]; u8 Data[256];
}burst_rw_reg,Burst_RW_Reg, *pBurst_RW_Reg; };
typedef struct _USB_VendorReq{ struct usb_vendor_req {
u8 bRequest; u8 bRequest;
u16 wValue; u16 wValue;
u16 wIndex; u16 wIndex;
u16 wLength; u16 wLength;
u8 u8Dir;//0:OUT, 1:IN u8 u8Dir;//0:OUT, 1:IN
u8 u8InData; u8 u8InData;
}usb_vendor_req, USB_VendorReq, *pUSB_VendorReq; };
typedef struct _DR_VARIABLE_STRUCT_ { struct dr_variable_struct {
u8 offset; u8 offset;
u32 variable; u32 variable;
}DR_VARIABLE_STRUCT; };
//int mp_start_joinbss(_adapter *padapter, NDIS_802_11_SSID *pssid);
//void _irqlevel_changed_(_irqL *irqlevel, /*bool*/unsigned char bLower);
#define _irqlevel_changed_(a,b) #define _irqlevel_changed_(a,b)
//oid_rtl_seg_81_80_00 //oid_rtl_seg_81_80_00
@ -408,13 +399,13 @@ struct rfintfs_parm {
u32 rfintfs; u32 rfintfs;
}; };
typedef struct _mp_xmit_parm_ { struct mp_xmit_parm {
u8 enable; u8 enable;
u32 count; u32 count;
u16 length; u16 length;
u8 payload_type; u8 payload_type;
u8 da[ETH_ALEN]; u8 da[ETH_ALEN];
}MP_XMIT_PARM, *PMP_XMIT_PARM; };
struct mp_xmit_packet { struct mp_xmit_packet {
u32 len; u32 len;
@ -524,7 +515,7 @@ static struct mp_ioctl_handler mp_ioctl_hdl[] = {
GEN_MP_IOCTL_HANDLER(sizeof(struct eeprom_rw_param), NULL, 0) GEN_MP_IOCTL_HANDLER(sizeof(struct eeprom_rw_param), NULL, 0)
GEN_MP_IOCTL_HANDLER(sizeof(struct eeprom_rw_param), NULL, 0) GEN_MP_IOCTL_HANDLER(sizeof(struct eeprom_rw_param), NULL, 0)
GEN_MP_IOCTL_HANDLER(sizeof(EFUSE_ACCESS_STRUCT), oid_rt_pro_efuse_hdl, OID_RT_PRO_EFUSE) GEN_MP_IOCTL_HANDLER(sizeof(struct efuse_access_struct), oid_rt_pro_efuse_hdl, OID_RT_PRO_EFUSE)
/*25*/ GEN_MP_IOCTL_HANDLER(0, oid_rt_pro_efuse_map_hdl, OID_RT_PRO_EFUSE_MAP) /*25*/ GEN_MP_IOCTL_HANDLER(0, oid_rt_pro_efuse_map_hdl, OID_RT_PRO_EFUSE_MAP)
GEN_MP_IOCTL_HANDLER(sizeof(u32), oid_rt_get_efuse_max_size_hdl, OID_RT_GET_EFUSE_MAX_SIZE) GEN_MP_IOCTL_HANDLER(sizeof(u32), oid_rt_get_efuse_max_size_hdl, OID_RT_GET_EFUSE_MAX_SIZE)
GEN_MP_IOCTL_HANDLER(sizeof(u32), oid_rt_get_efuse_current_size_hdl, OID_RT_GET_EFUSE_CURRENT_SIZE) GEN_MP_IOCTL_HANDLER(sizeof(u32), oid_rt_get_efuse_current_size_hdl, OID_RT_GET_EFUSE_CURRENT_SIZE)

6
os_dep/ioctl_linux.c
View file

@ -2914,7 +2914,7 @@ static int rtw_drvext_hdl(struct net_device *dev, struct iw_request_info *info,
static void rtw_dbg_mode_hdl(_adapter *padapter, u32 id, u8 *pdata, u32 len) static void rtw_dbg_mode_hdl(_adapter *padapter, u32 id, u8 *pdata, u32 len)
{ {
pRW_Reg RegRWStruct; struct mp_rw_reg * RegRWStruct;
struct rf_reg_param *prfreg; struct rf_reg_param *prfreg;
u8 path; u8 path;
u8 offset; u8 offset;
@ -2928,7 +2928,7 @@ static void rtw_dbg_mode_hdl(_adapter *padapter, u32 id, u8 *pdata, u32 len)
DBG_88E("871x_driver is only for normal mode, can't enter mp mode\n"); DBG_88E("871x_driver is only for normal mode, can't enter mp mode\n");
break; break;
case GEN_MP_IOCTL_SUBCODE(READ_REG): case GEN_MP_IOCTL_SUBCODE(READ_REG):
RegRWStruct = (pRW_Reg)pdata; RegRWStruct = (struct mp_rw_reg *)pdata;
switch (RegRWStruct->width) switch (RegRWStruct->width)
{ {
case 1: case 1:
@ -2946,7 +2946,7 @@ static void rtw_dbg_mode_hdl(_adapter *padapter, u32 id, u8 *pdata, u32 len)
break; break;
case GEN_MP_IOCTL_SUBCODE(WRITE_REG): case GEN_MP_IOCTL_SUBCODE(WRITE_REG):
RegRWStruct = (pRW_Reg)pdata; RegRWStruct = (struct mp_rw_reg *)pdata;
switch (RegRWStruct->width) switch (RegRWStruct->width)
{ {
case 1: case 1: