From ff041723c7fd3599be7ab9e1b5bc63fd493bf34f Mon Sep 17 00:00:00 2001 From: Pavankumar Nandeshwar Date: Wed, 6 Jan 2021 08:14:13 -0800 Subject: [PATCH] qcacmn: change qcn9100 to qcn6122 in target_if Change the name of target type qcn9100 to qcn6122 target_if. Change-Id: Icfdcd2c8d872b5305687884b7d9186fb85274bd4 CRs-Fixed: 2849577 --- target_if/cfr/src/target_if_cfr.c | 6 +++--- target_if/cfr/src/target_if_cfr_enh.c | 8 ++++---- target_if/core/inc/target_if.h | 8 ++++---- target_if/core/src/target_if_main.c | 10 +++++----- target_if/init_deinit/src/service_ready_util.c | 4 ++-- target_if/spectral/target_if_spectral.c | 18 +++++++++--------- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/target_if/cfr/src/target_if_cfr.c b/target_if/cfr/src/target_if_cfr.c index 38f68b3143..d78c924f61 100644 --- a/target_if/cfr/src/target_if_cfr.c +++ b/target_if/cfr/src/target_if_cfr.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved. + * Copyright (c) 2019-2021 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -374,7 +374,7 @@ target_if_cfr_init_pdev(struct wlan_objmgr_psoc *psoc, return cfr_wifi2_0_init_pdev(psoc, pdev); } else if ((target_type == TARGET_TYPE_QCA6018) || (target_type == TARGET_TYPE_QCN9000) || - (target_type == TARGET_TYPE_QCN9100) || + (target_type == TARGET_TYPE_QCN6122) || (target_type == TARGET_TYPE_QCA5018)) { pa->is_cfr_capable = cfr_sc->is_cfr_capable; return cfr_enh_init_pdev(psoc, pdev); @@ -404,7 +404,7 @@ target_if_cfr_deinit_pdev(struct wlan_objmgr_psoc *psoc, return cfr_wifi2_0_deinit_pdev(psoc, pdev); } else if ((target_type == TARGET_TYPE_QCA6018) || (target_type == TARGET_TYPE_QCN9000) || - (target_type == TARGET_TYPE_QCN9100) || + (target_type == TARGET_TYPE_QCN6122) || (target_type == TARGET_TYPE_QCA5018)) { return cfr_enh_deinit_pdev(psoc, pdev); } else diff --git a/target_if/cfr/src/target_if_cfr_enh.c b/target_if/cfr/src/target_if_cfr_enh.c index 4297d95c45..d034c676c8 100644 --- a/target_if/cfr/src/target_if_cfr_enh.c +++ b/target_if/cfr/src/target_if_cfr_enh.c @@ -547,7 +547,7 @@ static QDF_STATUS check_dma_length(struct look_up_table *lut, lut->payload_length <= PINE_MAX_DATA_LENGTH_BYTES) { return QDF_STATUS_SUCCESS; } - } else if (target_type == TARGET_TYPE_QCN9100) { + } else if (target_type == TARGET_TYPE_QCN6122) { if (lut->header_length <= SPRUCE_MAX_HEADER_LENGTH_WORDS && lut->payload_length <= SPRUCE_MAX_DATA_LENGTH_BYTES) { return QDF_STATUS_SUCCESS; @@ -1208,7 +1208,7 @@ static void enh_prepare_cfr_header_txstatus(wmi_cfr_peer_tx_event_param header->chip_type = CFR_CAPTURE_RADIO_PINE; else if (target_type == TARGET_TYPE_QCA5018) header->chip_type = CFR_CAPTURE_RADIO_MAPLE; - else if (target_type == TARGET_TYPE_QCN9100) + else if (target_type == TARGET_TYPE_QCN6122) header->chip_type = CFR_CAPTURE_RADIO_SPRUCE; else header->chip_type = CFR_CAPTURE_RADIO_CYP; @@ -1416,7 +1416,7 @@ target_if_peer_capture_event(ol_scn_t sc, uint8_t *data, uint32_t datalen) header->chip_type = CFR_CAPTURE_RADIO_PINE; else if (target_type == TARGET_TYPE_QCA5018) header->chip_type = CFR_CAPTURE_RADIO_MAPLE; - else if (target_type == TARGET_TYPE_QCN9100) + else if (target_type == TARGET_TYPE_QCN6122) header->chip_type = CFR_CAPTURE_RADIO_SPRUCE; else header->chip_type = CFR_CAPTURE_RADIO_CYP; @@ -1810,7 +1810,7 @@ QDF_STATUS cfr_enh_init_pdev(struct wlan_objmgr_psoc *psoc, pcfr->num_subbufs = STREAMFS_NUM_SUBBUF_MAPLE; pcfr->chip_type = CFR_CAPTURE_RADIO_MAPLE; pcfr->max_mu_users = MAPLE_CFR_MU_USERS; - } else if (target_type == TARGET_TYPE_QCN9100) { + } else if (target_type == TARGET_TYPE_QCN6122) { pcfr->subbuf_size = STREAMFS_MAX_SUBBUF_SPRUCE; pcfr->num_subbufs = STREAMFS_NUM_SUBBUF_SPRUCE; pcfr->chip_type = CFR_CAPTURE_RADIO_SPRUCE; diff --git a/target_if/core/inc/target_if.h b/target_if/core/inc/target_if.h index e1e5a148b1..ce01468430 100644 --- a/target_if/core/inc/target_if.h +++ b/target_if/core/inc/target_if.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2020 The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2021 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -537,12 +537,12 @@ bool target_is_tgt_type_adrastea(uint32_t target_type); bool target_is_tgt_type_qcn9000(uint32_t target_type); /** - * target_is_tgt_type_qcn9100() - Check if the target type is QCN9100 (Spruce) + * target_is_tgt_type_qcn6122() - Check if the target type is QCN6122 (Spruce) * @target_type: target type to be checked. * - * Return: true if the target_type is QCN9100, else false. + * Return: true if the target_type is QCN6122, else false. */ -bool target_is_tgt_type_qcn9100(uint32_t target_type); +bool target_is_tgt_type_qcn6122(uint32_t target_type); /** * target_psoc_set_wlan_init_status() - set info wlan_init_status diff --git a/target_if/core/src/target_if_main.c b/target_if/core/src/target_if_main.c index 17d465591d..37ca49b1d2 100644 --- a/target_if/core/src/target_if_main.c +++ b/target_if/core/src/target_if_main.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2020 The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2021 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -410,8 +410,8 @@ static void target_if_target_tx_ops_register( target_tx_ops->tgt_is_tgt_type_qcn9000 = target_is_tgt_type_qcn9000; - target_tx_ops->tgt_is_tgt_type_qcn9100 = - target_is_tgt_type_qcn9100; + target_tx_ops->tgt_is_tgt_type_qcn6122 = + target_is_tgt_type_qcn6122; target_tx_ops->tgt_get_tgt_type = lmac_get_tgt_type; @@ -700,9 +700,9 @@ bool target_is_tgt_type_qcn9000(uint32_t target_type) return target_type == TARGET_TYPE_QCN9000; } -bool target_is_tgt_type_qcn9100(uint32_t target_type) +bool target_is_tgt_type_qcn6122(uint32_t target_type) { - return target_type == TARGET_TYPE_QCN9100; + return target_type == TARGET_TYPE_QCN6122; } QDF_STATUS diff --git a/target_if/init_deinit/src/service_ready_util.c b/target_if/init_deinit/src/service_ready_util.c index d5579ecb77..311d1a5f79 100644 --- a/target_if/init_deinit/src/service_ready_util.c +++ b/target_if/init_deinit/src/service_ready_util.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2020 The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2021 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -891,7 +891,7 @@ QDF_STATUS init_deinit_validate_160_80p80_fw_caps( if ((tgt_hdl->info.target_type == TARGET_TYPE_QCA8074) || (tgt_hdl->info.target_type == TARGET_TYPE_QCA8074V2) || - (tgt_hdl->info.target_type == TARGET_TYPE_QCN9100) || + (tgt_hdl->info.target_type == TARGET_TYPE_QCN6122) || (tgt_hdl->info.target_type == TARGET_TYPE_QCA6290)) { /** * Return true for now. This is not available in diff --git a/target_if/spectral/target_if_spectral.c b/target_if/spectral/target_if_spectral.c index da4cf9d83e..db0a83c6eb 100644 --- a/target_if/spectral/target_if_spectral.c +++ b/target_if/spectral/target_if_spectral.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011,2017-2020 The Linux Foundation. All rights reserved. + * Copyright (c) 2011,2017-2021 The Linux Foundation. All rights reserved. * * * Permission to use, copy, modify, and/or distribute this software for @@ -1727,7 +1727,7 @@ target_if_init_spectral_param_min_max( param_min_max->fft_size_max[CH_WIDTH_20MHZ] = SPECTRAL_PARAM_FFT_SIZE_MAX_GEN3_DEFAULT; if (target_type == TARGET_TYPE_QCN9000 || - target_type == TARGET_TYPE_QCN9100 || + target_type == TARGET_TYPE_QCN6122 || target_type == TARGET_TYPE_QCA5018 || target_type == TARGET_TYPE_QCA6490) { param_min_max->fft_size_max[CH_WIDTH_40MHZ] = @@ -1885,7 +1885,7 @@ target_if_init_spectral_capability(struct target_if_spectral *spectral, pcap->num_detectors_40mhz = 1; pcap->num_detectors_80mhz = 1; if (target_type == TARGET_TYPE_QCN9000 || - target_type == TARGET_TYPE_QCN9100 || + target_type == TARGET_TYPE_QCN6122 || target_type == TARGET_TYPE_QCA6490) { pcap->num_detectors_160mhz = 1; pcap->num_detectors_80p80mhz = 1; @@ -2463,7 +2463,7 @@ target_if_spectral_len_adj_swar_init(struct spectral_fft_bin_len_adj_swar *swar, { if (target_type == TARGET_TYPE_QCA8074V2 || target_type == TARGET_TYPE_QCN9000 || - target_type == TARGET_TYPE_QCN9100 || + target_type == TARGET_TYPE_QCN6122 || target_type == TARGET_TYPE_QCA5018 || target_type == TARGET_TYPE_QCA6750 || target_type == TARGET_TYPE_QCA6490) @@ -2478,7 +2478,7 @@ target_if_spectral_len_adj_swar_init(struct spectral_fft_bin_len_adj_swar *swar, if (target_type == TARGET_TYPE_QCA8074 || target_type == TARGET_TYPE_QCA8074V2 || target_type == TARGET_TYPE_QCA6018 || - target_type == TARGET_TYPE_QCN9100 || + target_type == TARGET_TYPE_QCN6122 || target_type == TARGET_TYPE_QCA5018 || target_type == TARGET_TYPE_QCN9000 || target_type == TARGET_TYPE_QCA6490) { @@ -2519,7 +2519,7 @@ target_if_spectral_report_params_init( * needs to use them they have to add proper initial values. */ if (target_type == TARGET_TYPE_QCN9000 || - target_type == TARGET_TYPE_QCN9100 || + target_type == TARGET_TYPE_QCN6122 || target_type == TARGET_TYPE_QCA5018 || target_type == TARGET_TYPE_QCA6750 || target_type == TARGET_TYPE_QCA6490) { @@ -2560,7 +2560,7 @@ target_if_spectral_report_params_init( rparams->detid_mode_table[SPECTRAL_DETECTOR_ID_0] = SPECTRAL_SCAN_MODE_NORMAL; if (target_type == TARGET_TYPE_QCN9000 || - target_type == TARGET_TYPE_QCN9100 || + target_type == TARGET_TYPE_QCN6122 || target_type == TARGET_TYPE_QCA6490) { rparams->detid_mode_table[SPECTRAL_DETECTOR_ID_1] = SPECTRAL_SCAN_MODE_AGILE; @@ -2686,7 +2686,7 @@ target_if_pdev_spectral_init(struct wlan_objmgr_pdev *pdev) target_type == TARGET_TYPE_QCA6018 || target_type == TARGET_TYPE_QCA5018 || target_type == TARGET_TYPE_QCA6390 || - target_type == TARGET_TYPE_QCN9100 || + target_type == TARGET_TYPE_QCN6122 || target_type == TARGET_TYPE_QCA6490 || target_type == TARGET_TYPE_QCN9000 || target_type == TARGET_TYPE_QCA6750) @@ -2700,7 +2700,7 @@ target_if_pdev_spectral_init(struct wlan_objmgr_pdev *pdev) (target_type == TARGET_TYPE_QCA8074V2) || (target_type == TARGET_TYPE_QCA6018) || (target_type == TARGET_TYPE_QCA5018) || - (target_type == TARGET_TYPE_QCN9100) || + (target_type == TARGET_TYPE_QCN6122) || (target_type == TARGET_TYPE_QCN9000) || (target_type == TARGET_TYPE_QCA6290) || (target_type == TARGET_TYPE_QCA6390) ||