rtl8188eu: Convert typedef statements in include/HalVerDef.h

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-22 17:43:38 -05:00
parent 35fba91a0f
commit c2a914a341
5 changed files with 23 additions and 36 deletions

View file

@ -26,7 +26,7 @@
#define _HAL_INIT_C_ #define _HAL_INIT_C_
void dump_chip_info(HAL_VERSION ChipVersion) void dump_chip_info(struct HAL_VERSION ChipVersion)
{ {
uint cnt = 0; uint cnt = 0;
char buf[128]; char buf[128];

View file

@ -2376,10 +2376,10 @@ rtl8188e_Efuse_PgPacketWrite( PADAPTER pAdapter,
return ret; return ret;
} }
static HAL_VERSION ReadChipVersion8188E(PADAPTER padapter) static struct HAL_VERSION ReadChipVersion8188E(PADAPTER padapter)
{ {
u32 value32; u32 value32;
HAL_VERSION ChipVersion; struct HAL_VERSION ChipVersion;
HAL_DATA_TYPE *pHalData; HAL_DATA_TYPE *pHalData;

View file

@ -20,9 +20,7 @@
#ifndef __HAL_VERSION_DEF_H__ #ifndef __HAL_VERSION_DEF_H__
#define __HAL_VERSION_DEF_H__ #define __HAL_VERSION_DEF_H__
// HAL_IC_TYPE_E enum HAL_IC_TYPE {
typedef enum tag_HAL_IC_Type_Definition
{
CHIP_8192S = 0, CHIP_8192S = 0,
CHIP_8188C = 1, CHIP_8188C = 1,
CHIP_8192C = 2, CHIP_8192C = 2,
@ -34,19 +32,15 @@ typedef enum tag_HAL_IC_Type_Definition
CHIP_8821A = 8, CHIP_8821A = 8,
CHIP_8723B = 9, CHIP_8723B = 9,
CHIP_8192E = 10, CHIP_8192E = 10,
}HAL_IC_TYPE_E; };
//HAL_CHIP_TYPE_E enum HAL_CHIP_TYPE {
typedef enum tag_HAL_CHIP_Type_Definition
{
TEST_CHIP = 0, TEST_CHIP = 0,
NORMAL_CHIP = 1, NORMAL_CHIP = 1,
FPGA = 2, FPGA = 2,
}HAL_CHIP_TYPE_E; };
//HAL_CUT_VERSION_E enum HAL_CUT_VERSION {
typedef enum tag_HAL_Cut_Version_Definition
{
A_CUT_VERSION = 0, A_CUT_VERSION = 0,
B_CUT_VERSION = 1, B_CUT_VERSION = 1,
C_CUT_VERSION = 2, C_CUT_VERSION = 2,
@ -54,17 +48,14 @@ typedef enum tag_HAL_Cut_Version_Definition
E_CUT_VERSION = 4, E_CUT_VERSION = 4,
F_CUT_VERSION = 5, F_CUT_VERSION = 5,
G_CUT_VERSION = 6, G_CUT_VERSION = 6,
}HAL_CUT_VERSION_E; };
// HAL_Manufacturer enum HAL_VENDOR {
typedef enum tag_HAL_Manufacturer_Version_Definition
{
CHIP_VENDOR_TSMC = 0, CHIP_VENDOR_TSMC = 0,
CHIP_VENDOR_UMC = 1, CHIP_VENDOR_UMC = 1,
}HAL_VENDOR_E; };
typedef enum tag_HAL_RF_Type_Definition enum HAL_RF_TYPE {
{
RF_TYPE_1T1R = 0, RF_TYPE_1T1R = 0,
RF_TYPE_1T2R = 1, RF_TYPE_1T2R = 1,
RF_TYPE_2T2R = 2, RF_TYPE_2T2R = 2,
@ -73,20 +64,16 @@ typedef enum tag_HAL_RF_Type_Definition
RF_TYPE_3T3R = 5, RF_TYPE_3T3R = 5,
RF_TYPE_3T4R = 6, RF_TYPE_3T4R = 6,
RF_TYPE_4T4R = 7, RF_TYPE_4T4R = 7,
}HAL_RF_TYPE_E; };
typedef struct tag_HAL_VERSION struct HAL_VERSION {
{ enum HAL_IC_TYPE ICType;
HAL_IC_TYPE_E ICType; enum HAL_CHIP_TYPE ChipType;
HAL_CHIP_TYPE_E ChipType; enum HAL_CUT_VERSION CUTVersion;
HAL_CUT_VERSION_E CUTVersion; enum HAL_VENDOR VendorType;
HAL_VENDOR_E VendorType; enum HAL_RF_TYPE RFType;
HAL_RF_TYPE_E RFType;
u8 ROMVer; u8 ROMVer;
}HAL_VERSION,*PHAL_VERSION; };
//VERSION_8192C VersionID;
//HAL_VERSION VersionID;
// Get element // Get element
#define GET_CVID_IC_TYPE(version) (((version).ICType)) #define GET_CVID_IC_TYPE(version) (((version).ICType))

View file

@ -148,7 +148,7 @@
#define REG_NOA_DESC_COUNT 0x05EC #define REG_NOA_DESC_COUNT 0x05EC
#include "HalVerDef.h" #include "HalVerDef.h"
void dump_chip_info(HAL_VERSION ChipVersion); void dump_chip_info(struct HAL_VERSION ChipVersion);
u8 //return the final channel plan decision u8 //return the final channel plan decision

View file

@ -289,7 +289,7 @@ typedef enum _RT_REGULATOR_MODE {
typedef struct hal_data_8188e typedef struct hal_data_8188e
{ {
HAL_VERSION VersionID; struct HAL_VERSION VersionID;
RT_MULTI_FUNC MultiFunc; // For multi-function consideration. RT_MULTI_FUNC MultiFunc; // For multi-function consideration.
RT_POLARITY_CTL PolarityCtl; // For Wifi PDn Polarity control. RT_POLARITY_CTL PolarityCtl; // For Wifi PDn Polarity control.
RT_REGULATOR_MODE RegulatorMode; // switching regulator or LDO RT_REGULATOR_MODE RegulatorMode; // switching regulator or LDO