From d45d2487438ff62de379610a907101378b13181c Mon Sep 17 00:00:00 2001 From: Wu Gao Date: Wed, 26 Jun 2019 14:39:08 +0800 Subject: [PATCH] qcacmn: Register to direct buffer rx with QCA6390 Register spectral to direct buffer rx with QCA6390. Change-Id: Ib07fc36faf6ba4cc5aff9203d70aef732bb703e3 CRs-Fixed: 2497826 --- spectral/dispatcher/src/wlan_spectral_tgt_api.c | 9 ++++++--- target_if/spectral/target_if_spectral.c | 6 ++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/spectral/dispatcher/src/wlan_spectral_tgt_api.c b/spectral/dispatcher/src/wlan_spectral_tgt_api.c index bc2a85a07aa6..877aca1f16a4 100644 --- a/spectral/dispatcher/src/wlan_spectral_tgt_api.c +++ b/spectral/dispatcher/src/wlan_spectral_tgt_api.c @@ -299,15 +299,18 @@ tgt_spectral_register_to_dbr(struct wlan_objmgr_pdev *pdev) struct wlan_objmgr_psoc *psoc; struct wlan_lmac_if_direct_buf_rx_tx_ops *dbr_tx_ops = NULL; struct dbr_module_config dbr_config = {0}; + uint32_t target_type; psoc = wlan_pdev_get_psoc(pdev); dbr_tx_ops = &psoc->soc_cb.tx_ops.dbr_tx_ops; dbr_config.num_resp_per_event = DBR_NUM_RESP_PER_EVENT_SPECTRAL; dbr_config.event_timeout_in_ms = DBR_EVENT_TIMEOUT_IN_MS_SPECTRAL; + target_type = tgt_spectral_get_target_type(psoc); - if ((tgt_spectral_get_target_type(psoc) == TARGET_TYPE_QCA8074) || - (tgt_spectral_get_target_type(psoc) == TARGET_TYPE_QCA8074V2) || - (tgt_spectral_get_target_type(psoc) == TARGET_TYPE_QCA6018)) + if ((target_type == TARGET_TYPE_QCA8074) || + (target_type == TARGET_TYPE_QCA8074V2) || + (target_type == TARGET_TYPE_QCA6018) || + (target_type == TARGET_TYPE_QCA6390)) if (dbr_tx_ops->direct_buf_rx_module_register) return dbr_tx_ops->direct_buf_rx_module_register (pdev, 0, &dbr_config, diff --git a/target_if/spectral/target_if_spectral.c b/target_if/spectral/target_if_spectral.c index ec539c1bdd46..d819864dbe9a 100644 --- a/target_if/spectral/target_if_spectral.c +++ b/target_if/spectral/target_if_spectral.c @@ -2028,7 +2028,8 @@ target_if_pdev_spectral_init(struct wlan_objmgr_pdev *pdev) spectral->fftbin_size_war = SPECTRAL_FFTBIN_SIZE_WAR_2BYTE_TO_1BYTE; else if (target_type == TARGET_TYPE_QCA8074 || - target_type == TARGET_TYPE_QCA6018) + target_type == TARGET_TYPE_QCA6018 || + target_type == TARGET_TYPE_QCA6390) spectral->fftbin_size_war = SPECTRAL_FFTBIN_SIZE_WAR_4BYTE_TO_1BYTE; else @@ -2048,7 +2049,8 @@ target_if_pdev_spectral_init(struct wlan_objmgr_pdev *pdev) (target_type == TARGET_TYPE_QCA8074V2) || (target_type == TARGET_TYPE_QCA6018) || (target_type == TARGET_TYPE_QCN9000) || - (target_type == TARGET_TYPE_QCA6290)) { + (target_type == TARGET_TYPE_QCA6290) || + (target_type == TARGET_TYPE_QCA6390)) { spectral->spectral_gen = SPECTRAL_GEN3; spectral->hdr_sig_exp = SPECTRAL_PHYERR_SIGNATURE_GEN3; spectral->tag_sscan_summary_exp =