diff options
| author | Service qcabuildsw <qcabuildsw@localhost> | 2016-07-13 11:12:14 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-07-13 11:12:14 -0700 |
| commit | bdfd84d8936b26211838526783bbd10bdcfb1580 (patch) | |
| tree | 1f3206aa87b6e7b7ccd44d5bb127dcb6adcf46ad | |
| parent | f6bcb1de8d4cb51233dc13dd7b5bf753a4f59899 (diff) | |
| parent | 805ac5b24a32ac4785b945bf015e9e3f821c2972 (diff) | |
Merge "qcacld-3.0: update fw common interface files(part-2)" into wlan-cld3.driver.lnx.1.1-dev
| -rw-r--r-- | target/inc/bmi_msg.h | 16 | ||||
| -rw-r--r-- | target/inc/cepci.h | 2 | ||||
| -rw-r--r-- | target/inc/htc_services.h | 1 | ||||
| -rw-r--r-- | target/inc/wlan_defs.h | 10 |
4 files changed, 22 insertions, 7 deletions
diff --git a/target/inc/bmi_msg.h b/target/inc/bmi_msg.h index 8956ba75577a..d1aa1ee102ef 100644 --- a/target/inc/bmi_msg.h +++ b/target/inc/bmi_msg.h @@ -249,17 +249,21 @@ PREPACK struct bmi_target_info { #define TARGET_TYPE_AR9888 7 #define TARGET_TYPE_AR6320 8 #define TARGET_TYPE_AR900B 9 +#define TARGET_TYPE_QCA9984 10 +#define TARGET_TYPE_IPQ4019 11 +#define TARGET_TYPE_QCA9888 12 /* For attach Peregrine 2.0 board target_reg_tbl only */ -#define TARGET_TYPE_AR9888V2 10 +#define TARGET_TYPE_AR9888V2 13 /* For attach Rome1.0 target_reg_tbl only*/ -#define TARGET_TYPE_AR6320V1 11 +#define TARGET_TYPE_AR6320V1 14 /* For Rome2.0/2.1 target_reg_tbl ID*/ -#define TARGET_TYPE_AR6320V2 12 +#define TARGET_TYPE_AR6320V2 15 /* For Rome3.0 target_reg_tbl ID*/ -#define TARGET_TYPE_AR6320V3 13 +#define TARGET_TYPE_AR6320V3 16 /* For Tufello1.0 target_reg_tbl ID*/ -#define TARGET_TYPE_QCA9377V1 14 - +#define TARGET_TYPE_QCA9377V1 17 +/* For Adrastea target */ +#define TARGET_TYPE_ADRASTEA 19 extern void target_register_tbl_attach(A_UINT32 target_type); diff --git a/target/inc/cepci.h b/target/inc/cepci.h index 29933846f75d..5c2247eafd56 100644 --- a/target/inc/cepci.h +++ b/target/inc/cepci.h @@ -84,10 +84,10 @@ struct pcie_state_s { * PCIE_CONFIG_FLAG definitions */ #if defined(AR900B) -#define PCIE_CONFIG_FLAG_ENABLE_L1 0x0000001 #define CE_PKTLOG_PIPE 8 /* used by both host and target side */ #endif +#define PCIE_CONFIG_FLAG_ENABLE_L1 0x0000001 #define PCIE_CONFIG_FLAG_CLK_GATING_L1 0x0000001 #define PCIE_CONFIG_FLAG_CLK_SWITCH_WAIT 0x0000002 #define PCIE_CONFIG_FLAG_AXI_CLK_GATE 0x0000004 diff --git a/target/inc/htc_services.h b/target/inc/htc_services.h index ae653d6e15cb..8021af245777 100644 --- a/target/inc/htc_services.h +++ b/target/inc/htc_services.h @@ -59,6 +59,7 @@ typedef enum { #define HTT_DATA_MSG_SVC MAKE_SERVICE_ID(HTT_SERVICE_GROUP,0) #define HTT_DATA2_MSG_SVC MAKE_SERVICE_ID(HTT_SERVICE_GROUP,1) +#define HTT_DATA3_MSG_SVC MAKE_SERVICE_ID(HTT_SERVICE_GROUP, 2) /* raw stream service (i.e. flash, tcmd, calibration apps) */ #define HTC_RAW_STREAMS_SVC MAKE_SERVICE_ID(HTC_TEST_GROUP,0) diff --git a/target/inc/wlan_defs.h b/target/inc/wlan_defs.h index ca06a393b5e9..162671c529fe 100644 --- a/target/inc/wlan_defs.h +++ b/target/inc/wlan_defs.h @@ -40,6 +40,7 @@ * but for now provide a default value here in case it's not defined * in the fwconfig_xxx.h file. */ +#define NUM_SPATIAL_STREAM 2 #ifndef MAX_SPATIAL_STREAM #define MAX_SPATIAL_STREAM 3 #endif @@ -835,4 +836,13 @@ struct wlan_dbg_tidq_stats { struct wlan_dbg_txq_stats txq_st; }; +typedef enum { + WHAL_REG_EXT_FCC_MIDBAND = 0, + WHAL_REG_EXT_JAPAN_MIDBAND = 1, + WHAL_REG_EXT_FCC_DFS_HT40 = 2, + WHAL_REG_EXT_JAPAN_NONDFS_HT40 = 3, + WHAL_REG_EXT_JAPAN_DFS_HT40 = 4, + WHAL_REG_EXT_FCC_CH_144 = 5, +} WHAL_REG_EXT_BITMAP; + #endif /* __WLANDEFS_H__ */ |