diff --git a/include/rtw_mp_ioctl.h b/include/rtw_mp_ioctl.h index b6e1595..d693a68 100644 --- a/include/rtw_mp_ioctl.h +++ b/include/rtw_mp_ioctl.h @@ -29,52 +29,11 @@ #include #include -/* */ -typedef struct CFG_DBG_MSG_STRUCT { - u32 DebugLevel; - u32 DebugComponent_H32; - u32 DebugComponent_L32; -}CFG_DBG_MSG_STRUCT,*PCFG_DBG_MSG_STRUCT; - -typedef struct _RW_REG { +struct mp_rw_reg { u32 offset; u32 width; u32 value; -}mp_rw_reg,RW_Reg, *pRW_Reg; - -/* for OID_RT_PRO_READ16_EEPROM & OID_RT_PRO_WRITE16_EEPROM */ -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 cnts; - u8 data[0]; -}EFUSE_ACCESS_STRUCT, *PEFUSE_ACCESS_STRUCT; - -typedef struct _BURST_RW_REG { - u32 offset; - u32 len; - u8 Data[256]; -}burst_rw_reg,Burst_RW_Reg, *pBurst_RW_Reg; - -typedef struct _USB_VendorReq{ - u8 bRequest; - u16 wValue; - u16 wIndex; - u16 wLength; - u8 u8Dir;/* 0:OUT, 1:IN */ - u8 u8InData; -}usb_vendor_req, USB_VendorReq, *pUSB_VendorReq; - -typedef struct _DR_VARIABLE_STRUCT_ { - u8 offset; - u32 variable; -}DR_VARIABLE_STRUCT; - -/* int mp_start_joinbss(struct adapter *padapter, NDIS_802_11_SSID *pssid); */ +}; #define _irqlevel_changed_(a,b) @@ -428,14 +387,6 @@ struct rfintfs_parm { u32 rfintfs; }; -typedef struct _mp_xmit_parm_ { - u8 enable; - u32 count; - u16 length; - u8 payload_type; - u8 da[ETH_ALEN]; -}MP_XMIT_PARM, *PMP_XMIT_PARM; - struct mp_xmit_packet { u32 len; u32 mem[MAX_MP_XMITBUF_SZ >> 2]; diff --git a/os_dep/ioctl_linux.c b/os_dep/ioctl_linux.c index aa360f8..3a5f601 100644 --- a/os_dep/ioctl_linux.c +++ b/os_dep/ioctl_linux.c @@ -2909,7 +2909,7 @@ _rtw_drvext_hdl_exit: static void rtw_dbg_mode_hdl(struct adapter *padapter, u32 id, u8 *pdata, u32 len) { - pRW_Reg RegRWStruct; + struct mp_rw_reg * RegRWStruct; struct rf_reg_param *prfreg; u8 path; u8 offset; @@ -2923,7 +2923,7 @@ static void rtw_dbg_mode_hdl(struct adapter *padapter, u32 id, u8 *pdata, u32 le DBG_871X("871x_driver is only for normal mode, can't enter mp mode\n"); break; case GEN_MP_IOCTL_SUBCODE(READ_REG): - RegRWStruct = (pRW_Reg)pdata; + RegRWStruct = (struct mp_rw_reg *)pdata; switch (RegRWStruct->width) { case 1: @@ -2941,7 +2941,7 @@ static void rtw_dbg_mode_hdl(struct adapter *padapter, u32 id, u8 *pdata, u32 le break; case GEN_MP_IOCTL_SUBCODE(WRITE_REG): - RegRWStruct = (pRW_Reg)pdata; + RegRWStruct = (struct mp_rw_reg *)pdata; switch (RegRWStruct->width) { case 1: