rtl8188eu: Convert typedef statement from include/hal_intf.h

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-26 18:04:37 -05:00
parent 476eaf9a4e
commit b2804a6af7
6 changed files with 16 additions and 17 deletions

View file

@ -946,7 +946,7 @@ efuse_ShadowRead1Byte(
u16 Offset, u16 Offset,
u8 *Value) u8 *Value)
{ {
EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter); struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter);
*Value = pEEPROM->efuse_eeprom_data[Offset]; *Value = pEEPROM->efuse_eeprom_data[Offset];
@ -959,7 +959,7 @@ efuse_ShadowRead2Byte(
u16 Offset, u16 Offset,
u16 *Value) u16 *Value)
{ {
EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter); struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter);
*Value = pEEPROM->efuse_eeprom_data[Offset]; *Value = pEEPROM->efuse_eeprom_data[Offset];
*Value |= pEEPROM->efuse_eeprom_data[Offset+1]<<8; *Value |= pEEPROM->efuse_eeprom_data[Offset+1]<<8;
@ -973,7 +973,7 @@ efuse_ShadowRead4Byte(
u16 Offset, u16 Offset,
u32 *Value) u32 *Value)
{ {
EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter); struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter);
*Value = pEEPROM->efuse_eeprom_data[Offset]; *Value = pEEPROM->efuse_eeprom_data[Offset];
*Value |= pEEPROM->efuse_eeprom_data[Offset+1]<<8; *Value |= pEEPROM->efuse_eeprom_data[Offset+1]<<8;
@ -1007,7 +1007,7 @@ efuse_ShadowWrite1Byte(
u16 Offset, u16 Offset,
u8 Value) u8 Value)
{ {
EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter); struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter);
pEEPROM->efuse_eeprom_data[Offset] = Value; pEEPROM->efuse_eeprom_data[Offset] = Value;
@ -1020,7 +1020,7 @@ efuse_ShadowWrite2Byte(
u16 Offset, u16 Offset,
u16 Value) u16 Value)
{ {
EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter); struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter);
pEEPROM->efuse_eeprom_data[Offset] = Value&0x00FF; pEEPROM->efuse_eeprom_data[Offset] = Value&0x00FF;
pEEPROM->efuse_eeprom_data[Offset+1] = Value>>8; pEEPROM->efuse_eeprom_data[Offset+1] = Value>>8;
@ -1034,7 +1034,7 @@ efuse_ShadowWrite4Byte(
u16 Offset, u16 Offset,
u32 Value) u32 Value)
{ {
EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter); struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter);
pEEPROM->efuse_eeprom_data[Offset] = (u8)(Value&0x000000FF); pEEPROM->efuse_eeprom_data[Offset] = (u8)(Value&0x000000FF);
pEEPROM->efuse_eeprom_data[Offset+1] = (u8)((Value>>8)&0x0000FF); pEEPROM->efuse_eeprom_data[Offset+1] = (u8)((Value>>8)&0x0000FF);
@ -1064,7 +1064,7 @@ void EFUSE_ShadowMapUpdate(
u8 efuseType, u8 efuseType,
bool bPseudoTest) bool bPseudoTest)
{ {
EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter); struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter);
u16 mapLen=0; u16 mapLen=0;
EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, bPseudoTest); EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, bPseudoTest);

View file

@ -2642,7 +2642,7 @@ s32 InitLLTTable(PADAPTER padapter, u8 txpktbuf_bndy)
void void
Hal_InitPGData88E(PADAPTER padapter) Hal_InitPGData88E(PADAPTER padapter)
{ {
EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter); struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter);
u32 i; u32 i;
u16 value16; u16 value16;
@ -2666,7 +2666,7 @@ Hal_EfuseParseIDCode88E(
u8 *hwinfo u8 *hwinfo
) )
{ {
EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter); struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter);
u16 EEPROMId; u16 EEPROMId;

View file

@ -917,7 +917,7 @@ phy_BB8188E_Config_ParaFile(
PADAPTER Adapter PADAPTER Adapter
) )
{ {
EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(Adapter); struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(Adapter);
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
int rtStatus = _SUCCESS; int rtStatus = _SUCCESS;

View file

@ -1745,7 +1745,7 @@ Hal_EfuseParseMACAddr_8188EU(
{ {
u16 i, usValue; u16 i, usValue;
u8 sMacAddr[6] = {0x00, 0xE0, 0x4C, 0x81, 0x88, 0x02}; u8 sMacAddr[6] = {0x00, 0xE0, 0x4C, 0x81, 0x88, 0x02};
EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter); struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter);
if (AutoLoadFail) if (AutoLoadFail)
{ {
@ -1785,7 +1785,7 @@ readAdapterInfo_8188EU(
PADAPTER padapter PADAPTER padapter
) )
{ {
EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter); struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter);
/* parse the eeprom/efuse content */ /* parse the eeprom/efuse content */
Hal_EfuseParseIDCode88E(padapter, pEEPROM->efuse_eeprom_data); Hal_EfuseParseIDCode88E(padapter, pEEPROM->efuse_eeprom_data);
@ -1815,7 +1815,7 @@ static void _ReadPROMContent(
PADAPTER Adapter PADAPTER Adapter
) )
{ {
EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(Adapter); struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(Adapter);
u8 eeValue; u8 eeValue;
/* check system boot selection */ /* check system boot selection */

View file

@ -314,9 +314,8 @@ enum hardware_type {
#define IS_HARDWARE_TYPE_8188E(_Adapter) \ #define IS_HARDWARE_TYPE_8188E(_Adapter) \
(IS_HARDWARE_TYPE_8188EE(_Adapter) || IS_HARDWARE_TYPE_8188EU(_Adapter) || IS_HARDWARE_TYPE_8188ES(_Adapter)) (IS_HARDWARE_TYPE_8188EE(_Adapter) || IS_HARDWARE_TYPE_8188EU(_Adapter) || IS_HARDWARE_TYPE_8188ES(_Adapter))
typedef struct eeprom_priv EEPROM_EFUSE_PRIV, *PEEPROM_EFUSE_PRIV;
#define GET_EEPROM_EFUSE_PRIV(adapter) (&adapter->eeprompriv) #define GET_EEPROM_EFUSE_PRIV(adapter) (&adapter->eeprompriv)
#define is_boot_from_eeprom(adapter) (adapter->eeprompriv.EepromOrEfuse) #define is_boot_from_eeprom(adapter) (adapter->eeprompriv.EepromOrEfuse)
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN

View file

@ -7094,7 +7094,7 @@ static int rtw_mp_efuse_get(struct net_device *dev,
union iwreq_data *wdata, char *extra) union iwreq_data *wdata, char *extra)
{ {
PADAPTER padapter = rtw_netdev_priv(dev); PADAPTER padapter = rtw_netdev_priv(dev);
EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter); struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter);
struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter); struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
struct efuse_hal *pEfuseHal; struct efuse_hal *pEfuseHal;
struct iw_point *wrqu; struct iw_point *wrqu;
@ -8999,7 +8999,7 @@ static int rtw_mp_QueryDrv(struct net_device *dev,
PADAPTER padapter = rtw_netdev_priv(dev); PADAPTER padapter = rtw_netdev_priv(dev);
char *input = kmalloc(wrqu->data.length, GFP_KERNEL); char *input = kmalloc(wrqu->data.length, GFP_KERNEL);
u8 qAutoLoad=1; u8 qAutoLoad=1;
EEPROM_EFUSE_PRIV *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter); struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(padapter);
if (!input) if (!input)
return -ENOMEM; return -ENOMEM;