From 7cf92f4baed4aaf6d97d278b2985ac512059b2da Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Wed, 1 Apr 2026 21:33:39 +0200 Subject: [PATCH] Remove all gNB num_cc parameters in MACRLCs and L1s sections These parameters are not used. --- ci-scripts/conf_files/gnb-du.sa.band1.52prb.usrpb210.conf | 2 -- ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf | 2 -- .../conf_files/gnb-du.sa.band78.106prb.usrpb200.conf | 2 -- .../gnb-du.sa.band78.51prb.usrpb210.ho-pci0.conf | 2 -- .../gnb-du.sa.band78.51prb.usrpb210.ho-pci1.conf | 2 -- ci-scripts/conf_files/gnb-pnf.band66.rfsim.conf | 1 - ci-scripts/conf_files/gnb-pnf.band77.usrpn310.4x4.conf | 1 - .../conf_files/gnb-vnf.sa.band66.u0.25prb.nfapi.conf | 1 - .../conf_files/gnb-vnf.sa.band77.162prb.nfapi.4x4.conf | 1 - .../conf_files/gnb-vnf.sa.band78.273prb.aerial.conf | 1 - .../gnb-vnf.sa.band78.273prb.aerial.ul-heavy.conf | 1 - ci-scripts/conf_files/gnb-vnf.sa.band78.78prb.aerial.conf | 1 - .../conf_files/gnb.band66.106prb.rfsim.phytest-dora.conf | 2 -- .../gnb.band77.273prb.fhi72.4x4-vvdn-phytest.conf | 2 -- .../conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf | 2 -- .../gnb.band79.106prb.usrpn300.phytest-dora.conf | 2 -- .../gnb.band79.162prb.usrpn300.phytest-dora.conf | 2 -- .../gnb.band79.273prb.usrpn300.phytest-dora.conf | 2 -- ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf | 2 -- .../conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn-leo.conf | 2 -- .../conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn.conf | 2 -- ci-scripts/conf_files/gnb.sa.band257.u3.66prb.rfsim.conf | 2 -- ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf | 2 -- .../conf_files/gnb.sa.band77.162prb.usrpn310.2x2.conf | 2 -- .../conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf | 2 -- .../conf_files/gnb.sa.band77.273prb.usrpn310.2x2.conf | 2 -- .../conf_files/gnb.sa.band77.51prb.usrpb200.n2-ho.conf | 2 -- .../conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf | 2 -- ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf | 2 -- .../conf_files/gnb.sa.band78.106prb.rfsim.flexric.conf | 2 -- .../conf_files/gnb.sa.band78.106prb.rfsim.neighbour.conf | 2 -- ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.prs.conf | 2 -- ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.yaml | 6 ++---- .../conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.conf | 2 -- .../conf_files/gnb.sa.band78.106prb.vrtsim.2x2.yaml | 6 ++---- ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf | 2 -- ci-scripts/conf_files/gnb.sa.band78.273prb.rfsim.2x2.conf | 2 -- .../conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.2x2.conf | 2 -- ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf | 2 -- ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf | 2 -- ci-scripts/conf_files/nrue.band78.106prb.l2sim.conf | 1 - .../untested/gNB_SA_n78_106PRB.2x2_usrpn310.conf | 2 -- .../untested/gNB_SA_n78_133PRB.2x2_usrpn310.conf | 2 -- .../untested/gnb.band78.sa.fr1.106PRB.usrpn310.conf | 2 -- .../untested/gnb.band78.tm1.fr1.106PRB.usrpb210.conf | 2 -- .../untested/gnb.band78.tm1.fr1.106PRB.usrpn310.conf | 2 -- .../untested/gnb.nsa.band78.106prb.usrpn310.2x2.conf | 2 -- .../untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf | 2 -- .../untested/gnb.sa.band78.106prb.usrp310.2x2.conf | 2 -- .../untested/gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf | 2 -- .../untested/gnb.sa.band78.162prb.usrpn310.2x2.conf | 2 -- .../untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf | 2 -- doc/LDPC_OFFLOAD_SETUP.md | 2 -- doc/testing_oai_nsa_w_cots_ue_resources/gnb.conf | 2 -- openair2/GNB_APP/L1_nr_paramdef.h | 2 -- openair2/GNB_APP/MACRLC_nr_paramdef.h | 3 --- targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf | 2 -- .../CONF/gnb-du.sa.band66.25prb.rfsim.pci0.conf | 2 -- .../CONF/gnb-du.sa.band66.25prb.rfsim.pci1.conf | 2 -- .../gnb-du.sa.band77.273prb.fhi72.4x4-benetel650.conf | 2 -- ...-du.sa.band77.273prb.fhi72.4x4-das-benetel650_650.conf | 2 -- ....sa.band77.273prb.fhi72.8x8-benetel650_650-mplane.conf | 2 -- .../gnb-du.sa.band77.273prb.fhi72.8x8-benetel650_650.conf | 2 -- .../CONF/gnb-du.sa.band78.106prb.rfsim.pci0.conf | 2 -- .../CONF/gnb-du.sa.band78.106prb.rfsim.pci1.conf | 2 -- .../GENERIC-NR-5GC/CONF/gnb-pnf.band78.rfsim.2x2.conf | 1 - .../GENERIC-NR-5GC/CONF/gnb-pnf.band78.rfsim.conf | 1 - .../CONF/gnb-vnf.sa.band78.106prb.nfapi.conf | 1 - .../CONF/gnb-vnf.sa.band78.273prb.aerial.conf | 1 - .../CONF/gnb-vnf.sa.band78.273prb.nfapi.conf | 1 - .../GENERIC-NR-5GC/CONF/gnb-vnf.sa.cbrs.aerial.conf | 1 - .../CONF/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf | 2 -- .../CONF/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf | 2 -- .../CONF/gnb.sa.band1.u0.52PRB.usrpb210.conf | 2 -- .../CONF/gnb.sa.band254.ntn.mu1.24prb.rfsim.conf | 2 -- .../CONF/gnb.sa.band255.ntn.mu0.25prb.rfsim.conf | 2 -- .../CONF/gnb.sa.band256.ntn.mu0.25prb.rfsim.conf | 2 -- .../CONF/gnb.sa.band257.66prb.fhi72.2x2-liteon.conf | 2 -- .../CONF/gnb.sa.band257.u3.32prb.usrpx410.conf | 2 -- .../CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf | 2 -- .../CONF/gnb.sa.band41.fr1.52PRB.usrpb210.conf | 2 -- .../CONF/gnb.sa.band512.ntn.mu3.132prb.rfsim.conf | 2 -- .../CONF/gnb.sa.band512.ntn.mu3.32prb.rfsim.conf | 2 -- .../CONF/gnb.sa.band512.ntn.mu3.66prb.rfsim.conf | 2 -- .../CONF/gnb.sa.band66.fr1.106PRB.usrpn300.conf | 2 -- .../CONF/gnb.sa.band66.fr1.106PRB.usrpx300.conf | 2 -- .../CONF/gnb.sa.band66.fr1.24PRB.usrpx300.conf | 2 -- .../CONF/gnb.sa.band66.fr1.25PRB.usrpx300.conf | 2 -- .../GENERIC-NR-5GC/CONF/gnb.sa.band66.u0.25prb.rfsim.conf | 2 -- .../CONF/gnb.sa.band77.106prb.fhi72.4x4-vvdn.conf | 2 -- .../CONF/gnb.sa.band77.162prb.usrpn310.4x4.conf | 2 -- ....sa.band77.273prb.fhi72.2x2-benetel550-long-prach.conf | 2 -- .../CONF/gnb.sa.band77.273prb.fhi72.2x2-vvdn-16b.conf | 2 -- .../CONF/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf | 2 -- .../CONF/gnb.sa.band77.fr1.273PRB.2x2.usrpn300.conf | 2 -- .../CONF/gnb.sa.band77.fr1.273PRB.usrpx300.conf | 2 -- .../CONF/gnb.sa.band78.106PRB.usrpb210.RA_2-Step.conf | 2 -- .../CONF/gnb.sa.band78.106prb.bladerf2.0xa4.conf | 2 -- .../CONF/gnb.sa.band78.106prb.fhi72.1x1-proto-ru.conf | 2 -- .../gnb.sa.band78.273prb.fhi72.2x2-benetel550-16b.conf | 2 -- .../CONF/gnb.sa.band78.273prb.fhi72.4x2-benetel550.conf | 2 -- .../gnb.sa.band78.273prb.fhi72.4x4-benetel550-mplane.conf | 2 -- .../CONF/gnb.sa.band78.273prb.fhi72.4x4-benetel550.conf | 2 -- .../CONF/gnb.sa.band78.273prb.fhi72.4x4-foxconn.conf | 2 -- .../CONF/gnb.sa.band78.273prb.fhi72.4x4-liteon.conf | 2 -- .../CONF/gnb.sa.band78.273prb.fhi72.4x4-metanoia.conf | 2 -- .../CONF/gnb.sa.band78.51PRB.bladerf2.0xa4.conf | 2 -- .../CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf | 2 -- .../CONF/gnb.sa.band78.fr1.106PRB.pci0.rfsim.conf | 2 -- .../CONF/gnb.sa.band78.fr1.106PRB.pci1.rfsim.conf | 2 -- .../CONF/gnb.sa.band78.fr1.106PRB.usrpb210.2pattern.conf | 2 -- .../CONF/gnb.sa.band78.fr1.106PRB.usrpb210.4layer.conf | 2 -- .../CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf | 2 -- .../CONF/gnb.sa.band78.fr1.106PRB.usrpb210.redcap.yaml | 8 ++------ .../CONF/gnb.sa.band78.fr1.106PRB.usrpb210.sabox.conf | 2 -- .../CONF/gnb.sa.band78.fr1.106PRB.usrpb210.yaml | 8 ++------ .../CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf | 2 -- .../CONF/gnb.sa.band78.fr1.189PRB.rfsim.conf | 2 -- .../CONF/gnb.sa.band78.fr1.217PRB.2x2.usrpn300.conf | 2 -- .../CONF/gnb.sa.band78.fr1.24PRB.usrpb210.conf | 2 -- .../CONF/gnb0.prs.band261.fr2.64PRB.usrpx310.conf | 2 -- .../CONF/gnb0.prs.band78.fr1.106PRB.usrpx310.conf | 2 -- .../CONF/gnb1.prs.band261.fr2.64PRB.usrpx310.conf | 2 -- .../CONF/gnb1.prs.band78.fr1.106PRB.usrpx310.conf | 2 -- tests/nr-cu-nrppa/nr-nrppa-test.conf | 1 - 125 files changed, 8 insertions(+), 248 deletions(-) diff --git a/ci-scripts/conf_files/gnb-du.sa.band1.52prb.usrpb210.conf b/ci-scripts/conf_files/gnb-du.sa.band1.52prb.usrpb210.conf index 84dbc98add..9bf0aa8980 100644 --- a/ci-scripts/conf_files/gnb-du.sa.band1.52prb.usrpb210.conf +++ b/ci-scripts/conf_files/gnb-du.sa.band1.52prb.usrpb210.conf @@ -157,7 +157,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "f1"; local_n_address = "127.0.0.5"; @@ -171,7 +170,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 200; pucch0_dtx_threshold = 150; diff --git a/ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf b/ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf index 74d9a4a5c3..d31988f1f1 100644 --- a/ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf +++ b/ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf @@ -162,7 +162,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "f1"; local_n_address = "192.168.71.171"; @@ -176,7 +175,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 200; pucch0_dtx_threshold = 150; diff --git a/ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf b/ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf index e6da89d239..d811c47c84 100644 --- a/ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf +++ b/ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf @@ -191,7 +191,6 @@ rlc = { MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "f1"; local_n_address = "127.0.0.5"; @@ -205,7 +204,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 200; pucch0_dtx_threshold = 30; diff --git a/ci-scripts/conf_files/gnb-du.sa.band78.51prb.usrpb210.ho-pci0.conf b/ci-scripts/conf_files/gnb-du.sa.band78.51prb.usrpb210.ho-pci0.conf index 63089de024..9dc16a527f 100644 --- a/ci-scripts/conf_files/gnb-du.sa.band78.51prb.usrpb210.ho-pci0.conf +++ b/ci-scripts/conf_files/gnb-du.sa.band78.51prb.usrpb210.ho-pci0.conf @@ -156,7 +156,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "f1"; local_n_address = "172.21.19.98"; @@ -171,7 +170,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 100; pucch0_dtx_threshold = 10; diff --git a/ci-scripts/conf_files/gnb-du.sa.band78.51prb.usrpb210.ho-pci1.conf b/ci-scripts/conf_files/gnb-du.sa.band78.51prb.usrpb210.ho-pci1.conf index 775cacc16d..4b31453a8f 100644 --- a/ci-scripts/conf_files/gnb-du.sa.band78.51prb.usrpb210.ho-pci1.conf +++ b/ci-scripts/conf_files/gnb-du.sa.band78.51prb.usrpb210.ho-pci1.conf @@ -156,7 +156,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "f1"; local_n_address = "172.21.19.99"; @@ -171,7 +170,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 100; pucch0_dtx_threshold = 10; diff --git a/ci-scripts/conf_files/gnb-pnf.band66.rfsim.conf b/ci-scripts/conf_files/gnb-pnf.band66.rfsim.conf index 292ae955d6..a1f37686e2 100644 --- a/ci-scripts/conf_files/gnb-pnf.band66.rfsim.conf +++ b/ci-scripts/conf_files/gnb-pnf.band66.rfsim.conf @@ -2,7 +2,6 @@ L1s = ( { - num_cc = 1; tr_n_preference = "nfapi"; remote_n_address = "192.168.71.140"; // vnf addr local_n_address = "192.168.71.141"; // pnf addr diff --git a/ci-scripts/conf_files/gnb-pnf.band77.usrpn310.4x4.conf b/ci-scripts/conf_files/gnb-pnf.band77.usrpn310.4x4.conf index 6dbb840009..5e6248c54f 100644 --- a/ci-scripts/conf_files/gnb-pnf.band77.usrpn310.4x4.conf +++ b/ci-scripts/conf_files/gnb-pnf.band77.usrpn310.4x4.conf @@ -4,7 +4,6 @@ usrp-tx-thread-config = 1; tune-offset = 30720000; L1s = ({ - num_cc = 1; tr_n_preference = "nfapi"; remote_n_address = "127.0.0.1"; // vnf addr local_n_address = "127.0.0.1"; // pnf addr diff --git a/ci-scripts/conf_files/gnb-vnf.sa.band66.u0.25prb.nfapi.conf b/ci-scripts/conf_files/gnb-vnf.sa.band66.u0.25prb.nfapi.conf index d9356ff71f..dffed39f9c 100644 --- a/ci-scripts/conf_files/gnb-vnf.sa.band66.u0.25prb.nfapi.conf +++ b/ci-scripts/conf_files/gnb-vnf.sa.band66.u0.25prb.nfapi.conf @@ -173,7 +173,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "nfapi"; remote_s_address = "192.168.71.141"; // pnf addr [!] local_s_address = "192.168.71.140"; // vnf addr diff --git a/ci-scripts/conf_files/gnb-vnf.sa.band77.162prb.nfapi.4x4.conf b/ci-scripts/conf_files/gnb-vnf.sa.band77.162prb.nfapi.4x4.conf index 3bc65aedfb..f3397d29e5 100644 --- a/ci-scripts/conf_files/gnb-vnf.sa.band77.162prb.nfapi.4x4.conf +++ b/ci-scripts/conf_files/gnb-vnf.sa.band77.162prb.nfapi.4x4.conf @@ -175,7 +175,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "nfapi"; remote_s_address = "127.0.0.1"; // pnf addr [!] local_s_address = "127.0.0.1"; // vnf addr diff --git a/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf b/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf index 8a83e37759..40c4326bd1 100644 --- a/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf +++ b/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf @@ -180,7 +180,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; remote_s_address = "127.0.0.1"; // pnf addr [!] local_s_address = "127.0.0.2"; // vnf addr local_s_portc = 50001; // vnf p5 port diff --git a/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.ul-heavy.conf b/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.ul-heavy.conf index a20d7512d9..6448ab5a9d 100644 --- a/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.ul-heavy.conf +++ b/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.ul-heavy.conf @@ -180,7 +180,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; remote_s_address = "127.0.0.1"; // pnf addr [!] local_s_address = "127.0.0.2"; // vnf addr local_s_portc = 50001; // vnf p5 port diff --git a/ci-scripts/conf_files/gnb-vnf.sa.band78.78prb.aerial.conf b/ci-scripts/conf_files/gnb-vnf.sa.band78.78prb.aerial.conf index 075b6b33ab..8f25e72a7b 100644 --- a/ci-scripts/conf_files/gnb-vnf.sa.band78.78prb.aerial.conf +++ b/ci-scripts/conf_files/gnb-vnf.sa.band78.78prb.aerial.conf @@ -179,7 +179,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; remote_s_address = "127.0.0.1"; // pnf addr [!] local_s_address = "127.0.0.2"; // vnf addr local_s_portc = 50001; // vnf p5 port diff --git a/ci-scripts/conf_files/gnb.band66.106prb.rfsim.phytest-dora.conf b/ci-scripts/conf_files/gnb.band66.106prb.rfsim.phytest-dora.conf index 3e1254b750..9d960d6a73 100644 --- a/ci-scripts/conf_files/gnb.band66.106prb.rfsim.phytest-dora.conf +++ b/ci-scripts/conf_files/gnb.band66.106prb.rfsim.phytest-dora.conf @@ -161,7 +161,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; } @@ -169,7 +168,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0 } diff --git a/ci-scripts/conf_files/gnb.band77.273prb.fhi72.4x4-vvdn-phytest.conf b/ci-scripts/conf_files/gnb.band77.273prb.fhi72.4x4-vvdn-phytest.conf index 86a27fbe3c..1da7b2f723 100644 --- a/ci-scripts/conf_files/gnb.band77.273prb.fhi72.4x4-vvdn-phytest.conf +++ b/ci-scripts/conf_files/gnb.band77.273prb.fhi72.4x4-vvdn-phytest.conf @@ -173,7 +173,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 220; @@ -184,7 +183,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120 pucch0_dtx_threshold = 80; diff --git a/ci-scripts/conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf b/ci-scripts/conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf index 677b4e530a..a6badf3f3a 100644 --- a/ci-scripts/conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf +++ b/ci-scripts/conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf @@ -173,7 +173,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; } @@ -181,7 +180,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; } ); diff --git a/ci-scripts/conf_files/gnb.band79.106prb.usrpn300.phytest-dora.conf b/ci-scripts/conf_files/gnb.band79.106prb.usrpn300.phytest-dora.conf index 949ab4c118..4296e7709d 100644 --- a/ci-scripts/conf_files/gnb.band79.106prb.usrpn300.phytest-dora.conf +++ b/ci-scripts/conf_files/gnb.band79.106prb.usrpn300.phytest-dora.conf @@ -173,7 +173,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; } @@ -181,7 +180,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; } ); diff --git a/ci-scripts/conf_files/gnb.band79.162prb.usrpn300.phytest-dora.conf b/ci-scripts/conf_files/gnb.band79.162prb.usrpn300.phytest-dora.conf index 9deee529a6..724bafd19c 100644 --- a/ci-scripts/conf_files/gnb.band79.162prb.usrpn300.phytest-dora.conf +++ b/ci-scripts/conf_files/gnb.band79.162prb.usrpn300.phytest-dora.conf @@ -170,13 +170,11 @@ gNBs = ); MACRLCs = ({ - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; }); L1s = ({ - num_cc = 1; tr_n_preference = "local_mac"; }); diff --git a/ci-scripts/conf_files/gnb.band79.273prb.usrpn300.phytest-dora.conf b/ci-scripts/conf_files/gnb.band79.273prb.usrpn300.phytest-dora.conf index dc65ab7e5f..269fdf1d32 100644 --- a/ci-scripts/conf_files/gnb.band79.273prb.usrpn300.phytest-dora.conf +++ b/ci-scripts/conf_files/gnb.band79.273prb.usrpn300.phytest-dora.conf @@ -172,13 +172,11 @@ gNBs = ); MACRLCs = ({ - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; }); L1s = ({ - num_cc = 1; tr_n_preference = "local_mac"; }); diff --git a/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf b/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf index 5ae5472238..919aeeff4f 100644 --- a/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf +++ b/ci-scripts/conf_files/gnb.nsa.band78.106prb.usrpb200.conf @@ -180,7 +180,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 200; @@ -190,7 +189,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0 } diff --git a/ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn-leo.conf b/ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn-leo.conf index 13bf2b2d2b..6a3284200c 100644 --- a/ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn-leo.conf +++ b/ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn-leo.conf @@ -197,7 +197,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 150; @@ -209,7 +208,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 150; pucch0_dtx_threshold = 150; diff --git a/ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn.conf b/ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn.conf index 1aeb106705..c38514c1aa 100644 --- a/ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn.conf +++ b/ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn.conf @@ -205,7 +205,6 @@ rlc = { MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 150; @@ -217,7 +216,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 150; pucch0_dtx_threshold = 150; diff --git a/ci-scripts/conf_files/gnb.sa.band257.u3.66prb.rfsim.conf b/ci-scripts/conf_files/gnb.sa.band257.u3.66prb.rfsim.conf index c58a805b5d..4182ce10be 100644 --- a/ci-scripts/conf_files/gnb.sa.band257.u3.66prb.rfsim.conf +++ b/ci-scripts/conf_files/gnb.sa.band257.u3.66prb.rfsim.conf @@ -172,7 +172,6 @@ gNBs = ); MACRLCs = ({ - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 200; @@ -185,7 +184,6 @@ MACRLCs = ({ L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; #pucch0_dtx_threshold = 120; diff --git a/ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf b/ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf index fbe2350352..cab0804a8a 100644 --- a/ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf +++ b/ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf @@ -172,7 +172,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; ulsch_max_slots_inactivity = 100; @@ -183,7 +182,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; pusch_proc_threads = 8; prach_dtx_threshold = 200; diff --git a/ci-scripts/conf_files/gnb.sa.band77.162prb.usrpn310.2x2.conf b/ci-scripts/conf_files/gnb.sa.band77.162prb.usrpn310.2x2.conf index aaf9a37b11..950d18c9f4 100644 --- a/ci-scripts/conf_files/gnb.sa.band77.162prb.usrpn310.2x2.conf +++ b/ci-scripts/conf_files/gnb.sa.band77.162prb.usrpn310.2x2.conf @@ -178,7 +178,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 320; @@ -192,7 +191,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; pusch_dtx_threshold = 20; diff --git a/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf b/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf index f0e9636cd3..7e87941f0d 100644 --- a/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf +++ b/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf @@ -174,7 +174,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 200; @@ -185,7 +184,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 130 pucch0_dtx_threshold = 80; diff --git a/ci-scripts/conf_files/gnb.sa.band77.273prb.usrpn310.2x2.conf b/ci-scripts/conf_files/gnb.sa.band77.273prb.usrpn310.2x2.conf index 894a5a4364..ab5db0581a 100644 --- a/ci-scripts/conf_files/gnb.sa.band77.273prb.usrpn310.2x2.conf +++ b/ci-scripts/conf_files/gnb.sa.band77.273prb.usrpn310.2x2.conf @@ -171,7 +171,6 @@ gNBs = ( MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 320; @@ -185,7 +184,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; max_ldpc_iterations = 15; diff --git a/ci-scripts/conf_files/gnb.sa.band77.51prb.usrpb200.n2-ho.conf b/ci-scripts/conf_files/gnb.sa.band77.51prb.usrpb200.n2-ho.conf index 7d6aa7ef52..34c747f9cb 100644 --- a/ci-scripts/conf_files/gnb.sa.band77.51prb.usrpb200.n2-ho.conf +++ b/ci-scripts/conf_files/gnb.sa.band77.51prb.usrpb200.n2-ho.conf @@ -171,7 +171,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 200; @@ -182,7 +181,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; pucch0_dtx_threshold = 100; diff --git a/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf b/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf index 9cd45f7fd9..6baf3940c2 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.n310.7ds2u.conf @@ -174,7 +174,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 150; @@ -184,7 +183,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 150; #pucch0_dtx_threshold = 150; diff --git a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf index 6c7a7284c3..dab87bb6a3 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf @@ -176,7 +176,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 200; @@ -186,7 +185,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 200; # pucch0_dtx_threshold = 150; diff --git a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.flexric.conf b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.flexric.conf index a44f88d631..3d180c546c 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.flexric.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.flexric.conf @@ -166,7 +166,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 200; @@ -176,7 +175,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 200; # pucch0_dtx_threshold = 150; diff --git a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.neighbour.conf b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.neighbour.conf index d3aae08c2f..1c5441c491 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.neighbour.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.neighbour.conf @@ -174,7 +174,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 250; @@ -184,7 +183,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; pucch0_dtx_threshold = 100; diff --git a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.prs.conf b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.prs.conf index 2b0739c880..cf16ec27e6 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.prs.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.prs.conf @@ -167,7 +167,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 200; @@ -197,7 +196,6 @@ prs_config = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; } diff --git a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.yaml b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.yaml index 0c5af740bb..cc519ba0f0 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.yaml +++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.yaml @@ -143,16 +143,14 @@ gNBs: MACRLCs: - - num_cc: 1 - tr_s_preference: local_L1 + - tr_s_preference: local_L1 tr_n_preference: local_RRC pusch_TargetSNRx10: 200 pucch_TargetSNRx10: 200 stats_max_ue: 17 L1s: - - num_cc: 1 - tr_n_preference: local_mac + - tr_n_preference: local_mac prach_dtx_threshold: 200 # pucch0_dtx_threshold = 150; diff --git a/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.conf b/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.conf index 994b7a1720..df090801d0 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.usrpb200.sc-fdma.conf @@ -178,7 +178,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 200; @@ -189,7 +188,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 150; pucch0_dtx_threshold = 30; diff --git a/ci-scripts/conf_files/gnb.sa.band78.106prb.vrtsim.2x2.yaml b/ci-scripts/conf_files/gnb.sa.band78.106prb.vrtsim.2x2.yaml index 02a9f7cde5..3391adb26c 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.106prb.vrtsim.2x2.yaml +++ b/ci-scripts/conf_files/gnb.sa.band78.106prb.vrtsim.2x2.yaml @@ -146,15 +146,13 @@ gNBs: MACRLCs: - - num_cc: 1 - tr_s_preference: local_L1 + - tr_s_preference: local_L1 tr_n_preference: local_RRC pusch_TargetSNRx10: 200 pucch_TargetSNRx10: 200 L1s: - - num_cc: 1 - tr_n_preference: local_mac + - tr_n_preference: local_mac prach_dtx_threshold: 200 # pucch0_dtx_threshold = 150; diff --git a/ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf b/ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf index 2811375c61..1be573160f 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf @@ -169,7 +169,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 150; @@ -179,7 +178,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; pusch_proc_threads = 8; prach_dtx_threshold = 120; diff --git a/ci-scripts/conf_files/gnb.sa.band78.273prb.rfsim.2x2.conf b/ci-scripts/conf_files/gnb.sa.band78.273prb.rfsim.2x2.conf index fce7aba143..9ce0d34f8b 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.273prb.rfsim.2x2.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.273prb.rfsim.2x2.conf @@ -173,7 +173,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; } @@ -181,7 +180,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; tx_amp_backoff_dB = 30; diff --git a/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.2x2.conf b/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.2x2.conf index 979c4e3479..6e38413dcf 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.2x2.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.2x2.conf @@ -177,7 +177,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 200; @@ -187,7 +186,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; pucch0_dtx_threshold = 50; diff --git a/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf b/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf index c44462065c..27333a1e0d 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf @@ -179,7 +179,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 200; @@ -190,7 +189,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; pucch0_dtx_threshold = 50; diff --git a/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf b/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf index df6d4a9a71..dbac20b595 100644 --- a/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf +++ b/ci-scripts/conf_files/gnb.sa.band78.51prb.usrpb200.conf @@ -168,7 +168,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 200; @@ -179,7 +178,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; pucch0_dtx_threshold = 100; diff --git a/ci-scripts/conf_files/nrue.band78.106prb.l2sim.conf b/ci-scripts/conf_files/nrue.band78.106prb.l2sim.conf index 54344049da..b2c7cbfd9a 100644 --- a/ci-scripts/conf_files/nrue.band78.106prb.l2sim.conf +++ b/ci-scripts/conf_files/nrue.band78.106prb.l2sim.conf @@ -19,7 +19,6 @@ pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; }); MACRLCs = ( { - num_cc = 1; tr_n_preference = "nfapi"; remote_n_address = "127.0.0.1"; //Proxy IP local_n_address = "127.0.0.1"; diff --git a/ci-scripts/conf_files/untested/gNB_SA_n78_106PRB.2x2_usrpn310.conf b/ci-scripts/conf_files/untested/gNB_SA_n78_106PRB.2x2_usrpn310.conf index 53c9f5e96c..6f63a6b85e 100644 --- a/ci-scripts/conf_files/untested/gNB_SA_n78_106PRB.2x2_usrpn310.conf +++ b/ci-scripts/conf_files/untested/gNB_SA_n78_106PRB.2x2_usrpn310.conf @@ -188,7 +188,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 200; @@ -198,7 +197,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; pucch0_dtx_threshold = 150; diff --git a/ci-scripts/conf_files/untested/gNB_SA_n78_133PRB.2x2_usrpn310.conf b/ci-scripts/conf_files/untested/gNB_SA_n78_133PRB.2x2_usrpn310.conf index 971355190d..ebdfaa5988 100644 --- a/ci-scripts/conf_files/untested/gNB_SA_n78_133PRB.2x2_usrpn310.conf +++ b/ci-scripts/conf_files/untested/gNB_SA_n78_133PRB.2x2_usrpn310.conf @@ -184,7 +184,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 200; @@ -194,7 +193,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; } diff --git a/ci-scripts/conf_files/untested/gnb.band78.sa.fr1.106PRB.usrpn310.conf b/ci-scripts/conf_files/untested/gnb.band78.sa.fr1.106PRB.usrpn310.conf index 7379711001..1c7fc464ff 100644 --- a/ci-scripts/conf_files/untested/gnb.band78.sa.fr1.106PRB.usrpn310.conf +++ b/ci-scripts/conf_files/untested/gnb.band78.sa.fr1.106PRB.usrpn310.conf @@ -192,7 +192,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 200; @@ -202,7 +201,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 200; # pucch0_dtx_threshold = 150; diff --git a/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpb210.conf b/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpb210.conf index a2225507e7..af165cd287 100644 --- a/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpb210.conf +++ b/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpb210.conf @@ -179,7 +179,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 200; @@ -189,7 +188,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0 } diff --git a/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpn310.conf b/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpn310.conf index abc27b2a92..5d6e275d1e 100644 --- a/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpn310.conf +++ b/ci-scripts/conf_files/untested/gnb.band78.tm1.fr1.106PRB.usrpn310.conf @@ -183,7 +183,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 200; @@ -193,7 +192,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; } ); diff --git a/ci-scripts/conf_files/untested/gnb.nsa.band78.106prb.usrpn310.2x2.conf b/ci-scripts/conf_files/untested/gnb.nsa.band78.106prb.usrpn310.2x2.conf index 846aec5e17..5462521df6 100644 --- a/ci-scripts/conf_files/untested/gnb.nsa.band78.106prb.usrpn310.2x2.conf +++ b/ci-scripts/conf_files/untested/gnb.nsa.band78.106prb.usrpn310.2x2.conf @@ -184,7 +184,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; } @@ -192,7 +191,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; pucch0_dtx_threshold = 80; diff --git a/ci-scripts/conf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf b/ci-scripts/conf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf index 3c96388f91..4d81e4d0b8 100644 --- a/ci-scripts/conf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf +++ b/ci-scripts/conf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf @@ -172,7 +172,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; ulsch_max_slots_inactivity = 100; @@ -183,7 +182,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; pusch_proc_threads = 8; prach_dtx_threshold = 200; diff --git a/ci-scripts/conf_files/untested/gnb.sa.band78.106prb.usrp310.2x2.conf b/ci-scripts/conf_files/untested/gnb.sa.band78.106prb.usrp310.2x2.conf index e31981b921..320003792e 100644 --- a/ci-scripts/conf_files/untested/gnb.sa.band78.106prb.usrp310.2x2.conf +++ b/ci-scripts/conf_files/untested/gnb.sa.band78.106prb.usrp310.2x2.conf @@ -175,7 +175,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 220; @@ -185,7 +184,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 150; # pucch0_dtx_threshold = 150; diff --git a/ci-scripts/conf_files/untested/gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf b/ci-scripts/conf_files/untested/gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf index 0188d43738..177b7a3c82 100644 --- a/ci-scripts/conf_files/untested/gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf +++ b/ci-scripts/conf_files/untested/gnb.sa.band78.106prb.usrpn310.ddsuu-2x2.conf @@ -188,7 +188,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 220; @@ -198,7 +197,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 150; # pucch0_dtx_threshold = 150; diff --git a/ci-scripts/conf_files/untested/gnb.sa.band78.162prb.usrpn310.2x2.conf b/ci-scripts/conf_files/untested/gnb.sa.band78.162prb.usrpn310.2x2.conf index 07ed611b9a..057ba92573 100644 --- a/ci-scripts/conf_files/untested/gnb.sa.band78.162prb.usrpn310.2x2.conf +++ b/ci-scripts/conf_files/untested/gnb.sa.band78.162prb.usrpn310.2x2.conf @@ -189,7 +189,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; # pusch_TargetSNRx10 = 200; @@ -199,7 +198,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; # pucch0_dtx_threshold = 150; diff --git a/ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf b/ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf index 2710651c6c..a4276e1071 100644 --- a/ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf +++ b/ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf @@ -167,7 +167,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 200; @@ -178,7 +177,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; pucch0_dtx_threshold = 100; diff --git a/doc/LDPC_OFFLOAD_SETUP.md b/doc/LDPC_OFFLOAD_SETUP.md index 4030f2127a..bb30efaa8f 100644 --- a/doc/LDPC_OFFLOAD_SETUP.md +++ b/doc/LDPC_OFFLOAD_SETUP.md @@ -305,7 +305,6 @@ Example configuration snippet: ... MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 180; @@ -322,7 +321,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; pucch0_dtx_threshold = 100; diff --git a/doc/testing_oai_nsa_w_cots_ue_resources/gnb.conf b/doc/testing_oai_nsa_w_cots_ue_resources/gnb.conf index 7f244c0fec..5275469137 100755 --- a/doc/testing_oai_nsa_w_cots_ue_resources/gnb.conf +++ b/doc/testing_oai_nsa_w_cots_ue_resources/gnb.conf @@ -183,7 +183,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; } @@ -191,7 +190,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; } ); diff --git a/openair2/GNB_APP/L1_nr_paramdef.h b/openair2/GNB_APP/L1_nr_paramdef.h index 6ad649759a..947b7d710c 100644 --- a/openair2/GNB_APP/L1_nr_paramdef.h +++ b/openair2/GNB_APP/L1_nr_paramdef.h @@ -13,7 +13,6 @@ /* L1 configuration parameters names */ -#define L1_CC "num_cc" #define L1_LOCAL_N_ADDRESS "local_n_address" #define L1_REMOTE_N_ADDRESS "remote_n_address" #define L1_LOCAL_N_PORTC "local_n_portc" @@ -45,7 +44,6 @@ /*----------------------------------------------------------------------------------------------------------------------------------------------------*/ // clang-format off #define L1PARAMS_DESC { \ - {L1_CC, NULL, 0, .uptr=NULL, .defintval=1, TYPE_UINT, 0}, \ {L1_TRANSPORT_N_PREFERENCE, NULL, 0, .strptr=NULL, .defstrval="local_mac", TYPE_STRING, 0}, \ {L1_LOCAL_N_ADDRESS, NULL, 0, .strptr=NULL, .defstrval="127.0.0.1", TYPE_STRING, 0}, \ {L1_REMOTE_N_ADDRESS, NULL, 0, .strptr=NULL, .defstrval="127.0.0.2", TYPE_STRING, 0}, \ diff --git a/openair2/GNB_APP/MACRLC_nr_paramdef.h b/openair2/GNB_APP/MACRLC_nr_paramdef.h index cd931116ef..953c9d8ebd 100644 --- a/openair2/GNB_APP/MACRLC_nr_paramdef.h +++ b/openair2/GNB_APP/MACRLC_nr_paramdef.h @@ -15,7 +15,6 @@ #define MACRLC_LIST "MACRLCs" /* MACRLC configuration parameters names */ -#define MACRLC_CC "num_cc" #define MACRLC_TRANSPORT_N_PREFERENCE "tr_n_preference" #define MACRLC_LOCAL_N_ADDRESS "local_n_address" #define MACRLC_LOCAL_N_ADDRESS_F1U "local_n_address_f1u" @@ -87,7 +86,6 @@ /*-------------------------------------------------------------------------------------------------------------------------------------------------------*/ // clang-format off #define MACRLCPARAMS_DESC { \ - {MACRLC_CC, NULL, 0, .uptr=NULL, .defintval=50011, TYPE_UINT, 0}, \ {MACRLC_TRANSPORT_N_PREFERENCE, NULL, 0, .strptr=NULL, .defstrval="local_L1", TYPE_STRING, 0}, \ {MACRLC_LOCAL_N_ADDRESS, NULL, 0, .strptr=NULL, .defstrval="127.0.0.1", TYPE_STRING, 0}, \ {MACRLC_REMOTE_N_ADDRESS, NULL, 0, .uptr=NULL, .defstrval="127.0.0.2", TYPE_STRING, 0}, \ @@ -159,7 +157,6 @@ { .s5 = { NULL } }, \ { .s5 = { NULL } }, \ { .s5 = { NULL } }, \ - { .s5 = { NULL } }, \ { .s2 = { config_check_intrange, {0, 31} } }, /* DL min MCS */ \ { .s2 = { config_check_intrange, {0, 31} } }, /* DL max MCS */ \ { .s5 = { NULL } }, \ diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf index dd4cad0023..4851203f75 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf @@ -162,7 +162,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "f1"; local_n_address = "127.0.0.3"; @@ -175,7 +174,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; pucch0_dtx_threshold = 150; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band66.25prb.rfsim.pci0.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band66.25prb.rfsim.pci0.conf index 23ca35bddf..255b78c266 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band66.25prb.rfsim.pci0.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band66.25prb.rfsim.pci0.conf @@ -158,7 +158,6 @@ gNBs = ); MACRLCs = ({ - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "f1"; local_n_address = "127.0.0.4"; @@ -169,7 +168,6 @@ MACRLCs = ({ }); L1s = ({ - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 200; pucch0_dtx_threshold = 150; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band66.25prb.rfsim.pci1.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band66.25prb.rfsim.pci1.conf index f2bd6f00cc..669f07f161 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band66.25prb.rfsim.pci1.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band66.25prb.rfsim.pci1.conf @@ -158,7 +158,6 @@ gNBs = ); MACRLCs = ({ - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "f1"; local_n_address = "127.0.0.5"; @@ -169,7 +168,6 @@ MACRLCs = ({ }); L1s = ({ - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 200; pucch0_dtx_threshold = 150; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band77.273prb.fhi72.4x4-benetel650.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band77.273prb.fhi72.4x4-benetel650.conf index 882080f43a..e632c650ee 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band77.273prb.fhi72.4x4-benetel650.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band77.273prb.fhi72.4x4-benetel650.conf @@ -167,7 +167,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "f1"; local_n_address = "172.21.16.51"; @@ -188,7 +187,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 100; pucch0_dtx_threshold = 80; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band77.273prb.fhi72.4x4-das-benetel650_650.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band77.273prb.fhi72.4x4-das-benetel650_650.conf index c3adfa0968..044426471d 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band77.273prb.fhi72.4x4-das-benetel650_650.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band77.273prb.fhi72.4x4-das-benetel650_650.conf @@ -167,7 +167,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "f1"; local_n_address = "172.21.16.51"; @@ -192,7 +191,6 @@ MACRLCs = ( L1s = ( { enable_das = 1; - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 100; pucch0_dtx_threshold = 80; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band77.273prb.fhi72.8x8-benetel650_650-mplane.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band77.273prb.fhi72.8x8-benetel650_650-mplane.conf index bcd388c7c5..fc02a25601 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band77.273prb.fhi72.8x8-benetel650_650-mplane.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band77.273prb.fhi72.8x8-benetel650_650-mplane.conf @@ -167,7 +167,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "f1"; local_n_address = "172.21.16.51"; @@ -188,7 +187,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 100; pucch0_dtx_threshold = 80; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band77.273prb.fhi72.8x8-benetel650_650.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band77.273prb.fhi72.8x8-benetel650_650.conf index 735525dc5f..6e02f3ef0f 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band77.273prb.fhi72.8x8-benetel650_650.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band77.273prb.fhi72.8x8-benetel650_650.conf @@ -167,7 +167,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "f1"; local_n_address = "172.21.16.51"; @@ -188,7 +187,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 100; pucch0_dtx_threshold = 80; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band78.106prb.rfsim.pci0.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band78.106prb.rfsim.pci0.conf index 3e5e184ead..fd00e6483b 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band78.106prb.rfsim.pci0.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band78.106prb.rfsim.pci0.conf @@ -156,7 +156,6 @@ gNBs = ); MACRLCs = ({ - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "f1"; local_n_address = "127.0.0.4"; @@ -167,7 +166,6 @@ MACRLCs = ({ }); L1s = ({ - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 200; pucch0_dtx_threshold = 150; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band78.106prb.rfsim.pci1.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band78.106prb.rfsim.pci1.conf index df46fab501..69aa1a1f58 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band78.106prb.rfsim.pci1.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band78.106prb.rfsim.pci1.conf @@ -156,7 +156,6 @@ gNBs = ); MACRLCs = ({ - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "f1"; local_n_address = "127.0.0.5"; @@ -167,7 +166,6 @@ MACRLCs = ({ }); L1s = ({ - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 200; pucch0_dtx_threshold = 150; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-pnf.band78.rfsim.2x2.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-pnf.band78.rfsim.2x2.conf index 6f8829259f..fe58b16e90 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-pnf.band78.rfsim.2x2.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-pnf.band78.rfsim.2x2.conf @@ -7,7 +7,6 @@ log_config = { }; L1s = ({ - num_cc = 1; tr_n_preference = "nfapi"; remote_n_address = "127.0.0.1"; // vnf addr local_n_address = "127.0.0.1"; // pnf addr diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-pnf.band78.rfsim.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-pnf.band78.rfsim.conf index 98b0dfb7d0..09fc61dc94 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-pnf.band78.rfsim.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-pnf.band78.rfsim.conf @@ -7,7 +7,6 @@ log_config = { }; L1s = ({ - num_cc = 1; tr_n_preference = "nfapi"; remote_n_address = "127.0.0.1"; // vnf addr local_n_address = "127.0.0.1"; // pnf addr diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-vnf.sa.band78.106prb.nfapi.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-vnf.sa.band78.106prb.nfapi.conf index 27b21fa8d9..5abe16c3eb 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-vnf.sa.band78.106prb.nfapi.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-vnf.sa.band78.106prb.nfapi.conf @@ -175,7 +175,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; remote_s_address = "127.0.0.1"; // pnf addr [!] local_s_address = "127.0.0.1"; // vnf addr local_s_portc = 50001; // vnf p5 port diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-vnf.sa.band78.273prb.aerial.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-vnf.sa.band78.273prb.aerial.conf index 72c5966f54..3e1d847a69 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-vnf.sa.band78.273prb.aerial.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-vnf.sa.band78.273prb.aerial.conf @@ -177,7 +177,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; remote_s_address = "127.0.0.1"; // pnf addr [!] local_s_address = "127.0.0.2"; // vnf addr local_s_portc = 50001; // vnf p5 port diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-vnf.sa.band78.273prb.nfapi.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-vnf.sa.band78.273prb.nfapi.conf index 8f2f48a15c..6ffdf71496 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-vnf.sa.band78.273prb.nfapi.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-vnf.sa.band78.273prb.nfapi.conf @@ -179,7 +179,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; remote_s_address = "127.0.0.1"; // pnf addr [!] local_s_address = "127.0.0.2"; // vnf addr local_s_portc = 50001; // vnf p5 port diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-vnf.sa.cbrs.aerial.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-vnf.sa.cbrs.aerial.conf index db52106e4b..2bb6664132 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-vnf.sa.cbrs.aerial.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-vnf.sa.cbrs.aerial.conf @@ -177,7 +177,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; local_s_if_name = "lo:"; remote_s_address = "127.0.0.1"; // pnf addr [!] local_s_address = "127.0.0.2"; // vnf addr diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf index 6c82e9e2c1..111fd2700a 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf @@ -204,7 +204,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; # pusch_TargetSNRx10 = 200; @@ -214,7 +213,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; # pucch0_dtx_threshold = 150; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf index 18d51ac039..7fc3d62661 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf @@ -208,7 +208,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; #pusch_TargetSNRx10 = 200; @@ -218,7 +217,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; # pucch0_dtx_threshold = 150; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band1.u0.52PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band1.u0.52PRB.usrpb210.conf index 8679467454..1bbcd2b853 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band1.u0.52PRB.usrpb210.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band1.u0.52PRB.usrpb210.conf @@ -166,7 +166,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 200; @@ -176,7 +175,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; pucch0_dtx_threshold = 100; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band254.ntn.mu1.24prb.rfsim.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band254.ntn.mu1.24prb.rfsim.conf index 2aef12de15..5b711040ae 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band254.ntn.mu1.24prb.rfsim.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band254.ntn.mu1.24prb.rfsim.conf @@ -193,7 +193,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 150; @@ -203,7 +202,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; pucch0_dtx_threshold = 150; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band255.ntn.mu0.25prb.rfsim.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band255.ntn.mu0.25prb.rfsim.conf index 9add7136fb..6bdb33c981 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band255.ntn.mu0.25prb.rfsim.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band255.ntn.mu0.25prb.rfsim.conf @@ -192,7 +192,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 150; @@ -202,7 +201,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; pucch0_dtx_threshold = 150; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band256.ntn.mu0.25prb.rfsim.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band256.ntn.mu0.25prb.rfsim.conf index 1c56bf2ed7..a7be3890e1 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band256.ntn.mu0.25prb.rfsim.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band256.ntn.mu0.25prb.rfsim.conf @@ -192,7 +192,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 150; @@ -202,7 +201,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; pucch0_dtx_threshold = 150; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band257.66prb.fhi72.2x2-liteon.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band257.66prb.fhi72.2x2-liteon.conf index 149f79cb30..2b785d6ee7 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band257.66prb.fhi72.2x2-liteon.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band257.66prb.fhi72.2x2-liteon.conf @@ -175,7 +175,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 200; @@ -194,7 +193,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 250; pucch0_dtx_threshold = 100; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band257.u3.32prb.usrpx410.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band257.u3.32prb.usrpx410.conf index 00fa4a5cea..dac5890728 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band257.u3.32prb.usrpx410.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band257.u3.32prb.usrpx410.conf @@ -173,7 +173,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; #pusch_TargetSNRx10 = 150; @@ -183,7 +182,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; #pucch0_dtx_threshold = 120; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf index b43313c735..db724b9f8d 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf @@ -170,7 +170,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 150; @@ -183,7 +182,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; pucch0_dtx_threshold = 100; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.52PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.52PRB.usrpb210.conf index e1e7fb857b..d297aa7f14 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.52PRB.usrpb210.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.52PRB.usrpb210.conf @@ -175,7 +175,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 150; @@ -185,7 +184,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; pusch_proc_threads = 8; prach_dtx_threshold = 120; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band512.ntn.mu3.132prb.rfsim.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band512.ntn.mu3.132prb.rfsim.conf index b487b2eb22..b88ca99c91 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band512.ntn.mu3.132prb.rfsim.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band512.ntn.mu3.132prb.rfsim.conf @@ -205,7 +205,6 @@ rlc = { MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; } @@ -213,7 +212,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; } diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band512.ntn.mu3.32prb.rfsim.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band512.ntn.mu3.32prb.rfsim.conf index c70e97b1b5..deedbb695c 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band512.ntn.mu3.32prb.rfsim.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band512.ntn.mu3.32prb.rfsim.conf @@ -207,7 +207,6 @@ rlc = { MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; } @@ -215,7 +214,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; } diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band512.ntn.mu3.66prb.rfsim.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band512.ntn.mu3.66prb.rfsim.conf index dca5bfee22..5b18f6776e 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band512.ntn.mu3.66prb.rfsim.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band512.ntn.mu3.66prb.rfsim.conf @@ -206,7 +206,6 @@ rlc = { MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; } @@ -214,7 +213,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; } diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpn300.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpn300.conf index 802e7b27f3..602447e7e4 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpn300.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpn300.conf @@ -171,7 +171,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; ulsch_max_slots_inactivity = 100; @@ -182,7 +181,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; pusch_proc_threads = 8; ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0 diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpx300.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpx300.conf index 0814b884e4..72b0d38c38 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpx300.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpx300.conf @@ -186,7 +186,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 150; @@ -196,7 +195,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; pucch0_dtx_threshold = 150; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.24PRB.usrpx300.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.24PRB.usrpx300.conf index 815f1364d9..fced0d90a3 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.24PRB.usrpx300.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.24PRB.usrpx300.conf @@ -220,7 +220,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 150; @@ -232,7 +231,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 150; pucch0_dtx_threshold = 150; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.25PRB.usrpx300.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.25PRB.usrpx300.conf index 46cf01a74d..b502554fd1 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.25PRB.usrpx300.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.25PRB.usrpx300.conf @@ -220,7 +220,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 150; @@ -232,7 +231,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 150; pucch0_dtx_threshold = 150; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.u0.25prb.rfsim.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.u0.25prb.rfsim.conf index c25ea1771b..44d453c285 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.u0.25prb.rfsim.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.u0.25prb.rfsim.conf @@ -171,7 +171,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 150; @@ -181,7 +180,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; pucch0_dtx_threshold = 150; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.106prb.fhi72.4x4-vvdn.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.106prb.fhi72.4x4-vvdn.conf index ea4a9b33ba..4032f9c275 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.106prb.fhi72.4x4-vvdn.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.106prb.fhi72.4x4-vvdn.conf @@ -175,7 +175,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 200; @@ -190,7 +189,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 110; pucch0_dtx_threshold = 80; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.162prb.usrpn310.4x4.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.162prb.usrpn310.4x4.conf index 5d23440284..74885407b0 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.162prb.usrpn310.4x4.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.162prb.usrpn310.4x4.conf @@ -178,7 +178,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 250; @@ -190,7 +189,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; pusch_dtx_threshold = 20; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.2x2-benetel550-long-prach.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.2x2-benetel550-long-prach.conf index 61aa517afd..e22d5d566d 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.2x2-benetel550-long-prach.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.2x2-benetel550-long-prach.conf @@ -174,7 +174,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 180; @@ -190,7 +189,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 100; pucch0_dtx_threshold = 10; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.2x2-vvdn-16b.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.2x2-vvdn-16b.conf index 28a970caa5..dd2efe911c 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.2x2-vvdn-16b.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.2x2-vvdn-16b.conf @@ -172,7 +172,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 180; @@ -187,7 +186,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 130 pucch0_dtx_threshold = 80; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf index 46558e63bc..9edbd527c7 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf @@ -174,7 +174,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 180; @@ -189,7 +188,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 130 pucch0_dtx_threshold = 80; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.2x2.usrpn300.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.2x2.usrpn300.conf index 5a7d820a33..fdacd22737 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.2x2.usrpn300.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.2x2.usrpn300.conf @@ -170,7 +170,6 @@ gNBs = ( MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 300; @@ -181,7 +180,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; pucch0_dtx_threshold = 80; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.usrpx300.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.usrpx300.conf index 3527237ec9..c61b9e6769 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.usrpx300.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.usrpx300.conf @@ -170,7 +170,6 @@ gNBs = ( MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 300; @@ -181,7 +180,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; pucch0_dtx_threshold = 80; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.106PRB.usrpb210.RA_2-Step.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.106PRB.usrpb210.RA_2-Step.conf index b0eb1bf69f..4e5603884b 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.106PRB.usrpb210.RA_2-Step.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.106PRB.usrpb210.RA_2-Step.conf @@ -194,7 +194,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 150; @@ -204,7 +203,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; pucch0_dtx_threshold = 100; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.106prb.bladerf2.0xa4.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.106prb.bladerf2.0xa4.conf index e98f5efd6d..7b223bea88 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.106prb.bladerf2.0xa4.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.106prb.bladerf2.0xa4.conf @@ -171,7 +171,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 200; @@ -181,7 +180,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 200; } diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.106prb.fhi72.1x1-proto-ru.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.106prb.fhi72.1x1-proto-ru.conf index 23a932f727..7255b6a14e 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.106prb.fhi72.1x1-proto-ru.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.106prb.fhi72.1x1-proto-ru.conf @@ -174,7 +174,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 250; @@ -189,7 +188,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 200; pucch0_dtx_threshold = 100; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.2x2-benetel550-16b.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.2x2-benetel550-16b.conf index 9e75c482a7..6369df890b 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.2x2-benetel550-16b.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.2x2-benetel550-16b.conf @@ -175,7 +175,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 180; @@ -191,7 +190,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 100; pucch0_dtx_threshold = 80; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x2-benetel550.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x2-benetel550.conf index f5b6adf389..1b75f55d5f 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x2-benetel550.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x2-benetel550.conf @@ -173,7 +173,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 180; @@ -189,7 +188,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 100; pucch0_dtx_threshold = 80; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-benetel550-mplane.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-benetel550-mplane.conf index 1b532c71f0..cbde1e7cbd 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-benetel550-mplane.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-benetel550-mplane.conf @@ -175,7 +175,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 180; @@ -191,7 +190,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 100; pucch0_dtx_threshold = 80; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-benetel550.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-benetel550.conf index ba2635be13..81f1ebb6e9 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-benetel550.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-benetel550.conf @@ -175,7 +175,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 180; @@ -191,7 +190,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 100; pucch0_dtx_threshold = 80; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-foxconn.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-foxconn.conf index 1301875918..8894d1769b 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-foxconn.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-foxconn.conf @@ -174,7 +174,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 120; @@ -188,7 +187,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 130; pucch0_dtx_threshold = 80; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-liteon.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-liteon.conf index e883f08ca2..a520ac421f 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-liteon.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-liteon.conf @@ -174,7 +174,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 200; @@ -189,7 +188,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 130 pucch0_dtx_threshold = 80; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-metanoia.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-metanoia.conf index 23822e7fd6..f56f9e2dde 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-metanoia.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.273prb.fhi72.4x4-metanoia.conf @@ -157,7 +157,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 220; @@ -171,7 +170,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 130; pucch0_dtx_threshold = 80; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.51PRB.bladerf2.0xa4.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.51PRB.bladerf2.0xa4.conf index 9bc72202ce..2a5f990d09 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.51PRB.bladerf2.0xa4.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.51PRB.bladerf2.0xa4.conf @@ -169,7 +169,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 200; @@ -179,7 +178,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 150; pucch0_dtx_threshold = 100; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf index 11e6cdd3e6..7522264325 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf @@ -172,7 +172,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; #pusch_TargetSNRx10 = 150; @@ -182,7 +181,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; #pucch0_dtx_threshold = 120; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.pci0.rfsim.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.pci0.rfsim.conf index be3c4ad04b..8773e2a92d 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.pci0.rfsim.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.pci0.rfsim.conf @@ -173,7 +173,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 150; @@ -183,7 +182,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; pucch0_dtx_threshold = 100; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.pci1.rfsim.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.pci1.rfsim.conf index af7df10aa2..444762c266 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.pci1.rfsim.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.pci1.rfsim.conf @@ -173,7 +173,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 150; @@ -183,7 +182,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; pucch0_dtx_threshold = 100; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.2pattern.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.2pattern.conf index 5988b3f08b..0fb2454d26 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.2pattern.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.2pattern.conf @@ -172,7 +172,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 150; @@ -182,7 +181,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; pucch0_dtx_threshold = 100; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.4layer.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.4layer.conf index 63a743b3a0..18ce0529ec 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.4layer.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.4layer.conf @@ -172,7 +172,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 150; @@ -182,7 +181,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; pusch_proc_threads = 8; prach_dtx_threshold = 120; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf index 39f9527576..e19b88cdd4 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf @@ -172,7 +172,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 150; @@ -182,7 +181,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; pucch0_dtx_threshold = 100; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.redcap.yaml b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.redcap.yaml index ce13467aa2..b5b5708811 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.redcap.yaml +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.redcap.yaml @@ -168,17 +168,13 @@ gNBs: GNB_PORT_FOR_S1U: 2152 # Spec 2152 MACRLCs: - - - num_cc: 1 - tr_s_preference: local_L1 + - tr_s_preference: local_L1 tr_n_preference: local_RRC pusch_TargetSNRx10: 150 pucch_TargetSNRx10: 200 L1s: - - - num_cc: 1 - tr_n_preference: local_mac + - tr_n_preference: local_mac prach_dtx_threshold: 120 pucch0_dtx_threshold: 100 ofdm_offset_divisor: 8 #set this to UINT_MAX for offset 0 diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.sabox.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.sabox.conf index 0eae8d0b10..f0ffeda4ed 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.sabox.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.sabox.conf @@ -180,7 +180,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 200; @@ -190,7 +189,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; } ); diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.yaml b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.yaml index 3081592eb0..35863c042b 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.yaml +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.yaml @@ -149,17 +149,13 @@ gNBs: GNB_PORT_FOR_S1U: 2152 # Spec 2152 MACRLCs: - - - num_cc: 1 - tr_s_preference: local_L1 + - tr_s_preference: local_L1 tr_n_preference: local_RRC pusch_TargetSNRx10: 150 pucch_TargetSNRx10: 200 L1s: - - - num_cc: 1 - tr_n_preference: local_mac + - tr_n_preference: local_mac prach_dtx_threshold: 120 pucch0_dtx_threshold: 100 ofdm_offset_divisor: 8 #set this to UINT_MAX for offset 0 diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf index a5e3678c49..6601237d9e 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf @@ -179,7 +179,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 300; @@ -190,7 +189,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; pucch0_dtx_threshold = 80; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.189PRB.rfsim.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.189PRB.rfsim.conf index 1eb9642821..b0aefa7e42 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.189PRB.rfsim.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.189PRB.rfsim.conf @@ -176,7 +176,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 200; @@ -186,7 +185,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 200; # pucch0_dtx_threshold = 150; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.217PRB.2x2.usrpn300.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.217PRB.2x2.usrpn300.conf index df5bfd99ef..f1f2b28775 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.217PRB.2x2.usrpn300.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.217PRB.2x2.usrpn300.conf @@ -173,7 +173,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 150; @@ -184,7 +183,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; pucch0_dtx_threshold = 80; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.24PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.24PRB.usrpb210.conf index 707c08f580..93e24124c9 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.24PRB.usrpb210.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.24PRB.usrpb210.conf @@ -170,7 +170,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 150; @@ -180,7 +179,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; pusch_proc_threads = 8; prach_dtx_threshold = 120; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb0.prs.band261.fr2.64PRB.usrpx310.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb0.prs.band261.fr2.64PRB.usrpx310.conf index cb14d01411..b014794a78 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb0.prs.band261.fr2.64PRB.usrpx310.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb0.prs.band261.fr2.64PRB.usrpx310.conf @@ -183,7 +183,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 200; @@ -213,7 +212,6 @@ prs_config = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0 } diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb0.prs.band78.fr1.106PRB.usrpx310.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb0.prs.band78.fr1.106PRB.usrpx310.conf index 6dedc07362..6777091865 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb0.prs.band78.fr1.106PRB.usrpx310.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb0.prs.band78.fr1.106PRB.usrpx310.conf @@ -170,7 +170,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 150; @@ -180,7 +179,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; pucch0_dtx_threshold = 100; diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb1.prs.band261.fr2.64PRB.usrpx310.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb1.prs.band261.fr2.64PRB.usrpx310.conf index 78c9570ea3..192a6958d2 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb1.prs.band261.fr2.64PRB.usrpx310.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb1.prs.band261.fr2.64PRB.usrpx310.conf @@ -189,7 +189,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 200; @@ -219,7 +218,6 @@ prs_config = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0 } diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb1.prs.band78.fr1.106PRB.usrpx310.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb1.prs.band78.fr1.106PRB.usrpx310.conf index e5968ec010..d9da3fb77e 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb1.prs.band78.fr1.106PRB.usrpx310.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb1.prs.band78.fr1.106PRB.usrpx310.conf @@ -170,7 +170,6 @@ gNBs = MACRLCs = ( { - num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 150; @@ -180,7 +179,6 @@ MACRLCs = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; pucch0_dtx_threshold = 100; diff --git a/tests/nr-cu-nrppa/nr-nrppa-test.conf b/tests/nr-cu-nrppa/nr-nrppa-test.conf index 6db9c7b355..1bbda67679 100644 --- a/tests/nr-cu-nrppa/nr-nrppa-test.conf +++ b/tests/nr-cu-nrppa/nr-nrppa-test.conf @@ -53,7 +53,6 @@ positioning_config = ( L1s = ( { - num_cc = 1; tr_n_preference = "local_mac"; prach_dtx_threshold = 120; pucch0_dtx_threshold = 150;