qcacmn: Move REGDMN and wireless modes to reg_services_public_struct.h

There is a requirement to use REGDMN and wireless modes in UMAC layer of
the cmndev component. As the WMI_HOST_REGDMN modes currently are defined in
WMI layer, we can't use them directly in the UMAC layer. Hence move them
to the reg_services_public_struct.h and rename them as HOST_REGDMN modes.
Replace all WMI_HOST_REGDMN instances with HOST_REGDMN. Wireless modes are
currently defined in WIN component, use them to cmndev component.

CRs-Fixed: 3044590
Change-Id: Iee5fa1745a1a44b834334746b10bdbb6f6563a0a
This commit is contained in:
Shiva Krishna Pittala
2021-09-25 13:02:38 +05:30
committed by Madan Koyyalamudi
parent 81f3009593
commit 29817dce94
6 changed files with 403 additions and 138 deletions

View File

@@ -33,6 +33,7 @@
#endif /* WLAN_CONV_SPECTRAL_ENABLE */
#include <wlan_vdev_mgr_tgt_if_tx_defs.h>
#include <wlan_vdev_mgr_tgt_if_rx_defs.h>
#include <reg_services_public_struct.h>
#define MAC_MAX_KEY_LENGTH 32
#define MAC_PN_LENGTH 8
@@ -520,97 +521,6 @@ typedef struct {
uint32_t reg_info_2;
} wmi_host_channel;
/**
* enum WMI_HOST_REGDMN_MODE:
* @WMI_HOST_REGDMN_MODE_11A: 11a channels
* @WMI_HOST_REGDMN_MODE_TURBO: 11a turbo-only channels
* @WMI_HOST_REGDMN_MODE_11B: 11b channels
* @WMI_HOST_REGDMN_MODE_PUREG: 11g channels (OFDM only)
* @WMI_HOST_REGDMN_MODE_11G: historical
* @WMI_HOST_REGDMN_MODE_108G: 11g+Turbo channels
* @WMI_HOST_REGDMN_MODE_108A: 11a+Turbo channels
* @WMI_HOST_REGDMN_MODE_11AC_VHT20_2G: 2GHz, VHT20
* @WMI_HOST_REGDMN_MODE_XR: XR channels
* @WMI_HOST_REGDMN_MODE_11A_HALF_RATE: 11a half rate channels
* @WMI_HOST_REGDMN_MODE_11A_QUARTER_RATE: 11a quarter rate channels
* @WMI_HOST_REGDMN_MODE_11NG_HT20: 11ng HT20 channels
* @WMI_HOST_REGDMN_MODE_11NA_HT20: 11na HT20 channels
* @WMI_HOST_REGDMN_MODE_11NG_HT40PLUS: 11ng HT40+ channels
* @WMI_HOST_REGDMN_MODE_11NG_HT40MINUS: 11ng HT40- channels
* @WMI_HOST_REGDMN_MODE_11NA_HT40PLUS: 11na HT40+ channels
* @WMI_HOST_REGDMN_MODE_11NA_HT40MINUS: 11na HT40- channels
* @WMI_HOST_REGDMN_MODE_11AC_VHT20: 5GHz, VHT20
* @WMI_HOST_REGDMN_MODE_11AC_VHT40PLUS: 5GHz, VHT40+ channels
* @WMI_HOST_REGDMN_MODE_11AC_VHT40MINUS: 5GHz, VHT40- channels
* @WMI_HOST_REGDMN_MODE_11AC_VHT80: 5GHz, VHT80 channels
* @WMI_HOST_REGDMN_MODE_11AC_VHT160: 5GHz, VHT160 channels
* @WMI_HOST_REGDMN_MODE_11AC_VHT80_80: 5GHz, VHT80+80 channels
* @WMI_HOST_REGDMN_MODE_11AXG_HE20: 11ax 2.4GHz, HE20 channels
* @WMI_HOST_REGDMN_MODE_11AXA_HE20: 11ax 5GHz, HE20 channels
* @WMI_HOST_REGDMN_MODE_11AXG_HE40PLUS: 11ax 2.4GHz, HE40+ channels
* @WMI_HOST_REGDMN_MODE_11AXG_HE40MINUS: 11ax 2.4GHz, HE40- channels
* @WMI_HOST_REGDMN_MODE_11AXA_HE40PLUS: 11ax 5GHz, HE40+ channels
* @WMI_HOST_REGDMN_MODE_11AXA_HE40MINUS: 11ax 5GHz, HE40- channels
* @WMI_HOST_REGDMN_MODE_11AXA_HE80: 11ax 5GHz, HE80 channels
* @WMI_HOST_REGDMN_MODE_11AXA_HE160: 11ax 5GHz, HE160 channels
* @WMI_HOST_REGDMN_MODE_11AXA_HE80_80: 11ax 5GHz, HE80+80 channels
* @WMI_HOST_REGDMN_MODE_11BEG_EHT20: 11be 2GHz, EHT20 channels
* @WMI_HOST_REGDMN_MODE_11BEA_EHT20: 11be 5GHz, EHT20 channels
* @WMI_HOST_REGDMN_MODE_11BEG_EHT40PLUS: 11be 2GHz, EHT40+ channels
* @WMI_HOST_REGDMN_MODE_11BEG_EHT40MINUS: 11be 2GHz, EHT40- channels
* @WMI_HOST_REGDMN_MODE_11BEA_EHT40PLUS: 11be 5GHz, EHT40+ channels
* @WMI_HOST_REGDMN_MODE_11BEA_EHT40MINUS: 11be 5GHz, EHT40- channels
* @WMI_HOST_REGDMN_MODE_11BEA_EHT80: 11be 5GHz, EHT80 channels
* @WMI_HOST_REGDMN_MODE_11BEA_EHT160: 11be 5GHz, EHT160 channels
* @WMI_HOST_REGDMN_MODE_11BEA_EHT320: 11be 5GHz, EHT320 channels
*/
typedef enum {
WMI_HOST_REGDMN_MODE_11A = 0x00000001,
WMI_HOST_REGDMN_MODE_TURBO = 0x00000002,
WMI_HOST_REGDMN_MODE_11B = 0x00000004,
WMI_HOST_REGDMN_MODE_PUREG = 0x00000008,
WMI_HOST_REGDMN_MODE_11G = 0x00000008,
WMI_HOST_REGDMN_MODE_108G = 0x00000020,
WMI_HOST_REGDMN_MODE_108A = 0x00000040,
WMI_HOST_REGDMN_MODE_11AC_VHT20_2G = 0x00000080,
WMI_HOST_REGDMN_MODE_XR = 0x00000100,
WMI_HOST_REGDMN_MODE_11A_HALF_RATE = 0x00000200,
WMI_HOST_REGDMN_MODE_11A_QUARTER_RATE = 0x00000400,
WMI_HOST_REGDMN_MODE_11NG_HT20 = 0x00000800,
WMI_HOST_REGDMN_MODE_11NA_HT20 = 0x00001000,
WMI_HOST_REGDMN_MODE_11NG_HT40PLUS = 0x00002000,
WMI_HOST_REGDMN_MODE_11NG_HT40MINUS = 0x00004000,
WMI_HOST_REGDMN_MODE_11NA_HT40PLUS = 0x00008000,
WMI_HOST_REGDMN_MODE_11NA_HT40MINUS = 0x00010000,
WMI_HOST_REGDMN_MODE_11AC_VHT20 = 0x00020000,
WMI_HOST_REGDMN_MODE_11AC_VHT40PLUS = 0x00040000,
WMI_HOST_REGDMN_MODE_11AC_VHT40MINUS = 0x00080000,
WMI_HOST_REGDMN_MODE_11AC_VHT80 = 0x00100000,
WMI_HOST_REGDMN_MODE_11AC_VHT160 = 0x00200000,
WMI_HOST_REGDMN_MODE_11AC_VHT80_80 = 0x00400000,
WMI_HOST_REGDMN_MODE_11AXG_HE20 = 0x00800000,
WMI_HOST_REGDMN_MODE_11AXA_HE20 = 0x01000000,
WMI_HOST_REGDMN_MODE_11AXG_HE40PLUS = 0x02000000,
WMI_HOST_REGDMN_MODE_11AXG_HE40MINUS = 0x04000000,
WMI_HOST_REGDMN_MODE_11AXA_HE40PLUS = 0x08000000,
WMI_HOST_REGDMN_MODE_11AXA_HE40MINUS = 0x10000000,
WMI_HOST_REGDMN_MODE_11AXA_HE80 = 0x20000000,
WMI_HOST_REGDMN_MODE_11AXA_HE160 = 0x40000000,
WMI_HOST_REGDMN_MODE_11AXA_HE80_80 = 0x80000000,
#ifdef WLAN_FEATURE_11BE
WMI_HOST_REGDMN_MODE_11BEG_EHT20 = 0x0000000100000000,
WMI_HOST_REGDMN_MODE_11BEA_EHT20 = 0x0000000200000000,
WMI_HOST_REGDMN_MODE_11BEG_EHT40PLUS = 0x0000000400000000,
WMI_HOST_REGDMN_MODE_11BEG_EHT40MINUS = 0x0000000800000000,
WMI_HOST_REGDMN_MODE_11BEA_EHT40PLUS = 0x0000001000000000,
WMI_HOST_REGDMN_MODE_11BEA_EHT40MINUS = 0x0000002000000000,
WMI_HOST_REGDMN_MODE_11BEA_EHT80 = 0x0000004000000000,
WMI_HOST_REGDMN_MODE_11BEA_EHT160 = 0x0000008000000000,
WMI_HOST_REGDMN_MODE_11BEA_EHT320 = 0x0000010000000000,
#endif
WMI_HOST_REGDMN_MODE_ALL = 0xffffffffffffffff
} WMI_HOST_REGDMN_MODE;
/**
* enum WMI_HOST_WLAN_BAND_CAPABILITY: Band capability (2.4 GHz, 5 GHz). Maps to
* WLAN_BAND_CAPABILITY used in firmware header file(s).