Skip to content

Commit

Permalink
staging: rtl8192e: Prepare header files to ease use of typedef enum c…
Browse files Browse the repository at this point in the history 
…onversion

The tool that I am using fails for certain conditions. This patch makes trivial
changes to the source to allow the tool to work for all cases.

I also remove some artifacts left from the typedef struct conversion.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
  • Loading branch information
Larry Finger authored and Larry Finger committed Aug 24, 2011
1 parent 66ba443 commit d3b2c17
Show file tree
Hide file tree
Showing 10 changed files with 136 additions and 134 deletions.
30 changes: 15 additions & 15 deletions drivers/staging/rtl8192e/r8190P_def.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
#define RX_CMD_QUEUE 1


typedef enum _rtl819x_loopback{
typedef enum _rtl819x_loopback_e{
RTL819X_NO_LOOPBACK = 0,
RTL819X_MAC_LOOPBACK = 1,
RTL819X_DMA_LOOPBACK = 2,
RTL819X_CCK_LOOPBACK = 3,
}rtl819x_loopback_e;
} rtl819x_loopback_e;


#define RESET_DELAY_8185 20
Expand Down Expand Up @@ -132,7 +132,7 @@ typedef enum _rtl819x_loopback{
typedef enum _VERSION_8190{
VERSION_8190_BD=0x3,
VERSION_8190_BE
}VERSION_8190,*PVERSION_8190;
} VERSION_8190,*PVERSION_8190;

#define IC_VersionCut_C 0x2
#define IC_VersionCut_D 0x3
Expand All @@ -143,14 +143,14 @@ typedef enum tag_Rf_OpType
RF_OP_By_SW_3wire = 0,
RF_OP_By_FW,
RF_OP_MAX
}RF_OpType_E;
} RF_OpType_E;


typedef enum _POWER_SAVE_MODE
{
POWER_SAVE_MODE_ACTIVE,
POWER_SAVE_MODE_SAVE,
}POWER_SAVE_MODE;
} POWER_SAVE_MODE;

typedef enum _INTERFACE_SELECT_8190PCI{
INTF_SEL1_MINICARD = 0,
Expand Down Expand Up @@ -178,7 +178,7 @@ struct bb_reg_definition {
u32 rfTxAFE;
u32 rfLSSIReadBack;
u32 rfLSSIReadBackPi;
};//, *struct bb_reg_definition *;
};

struct tx_fwinfo {
u8 TxRate:7;
Expand All @@ -205,7 +205,7 @@ struct tx_fwinfo {
u32 TxAGCSign:1;
u32 Tx_INFO_RSVD:6;
u32 PacketID:13;
};//;
};

struct tx_fwinfo_8190pci {
u8 TxRate:7;
Expand Down Expand Up @@ -237,7 +237,7 @@ struct tx_fwinfo_8190pci {
u32 PacketID:13;


};//, *struct tx_fwinfo_8190pci *;
};


#define TX_DESC_SIZE 32
Expand Down Expand Up @@ -276,7 +276,7 @@ struct phy_ofdm_rx_status_rxsc_sgien_exintfflag {
u8 rxsc:2;
u8 sgi_en:1;
u8 ex_intf_flag:1;
};//;
};

struct phy_sts_ofdm_819xpci {
u8 trsw_gain_X[4];
Expand All @@ -292,13 +292,13 @@ struct phy_sts_ofdm_819xpci {
u8 max_ex_pwr;
u8 sgi_en;
u8 rxsc_sgien_exflg;
};//;
};

struct phy_sts_cck_819xpci {
u8 adc_pwdb_X[4];
u8 sq_rpt;
u8 cck_agc_rpt;
};//;
};


#define PHY_RSSI_SLID_WIN_MAX 100
Expand Down Expand Up @@ -340,7 +340,7 @@ struct tx_desc {
u32 Reserved5;
u32 Reserved6;
u32 Reserved7;
};//, *ptx_desc;
};


struct tx_desc_cmd {
Expand All @@ -364,7 +364,7 @@ struct tx_desc_cmd {
u32 Reserved4;
u32 Reserved5;
u32 Reserved6;
};//, *ptx_desc_cmd;
};

struct rx_desc {
u16 Length:14;
Expand All @@ -385,7 +385,7 @@ struct rx_desc {

u32 BufferAddress;

};//, *prx_desc;
};


struct rx_fwinfo {
Expand All @@ -407,6 +407,6 @@ struct rx_fwinfo {

u32 TSFL;

};//, *prx_fwinfo;
};

#endif
12 changes: 6 additions & 6 deletions drivers/staging/rtl8192e/r8192E_cmdpkt.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@ struct cmpk_txfb {

u16 reserve3; /* */
u16 duration; /* */
};//;
};

struct cmpk_intr_sta {
u8 element_id;
u8 length;
u16 reserve;
u32 interrupt_status;
};//;
};


struct cmpk_set_cfg {
Expand All @@ -79,7 +79,7 @@ struct cmpk_set_cfg {
u8 cfg_offset;
u32 value;
u32 mask;
};//;
};

#define cmpk_query_cfg_t struct cmpk_set_cfg

Expand Down Expand Up @@ -118,7 +118,7 @@ struct cmpk_rx_dbginfo {
u8 element_id;


};//;
};

struct cmpk_tx_rahis {
u8 element_id;
Expand All @@ -137,7 +137,7 @@ struct cmpk_tx_rahis {

} __packed;

typedef enum tag_command_packet_directories
typedef enum _cmpk_element_e
{
RX_TX_FEEDBACK = 0,
RX_INTERRUPT_STATUS = 1,
Expand All @@ -148,7 +148,7 @@ typedef enum tag_command_packet_directories
RX_TX_PER_PKT_FEEDBACK = 6,
RX_TX_RATE_HISTORY = 7,
RX_CMD_ELE_MAX
}cmpk_element_e;
} cmpk_element_e;

extern u32 cmpk_message_handle_rx(struct net_device *dev, struct rtllib_rx_stats * pstats);
extern bool cmpk_message_handle_tx(struct net_device *dev, u8* codevirtualaddress, u32 packettype, u32 buffer_len);
Expand Down
20 changes: 10 additions & 10 deletions drivers/staging/rtl8192e/r8192E_firmware.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,40 +23,40 @@

#define GET_COMMAND_PACKET_FRAG_THRESHOLD(v) (4*(v/4) - 8 )

typedef enum _firmware_init_step{
typedef enum _firmware_init_step_e{
FW_INIT_STEP0_BOOT = 0,
FW_INIT_STEP1_MAIN = 1,
FW_INIT_STEP2_DATA = 2,
}firmware_init_step_e;
} firmware_init_step_e;

typedef enum _opt_rst_type{
typedef enum _opt_rst_type_e{
OPT_SYSTEM_RESET = 0,
OPT_FIRMWARE_RESET = 1,
}opt_rst_type_e;
} opt_rst_type_e;

typedef enum _desc_packet_type_e{
DESC_PACKET_TYPE_INIT = 0,
DESC_PACKET_TYPE_NORMAL = 1,
}desc_packet_type_e;
} desc_packet_type_e;

typedef enum _firmware_source{
typedef enum _firmware_source_e{
FW_SOURCE_IMG_FILE = 0,
FW_SOURCE_HEADER_FILE = 1,
}firmware_source_e, *pfirmware_source_e;
} firmware_source_e, *pfirmware_source_e;

typedef enum _firmware_status{
typedef enum _firmware_status_e{
FW_STATUS_0_INIT = 0,
FW_STATUS_1_MOVE_BOOT_CODE = 1,
FW_STATUS_2_MOVE_MAIN_CODE = 2,
FW_STATUS_3_TURNON_CPU = 3,
FW_STATUS_4_MOVE_DATA_CODE = 4,
FW_STATUS_5_READY = 5,
}firmware_status_e;
} firmware_status_e;

struct fw_seg_container {
u16 seg_size;
u8 *seg_ptr;
};//, *pfw_seg_container;
};

struct rt_firmware {
firmware_status_e firmware_status;
Expand Down
6 changes: 3 additions & 3 deletions drivers/staging/rtl8192e/r8192E_phy.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,21 +73,21 @@ extern u32 rtl819XRadioB_Array[];
extern u32 rtl819XRadioC_Array[];
extern u32 rtl819XRadioD_Array[];

typedef enum _HW90_BLOCK {
typedef enum _HW90_BLOCK_E {
HW90_BLOCK_MAC = 0,
HW90_BLOCK_PHY0 = 1,
HW90_BLOCK_PHY1 = 2,
HW90_BLOCK_RF = 3,
HW90_BLOCK_MAXIMUM = 4,
} HW90_BLOCK_E, *PHW90_BLOCK_E;

typedef enum _RF90_RADIO_PATH{
typedef enum _RF90_RADIO_PATH_E{
RF90_PATH_A = 0,
RF90_PATH_B = 1,
RF90_PATH_C = 2,
RF90_PATH_D = 3,
RF90_PATH_MAX
}RF90_RADIO_PATH_E, *PRF90_RADIO_PATH_E;
} RF90_RADIO_PATH_E, *PRF90_RADIO_PATH_E;

#define bMaskByte0 0xff
#define bMaskByte1 0xff00
Expand Down
40 changes: 20 additions & 20 deletions drivers/staging/rtl8192e/rtl819x_HT.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,19 +56,19 @@ typedef enum _HT_MCS_RATE{
HT_MCS13 = 0x00002000,
HT_MCS14 = 0x00004000,
HT_MCS15 = 0x00008000,
}HT_MCS_RATE,*PHT_MCS_RATE;
} HT_MCS_RATE,*PHT_MCS_RATE;

typedef enum _HT_CHANNEL_WIDTH{
HT_CHANNEL_WIDTH_20 = 0,
HT_CHANNEL_WIDTH_20_40 = 1,
}HT_CHANNEL_WIDTH, *PHT_CHANNEL_WIDTH;
} HT_CHANNEL_WIDTH, *PHT_CHANNEL_WIDTH;

typedef enum _HT_EXTCHNL_OFFSET{
HT_EXTCHNL_OFFSET_NO_EXT = 0,
HT_EXTCHNL_OFFSET_UPPER = 1,
HT_EXTCHNL_OFFSET_NO_DEF = 2,
HT_EXTCHNL_OFFSET_LOWER = 3,
}HT_EXTCHNL_OFFSET, *PHT_EXTCHNL_OFFSET;
} HT_EXTCHNL_OFFSET, *PHT_EXTCHNL_OFFSET;

typedef enum _CHNLOP{
CHNLOP_NONE = 0,
Expand Down Expand Up @@ -204,13 +204,13 @@ struct mimops_ctrl {
typedef enum _HT_SPEC_VER{
HT_SPEC_VER_IEEE = 0,
HT_SPEC_VER_EWC = 1,
}HT_SPEC_VER, *PHT_SPEC_VER;
} HT_SPEC_VER, *PHT_SPEC_VER;

typedef enum _HT_AGGRE_MODE_E{
HT_AGG_AUTO = 0,
HT_AGG_FORCE_ENABLE = 1,
HT_AGG_FORCE_DISABLE = 2,
}HT_AGGRE_MODE_E, *PHT_AGGRE_MODE_E;
} HT_AGGRE_MODE_E, *PHT_AGGRE_MODE_E;


struct rt_hi_throughput {
Expand Down Expand Up @@ -327,7 +327,7 @@ struct rt_htinfo_sta_entry {

u16 nAMSDU_MaxSize;

};//, *struct rt_htinfo_sta_entry *;
};



Expand Down Expand Up @@ -359,12 +359,12 @@ struct mimo_rssi {
u32 AntennaC;
u32 AntennaD;
u32 Average;
};//, *struct mimo_rssi *;
};

struct mimo_evm {
u32 EVM1;
u32 EVM2;
};//, *struct mimo_evm *;
};

struct false_alarm_stats {
u32 Cnt_Parity_Fail;
Expand All @@ -374,7 +374,7 @@ struct false_alarm_stats {
u32 Cnt_Ofdm_fail;
u32 Cnt_Cck_fail;
u32 Cnt_all;
};//, *struct false_alarm_stats *;
};


extern u8 MCS_FILTER_ALL[16];
Expand All @@ -397,14 +397,14 @@ extern u8 MCS_FILTER_1SS[16];

#define IS_11N_MCS_RATE(rate) (rate&0x80)

typedef enum _HT_AGGRE_SIZE{
typedef enum _HT_AGGRE_SIZE_E{
HT_AGG_SIZE_8K = 0,
HT_AGG_SIZE_16K = 1,
HT_AGG_SIZE_32K = 2,
HT_AGG_SIZE_64K = 3,
}HT_AGGRE_SIZE_E, *PHT_AGGRE_SIZE_E;
} HT_AGGRE_SIZE_E, *PHT_AGGRE_SIZE_E;

typedef enum _HT_IOT_PEER
typedef enum _HT_IOT_PEER_E
{
HT_IOT_PEER_UNKNOWN = 0,
HT_IOT_PEER_REALTEK = 1,
Expand All @@ -418,14 +418,14 @@ typedef enum _HT_IOT_PEER
HT_IOT_PEER_SELF_SOFTAP = 9,
HT_IOT_PEER_AIRGO = 10,
HT_IOT_PEER_MAX = 11,
}HT_IOT_PEER_E, *PHTIOT_PEER_E;
} HT_IOT_PEER_E, *PHTIOT_PEER_E;

typedef enum _HT_IOT_PEER_SUBTYPE
typedef enum _HT_IOT_PEER_SUBTYPE_E
{
HT_IOT_PEER_ATHEROS_DIR635 = 0,
}HT_IOT_PEER_SUBTYPE_E, *PHTIOT_PEER_SUBTYPE_E;
} HT_IOT_PEER_SUBTYPE_E, *PHTIOT_PEER_SUBTYPE_E;

typedef enum _HT_IOT_ACTION{
typedef enum _HT_IOT_ACTION_E{
HT_IOT_ACT_TX_USE_AMSDU_4K = 0x00000001,
HT_IOT_ACT_TX_USE_AMSDU_8K = 0x00000002,
HT_IOT_ACT_DISABLE_MCS14 = 0x00000004,
Expand Down Expand Up @@ -458,21 +458,21 @@ typedef enum _HT_IOT_ACTION{

HT_IOT_ACT_DISABLE_RX_40MHZ_SHORT_GI = 0x08000000,

}HT_IOT_ACTION_E, *PHT_IOT_ACTION_E;
} HT_IOT_ACTION_E, *PHT_IOT_ACTION_E;

typedef enum _HT_IOT_RAFUNC{
HT_IOT_RAFUNC_DISABLE_ALL = 0x00,
HT_IOT_RAFUNC_PEER_1R = 0x01,
HT_IOT_RAFUNC_TX_AMSDU = 0x02,
}HT_IOT_RAFUNC, *PHT_IOT_RAFUNC;
} HT_IOT_RAFUNC, *PHT_IOT_RAFUNC;

typedef enum _RT_HT_CAP{
typedef enum _RT_HT_CAPBILITY{
RT_HT_CAP_USE_TURBO_AGGR = 0x01,
RT_HT_CAP_USE_LONG_PREAMBLE = 0x02,
RT_HT_CAP_USE_AMPDU = 0x04,
RT_HT_CAP_USE_WOW = 0x8,
RT_HT_CAP_USE_SOFTAP = 0x10,
RT_HT_CAP_USE_92SE = 0x20,
}RT_HT_CAPBILITY, *PRT_HT_CAPBILITY;
} RT_HT_CAPBILITY, *PRT_HT_CAPBILITY;

#endif
Loading

0 comments on commit d3b2c17

Please sign in to comment.