Staging: rtl8723bs: remove unreferenced enum definitions
cover Staging: rtl8723bs: remove unreferenced enum definitions
The staging/rtl8723bs driver includes 57 enum definitions that are not referenced elsewhere in the code. This patchset removes these unnecessary definitions.
This patchset replaces the patchset sent with the message "[PATCH 00/33]
Staging: rtl8723bs: remove unnecessary enum names and definitions", which also included 82 changes from named enums to anonymous enums.
[PATCH 01/21] Staging: rtl8723bs: remove enums in rtw_mlme.h [PATCH 02/21] Staging: rtl8723bs: remove enums in hal_com.h [PATCH 03/21] Staging: rtl8723bs: remove enums in drv_types.h [PATCH 04/21] Staging: rtl8723bs: remove enums in wlan_bssdef.h [PATCH 05/21] Staging: rtl8723bs: remove enums in rtw_mp.h [PATCH 06/21] Staging: rtl8723bs: remove enums in osdep_service.h [PATCH 07/21] Staging: rtl8723bs: remove enums in hal_intf.h [PATCH 08/21] Staging: rtl8723bs: remove enums in hal_com_h2c.h [PATCH 09/21] Staging: rtl8723bs: remove enums in rtw_wifi_regd.h [PATCH 10/21] Staging: rtl8723bs: remove enums in wifi.h [PATCH 11/21] Staging: rtl8723bs: remove enums in hal_phy.h [PATCH 12/21] Staging: rtl8723bs: remove enums in rtw_mlme_ext.h [PATCH 13/21] Staging: rtl8723bs: remove enums in rtw_xmit.h [PATCH 14/21] Staging: rtl8723bs: remove enums in rtw_rf.h [PATCH 15/21] Staging: rtl8723bs: remove enums in ieee80211.h [PATCH 16/21] Staging: rtl8723bs: remove enums in odm_interface.h [PATCH 17/21] Staging: rtl8723bs: remove enums in HalBtcOutSrc.h [PATCH 18/21] Staging: rtl8723bs: remove enums in odm_types.h [PATCH 19/21] Staging: rtl8723bs: remove enums in odm_DIG.h [PATCH 20/21] Staging: rtl8723bs: remove enums in HalPhyRf.h [PATCH 21/21] Staging: rtl8723bs: remove enums in odm.h
drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h | 34 ----- drivers/staging/rtl8723bs/hal/HalPhyRf.h | 5 - drivers/staging/rtl8723bs/hal/odm.h | 117 ------------------ drivers/staging/rtl8723bs/hal/odm_DIG.h | 16 --- drivers/staging/rtl8723bs/hal/odm_interface.h | 8 -- drivers/staging/rtl8723bs/hal/odm_types.h | 41 ------ drivers/staging/rtl8723bs/include/drv_types.h | 15 --- drivers/staging/rtl8723bs/include/hal_com.h | 4 - .../staging/rtl8723bs/include/hal_com_h2c.h | 60 --------- drivers/staging/rtl8723bs/include/hal_intf.h | 22 ---- drivers/staging/rtl8723bs/include/hal_phy.h | 42 ------- drivers/staging/rtl8723bs/include/ieee80211.h | 81 ------------ .../staging/rtl8723bs/include/osdep_service.h | 23 ---- drivers/staging/rtl8723bs/include/rtw_mlme.h | 12 -- .../staging/rtl8723bs/include/rtw_mlme_ext.h | 12 -- drivers/staging/rtl8723bs/include/rtw_mp.h | 98 --------------- drivers/staging/rtl8723bs/include/rtw_rf.h | 24 ---- .../staging/rtl8723bs/include/rtw_wifi_regd.h | 7 -- drivers/staging/rtl8723bs/include/rtw_xmit.h | 7 -- drivers/staging/rtl8723bs/include/wifi.h | 24 ---- .../staging/rtl8723bs/include/wlan_bssdef.h | 5 - 21 files changed, 657 deletions(-)
Signature · 1 line
2.30.2
PATCH 1/21 Staging: rtl8723bs: remove enums in rtw_mlme.h
Remove the following unnecessary enum definitions in include/rtw_mlme.h:
enum DriverInterface
enum scan_result_type
--- drivers/staging/rtl8723bs/include/rtw_mlme.h | 12 ------------ 1 file changed, 12 deletions(-)
drivers/staging/rtl8723bs/include/rtw_mlme.h +0 -12
@@ -96,18 +96,6 @@ enum _band {#define rtw_band_valid (band) ((band) >= GHZ24_50 && (band) < GHZ_MAX) -enum DriverInterface { -DRIVER_WEXT =1 , -DRIVER_CFG80211 =2 -}; - -enum scan_result_type { -SCAN_RESULT_P2P_ONLY =0 ,/* Will return all the P2P devices. */ -SCAN_RESULT_ALL =1 ,/* Will return all the scanned device, include AP. */ -SCAN_RESULT_WFD_TYPE =2 /* Will just return the correct WFD device. */ -/* If this device is Miracast sink device, it will just return all the Miracast source devices. */ -}; -/* there are several "locks" in mlme_priv,
Signature · 1 line
2.30.2
PATCH 2/21 Staging: rtl8723bs: remove enums in hal_com.h
In reply to Marco CesatiRemove the following unnecessary enum definition in include/hal_com.h:
enum firmware_source
--- drivers/staging/rtl8723bs/include/hal_com.h | 4 ---- 1 file changed, 4 deletions(-)
drivers/staging/rtl8723bs/include/hal_com.h +0 -4
@@ -171,10 +171,6 @@ enum rt_media_status { };#define MAX_DLFW_PAGE_SIZE 4096/* @ page : 4k bytes */ -enum firmware_source { -FW_SOURCE_IMG_FILE =0 , -FW_SOURCE_HEADER_FILE =1 ,/* from header file */ -};/* BK, BE, VI, VO, HCCA, MANAGEMENT, COMMAND, HIGH, BEACON. */ /* define MAX_TX_QUEUE 9 */
Signature · 1 line
2.30.2
PATCH 3/21 Staging: rtl8723bs: remove enums in drv_types.h
In reply to Marco CesatiRemove the following unnecessary enum definitions in include/drv_types.h:
enum _nic_version
enum adapter_type
--- drivers/staging/rtl8723bs/include/drv_types.h | 15 --------------- 1 file changed, 15 deletions(-)
drivers/staging/rtl8723bs/include/drv_types.h +0 -15
@@ -24,15 +24,6 @@#include <wifi.h> #include <ieee80211.h> -enum _nic_version { - -RTL8711_NIC , -RTL8712_NIC , -RTL8713_NIC , -RTL8716_NIC - -}; -#include <rtw_rf.h> #include <rtw_ht.h>
@@ -353,12 +344,6 @@ enum _iface_type { MAX_IFACE_PORT, }; -enum adapter_type { -PRIMARY_ADAPTER , -SECONDARY_ADAPTER , -MAX_ADAPTER =0xFF , -}; -enum driver_state {DRIVER_NORMAL =0 ,DRIVER_DISAPPEAR =1 ,
Signature · 1 line
2.30.2
PATCH 4/21 Staging: rtl8723bs: remove enums in wlan_bssdef.h
In reply to Marco CesatiRemove the following unnecessary enum definition in include/wlan_bssdef.h:
enum ndis_802_11_reload_defaults
--- drivers/staging/rtl8723bs/include/wlan_bssdef.h | 5 ----- 1 file changed, 5 deletions(-)
drivers/staging/rtl8723bs/include/wlan_bssdef.h +0 -5
@@ -127,11 +127,6 @@ struct ndis_801_11_ai_resfi {u16 AssociationId; }; -enum ndis_802_11_reload_defaults { - Ndis802_11ReloadWEPKeys -}; - -/* Key mapping keys require a BSSID */ struct ndis_802_11_wep {
Signature · 1 line
2.30.2
PATCH 5/21 Staging: rtl8723bs: remove enums in rtw_mp.h
In reply to Marco CesatiRemove the following unnecessary enum definitions in include/rtw_mp.h:
enum mp_mode
enum mpt_rate_index
enum power_mode
enum ofdm_tx_mode
enum encry_ctrl_state
enum mpt_txpwr_def
--- drivers/staging/rtl8723bs/include/rtw_mp.h | 98 ---------------------- 1 file changed, 98 deletions(-)
drivers/staging/rtl8723bs/include/rtw_mp.h +0 -98
@@ -265,97 +265,12 @@ struct mp_priv {/* Hardware Registers */ #define BB_REG_BASE_ADDR 0x800 -/* MP variables */ -enum mp_mode { -MP_OFF , -MP_ON , -MP_ERR , -MP_CONTINUOUS_TX , -MP_SINGLE_CARRIER_TX , -MP_CARRIER_SUPPRISSION_TX , -MP_SINGLE_TONE_TX , -MP_PACKET_TX , -MP_PACKET_RX -}; -#define MAX_RF_PATH_NUMS RF_PATH_MAXextern u8 mpdatarate[NumRates]; -/* MP set force data rate base on the definition. */ -enum mpt_rate_index { -/* CCK rate. */ -MPT_RATE_1M =0 ,/* 0 */ -MPT_RATE_2M , -MPT_RATE_55M , -MPT_RATE_11M ,/* 3 */ - -/* OFDM rate. */ -MPT_RATE_6M ,/* 4 */ -MPT_RATE_9M , -MPT_RATE_12M , -MPT_RATE_18M , -MPT_RATE_24M , -MPT_RATE_36M , -MPT_RATE_48M , -MPT_RATE_54M ,/* 11 */ - -/* HT rate. */ -MPT_RATE_MCS0 ,/* 12 */ -MPT_RATE_MCS1 , -MPT_RATE_MCS2 , -MPT_RATE_MCS3 , -MPT_RATE_MCS4 , -MPT_RATE_MCS5 , -MPT_RATE_MCS6 , -MPT_RATE_MCS7 ,/* 19 */ -MPT_RATE_MCS8 , -MPT_RATE_MCS9 , -MPT_RATE_MCS10 , -MPT_RATE_MCS11 , -MPT_RATE_MCS12 , -MPT_RATE_MCS13 , -MPT_RATE_MCS14 , -MPT_RATE_MCS15 ,/* 27 */ -/* VHT rate. Total: 20*/ -MPT_RATE_VHT1SS_MCS0 =100 ,/* To reserve MCS16~MCS31, the index starts from #100. */ -MPT_RATE_VHT1SS_MCS1 ,/* #101 */ -MPT_RATE_VHT1SS_MCS2 , -MPT_RATE_VHT1SS_MCS3 , -MPT_RATE_VHT1SS_MCS4 , -MPT_RATE_VHT1SS_MCS5 , -MPT_RATE_VHT1SS_MCS6 ,/* #106 */ -MPT_RATE_VHT1SS_MCS7 , -MPT_RATE_VHT1SS_MCS8 , -MPT_RATE_VHT1SS_MCS9 , -MPT_RATE_VHT2SS_MCS0 , -MPT_RATE_VHT2SS_MCS1 ,/* #111 */ -MPT_RATE_VHT2SS_MCS2 , -MPT_RATE_VHT2SS_MCS3 , -MPT_RATE_VHT2SS_MCS4 , -MPT_RATE_VHT2SS_MCS5 , -MPT_RATE_VHT2SS_MCS6 ,/* #116 */ -MPT_RATE_VHT2SS_MCS7 , -MPT_RATE_VHT2SS_MCS8 , -MPT_RATE_VHT2SS_MCS9 , -MPT_RATE_LAST -}; -#define MAX_TX_PWR_INDEX_N_MODE 64/* 0x3F */ -enum power_mode { -POWER_LOW =0 , -POWER_NORMAL -}; - -/* The following enumeration is used to define the value of Reg0xD00[30:28] or JaguarReg0x914[18:16]. */ -enum ofdm_tx_mode { -OFDM_ALL_OFF =0 , - OFDM_ContinuousTx =1 , - OFDM_SingleCarrier =2 , - OFDM_SingleTone =4 , -}; -#define RX_PKT_BROADCAST 1#define RX_PKT_DEST_ADDR 2#define RX_PKT_PHY_MATCH 3
@@ -371,19 +286,6 @@ enum ofdm_tx_mode {#define Mac_HT_FasleAlarm 0x90000000#define Mac_DropPacket 0xA0000000 -enum encry_ctrl_state { -HW_CONTROL ,/* hw encryption& decryption */ -SW_CONTROL ,/* sw encryption& decryption */ -HW_ENCRY_SW_DECRY ,/* hw encryption & sw decryption */ -SW_ENCRY_HW_DECRY /* sw encryption & hw decryption */ -}; - -enum mpt_txpwr_def { -MPT_CCK , -MPT_OFDM ,/* L and HT OFDM */ -MPT_VHT_OFDM -}; -#define REG_RF_BB_GAIN_OFFSET 0x7f#define RF_GAIN_OFFSET_MASK 0xfffff
Signature · 1 line
2.30.2
PATCH 6/21 Staging: rtl8723bs: remove enums in osdep_service.h
In reply to Marco CesatiRemove the following unnecessary enum definitions in include/osdep_service.h:
enum mstat_f
enum mstat_status
--- .../staging/rtl8723bs/include/osdep_service.h | 23 ------------------- 1 file changed, 23 deletions(-)
drivers/staging/rtl8723bs/include/osdep_service.h +0 -23
@@ -59,33 +59,10 @@extern int RTW_STATUS_CODE (int error_code);/* flags used for rtw_mstat_update() */ -enum mstat_f { -/* type: 0x00ff */ -MSTAT_TYPE_VIR =0x00 , -MSTAT_TYPE_PHY =0x01 , -MSTAT_TYPE_SKB =0x02 , -MSTAT_TYPE_USB =0x03 , -MSTAT_TYPE_MAX =0x04 , - -/* func: 0xff00 */ -MSTAT_FUNC_UNSPECIFIED =0x00 <<8 , -MSTAT_FUNC_IO =0x01 <<8 , -MSTAT_FUNC_TX_IO =0x02 <<8 , -MSTAT_FUNC_RX_IO =0x03 <<8 , -MSTAT_FUNC_TX =0x04 <<8 , -MSTAT_FUNC_RX =0x05 <<8 , -MSTAT_FUNC_MAX =0x06 <<8 , -};#define mstat_tf_idx (flags) ((flags)&0xff)#define mstat_ff_idx (flags) (((flags)&0xff00) >> 8) -enum mstat_status { -MSTAT_ALLOC_SUCCESS =0 , -MSTAT_ALLOC_FAIL , -MSTAT_FREE -}; -#define rtw_mstat_update (flag, status, sz) do {} while (0)#define rtw_mstat_dump (sel) do {} while (0)void *_rtw_zmalloc (u32 sz);
Signature · 1 line
2.30.2
Re: [PATCH 06/21] Staging: rtl8723bs: remove enums in osdep_service.h
Quoted 16 lines · Marco Cesati
Remove the following unnecessary enum definitions in
include/osdep_service.h:enum
mstat_f
enummstat_statusSigned-off-by Marco Cesati <[email protected]>--- .../staging/rtl8723bs/include/osdep_service.h | 23 ------------------- 1 file changed, 23 deletions(-)drivers/staging/rtl8723bs/include/osdep_service.h +0
-0
drivers/staging/rtl8723bs/include/osdep_service.h line 61
Quoted 3 lines
drivers/staging/rtl8723bs/include/osdep_service.h +0
-0@@ -59,33 +59,10 @@extern int RTW_STATUS_CODE (int error_code);/* flags used for rtw_mstat_update() */
This comment doesn't make sense any more. Also we can delete rtw_mstat_update(). Feel free to delete this in a follow on patch instead of resending.
drivers/staging/rtl8723bs/include/osdep_service.h line 65
Quoted 4 lines
drivers/staging/rtl8723bs/include/osdep_service.h +0
-4-enum mstat_f { -/* type: 0x00ff */ -MSTAT_TYPE_VIR =0x00 , -MSTAT_TYPE_PHY =0x01 ,
regards,
dan carpenter
PATCH 7/21 Staging: rtl8723bs: remove enums in hal_intf.h
In reply to Marco CesatiRemove the following unnecessary enum definitions in include/hal_intf.h:
enum rt_eeprom_type
enum wowlan_subcode
--- drivers/staging/rtl8723bs/include/hal_intf.h | 22 -------------------- 1 file changed, 22 deletions(-)
drivers/staging/rtl8723bs/include/hal_intf.h +0 -22
@@ -257,12 +257,6 @@ struct hal_ops {s32 (*fill_h2c_cmd)(struct adapter *,u8 ElementID,u32 CmdLen,u8 *pCmdBuffer); }; -enum rt_eeprom_type { -EEPROM_93C46 , -EEPROM_93C56 , -EEPROM_BOOT_EFUSE , -}; -#define RF_CHANGE_BY_INIT 0#define RF_CHANGE_BY_IPS BIT28#define RF_CHANGE_BY_PS BIT29
@@ -272,22 +266,6 @@ enum rt_eeprom_type {#define GET_EEPROM_EFUSE_PRIV (adapter) (&adapter->eeprompriv)#define is_boot_from_eeprom (adapter) (adapter->eeprompriv.EepromOrEfuse) -enum wowlan_subcode { -WOWLAN_PATTERN_MATCH =1 , -WOWLAN_MAGIC_PACKET =2 , -WOWLAN_UNICAST =3 , -WOWLAN_SET_PATTERN =4 , -WOWLAN_DUMP_REG =5 , -WOWLAN_ENABLE =6 , -WOWLAN_DISABLE =7 , -WOWLAN_STATUS =8 , -WOWLAN_DEBUG_RELOAD_FW =9 , -WOWLAN_DEBUG_1 =10 , -WOWLAN_DEBUG_2 =11 , -WOWLAN_AP_ENABLE =12 , -WOWLAN_AP_DISABLE =13 -}; -#define Rx_Pairwisekey 0x01#define Rx_GTK 0x02#define Rx_DisAssoc 0x04
Signature · 1 line
2.30.2
PATCH 8/21 Staging: rtl8723bs: remove enums in hal_com_h2c.h
In reply to Marco CesatiRemove the following unnecessary enum definition in include/hal_com_h2c.h:
enum h2c_cmd
--- .../staging/rtl8723bs/include/hal_com_h2c.h | 60 ------------------- 1 file changed, 60 deletions(-)
drivers/staging/rtl8723bs/include/hal_com_h2c.h +0 -60
@@ -11,66 +11,6 @@/* H2C CMD DEFINITION ------------------------------------------------ */ /* */ /* 88e, 8723b, 8812, 8821, 92e use the same FW code base */ -enum h2c_cmd { -/* Common Class: 000 */ -H2C_RSVD_PAGE =0x00 , -H2C_MEDIA_STATUS_RPT =0x01 , -H2C_SCAN_ENABLE =0x02 , -H2C_KEEP_ALIVE =0x03 , -H2C_DISCON_DECISION =0x04 , -H2C_PSD_OFFLOAD =0x05 , -H2C_AP_OFFLOAD =0x08 , -H2C_BCN_RSVDPAGE =0x09 , -H2C_PROBERSP_RSVDPAGE =0x0A , -H2C_FCS_RSVDPAGE =0x10 , -H2C_FCS_INFO =0x11 , -H2C_AP_WOW_GPIO_CTRL =0x13 , - -/* PoweSave Class: 001 */ -H2C_SET_PWR_MODE =0x20 , -H2C_PS_TUNING_PARA =0x21 , -H2C_PS_TUNING_PARA2 =0x22 , -H2C_P2P_LPS_PARAM =0x23 , -H2C_P2P_PS_OFFLOAD =0x24 , -H2C_PS_SCAN_ENABLE =0x25 , -H2C_SAP_PS_ =0x26 , -H2C_INACTIVE_PS_ =0x27 ,/* Inactive_PS */ -H2C_FWLPS_IN_IPS_ =0x28 , - -/* Dynamic Mechanism Class: 010 */ -H2C_MACID_CFG =0x40 , -H2C_TXBF =0x41 , -H2C_RSSI_SETTING =0x42 , -H2C_AP_REQ_TXRPT =0x43 , -H2C_INIT_RATE_COLLECT =0x44 , - -/* BT Class: 011 */ -H2C_B_TYPE_TDMA =0x60 , -H2C_BT_INFO =0x61 , -H2C_FORCE_BT_TXPWR =0x62 , -H2C_BT_IGNORE_WLANACT =0x63 , -H2C_DAC_SWING_VALUE =0x64 , -H2C_ANT_SEL_RSV =0x65 , -H2C_WL_OPMODE =0x66 , -H2C_BT_MP_OPER =0x67 , -H2C_BT_CONTROL =0x68 , -H2C_BT_WIFI_CTRL =0x69 , -H2C_BT_FW_PATCH =0x6A , - -/* WOWLAN Class: 100 */ -H2C_WOWLAN =0x80 , -H2C_REMOTE_WAKE_CTRL =0x81 , -H2C_AOAC_GLOBAL_INFO =0x82 , -H2C_AOAC_RSVD_PAGE =0x83 , -H2C_AOAC_RSVD_PAGE2 =0x84 , -H2C_D0_SCAN_OFFLOAD_CTRL =0x85 , -H2C_D0_SCAN_OFFLOAD_INFO =0x86 , -H2C_CHNL_SWITCH_OFFLOAD =0x87 , -H2C_AOAC_RSVDPAGE3 =0x88 , - -H2C_RESET_TSF =0xC0 , -H2C_MAXID , -};#define H2C_RSVDPAGE_LOC_LEN 5#define H2C_MEDIA_STATUS_RPT_LEN 3
Signature · 1 line
2.30.2
Re: [PATCH 08/21] Staging: rtl8723bs: remove enums in hal_com_h2c.h
Quoted 15 lines · Marco Cesati
Remove the following unnecessary enum definition in
include/hal_com_h2c.h:enum
h2c_cmdSigned-off-by Marco Cesati <[email protected]>--- .../staging/rtl8723bs/include/hal_com_h2c.h | 60 ------------------- 1 file changed, 60 deletions(-)drivers/staging/rtl8723bs/include/hal_com_h2c.h +0
-0
drivers/staging/rtl8723bs/include/hal_com_h2c.h line 13
Quoted 3 lines
drivers/staging/rtl8723bs/include/hal_com_h2c.h +0
-0@@ -11,66 +11,6 @@/* H2C CMD DEFINITION ------------------------------------------------ */ /* */ /* 88e, 8723b, 8812, 8821, 92e use the same FW code base */
Delete these comments.
drivers/staging/rtl8723bs/include/hal_com_h2c.h line 17
Quoted 4 lines
drivers/staging/rtl8723bs/include/hal_com_h2c.h +0
-4-enum h2c_cmd { -/* Common Class: 000 */ -H2C_RSVD_PAGE =0x00 , -H2C_MEDIA_STATUS_RPT =0x01 ,
regards,
dan carpenter
PATCH 9/21 Staging: rtl8723bs: remove enums in rtw_wifi_regd.h
In reply to Marco CesatiRemove the following unnecessary enum definitions in include/rtw_wifi_regd.h:
enum country_code_type_t
--- drivers/staging/rtl8723bs/include/rtw_wifi_regd.h | 7 ------- 1 file changed, 7 deletions(-)
drivers/staging/rtl8723bs/include/rtw_wifi_regd.h +0 -7
@@ -8,13 +8,6 @@#ifndef __RTW_WIFI_REGD_H__#define __RTW_WIFI_REGD_H__ -enum country_code_type_t { -COUNTRY_CODE_USER =0 , - -/*add new channel plan above this line */ -COUNTRY_CODE_MAX -}; -void rtw_regd_init (struct wiphy *wiphy,void (*reg_notifier)(struct wiphy *wiphy,struct regulatory_request *request));
Signature · 1 line
2.30.2
PATCH 10/21 Staging: rtl8723bs: remove enums in wifi.h
In reply to Marco CesatiRemove the following unnecessary enum definitions in include/wifi.h:
enum wifi_reg_domain
enum p2p_proto_wk_id
--- drivers/staging/rtl8723bs/include/wifi.h | 24 ------------------------ 1 file changed, 24 deletions(-)
drivers/staging/rtl8723bs/include/wifi.h +0 -24
@@ -88,20 +88,6 @@ enum wifi_frame_subtype { WIFI_QOS_DATA_NULL = (BIT(6) | WIFI_QOS_DATA_TYPE), }; -enum wifi_reg_domain { -DOMAIN_FCC =1 , -DOMAIN_IC =2 , -DOMAIN_ETSI =3 , -DOMAIN_SPAIN =4 , -DOMAIN_FRANCE =5 , -DOMAIN_MKK =6 , -DOMAIN_ISRAEL =7 , -DOMAIN_MKK1 =8 , -DOMAIN_MKK2 =9 , -DOMAIN_MKK3 =10 , -DOMAIN_MAX -}; -#define _TO_DS_ BIT(8)#define _FROM_DS_ BIT(9)#define _MORE_FRAG_ BIT(10)
@@ -778,16 +764,6 @@ enum p2p_wpsinfo {#define P2P_PRIVATE_IOCTL_SET_LEN 64 -enum p2p_proto_wk_id { -P2P_FIND_PHASE_WK =0 , -P2P_RESTORE_STATE_WK =1 , -P2P_PRE_TX_PROVDISC_PROCESS_WK =2 , -P2P_PRE_TX_NEGOREQ_PROCESS_WK =3 , -P2P_PRE_TX_INVITEREQ_PROCESS_WK =4 , -P2P_AP_P2P_CH_SWITCH_PROCESS_WK =5 , -P2P_RO_CH_WK =6 , -}; -/* =====================WFD Section ===================== */ /* For Wi-Fi Display */ #define WFD_ATTR_DEVICE_INFO 0x00
Signature · 1 line
2.30.2
PATCH 11/21 Staging: rtl8723bs: remove enums in hal_phy.h
In reply to Marco CesatiRemove the following unnecessary enum definitions in include/hal_phy.h:
enum antenna_path
enum rf_content
enum BaseBand_Config_Type
enum hw_block
--- drivers/staging/rtl8723bs/include/hal_phy.h | 42 --------------------- 1 file changed, 42 deletions(-)
drivers/staging/rtl8723bs/include/hal_phy.h +0 -42
@@ -74,48 +74,6 @@ enum rf_path {#define RF_PATH_MAX_92C_88E 2#define RF_PATH_MAX_90_8812 4/* Max RF number 90 support */ -enum antenna_path { -ANTENNA_NONE =0 , -ANTENNA_D =1 , -ANTENNA_C =2 , -ANTENNA_CD =3 , -ANTENNA_B =4 , -ANTENNA_BD =5 , -ANTENNA_BC =6 , -ANTENNA_BCD =7 , -ANTENNA_A =8 , -ANTENNA_AD =9 , -ANTENNA_AC =10 , -ANTENNA_ACD =11 , -ANTENNA_AB =12 , -ANTENNA_ABD =13 , -ANTENNA_ABC =14 , -ANTENNA_ABCD =15 -}; - -enum rf_content { - radioa_txt =0x1000 , - radiob_txt =0x1001 , - radioc_txt =0x1002 , - radiod_txt =0x1003 -}; - -enum BaseBand_Config_Type { - BaseBand_Config_PHY_REG =0 ,/* Radio Path A */ - BaseBand_Config_AGC_TAB =1 ,/* Radio Path B */ - BaseBand_Config_AGC_TAB_2G =2 , - BaseBand_Config_AGC_TAB_5G =3 , - BaseBand_Config_PHY_REG_PG -}; - -enum hw_block { -HW_BLOCK_MAC =0 , -HW_BLOCK_PHY0 =1 , -HW_BLOCK_PHY1 =2 , -HW_BLOCK_RF =3 , -HW_BLOCK_MAXIMUM =4 ,/* Never use this */ -}; -enum wireless_mode {WIRELESS_MODE_UNKNOWN =0x00 ,WIRELESS_MODE_A =0x01 ,
Signature · 1 line
2.30.2
PATCH 12/21 Staging: rtl8723bs: remove enums in rtw_mlme_ext.h
In reply to Marco CesatiRemove the following unnecessary enum definition in include/rtw_mlme_ext.h:
enum Associated_AP
--- drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 12 ------------ 1 file changed, 12 deletions(-)
drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +0 -12
@@ -258,18 +258,6 @@ struct rt_channel_plan_map {unsigned char Index5G; }; -enum Associated_AP { - atherosAP =0 , - broadcomAP =1 , - ciscoAP =2 , - marvellAP =3 , - ralinkAP =4 , - realtekAP =5 , - airgocapAP =6 , - unknownAP =7 , - maxAP, -}; -enum ht_iot_peer_e {HT_IOT_PEER_UNKNOWN =0 ,HT_IOT_PEER_REALTEK =1 ,
Signature · 1 line
2.30.2
PATCH 13/21 Staging: rtl8723bs: remove enums in rtw_xmit.h
In reply to Marco CesatiRemove the following unnecessary enum definition in include/rtw_xmit.h:
enum txdesc_sc
--- drivers/staging/rtl8723bs/include/rtw_xmit.h | 7 ------- 1 file changed, 7 deletions(-)
drivers/staging/rtl8723bs/include/rtw_xmit.h +0 -7
@@ -83,13 +83,6 @@ do {\#define TXDESC_OFFSET TXDESC_SIZE -enum txdesc_sc { -SC_DONT_CARE =0x00 , -SC_UPPER =0x01 , -SC_LOWER =0x02 , -SC_DUPLICATE =0x03 -}; -#define TXDESC_40_BYTES struct tx_desc {
Signature · 1 line
2.30.2
PATCH 14/21 Staging: rtl8723bs: remove enums in rtw_rf.h
In reply to Marco CesatiRemove the following unnecessary enum definitions in include/rtw_rf.h:
enum _rtl8712_rf_mimo_config_ enum rf90_radio_path enum protection_mode
--- drivers/staging/rtl8723bs/include/rtw_rf.h | 24 ---------------------- 1 file changed, 24 deletions(-)
drivers/staging/rtl8723bs/include/rtw_rf.h +0 -24
@@ -74,24 +74,6 @@ enum _reg_preamble_mode { PREAMBLE_SHORT = 3, }; -enum _rtl8712_rf_mimo_config_ { -RTL8712_RFCONFIG_1T =0x10 , -RTL8712_RFCONFIG_2T =0x20 , -RTL8712_RFCONFIG_1R =0x01 , -RTL8712_RFCONFIG_2R =0x02 , -RTL8712_RFCONFIG_1T1R =0x11 , -RTL8712_RFCONFIG_1T2R =0x12 , -RTL8712_RFCONFIG_TURBO =0x92 , -RTL8712_RFCONFIG_2T2R =0x22 -}; - -enum rf90_radio_path { -RF90_PATH_A =0 ,/* Radio Path A */ -RF90_PATH_B =1 ,/* Radio Path B */ -RF90_PATH_C =2 ,/* Radio Path C */ -RF90_PATH_D =3 /* Radio Path D */ -}; -/* Bandwidth Offset */ #define HAL_PRIME_CHNL_OFFSET_DONT_CARE 0#define HAL_PRIME_CHNL_OFFSET_LOWER 1
@@ -130,12 +112,6 @@ enum vht_data_sc { VHT_DATA_SC_40_LOWER_OF_80MHZ = 10, }; -enum protection_mode { -PROTECTION_MODE_AUTO =0 , -PROTECTION_MODE_FORCE_ENABLE =1 , -PROTECTION_MODE_FORCE_DISABLE =2 , -}; -/* 2007/11/15 MH Define different RF type. */ enum rt_rf_type_definition {RF_1T2R =0 ,
Signature · 1 line
2.30.2
PATCH 15/21 Staging: rtl8723bs: remove enums in ieee80211.h
In reply to Marco CesatiRemove the following unnecessary enum definitions in include/ieee80211.h:
enum ratr_table_mode enum eap_type enum ieee80211_state enum rtw_ieee80211_back_parties enum rtw_ieee80211_vht_actioncode enum secondary_ch_offset
--- drivers/staging/rtl8723bs/include/ieee80211.h | 81 ------------------- 1 file changed, 81 deletions(-)
drivers/staging/rtl8723bs/include/ieee80211.h +0 -81
@@ -139,19 +139,6 @@ enum rateid_idx { RATEID_IDX_VHT_1SS = 10, }; -enum ratr_table_mode { -RATR_INX_WIRELESS_NGB =0 ,/* BGN 40 Mhz 2SS 1SS */ -RATR_INX_WIRELESS_NG =1 ,/* GN or N */ -RATR_INX_WIRELESS_NB =2 ,/* BGN 20 Mhz 2SS 1SS or BN */ -RATR_INX_WIRELESS_N =3 , -RATR_INX_WIRELESS_GB =4 , -RATR_INX_WIRELESS_G =5 , -RATR_INX_WIRELESS_B =6 , -RATR_INX_WIRELESS_MC =7 , -RATR_INX_WIRELESS_AC_N =8 , -}; - -enum network_type {WIRELESS_INVALID =0 ,/* Sub-Element */
@@ -274,14 +261,6 @@ struct eapol {u16 length; } __attribute__ ((packed)); -enum eap_type { -EAP_PACKET =0 , -EAPOL_START , -EAPOL_LOGOFF , -EAPOL_KEY , -EAPOL_ENCAP_ASF_ALERT -}; -#define IEEE80211_FCS_LEN 4#define MIN_FRAG_THRESHOLD 256U
@@ -615,45 +594,6 @@ Total: 28-2340 bytes> 0: TID */ -enum ieee80211_state { - -/* the card is not linked at all */ -IEEE80211_NOLINK =0 , - -/* IEEE80211_ASSOCIATING* are for BSS client mode -* the driver shall not perform RX filtering unless -* the state is LINKED. -* The driver shall just check for the state LINKED and -* defaults to NOLINK for ALL the other states (including -* LINKED_SCANNING) -*/ - -/* the association procedure will start (wq scheduling)*/ -IEEE80211_ASSOCIATING , -IEEE80211_ASSOCIATING_RETRY , - -/* the association procedure is sending AUTH request*/ -IEEE80211_ASSOCIATING_AUTHENTICATING , - -/* the association procedure has successfully authentcated -* and is sending association request -*/ -IEEE80211_ASSOCIATING_AUTHENTICATED , - -/* the link is ok. the card associated to a BSS or linked -* to a ibss cell or acting as an AP and creating the bss -*/ -IEEE80211_LINKED , - -/* same as LINKED, but the driver shall apply RX filter -* rules as we are in NO_LINK mode. As the card is still -* logically linked, but it is doing a syncro site survey -* then it will be back to LINKED state. -*/ -IEEE80211_LINKED_SCANNING , - -}; -#define DEFAULT_MAX_SCAN_AGE (15 * HZ)#define DEFAULT_FTS 2346#define MAC_ARG (x) (x)
@@ -725,21 +665,6 @@ enum _public_action { ACT_PUBLIC_MAX }; -/* BACK (block-ack) parties */ -enum rtw_ieee80211_back_parties { -RTW_WLAN_BACK_RECIPIENT =0 , -RTW_WLAN_BACK_INITIATOR =1 , -RTW_WLAN_BACK_TIMER =2 , -}; - -/* VHT features action code */ -enum rtw_ieee80211_vht_actioncode { -RTW_WLAN_ACTION_VHT_COMPRESSED_BEAMFORMING =0 , -RTW_WLAN_ACTION_VHT_GROUPID_MANAGEMENT =1 , -RTW_WLAN_ACTION_VHT_OPMODE_NOTIFICATION =2 , -}; - -#define OUI_MICROSOFT 0x0050f2/* Microsoft (also used in Wi-Fi specs) * 00:50:F2 */ #define WME_OUI_TYPE 2
@@ -898,12 +823,6 @@ enum ParseRes rtw_ieee802_11_parse_elems(u8 *start, uint len,u8 *rtw_set_fixed_ie (unsigned char *pbuf,unsigned int len,unsigned char *source,unsigned int *frlen);u8 *rtw_set_ie (u8 *pbuf,signed int index,uint len,u8 *source,uint *frlen); -enum secondary_ch_offset { -SCN =0 ,/* no secondary channel */ -SCA =1 ,/* secondary channel above */ -SCB =3 ,/* secondary channel below */ -}; -u8 *rtw_get_ie (u8 *pbuf,signed int index,signed int *len,signed int limit);u8 *rtw_get_ie_ex (u8 *in_ie,uint in_len,u8 eid,u8 *oui,u8 oui_len,u8 *ie,uint *ielen);int rtw_ies_remove_ie (u8 *ies,uint *ies_len,uint offset,u8 eid,u8 *oui,u8 oui_len);
Signature · 1 line
2.30.2
PATCH 16/21 Staging: rtl8723bs: remove enums in odm_interface.h
In reply to Marco CesatiRemove the following unnecessary enum definition in hal/odm_interface.h:
enum odm_h2c_cmd
--- drivers/staging/rtl8723bs/hal/odm_interface.h | 8 -------- 1 file changed, 8 deletions(-)
drivers/staging/rtl8723bs/hal/odm_interface.h +0 -8
@@ -39,13 +39,5 @@ ODM_REG(DIG, _pDM_Odm)#define ODM_REG (_name, _pDM_Odm) _cat(_name, _pDM_Odm->SupportICType, _reg)#define ODM_BIT (_name, _pDM_Odm) _cat(_name, _pDM_Odm->SupportICType, _bit) -enum odm_h2c_cmd { -ODM_H2C_RSSI_REPORT =0 , -ODM_H2C_PSD_RESULT =1 , - ODM_H2C_PathDiv =2 , -ODM_H2C_WIFI_CALIBRATION =3 , -ODM_MAX_H2CCMD -}; -#endif /* __ODM_INTERFACE_H__ */
Signature · 1 line
2.30.2
PATCH 17/21 Staging: rtl8723bs: remove enums in HalBtcOutSrc.h
In reply to Marco CesatiRemove the following unnecessary enum definitions in hal/HalBtcOutSrc.h:
enum btc_dbg_opcode
enum btc_wifi_role
enum bt_wifi_coex_state
enum btc_notify_type_stack_operation
--- drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h | 34 -------------------- 1 file changed, 34 deletions(-)
drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h +0 -34
@@ -166,16 +166,6 @@ struct btc_board_info {/* bool bBtExist; */ }; -enum btc_dbg_opcode { -BTC_DBG_SET_COEX_NORMAL =0x0 , -BTC_DBG_SET_COEX_WIFI_ONLY =0x1 , -BTC_DBG_SET_COEX_BT_ONLY =0x2 , -BTC_DBG_SET_COEX_DEC_BT_PWR =0x3 , -BTC_DBG_SET_COEX_BT_AFH_MAP =0x4 , -BTC_DBG_SET_COEX_BT_IGNORE_WLAN_ACT =0x5 , -BTC_DBG_MAX -}; -enum btc_rssi_state {BTC_RSSI_STATE_HIGH =0x0 ,BTC_RSSI_STATE_MEDIUM =0x1 ,
@@ -189,14 +179,6 @@ enum btc_rssi_state {#define BTC_RSSI_MEDIUM (_rssi_) ((_rssi_ == BTC_RSSI_STATE_MEDIUM || _rssi_ == BTC_RSSI_STATE_STAY_MEDIUM) ? true : false)#define BTC_RSSI_LOW (_rssi_) ((_rssi_ == BTC_RSSI_STATE_LOW || _rssi_ == BTC_RSSI_STATE_STAY_LOW) ? true : false) -enum btc_wifi_role { -BTC_ROLE_STATION =0x0 , -BTC_ROLE_AP =0x1 , -BTC_ROLE_IBSS =0x2 , -BTC_ROLE_HS_MODE =0x3 , -BTC_ROLE_MAX -}; -enum btc_wifi_bw_mode {BTC_WIFI_BW_LEGACY =0x0 ,BTC_WIFI_BW_HT20 =0x1 ,
@@ -217,15 +199,6 @@ enum btc_wifi_pnp { };/* for 8723b-d cut large current issue */ -enum bt_wifi_coex_state { -BTC_WIFI_STAT_INIT , -BTC_WIFI_STAT_IQK , -BTC_WIFI_STAT_NORMAL_OFF , -BTC_WIFI_STAT_MP_OFF , -BTC_WIFI_STAT_NORMAL , -BTC_WIFI_STAT_ANT_DIV , -BTC_WIFI_STAT_MAX -};/* defined for BFP_BTC_GET */ enum btc_get_type {
@@ -355,13 +328,6 @@ enum btc_notify_type_special_packet {BTC_PACKET_MAX }; -enum btc_notify_type_stack_operation { -BTC_STACK_OP_NONE =0x0 , -BTC_STACK_OP_INQ_PAGE_PAIR_START =0x1 , -BTC_STACK_OP_INQ_PAGE_PAIR_FINISH =0x2 , -BTC_STACK_OP_MAX -}; -/* Bryant Add */ enum btc_antenna_pos {BTC_ANTENNA_AT_MAIN_PORT =0x1 ,
Signature · 1 line
2.30.2
Re: [PATCH 17/21] Staging: rtl8723bs: remove enums in HalBtcOutSrc.h
drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h enum btc_wifi_pnp { · line 201
Quoted 4 lines · Marco Cesati
drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h +0
-0@@ -217,15 +199,6 @@ enum btc_wifi_pnp { };/* for 8723b-d cut large current issue */
Delete this comment.
drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h enum btc_wifi_pnp { · line 204
Quoted 12 lines
drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h +0
-9-enum bt_wifi_coex_state { -BTC_WIFI_STAT_INIT , -BTC_WIFI_STAT_IQK , -BTC_WIFI_STAT_NORMAL_OFF , -BTC_WIFI_STAT_MP_OFF , -BTC_WIFI_STAT_NORMAL , -BTC_WIFI_STAT_ANT_DIV , -BTC_WIFI_STAT_MAX -};/* defined for BFP_BTC_GET */ enum btc_get_type {
regards,
dan carpenter
PATCH 18/21 Staging: rtl8723bs: remove enums in odm_types.h
In reply to Marco CesatiRemove the following unnecessary enum definition in hal/odm_types.h:
enum rt_spinlock_type
--- drivers/staging/rtl8723bs/hal/odm_types.h | 41 ----------------------- 1 file changed, 41 deletions(-)
drivers/staging/rtl8723bs/hal/odm_types.h +0 -41
@@ -27,47 +27,6 @@ enum hal_status { }; -/* */ -/* Declare for ODM spin lock definition temporarily from compile pass. */ -/* */ -enum rt_spinlock_type { -RT_TX_SPINLOCK =1 , -RT_RX_SPINLOCK =2 , -RT_RM_SPINLOCK =3 , -RT_CAM_SPINLOCK =4 , -RT_SCAN_SPINLOCK =5 , -RT_LOG_SPINLOCK =7 , -RT_BW_SPINLOCK =8 , -RT_CHNLOP_SPINLOCK =9 , -RT_RF_OPERATE_SPINLOCK =10 , -RT_INITIAL_SPINLOCK =11 , -RT_RF_STATE_SPINLOCK =12 ,/* For RF state. Added by Bruce, 2007-10-30. */ -/* Shall we define Ndis 6.2 SpinLock Here ? */ -RT_PORT_SPINLOCK =16 , -RT_H2C_SPINLOCK =20 ,/* For H2C cmd. Added by tynli. 2009.11.09. */ - - RT_BTData_SPINLOCK =25 , - -RT_WAPI_OPTION_SPINLOCK =26 , -RT_WAPI_RX_SPINLOCK =27 , - -/* add for 92D CCK control issue */ -RT_CCK_PAGEA_SPINLOCK =28 , -RT_BUFFER_SPINLOCK =29 , -RT_CHANNEL_AND_BANDWIDTH_SPINLOCK =30 , -RT_GEN_TEMP_BUF_SPINLOCK =31 , -RT_AWB_SPINLOCK =32 , -RT_FW_PS_SPINLOCK =33 , -RT_HW_TIMER_SPIN_LOCK =34 , -RT_MPT_WI_SPINLOCK =35 , -RT_P2P_SPIN_LOCK =36 ,/* Protect P2P context */ -RT_DBG_SPIN_LOCK =37 , -RT_IQK_SPINLOCK =38 , -RT_PENDED_OID_SPINLOCK =39 , -RT_CHNLLIST_SPINLOCK =40 , -RT_INDIC_SPINLOCK =41 ,/* protect indication */ -}; -#if defined(__LITTLE_ENDIAN)#define ODM_ENDIAN_TYPE ODM_ENDIAN_LITTLE#else
Signature · 1 line
2.30.2
PATCH 19/21 Staging: rtl8723bs: remove enums in odm_DIG.h
In reply to Marco CesatiRemove the following unnecessary enum definitions in hal/odm_DIG.h:
enum dm_dig_op_e
enum ODM_Pause_CCKPD_TYPE
--- drivers/staging/rtl8723bs/hal/odm_DIG.h | 16 ---------------- 1 file changed, 16 deletions(-)
drivers/staging/rtl8723bs/hal/odm_DIG.h +0 -16
@@ -77,27 +77,11 @@ struct false_ALARM_STATISTICS {u32 Cnt_BW_LSC;/* Gary */ }; -enum dm_dig_op_e {/* tag_Dynamic_Init_Gain_Operation_Type_Definition */ -DIG_TYPE_THRESH_HIGH =0 , -DIG_TYPE_THRESH_LOW =1 , -DIG_TYPE_BACKOFF =2 , -DIG_TYPE_RX_GAIN_MIN =3 , -DIG_TYPE_RX_GAIN_MAX =4 , -DIG_TYPE_ENABLE =5 , -DIG_TYPE_DISABLE =6 , -DIG_OP_TYPE_MAX -}; -enum ODM_Pause_DIG_TYPE {ODM_PAUSE_DIG =BIT0 ,ODM_RESUME_DIG =BIT1 }; -enum ODM_Pause_CCKPD_TYPE { -ODM_PAUSE_CCKPD =BIT0 , -ODM_RESUME_CCKPD =BIT1 -}; -#define DM_DIG_THRESH_HIGH 40#define DM_DIG_THRESH_LOW 35
Signature · 1 line
2.30.2
PATCH 20/21 Staging: rtl8723bs: remove enums in HalPhyRf.h
In reply to Marco CesatiRemove the following unnecessary enum definition in hal/HalPhyRf.h:
enum spur_cal_method
--- drivers/staging/rtl8723bs/hal/HalPhyRf.h | 5 ----- 1 file changed, 5 deletions(-)
drivers/staging/rtl8723bs/hal/HalPhyRf.h +0 -5
@@ -8,11 +8,6 @@#ifndef __HAL_PHY_RF_H__#define __HAL_PHY_RF_H__ -enum spur_cal_method { -PLL_RESET , -AFE_PHASE_SEL -}; -enum pwrtrack_method {BBSWING , TXAGC,
Signature · 1 line
2.30.2
PATCH 21/21 Staging: rtl8723bs: remove enums in odm.h
In reply to Marco CesatiRemove the following unnecessary enum definitions in hal/odm.h:
enum ODM_Ability_E
enum odm_rf_path_e
enum odm_mac_phy_mode_e
enum odm_bt_coexist_e
enum odm_operation_mode_e
enum odm_sec_chnl_offset_e
enum odm_security_e
enum odm_board_type_e
enum ODM_Package_TYPE_E
enum odm_cca_path_e
enum fat_state_e
enum rt_status
enum dm_swas_e
--- drivers/staging/rtl8723bs/hal/odm.h | 117 ---------------------------- 1 file changed, 117 deletions(-)
drivers/staging/rtl8723bs/hal/odm.h +0 -117
@@ -277,22 +277,6 @@ struct odm_mac_status_info {u8 test; }; -enum ODM_Ability_E {/* tag_Dynamic_ODM_Support_Ability_Type */ -/* BB Team */ -ODM_DIG =0x00000001 , -ODM_HIGH_POWER =0x00000002 , -ODM_CCK_CCA_TH =0x00000004 , -ODM_FA_STATISTICS =0x00000008 , -ODM_RAMASK =0x00000010 , -ODM_RSSI_MONITOR =0x00000020 , -ODM_SW_ANTDIV =0x00000040 , -ODM_HW_ANTDIV =0x00000080 , -ODM_BB_PWRSV =0x00000100 , -ODM_2TPATHDIV =0x00000200 , -ODM_1TPATHDIV =0x00000400 , -ODM_PSD2AFH =0x00000800 -}; -/* */ /* 2011/10/20 MH Define Common info enum for all team. */ /* */
@@ -452,16 +436,6 @@ enum odm_fab_e { /* tag_ODM_Fab_Version_Definition *//* */ /* For example 1T2R (A+AB = BIT0|BIT4|BIT5) */ /* */ -enum odm_rf_path_e {/* tag_ODM_RF_Path_Bit_Definition */ -ODM_RF_TX_A =BIT0 , -ODM_RF_TX_B =BIT1 , -ODM_RF_TX_C =BIT2 , -ODM_RF_TX_D =BIT3 , -ODM_RF_RX_A =BIT4 , -ODM_RF_RX_B =BIT5 , -ODM_RF_RX_C =BIT6 , -ODM_RF_RX_D =BIT7 , -};enum odm_rf_type_e {/* tag_ODM_RF_Type_Definition */ ODM_1T1R =0 ,
@@ -484,31 +458,6 @@ enum odm_rf_type_e { /* tag_ODM_RF_Type_Definition *//* DUALMAC_SINGLEPHY, */ /* MACPHY_MODE_8192D,*PMACPHY_MODE_8192D; */ /* Above is the original define in MP driver. Please use the same define. THX. */ -enum odm_mac_phy_mode_e {/* tag_ODM_MAC_PHY_Mode_Definition */ -ODM_SMSP =0 , -ODM_DMSP =1 , -ODM_DMDP =2 , -}; - -enum odm_bt_coexist_e {/* tag_BT_Coexist_Definition */ -ODM_BT_BUSY =1 , -ODM_BT_ON =2 , -ODM_BT_OFF =3 , -ODM_BT_NONE =4 , -}; - -/* ODM_CMNINFO_OP_MODE */ -enum odm_operation_mode_e {/* tag_Operation_Mode_Definition */ -ODM_NO_LINK =BIT0 , -ODM_LINK =BIT1 , -ODM_SCAN =BIT2 , -ODM_POWERSAVE =BIT3 , -ODM_AP_MODE =BIT4 , -ODM_CLIENT_MODE =BIT5 , -ODM_AD_HOC =BIT6 , -ODM_WIFI_DIRECT =BIT7 , -ODM_WIFI_DISPLAY =BIT8 , -};/* ODM_CMNINFO_WM_MODE */ enum odm_wireless_mode_e {/* tag_Wireless_Mode_Definition */
@@ -530,25 +479,6 @@ enum odm_band_type_e { /* tag_Band_Type_Definition */ODM_BANDMAX }; -/* ODM_CMNINFO_SEC_CHNL_OFFSET */ -enum odm_sec_chnl_offset_e {/* tag_Secondary_Channel_Offset_Definition */ -ODM_DONT_CARE =0 , -ODM_BELOW =1 , -ODM_ABOVE =2 -}; - -/* ODM_CMNINFO_SEC_MODE */ -enum odm_security_e {/* tag_Security_Definition */ -ODM_SEC_OPEN =0 , -ODM_SEC_WEP40 =1 , -ODM_SEC_TKIP =2 , -ODM_SEC_RESERVE =3 , -ODM_SEC_AESCCMP =4 , -ODM_SEC_WEP104 =5 , -ODM_WEP_WPA_MIXED =6 ,/* WEP + WPA */ -ODM_SEC_SMS4 =7 , -}; -/* ODM_CMNINFO_BW */ enum odm_bw_e {/* tag_Bandwidth_Definition */ ODM_BW20M =0 ,
@@ -561,24 +491,6 @@ enum odm_bw_e { /* tag_Bandwidth_Definition *//* ODM_CMNINFO_BOARD_TYPE */ /* For non-AC-series IC , ODM_BOARD_5G_EXT_PA and ODM_BOARD_5G_EXT_LNA are ignored */ /* For AC-series IC, external PA & LNA can be indivisuallly added on 2.4G and/or 5G */ -enum odm_board_type_e {/* tag_Board_Definition */ -ODM_BOARD_DEFAULT =0 ,/* The DEFAULT case. */ -ODM_BOARD_MINICARD =BIT (0 ),/* 0 = non-mini card, 1 = mini card. */ -ODM_BOARD_SLIM =BIT (1 ),/* 0 = non-slim card, 1 = slim card */ -ODM_BOARD_BT =BIT (2 ),/* 0 = without BT card, 1 = with BT */ -ODM_BOARD_EXT_PA =BIT (3 ),/* 0 = no 2G ext-PA, 1 = existing 2G ext-PA */ -ODM_BOARD_EXT_LNA =BIT (4 ),/* 0 = no 2G ext-LNA, 1 = existing 2G ext-LNA */ -ODM_BOARD_EXT_TRSW =BIT (5 ),/* 0 = no ext-TRSW, 1 = existing ext-TRSW */ -ODM_BOARD_EXT_PA_5G =BIT (6 ),/* 0 = no 5G ext-PA, 1 = existing 5G ext-PA */ -ODM_BOARD_EXT_LNA_5G =BIT (7 ),/* 0 = no 5G ext-LNA, 1 = existing 5G ext-LNA */ -}; - -enum ODM_Package_TYPE_E {/* tag_ODM_Package_Definition */ -ODM_PACKAGE_DEFAULT =0 , -ODM_PACKAGE_QFN68 =BIT (0 ), -ODM_PACKAGE_TFBGA90 =BIT (1 ), -ODM_PACKAGE_TFBGA79 =BIT (2 ), -};enum odm_type_gpa_e {/* tag_ODM_TYPE_GPA_Definition */ TYPE_GPA0 =0 ,
@@ -604,13 +516,6 @@ enum odm_type_alna_e { /* tag_ODM_TYPE_ALNA_Definition */TYPE_ALNA3 =BIT (3 )|BIT (2 )|BIT (1 )|BIT (0 ) }; -/* ODM_CMNINFO_ONE_PATH_CCA */ -enum odm_cca_path_e {/* tag_CCA_Path */ -ODM_CCA_2R =0 , -ODM_CCA_1R_A =1 , -ODM_CCA_1R_B =2 , -}; -struct iqk_matrix_regs_setting {/* _IQK_MATRIX_REGS_SETTING */ bool bIQKDone;s32 Value[3 ][IQK_Matrix_REG_NUM];
@@ -764,11 +669,6 @@ struct fat_t { /* _FAST_ANTENNA_TRAINNING_ */ }; -enum fat_state_e { -FAT_NORMAL_STATE =0 , -FAT_TRAINING_STATE =1 , -}; -enum ant_div_type_e {NO_ANTDIV =0xFF ,CG_TRX_HW_ANTDIV =0x01 ,
@@ -1197,18 +1097,6 @@ enum ODM_FW_Config_Type { CONFIG_FW_BT, }; -/* Status code */ -enum rt_status { -RT_STATUS_SUCCESS , -RT_STATUS_FAILURE , -RT_STATUS_PENDING , -RT_STATUS_RESOURCE , -RT_STATUS_INVALID_CONTEXT , -RT_STATUS_INVALID_PARAMETER , -RT_STATUS_NOT_SUPPORT , -RT_STATUS_OS_API_FAILED , -}; -#ifdef REMOVE_PACK #pragma pack()#endif
@@ -1270,11 +1158,6 @@ enum dm_rf_e { /* tag_RF_Type_Definition *//* 3 =========================================================== */ /* 3 Antenna Diversity */ /* 3 =========================================================== */ -enum dm_swas_e {/* tag_SW_Antenna_Switch_Definition */ - Antenna_A =1 , - Antenna_B =2 , - Antenna_MAX =3 , -};/* Maximal number of antenna detection mechanism needs to perform, added by Roger, 2011.12.28. */ #define MAX_ANTENNA_DETECTION_CNT 10
Signature · 1 line
2.30.2
Re: [PATCH 21/21] Staging: rtl8723bs: remove enums in odm.h
drivers/staging/rtl8723bs/hal/odm.h enum dm_rf_e { /* tag_RF_Type_Definition */ · line 1160
Quoted 4 lines · Marco Cesati
drivers/staging/rtl8723bs/hal/odm.h +0
-0@@ -1270,11 +1158,6 @@ enum dm_rf_e { /* tag_RF_Type_Definition *//* 3 =========================================================== */ /* 3 Antenna Diversity */ /* 3 =========================================================== */
Probably this comment can go as well.
drivers/staging/rtl8723bs/hal/odm.h enum dm_rf_e { /* tag_RF_Type_Definition */ · line 1161
Quoted 6 lines
drivers/staging/rtl8723bs/hal/odm.h +0
-5-enum dm_swas_e {/* tag_SW_Antenna_Switch_Definition */ - Antenna_A =1 , - Antenna_B =2 , - Antenna_MAX =3 , -};
regards,
dan carpenter