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..5d027614de 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,14 +173,11 @@ 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 local_s_portc = 50001; // vnf p5 port - remote_s_portc = 50000; // pnf p5 port [!] local_s_portd = 50011; // vnf p7 port [!] - remote_s_portd = 50010; // pnf p7 port [!] tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 150; pucch_TargetSNRx10 = 200; 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..a09f495451 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,14 +175,11 @@ 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 local_s_portc = 50001; // vnf p5 port - remote_s_portc = 50000; // pnf p5 port [!] local_s_portd = 50011; // vnf p7 port [!] - remote_s_portd = 50010; // pnf p7 port [!] tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 300; 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..8e50055cd3 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,13 +180,10 @@ 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 - remote_s_portc = 50000; // pnf p5 port [!] local_s_portd = 50011; // vnf p7 port [!] - remote_s_portd = 50010; // pnf p7 port [!] tr_s_preference = "aerial"; tr_n_preference = "local_RRC"; pucch_RSSI_Threshold = -270; 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..c06c6ca069 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,13 +180,10 @@ 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 - remote_s_portc = 50000; // pnf p5 port [!] local_s_portd = 50011; // vnf p7 port [!] - remote_s_portd = 50010; // pnf p7 port [!] tr_s_preference = "aerial"; tr_n_preference = "local_RRC"; pucch_RSSI_Threshold = -270; 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..2851ff5aaa 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,13 +179,10 @@ 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 - remote_s_portc = 50000; // pnf p5 port [!] local_s_portd = 50011; // vnf p7 port [!] - remote_s_portd = 50010; // pnf p7 port [!] tr_s_preference = "aerial"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 180; # 150; 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/episci/episci_rcc.band7.tm1.nfapi.conf b/ci-scripts/conf_files/untested/episci/episci_rcc.band7.tm1.nfapi.conf index 8f5998ca54..3f47d23710 100644 --- a/ci-scripts/conf_files/untested/episci/episci_rcc.band7.tm1.nfapi.conf +++ b/ci-scripts/conf_files/untested/episci/episci_rcc.band7.tm1.nfapi.conf @@ -203,9 +203,7 @@ MACRLCs = ( remote_s_address = "127.0.0.1"; local_s_address = "127.0.0.1"; local_s_portc = 50001; - remote_s_portc = 50000; local_s_portd = 50011; - remote_s_portd = 50010; tr_s_preference = "nfapi"; tr_n_preference = "local_RRC"; scheduler_mode = "fairRR"; diff --git a/ci-scripts/conf_files/untested/episci/episci_rcc.band78.tm1.106PRB.nfapi.conf b/ci-scripts/conf_files/untested/episci/episci_rcc.band78.tm1.106PRB.nfapi.conf index 327250f0ac..276d4fb1e2 100644 --- a/ci-scripts/conf_files/untested/episci/episci_rcc.band78.tm1.106PRB.nfapi.conf +++ b/ci-scripts/conf_files/untested/episci/episci_rcc.band78.tm1.106PRB.nfapi.conf @@ -189,9 +189,7 @@ MACRLCs = ( remote_s_address = "127.0.0.1"; // pnf addr [!] local_s_address = "127.0.0.2"; // vnf addr local_s_portc = 50601; // vnf p5 port - remote_s_portc = 50600; // pnf p5 port [!] local_s_portd = 50611; // vnf p7 port [!] - remote_s_portd = 50610; // pnf p7 port [!] tr_s_preference = "nfapi"; tr_n_preference = "local_RRC"; } diff --git a/ci-scripts/conf_files/untested/episci/gnb_band78.sa.fr1.106PRB.2x2.l2sim.conf b/ci-scripts/conf_files/untested/episci/gnb_band78.sa.fr1.106PRB.2x2.l2sim.conf index 963b2f830f..03b71b4da0 100644 --- a/ci-scripts/conf_files/untested/episci/gnb_band78.sa.fr1.106PRB.2x2.l2sim.conf +++ b/ci-scripts/conf_files/untested/episci/gnb_band78.sa.fr1.106PRB.2x2.l2sim.conf @@ -177,9 +177,7 @@ MACRLCs = ( remote_s_address = "127.0.0.1"; // pnf addr [!] local_s_address = "127.0.0.2"; // vnf addr local_s_portc = 50601; // vnf p5 port - remote_s_portc = 50600; // pnf p5 port [!] local_s_portd = 50611; // vnf p7 port [!] - remote_s_portd = 50610; // pnf p7 port [!] tr_s_preference = "nfapi"; tr_n_preference = "local_RRC"; } 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/common/utils/ocp_itti/all_msg.h b/common/utils/ocp_itti/all_msg.h index f9e6831283..a298ba54d0 100644 --- a/common/utils/ocp_itti/all_msg.h +++ b/common/utils/ocp_itti/all_msg.h @@ -2,9 +2,7 @@ * SPDX-License-Identifier: LicenseRef-CSSL-1.0 */ -#include "openair2/COMMON/phy_messages_def.h" #include "openair2/COMMON/mac_messages_def.h" -#include "openair2/COMMON/rlc_messages_def.h" #include "openair2/COMMON/pdcp_messages_def.h" #include "openair2/COMMON/rrc_messages_def.h" #include "openair2/COMMON/nas_messages_def.h" @@ -13,7 +11,6 @@ #include "openair2/COMMON/m2ap_messages_def.h" #include "openair2/COMMON/m3ap_messages_def.h" #include "openair2/COMMON/sctp_messages_def.h" -#include "openair2/COMMON/udp_messages_def.h" #include "openair2/COMMON/gtpv1_u_messages_def.h" #include "openair2/COMMON/f1ap_messages_def.h" #include "openair2/COMMON/e1ap_messages_def.h" diff --git a/common/utils/ocp_itti/intertask_interface.h b/common/utils/ocp_itti/intertask_interface.h index 47d0ac216f..b31368bce7 100644 --- a/common/utils/ocp_itti/intertask_interface.h +++ b/common/utils/ocp_itti/intertask_interface.h @@ -53,9 +53,7 @@ typedef struct IttiMsgText_s { char text[]; } IttiMsgText; -#include #include -#include #include #include #include @@ -208,7 +206,6 @@ typedef struct IttiMsgText_s { #include #include #include -#include #include #include #include @@ -262,18 +259,14 @@ typedef struct { TASK_DEF(TASK_UNKNOWN, 50) \ TASK_DEF(TASK_TIMER, 10) \ TASK_DEF(TASK_L2L1, 200) \ - TASK_DEF(TASK_BM, 200) \ - TASK_DEF(TASK_PHY_ENB, 200) \ TASK_DEF(TASK_MAC_GNB, 200) \ TASK_DEF(TASK_RLC_ENB, 200) \ - TASK_DEF(TASK_RRC_ENB_NB_IoT, 200) \ TASK_DEF(TASK_PDCP_ENB, 200) \ TASK_DEF(TASK_PDCP_GNB, 200) \ TASK_DEF(TASK_DATA_FORWARDING, 200) \ TASK_DEF(TASK_END_MARKER, 200) \ TASK_DEF(TASK_RRC_ENB, 200) \ TASK_DEF(TASK_RRC_GNB, 200) \ - TASK_DEF(TASK_RAL_ENB, 200) \ TASK_DEF(TASK_S1AP, 200) \ TASK_DEF(TASK_NGAP, 200) \ TASK_DEF(TASK_NRPPA, 200) \ @@ -288,14 +281,12 @@ typedef struct { TASK_DEF(TASK_GNB_APP, 200) \ TASK_DEF(TASK_MCE_APP, 200) \ TASK_DEF(TASK_MME_APP, 200) \ - TASK_DEF(TASK_PHY_UE, 200) \ TASK_DEF(TASK_MAC_UE, 200) \ TASK_DEF(TASK_RLC_UE, 200) \ TASK_DEF(TASK_PDCP_UE, 200) \ TASK_DEF(TASK_RRC_UE, 200) \ TASK_DEF(TASK_RRC_NRUE, 200) \ TASK_DEF(TASK_NAS_UE, 200) \ - TASK_DEF(TASK_RAL_UE, 200) \ TASK_DEF(TASK_GTPV1_U, 1000) \ TASK_DEF(TASK_CU_F1, 200) \ TASK_DEF(TASK_DU_F1, 200) \ diff --git a/doc/Doxyfile b/doc/Doxyfile index 1beb3b0a37..fad5807544 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -1801,34 +1801,27 @@ INPUT = \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/pdcp_messages_def.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/mac_rrc_primitives.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/ngap_messages_def.h \ -@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/rlc_messages_def.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/m3ap_messages_def.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/sctp_messages_def.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/x2ap_messages_types.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/commonDef.h \ -@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/udp_messages_def.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/nas_messages_types.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/sctp_messages_types.h \ @CMAKE_CURRENT_SOURCE_DIR@/../common/platform_types.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/ngap_messages_types.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/gtpv1_u_messages_types.h \ -@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/rlc_messages_types.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/e1ap_messages_def.h \ -@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/phy_messages_def.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/s1ap_messages_types.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/networkDef.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/f1ap_messages_types.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/mac_messages_types.h \ -@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/udp_messages_types.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/gtpv1_u_messages_def.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/s1ap_messages_def.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/rrc_messages_types.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/e1ap_messages_types.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/m3ap_messages_types.h \ -@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/phy_messages_types.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/x2ap_messages_def.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/mac_messages_def.h \ -@CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/openair_defs.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/as_message.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/nas_messages_def.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/COMMON/pdcp_messages_types.h \ 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/nfapi/oai_integration/nfapi_vnf.c b/nfapi/oai_integration/nfapi_vnf.c index 1d4488841a..4e68bb116d 100644 --- a/nfapi/oai_integration/nfapi_vnf.c +++ b/nfapi/oai_integration/nfapi_vnf.c @@ -1709,6 +1709,7 @@ void configure_nr_nfapi_vnf(eth_params_t params) vnf->p7_vnfs[0].aperiodic_timing_enabled = 0; vnf->p7_vnfs[0].periodic_timing_period = 1; vnf->p7_vnfs[0].config = nfapi_vnf_p7_config_create(); + AssertFatal(params.remote_portc == 0 && params.remote_portd == 0, "remote ports not used, use 0\n"); #ifndef ENABLE_AERIAL NFAPI_TRACE(NFAPI_TRACE_INFO, "[VNF] %s() vnf->p7_vnfs[0].config:%p VNF ADDRESS:%s:%d\n", diff --git a/openair1/PHY/defs_gNB.h b/openair1/PHY/defs_gNB.h index d21c9ab07e..b9d4992d32 100644 --- a/openair1/PHY/defs_gNB.h +++ b/openair1/PHY/defs_gNB.h @@ -358,8 +358,6 @@ typedef struct PHY_VARS_gNB_s { gNB_L1_proc_t proc; int num_RU; RU_t *RU_list[MAX_NUM_RU_PER_gNB]; - /// Ethernet parameters for northbound midhaul interface - eth_params_t eth_params_n; /// Ethernet parameters for fronthaul interface eth_params_t eth_params; int rx_total_gain_dB; diff --git a/openair2/COMMON/mac_primitives.h b/openair2/COMMON/mac_primitives.h deleted file mode 100644 index 707521a0ce..0000000000 --- a/openair2/COMMON/mac_primitives.h +++ /dev/null @@ -1,13 +0,0 @@ -/* - * SPDX-License-Identifier: LicenseRef-CSSL-1.0 - */ - -#ifndef __MAC_PRIMITIVES_H__ -#define __MAC_PRIMITIVES_H__ - - - -//void ue_decode_chbch(unsigned char Node_id); -//void ue_scheduler(unsigned char Node_id); -//void nodeb_decode_ul_sach(); -#endif diff --git a/openair2/COMMON/messages_def.h b/openair2/COMMON/messages_def.h deleted file mode 100644 index bdd590a53d..0000000000 --- a/openair2/COMMON/messages_def.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * SPDX-License-Identifier: LicenseRef-CSSL-1.0 - */ - -// These messages files are mandatory and must always be placed in first position -#include "intertask_messages_def.h" -#include "timer_messages_def.h" - -// Messages files used between tasks -#include "phy_messages_def.h" -#include "mac_messages_def.h" -#include "rlc_messages_def.h" -#include "pdcp_messages_def.h" -#include "rrc_messages_def.h" -#include "nas_messages_def.h" -#include "s1ap_messages_def.h" -#include "f1ap_messages_def.h" -#include "x2ap_messages_def.h" -#include "m2ap_messages_def.h" -#include "m3ap_messages_def.h" -#include "sctp_messages_def.h" -#include "udp_messages_def.h" -#include "gtpv1_u_messages_def.h" -#include "e1ap_messages_def.h" diff --git a/openair2/COMMON/openair_defs.h b/openair2/COMMON/openair_defs.h deleted file mode 100644 index 1ba95df5b8..0000000000 --- a/openair2/COMMON/openair_defs.h +++ /dev/null @@ -1,12 +0,0 @@ -/* - * SPDX-License-Identifier: LicenseRef-CSSL-1.0 - */ - -#ifndef __openair_DEFS_H__ -#define __openair_DEFS_H__ - -#include -#include -#include -#endif // /*__openair_DEFS_H__ */ - diff --git a/openair2/COMMON/phy_messages_def.h b/openair2/COMMON/phy_messages_def.h deleted file mode 100644 index 2846351b0c..0000000000 --- a/openair2/COMMON/phy_messages_def.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * SPDX-License-Identifier: LicenseRef-CSSL-1.0 - */ - -//-------------------------------------------------------------------------------------------// -// eNB: ENB_APP -> PHY messages -MESSAGE_DEF(PHY_CONFIGURATION_REQ, MESSAGE_PRIORITY_MED_PLUS, PhyConfigurationReq, phy_configuration_req) - -// UE: RRC -> PHY messages -MESSAGE_DEF(PHY_DEACTIVATE_REQ, MESSAGE_PRIORITY_MED_PLUS, PhyDeactivateReq, phy_deactivate_req) - -MESSAGE_DEF(PHY_FIND_CELL_REQ, MESSAGE_PRIORITY_MED_PLUS, PhyFindCellReq, phy_find_cell_req) -MESSAGE_DEF(PHY_FIND_NEXT_CELL_REQ, MESSAGE_PRIORITY_MED_PLUS, PhyFindNextCellReq, phy_find_next_cell_req) -MESSAGE_DEF(PHY_MEAS_THRESHOLD_REQ, MESSAGE_PRIORITY_MED_PLUS, PhyMeasThresholdReq, phy_meas_threshold_req) -// UE: PHY -> RRC messages -MESSAGE_DEF(PHY_FIND_CELL_IND, MESSAGE_PRIORITY_MED_PLUS, PhyFindCellInd, phy_find_cell_ind) -MESSAGE_DEF(PHY_MEAS_THRESHOLD_CONF, MESSAGE_PRIORITY_MED_PLUS, PhyMeasThresholdConf, phy_meas_threshold_conf) -MESSAGE_DEF(PHY_MEAS_REPORT_IND, MESSAGE_PRIORITY_MED_PLUS, PhyMeasReportInd, phy_meas_report_ind) diff --git a/openair2/COMMON/phy_messages_types.h b/openair2/COMMON/phy_messages_types.h deleted file mode 100644 index 9e758a92f7..0000000000 --- a/openair2/COMMON/phy_messages_types.h +++ /dev/null @@ -1,104 +0,0 @@ -/* - * SPDX-License-Identifier: LicenseRef-CSSL-1.0 - */ - -/* - * phy_messages_types.h - */ - -#ifndef PHY_MESSAGES_TYPES_H_ -#define PHY_MESSAGES_TYPES_H_ - -#include "PHY/defs_common.h" - -//-------------------------------------------------------------------------------------------// -// Defines to access message fields. -#define PHY_CONFIGURATION_REQ(mSGpTR) (mSGpTR)->ittiMsg.phy_configuration_req - -#define PHY_DEACTIVATE_REQ(mSGpTR) (mSGpTR)->ittiMsg.phy_deactivate_req - -#define PHY_FIND_CELL_REQ(mSGpTR) (mSGpTR)->ittiMsg.phy_find_cell_req -#define PHY_FIND_NEXT_CELL_REQ(mSGpTR) (mSGpTR)->ittiMsg.phy_find_next_cell_req - -#define PHY_FIND_CELL_IND(mSGpTR) (mSGpTR)->ittiMsg.phy_find_cell_ind - -#define PHY_MEAS_THRESHOLD_REQ(mSGpTR) (mSGpTR)->ittiMsg.phy_meas_threshold_req -#define PHY_MEAS_THRESHOLD_CONF(mSGpTR) (mSGpTR)->ittiMsg.phy_meas_threshold_conf -#define PHY_MEAS_REPORT_IND(mSGpTR) (mSGpTR)->ittiMsg.phy_meas_report_ind -//-------------------------------------------------------------------------------------------// -#define MAX_REPORTED_CELL 10 - -/* Enhance absolute radio frequency channel number */ -typedef uint16_t Earfcn; - -/* Physical cell identity, valid value are from 0 to 503 */ -typedef int16_t PhyCellId; - -/* Reference signal received power, valid value are from 0 (rsrp < -140 dBm) to 97 (rsrp <= -44 dBm) */ -typedef int8_t Rsrp; - -/* Reference signal received quality, valid value are from 0 (rsrq < -19.50 dB) to 34 (rsrq <= -3 dB) */ -typedef int8_t Rsrq; - -typedef struct CellInfo_s { - Earfcn earfcn; - PhyCellId cell_id; - Rsrp rsrp; - Rsrq rsrq; -} CellInfo; - -//-------------------------------------------------------------------------------------------// -// eNB: ENB_APP -> PHY messages -typedef struct PhyConfigurationReq_s { - frame_type_t frame_type[MAX_NUM_CCs]; - lte_prefix_type_t prefix_type[MAX_NUM_CCs]; - uint32_t downlink_frequency[MAX_NUM_CCs]; - int32_t uplink_frequency_offset[MAX_NUM_CCs]; - int32_t nb_antennas_tx[MAX_NUM_CCs]; - int32_t nb_antennas_rx[MAX_NUM_CCs]; - int32_t tx_gain[MAX_NUM_CCs]; - int32_t rx_gain[MAX_NUM_CCs]; -} PhyConfigurationReq; - -// UE: RRC -> PHY messages -typedef struct PhyDeactivateReq_s { - // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++ - // To be removed if the structure is filled - uint32_t dummy; -} PhyDeactivateReq; - -typedef struct PhyFindCellReq_s { - Earfcn earfcn_start; - Earfcn earfcn_end; -} PhyFindCellReq; - -typedef struct PhyFindNextCellReq_s { - // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++ - // To be removed if the structure is filled - uint32_t dummy; -} PhyFindNextCellReq; - -typedef struct PhyMeasThresholdReq_s { - // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++ - // To be removed if the structure is filled - uint32_t dummy; -} PhyMeasThresholdReq; - -typedef struct PhyMeasReportInd_s { - // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++ - // To be removed if the structure is filled - uint32_t dummy; -} PhyMeasReportInd; - -// UE: PHY -> RRC messages -typedef struct PhyFindCellInd_s { - uint8_t cell_nb; - CellInfo cells[MAX_REPORTED_CELL]; -} PhyFindCellInd; - -typedef struct PhyMeasThresholdConf_s { - // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++ - // To be removed if the structure is filled - uint32_t dummy; -} PhyMeasThresholdConf; -#endif /* PHY_MESSAGES_TYPES_H_ */ diff --git a/openair2/COMMON/rlc_messages_def.h b/openair2/COMMON/rlc_messages_def.h deleted file mode 100644 index 7d86f5b56b..0000000000 --- a/openair2/COMMON/rlc_messages_def.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * SPDX-License-Identifier: LicenseRef-CSSL-1.0 - */ - -/* - * rlc_messages_def.h - */ - -//-------------------------------------------------------------------------------------------// -// Messages for RLC logging - -#if defined(DISABLE_ITTI_XER_PRINT) - -#else -MESSAGE_DEF(RLC_AM_DATA_PDU_IND, MESSAGE_PRIORITY_MED_PLUS, IttiMsgText, rlc_am_data_pdu_ind) -MESSAGE_DEF(RLC_AM_DATA_PDU_REQ, MESSAGE_PRIORITY_MED_PLUS, IttiMsgText, rlc_am_data_pdu_req) -MESSAGE_DEF(RLC_AM_STATUS_PDU_IND, MESSAGE_PRIORITY_MED_PLUS, IttiMsgText, rlc_am_status_pdu_ind) -MESSAGE_DEF(RLC_AM_STATUS_PDU_REQ, MESSAGE_PRIORITY_MED_PLUS, IttiMsgText, rlc_am_status_pdu_req) -MESSAGE_DEF(RLC_AM_SDU_REQ, MESSAGE_PRIORITY_MED_PLUS, IttiMsgText, rlc_am_sdu_req) -MESSAGE_DEF(RLC_AM_SDU_IND, MESSAGE_PRIORITY_MED_PLUS, IttiMsgText, rlc_am_sdu_ind) - -MESSAGE_DEF(RLC_UM_DATA_PDU_IND, MESSAGE_PRIORITY_MED_PLUS, IttiMsgText, rlc_um_data_pdu_ind) -MESSAGE_DEF(RLC_UM_DATA_PDU_REQ, MESSAGE_PRIORITY_MED_PLUS, IttiMsgText, rlc_um_data_pdu_req) -MESSAGE_DEF(RLC_UM_SDU_REQ, MESSAGE_PRIORITY_MED_PLUS, IttiMsgText, rlc_um_sdu_req) -MESSAGE_DEF(RLC_UM_SDU_IND, MESSAGE_PRIORITY_MED_PLUS, IttiMsgText, rlc_um_sdu_ind) -#endif diff --git a/openair2/COMMON/rlc_messages_types.h b/openair2/COMMON/rlc_messages_types.h deleted file mode 100644 index ab9483669a..0000000000 --- a/openair2/COMMON/rlc_messages_types.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * SPDX-License-Identifier: LicenseRef-CSSL-1.0 - */ - -/* - * rlc_messages_types.h - */ - -#ifndef RLC_MESSAGES_TYPES_H_ -#define RLC_MESSAGES_TYPES_H_ - - - -#endif /* RLC_MESSAGES_TYPES_H_ */ diff --git a/openair2/COMMON/udp_messages_def.h b/openair2/COMMON/udp_messages_def.h deleted file mode 100644 index 03566ef09f..0000000000 --- a/openair2/COMMON/udp_messages_def.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - * SPDX-License-Identifier: LicenseRef-CSSL-1.0 - */ - -MESSAGE_DEF(UDP_INIT, MESSAGE_PRIORITY_MED, udp_init_t, udp_init) -MESSAGE_DEF(UDP_DATA_REQ, MESSAGE_PRIORITY_MED, udp_data_req_t, udp_data_req) -MESSAGE_DEF(UDP_DATA_IND, MESSAGE_PRIORITY_MED, udp_data_ind_t, udp_data_ind) diff --git a/openair2/COMMON/udp_messages_types.h b/openair2/COMMON/udp_messages_types.h deleted file mode 100644 index 9db6dc78d7..0000000000 --- a/openair2/COMMON/udp_messages_types.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * SPDX-License-Identifier: LicenseRef-CSSL-1.0 - */ - -#ifndef UDP_MESSAGES_TYPES_H_ -#define UDP_MESSAGES_TYPES_H_ - -#define UDP_INIT(mSGpTR) (mSGpTR)->ittiMsg.udp_init - -typedef struct { - uint32_t port; - char *address; -} udp_init_t; - -typedef struct { - uint8_t *buffer; - uint32_t buffer_length; - uint32_t buffer_offset; - uint32_t peer_address; - uint32_t peer_port; -} udp_data_req_t; - -typedef struct { - uint8_t *buffer; - uint32_t buffer_length; - uint32_t peer_address; - uint32_t peer_port; -} udp_data_ind_t; - -#endif /* UDP_MESSAGES_TYPES_H_ */ diff --git a/openair2/GNB_APP/L1_nr_paramdef.h b/openair2/GNB_APP/L1_nr_paramdef.h index 0255603a58..1faa03c475 100644 --- a/openair2/GNB_APP/L1_nr_paramdef.h +++ b/openair2/GNB_APP/L1_nr_paramdef.h @@ -13,31 +13,29 @@ /* L1 configuration parameters names */ -#define CONFIG_STRING_L1_CC "num_cc" -#define CONFIG_STRING_L1_LOCAL_N_ADDRESS "local_n_address" -#define CONFIG_STRING_L1_REMOTE_N_ADDRESS "remote_n_address" -#define CONFIG_STRING_L1_LOCAL_N_PORTC "local_n_portc" -#define CONFIG_STRING_L1_REMOTE_N_PORTC "remote_n_portc" -#define CONFIG_STRING_L1_LOCAL_N_PORTD "local_n_portd" -#define CONFIG_STRING_L1_REMOTE_N_PORTD "remote_n_portd" -#define CONFIG_STRING_L1_TRANSPORT_N_PREFERENCE "tr_n_preference" -#define CONFIG_STRING_L1_THREAD_POOL_SIZE "thread_pool_size" -#define CONFIG_STRING_L1_OFDM_OFFSET_DIVISOR "ofdm_offset_divisor" -#define CONFIG_STRING_L1_PUCCH0_DTX_THRESHOLD "pucch0_dtx_threshold" -#define CONFIG_STRING_L1_PRACH_DTX_THRESHOLD "prach_dtx_threshold" -#define CONFIG_STRING_L1_PUSCH_DTX_THRESHOLD "pusch_dtx_threshold" -#define CONFIG_STRING_L1_SRS_DTX_THRESHOLD "srs_dtx_threshold" -#define CONFIG_STRING_L1_MAX_LDPC_ITERATIONS "max_ldpc_iterations" -#define CONFIG_STRING_L1_RX_THREAD_CORE "L1_rx_thread_core" -#define CONFIG_STRING_L1_TX_THREAD_CORE "L1_tx_thread_core" +#define L1_LOCAL_N_ADDRESS "local_n_address" +#define L1_REMOTE_N_ADDRESS "remote_n_address" +#define L1_REMOTE_N_PORTC "remote_n_portc" +#define L1_LOCAL_N_PORTD "local_n_portd" +#define L1_REMOTE_N_PORTD "remote_n_portd" +#define L1_TRANSPORT_N_PREFERENCE "tr_n_preference" +#define L1_THREAD_POOL_SIZE "thread_pool_size" +#define L1_OFDM_OFFSET_DIVISOR "ofdm_offset_divisor" +#define L1_PUCCH0_DTX_THRESHOLD "pucch0_dtx_threshold" +#define L1_PRACH_DTX_THRESHOLD "prach_dtx_threshold" +#define L1_PUSCH_DTX_THRESHOLD "pusch_dtx_threshold" +#define L1_SRS_DTX_THRESHOLD "srs_dtx_threshold" +#define L1_MAX_LDPC_ITERATIONS "max_ldpc_iterations" +#define L1_RX_THREAD_CORE "L1_rx_thread_core" +#define L1_TX_THREAD_CORE "L1_tx_thread_core" #define HLP_TP_SIZ "thread_pool_size paramter removed, please use --thread-pool" -#define CONFIG_STRING_L1_TX_AMP_BACKOFF_dB "tx_amp_backoff_dB" +#define L1_TX_AMP_BACKOFF_dB "tx_amp_backoff_dB" #define HLP_L1TX_BO "Backoff from full-scale output at the L1 entity(frequency domain), ex. 12 would corresponding to 14-bit input level (6 dB/bit). Default 36 dBFS for OAI RU entity" -#define CONFIG_STRING_L1_PHASE_COMP "phase_compensation" +#define L1_PHASE_COMP "phase_compensation" #define HLP_L1_PHASE_COMP "Apply NR symbolwise phase rotation" -#define CONFIG_STRING_NUM_ANTENNAS_PER_THREAD "dmrs_num_antennas_per_thread" +#define L1_NUM_ANTENNAS_PER_THREAD "dmrs_num_antennas_per_thread" #define HLP_NUM_ARX "Number of antennas per thread for PUSCH channel estimation" -#define CONFIG_STRING_ANALOG_DAS "enable_das" +#define L1_ANALOG_DAS "enable_das" /*----------------------------------------------------------------------------------------------------------------------------------------------------*/ /* L1 configuration parameters */ @@ -45,50 +43,27 @@ /*----------------------------------------------------------------------------------------------------------------------------------------------------*/ // clang-format off #define L1PARAMS_DESC { \ - {CONFIG_STRING_L1_CC, NULL, 0, .uptr=NULL, .defintval=1, TYPE_UINT, 0}, \ - {CONFIG_STRING_L1_TRANSPORT_N_PREFERENCE, NULL, 0, .strptr=NULL, .defstrval="local_mac", TYPE_STRING, 0}, \ - {CONFIG_STRING_L1_LOCAL_N_ADDRESS, NULL, 0, .strptr=NULL, .defstrval="127.0.0.1", TYPE_STRING, 0}, \ - {CONFIG_STRING_L1_REMOTE_N_ADDRESS, NULL, 0, .strptr=NULL, .defstrval="127.0.0.2", TYPE_STRING, 0}, \ - {CONFIG_STRING_L1_LOCAL_N_PORTC, NULL, 0, .uptr=NULL, .defintval=50030, TYPE_UINT, 0}, \ - {CONFIG_STRING_L1_REMOTE_N_PORTC, NULL, 0, .uptr=NULL, .defintval=50030, TYPE_UINT, 0}, \ - {CONFIG_STRING_L1_LOCAL_N_PORTD, NULL, 0, .uptr=NULL, .defintval=50031, TYPE_UINT, 0}, \ - {CONFIG_STRING_L1_REMOTE_N_PORTD, NULL, 0, .uptr=NULL, .defintval=50031, TYPE_UINT, 0}, \ - {CONFIG_STRING_L1_THREAD_POOL_SIZE, HLP_TP_SIZ, 0, .uptr=NULL, .defintval=2022, TYPE_UINT, 0}, \ - {CONFIG_STRING_L1_OFDM_OFFSET_DIVISOR, NULL, 0, .uptr=NULL, .defuintval=8, TYPE_UINT, 0}, \ - {CONFIG_STRING_L1_PUCCH0_DTX_THRESHOLD, NULL, 0, .uptr=NULL, .defintval=100, TYPE_UINT, 0}, \ - {CONFIG_STRING_L1_PRACH_DTX_THRESHOLD, NULL, 0, .uptr=NULL, .defintval=150, TYPE_UINT, 0}, \ - {CONFIG_STRING_L1_PUSCH_DTX_THRESHOLD, NULL, 0, .uptr=NULL, .defintval=50, TYPE_UINT, 0}, \ - {CONFIG_STRING_L1_SRS_DTX_THRESHOLD, NULL, 0, .uptr=NULL, .defintval=30, TYPE_UINT, 0}, \ - {CONFIG_STRING_L1_MAX_LDPC_ITERATIONS, NULL, 0, .uptr=NULL, .defintval=8, TYPE_UINT, 0}, \ - {CONFIG_STRING_L1_RX_THREAD_CORE, NULL, 0, .iptr=NULL, .defintval=-1, TYPE_INT, 0}, \ - {CONFIG_STRING_L1_TX_THREAD_CORE, NULL, 0, .iptr=NULL, .defintval=-1, TYPE_INT, 0}, \ - {CONFIG_STRING_L1_TX_AMP_BACKOFF_dB, HLP_L1TX_BO,0, .uptr=NULL, .defintval=36, TYPE_UINT, 0}, \ - {CONFIG_STRING_L1_PHASE_COMP, HLP_L1_PHASE_COMP,PARAMFLAG_BOOL, .uptr=NULL,.defintval=1, TYPE_UINT, 0}, \ - {CONFIG_STRING_NUM_ANTENNAS_PER_THREAD, HLP_NUM_ARX,0, .uptr=NULL, .defintval=1, TYPE_UINT, 0}, \ - {CONFIG_STRING_ANALOG_DAS, NULL, 0, .uptr=NULL, .defintval=0, 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}, \ + {L1_REMOTE_N_PORTC, NULL, 0, .uptr=NULL, .defintval=50030, TYPE_UINT, 0}, \ + {L1_LOCAL_N_PORTD, NULL, 0, .uptr=NULL, .defintval=50031, TYPE_UINT, 0}, \ + {L1_REMOTE_N_PORTD, NULL, 0, .uptr=NULL, .defintval=50031, TYPE_UINT, 0}, \ + {L1_THREAD_POOL_SIZE, HLP_TP_SIZ, 0, .uptr=NULL, .defintval=2022, TYPE_UINT, 0}, \ + {L1_OFDM_OFFSET_DIVISOR, NULL, 0, .uptr=NULL, .defuintval=8, TYPE_UINT, 0}, \ + {L1_PUCCH0_DTX_THRESHOLD, NULL, 0, .uptr=NULL, .defintval=100, TYPE_UINT, 0}, \ + {L1_PRACH_DTX_THRESHOLD, NULL, 0, .uptr=NULL, .defintval=150, TYPE_UINT, 0}, \ + {L1_PUSCH_DTX_THRESHOLD, NULL, 0, .uptr=NULL, .defintval=50, TYPE_UINT, 0}, \ + {L1_SRS_DTX_THRESHOLD, NULL, 0, .uptr=NULL, .defintval=30, TYPE_UINT, 0}, \ + {L1_MAX_LDPC_ITERATIONS, NULL, 0, .uptr=NULL, .defintval=8, TYPE_UINT, 0}, \ + {L1_RX_THREAD_CORE, NULL, 0, .iptr=NULL, .defintval=-1, TYPE_INT, 0}, \ + {L1_TX_THREAD_CORE, NULL, 0, .iptr=NULL, .defintval=-1, TYPE_INT, 0}, \ + {L1_TX_AMP_BACKOFF_dB, HLP_L1TX_BO,0, .uptr=NULL, .defintval=36, TYPE_UINT, 0}, \ + {L1_PHASE_COMP, HLP_L1_PHASE_COMP,PARAMFLAG_BOOL, .uptr=NULL,.defintval=1, TYPE_UINT, 0}, \ + {L1_NUM_ANTENNAS_PER_THREAD, HLP_NUM_ARX,0, .uptr=NULL, .defintval=1, TYPE_UINT, 0}, \ + {L1_ANALOG_DAS, NULL, 0, .uptr=NULL, .defintval=0, TYPE_UINT, 0}, \ } // clang-format on -#define L1_CC_IDX 0 -#define L1_TRANSPORT_N_PREFERENCE_IDX 1 -#define L1_LOCAL_N_ADDRESS_IDX 2 -#define L1_REMOTE_N_ADDRESS_IDX 3 -#define L1_LOCAL_N_PORTC_IDX 4 -#define L1_REMOTE_N_PORTC_IDX 5 -#define L1_LOCAL_N_PORTD_IDX 6 -#define L1_REMOTE_N_PORTD_IDX 7 -#define L1_THREAD_POOL_SIZE 8 -#define L1_OFDM_OFFSET_DIVISOR 9 -#define L1_PUCCH0_DTX_THRESHOLD 10 -#define L1_PRACH_DTX_THRESHOLD 11 -#define L1_PUSCH_DTX_THRESHOLD 12 -#define L1_SRS_DTX_THRESHOLD 13 -#define L1_MAX_LDPC_ITERATIONS 14 -#define L1_RX_THREAD_CORE 15 -#define L1_TX_THREAD_CORE 16 -#define L1_TX_AMP_BACKOFF_dB 17 -#define L1_PHASE_COMP 18 -#define NUM_ANTENNAS_PER_THREAD 19 -#define L1_ANALOG_DAS 20 /*----------------------------------------------------------------------------------------------------------------------------------------------------*/ #endif diff --git a/openair2/GNB_APP/MACRLC_nr_paramdef.h b/openair2/GNB_APP/MACRLC_nr_paramdef.h index 26e05f114b..32e510d80b 100644 --- a/openair2/GNB_APP/MACRLC_nr_paramdef.h +++ b/openair2/GNB_APP/MACRLC_nr_paramdef.h @@ -11,52 +11,49 @@ /*----------------------------------------------------------------------------------------------------------------------------------------------------*/ +/* MACRLC configuration section names */ +#define MACRLC_LIST "MACRLCs" /* MACRLC configuration parameters names */ -#define CONFIG_STRING_MACRLC_CC "num_cc" -#define CONFIG_STRING_MACRLC_TRANSPORT_N_PREFERENCE "tr_n_preference" -#define CONFIG_STRING_MACRLC_LOCAL_N_ADDRESS "local_n_address" -#define CONFIG_STRING_MACRLC_LOCAL_N_ADDRESS_F1U "local_n_address_f1u" -#define CONFIG_STRING_MACRLC_REMOTE_N_ADDRESS "remote_n_address" -#define CONFIG_STRING_MACRLC_LOCAL_N_PORTC "local_n_portc" -#define CONFIG_STRING_MACRLC_REMOTE_N_PORTC "remote_n_portc" -#define CONFIG_STRING_MACRLC_LOCAL_N_PORTD "local_n_portd" -#define CONFIG_STRING_MACRLC_REMOTE_N_PORTD "remote_n_portd" -#define CONFIG_STRING_MACRLC_TRANSPORT_S_PREFERENCE "tr_s_preference" -#define CONFIG_STRING_MACRLC_TRANSPORT_S_SHM_PREFIX "tr_s_shm_prefix" -#define CONFIG_STRING_MACRLC_TRANSPORT_S_POLL_CORE "tr_s_poll_core" -#define CONFIG_STRING_MACRLC_LOCAL_S_ADDRESS "local_s_address" -#define CONFIG_STRING_MACRLC_REMOTE_S_ADDRESS "remote_s_address" -#define CONFIG_STRING_MACRLC_LOCAL_S_PORTC "local_s_portc" -#define CONFIG_STRING_MACRLC_REMOTE_S_PORTC "remote_s_portc" -#define CONFIG_STRING_MACRLC_LOCAL_S_PORTD "local_s_portd" -#define CONFIG_STRING_MACRLC_REMOTE_S_PORTD "remote_s_portd" -#define CONFIG_STRING_MACRLC_ULSCH_MAX_FRAME_INACTIVITY "ulsch_max_frame_inactivity" -#define CONFIG_STRING_MACRLC_PUSCHTARGETSNRX10 "pusch_TargetSNRx10" -#define CONFIG_STRING_MACRLC_PUCCHTARGETSNRX10 "pucch_TargetSNRx10" -#define CONFIG_STRING_MACRLC_UL_PRBBLACK_SNR_THRESHOLD "ul_prbblack_SNR_threshold" -#define CONFIG_STRING_MACRLC_PUCCHFAILURETHRES "pucch_FailureThres" -#define CONFIG_STRING_MACRLC_PUSCHFAILURETHRES "pusch_FailureThres" -#define CONFIG_STRING_MACRLC_DL_BLER_TARGET_UPPER "dl_bler_target_upper" -#define CONFIG_STRING_MACRLC_DL_BLER_TARGET_LOWER "dl_bler_target_lower" -#define CONFIG_STRING_MACRLC_DL_MIN_MCS "dl_min_mcs" -#define CONFIG_STRING_MACRLC_DL_MAX_MCS "dl_max_mcs" -#define CONFIG_STRING_MACRLC_UL_BLER_TARGET_UPPER "ul_bler_target_upper" -#define CONFIG_STRING_MACRLC_UL_BLER_TARGET_LOWER "ul_bler_target_lower" -#define CONFIG_STRING_MACRLC_UL_MIN_MCS "ul_min_mcs" -#define CONFIG_STRING_MACRLC_UL_MAX_MCS "ul_max_mcs" -#define CONFIG_STRING_MACRLC_DL_HARQ_ROUND_MAX "dl_harq_round_max" -#define CONFIG_STRING_MACRLC_UL_HARQ_ROUND_MAX "ul_harq_round_max" -#define CONFIG_STRING_MACRLC_MIN_GRANT_PRB "min_grant_prb" -#define CONFIG_STRING_MACRLC_IDENTITY_PM "identity_precoding_matrix" -#define CONFIG_STRING_MACRLC_ANALOG_BEAMFORMING "set_analog_beamforming" -#define CONFIG_STRING_MACRLC_BEAM_DURATION "beam_duration" -#define CONFIG_STRING_MACRLC_BEAMS_PERIOD "beams_per_period" -#define CONFIG_STRING_MACRLC_BEAM_WEIGHTS_LIST "beam_weights" -#define CONFIG_STRING_MACRLC_DBT_FILE "dbt_file" -#define CONFIG_STRING_MACRLC_PUSCH_RSSI_THRESHOLD "pusch_RSSI_Threshold" -#define CONFIG_STRING_MACRLC_PUCCH_RSSI_THRESHOLD "pucch_RSSI_Threshold" -#define CONFIG_STRING_MACRLC_STATS_MAX_UE "stats_max_ue" +#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" +#define MACRLC_REMOTE_N_ADDRESS "remote_n_address" +#define MACRLC_LOCAL_N_PORTD "local_n_portd" +#define MACRLC_REMOTE_N_PORTD "remote_n_portd" +#define MACRLC_TRANSPORT_S_PREFERENCE "tr_s_preference" +#define MACRLC_TRANSPORT_S_SHM_PREFIX "tr_s_shm_prefix" +#define MACRLC_TRANSPORT_S_POLL_CORE "tr_s_poll_core" +#define MACRLC_LOCAL_S_ADDRESS "local_s_address" +#define MACRLC_REMOTE_S_ADDRESS "remote_s_address" +#define MACRLC_LOCAL_S_PORTC "local_s_portc" +#define MACRLC_LOCAL_S_PORTD "local_s_portd" +#define MACRLC_ULSCH_MAX_FRAME_INACTIVITY "ulsch_max_frame_inactivity" +#define MACRLC_PUSCHTARGETSNRX10 "pusch_TargetSNRx10" +#define MACRLC_PUCCHTARGETSNRX10 "pucch_TargetSNRx10" +#define MACRLC_UL_PRBBLACK_SNR_THRESHOLD "ul_prbblack_SNR_threshold" +#define MACRLC_PUCCHFAILURETHRES "pucch_FailureThres" +#define MACRLC_PUSCHFAILURETHRES "pusch_FailureThres" +#define MACRLC_DL_BLER_TARGET_UPPER "dl_bler_target_upper" +#define MACRLC_DL_BLER_TARGET_LOWER "dl_bler_target_lower" +#define MACRLC_DL_MIN_MCS "dl_min_mcs" +#define MACRLC_DL_MAX_MCS "dl_max_mcs" +#define MACRLC_UL_BLER_TARGET_UPPER "ul_bler_target_upper" +#define MACRLC_UL_BLER_TARGET_LOWER "ul_bler_target_lower" +#define MACRLC_UL_MIN_MCS "ul_min_mcs" +#define MACRLC_UL_MAX_MCS "ul_max_mcs" +#define MACRLC_DL_HARQ_ROUND_MAX "dl_harq_round_max" +#define MACRLC_UL_HARQ_ROUND_MAX "ul_harq_round_max" +#define MACRLC_MIN_GRANT_PRB "min_grant_prb" +#define MACRLC_IDENTITY_PM "identity_precoding_matrix" +#define MACRLC_ANALOG_BEAMFORMING "set_analog_beamforming" +#define MACRLC_BEAM_DURATION "beam_duration" +#define MACRLC_BEAMS_PERIOD "beams_per_period" +#define MACRLC_BEAM_WEIGHTS_LIST "beam_weights" +#define MACRLC_DBT_FILE "dbt_file" +#define MACRLC_PUSCH_RSSI_THRESHOLD "pusch_RSSI_Threshold" +#define MACRLC_PUCCH_RSSI_THRESHOLD "pucch_RSSI_Threshold" +#define MACRLC_STATS_MAX_UE "stats_max_ue" #define HLP_MACRLC_UL_PRBBLACK "SNR threshold to decide whether a PRB will be blacklisted or not" #define HLP_MACRLC_DL_BLER_UP "Upper threshold of BLER to decrease DL MCS" @@ -85,100 +82,50 @@ /*-------------------------------------------------------------------------------------------------------------------------------------------------------*/ // clang-format off #define MACRLCPARAMS_DESC { \ - {CONFIG_STRING_MACRLC_CC, NULL, 0, .uptr=NULL, .defintval=50011, TYPE_UINT, 0}, \ - {CONFIG_STRING_MACRLC_TRANSPORT_N_PREFERENCE, NULL, 0, .strptr=NULL, .defstrval="local_L1", TYPE_STRING, 0}, \ - {CONFIG_STRING_MACRLC_LOCAL_N_ADDRESS, NULL, 0, .strptr=NULL, .defstrval="127.0.0.1", TYPE_STRING, 0}, \ - {CONFIG_STRING_MACRLC_REMOTE_N_ADDRESS, NULL, 0, .uptr=NULL, .defstrval="127.0.0.2", TYPE_STRING, 0}, \ - {CONFIG_STRING_MACRLC_LOCAL_N_PORTC, NULL, 0, .uptr=NULL, .defintval=50010, TYPE_UINT, 0}, \ - {CONFIG_STRING_MACRLC_REMOTE_N_PORTC, NULL, 0, .uptr=NULL, .defintval=50010, TYPE_UINT, 0}, \ - {CONFIG_STRING_MACRLC_LOCAL_N_PORTD, NULL, 0, .uptr=NULL, .defintval=50011, TYPE_UINT, 0}, \ - {CONFIG_STRING_MACRLC_REMOTE_N_PORTD, NULL, 0, .uptr=NULL, .defintval=50011, TYPE_UINT, 0}, \ - {CONFIG_STRING_MACRLC_TRANSPORT_S_PREFERENCE, NULL, 0, .strptr=NULL, .defstrval="local_RRC", TYPE_STRING, 0}, \ - {CONFIG_STRING_MACRLC_LOCAL_S_ADDRESS, NULL, 0, .uptr=NULL, .defstrval="127.0.0.1", TYPE_STRING, 0}, \ - {CONFIG_STRING_MACRLC_REMOTE_S_ADDRESS, NULL, 0, .uptr=NULL, .defstrval="127.0.0.2", TYPE_STRING, 0}, \ - {CONFIG_STRING_MACRLC_LOCAL_S_PORTC, NULL, 0, .uptr=NULL, .defintval=50020, TYPE_UINT, 0}, \ - {CONFIG_STRING_MACRLC_REMOTE_S_PORTC, NULL, 0, .uptr=NULL, .defintval=50020, TYPE_UINT, 0}, \ - {CONFIG_STRING_MACRLC_LOCAL_S_PORTD, NULL, 0, .uptr=NULL, .defintval=50021, TYPE_UINT, 0}, \ - {CONFIG_STRING_MACRLC_REMOTE_S_PORTD, NULL, 0, .uptr=NULL, .defintval=50021, TYPE_UINT, 0}, \ - {CONFIG_STRING_MACRLC_ULSCH_MAX_FRAME_INACTIVITY, NULL, 0, .uptr=NULL, .defintval=10, TYPE_UINT, 0}, \ - {CONFIG_STRING_MACRLC_PUSCHTARGETSNRX10, NULL, 0, .iptr=NULL, .defintval=200, TYPE_INT, 0}, \ - {CONFIG_STRING_MACRLC_PUCCHTARGETSNRX10, NULL, 0, .iptr=NULL, .defintval=150, TYPE_INT, 0}, \ - {CONFIG_STRING_MACRLC_UL_PRBBLACK_SNR_THRESHOLD, HLP_MACRLC_UL_PRBBLACK, 0, .iptr=NULL, .defintval=10, TYPE_INT, 0}, \ - {CONFIG_STRING_MACRLC_PUCCHFAILURETHRES, NULL, 0, .iptr=NULL, .defintval=10, TYPE_INT, 0}, \ - {CONFIG_STRING_MACRLC_PUSCHFAILURETHRES, NULL, 0, .iptr=NULL, .defintval=10, TYPE_INT, 0}, \ - {CONFIG_STRING_MACRLC_DL_BLER_TARGET_UPPER, HLP_MACRLC_DL_BLER_UP, 0, .dblptr=NULL, .defdblval=0.15, TYPE_DOUBLE, 0}, \ - {CONFIG_STRING_MACRLC_DL_BLER_TARGET_LOWER, HLP_MACRLC_DL_BLER_LO, 0, .dblptr=NULL, .defdblval=0.05, TYPE_DOUBLE, 0}, \ - {CONFIG_STRING_MACRLC_DL_MIN_MCS, HLP_MACRLC_DL_MIN_MCS, 0, .u8ptr=NULL, .defintval=0, TYPE_UINT8, 0}, \ - {CONFIG_STRING_MACRLC_DL_MAX_MCS, HLP_MACRLC_DL_MAX_MCS, 0, .u8ptr=NULL, .defintval=28, TYPE_UINT8, 0}, \ - {CONFIG_STRING_MACRLC_UL_BLER_TARGET_UPPER, HLP_MACRLC_UL_BLER_UP, 0, .dblptr=NULL, .defdblval=0.15, TYPE_DOUBLE, 0}, \ - {CONFIG_STRING_MACRLC_UL_BLER_TARGET_LOWER, HLP_MACRLC_UL_BLER_LO, 0, .dblptr=NULL, .defdblval=0.05, TYPE_DOUBLE, 0}, \ - {CONFIG_STRING_MACRLC_UL_MIN_MCS, HLP_MACRLC_UL_MIN_MCS, 0, .u8ptr=NULL, .defintval=0, TYPE_UINT8, 0}, \ - {CONFIG_STRING_MACRLC_UL_MAX_MCS, HLP_MACRLC_UL_MAX_MCS, 0, .u8ptr=NULL, .defintval=28, TYPE_UINT8, 0}, \ - {CONFIG_STRING_MACRLC_DL_HARQ_ROUND_MAX, HLP_MACRLC_DL_HARQ_MAX, 0, .u8ptr=NULL, .defintval=4, TYPE_UINT8, 0}, \ - {CONFIG_STRING_MACRLC_UL_HARQ_ROUND_MAX, HLP_MACRLC_UL_HARQ_MAX, 0, .u8ptr=NULL, .defintval=4, TYPE_UINT8, 0}, \ - {CONFIG_STRING_MACRLC_MIN_GRANT_PRB, HLP_MACRLC_MIN_GRANT_PRB, 0, .u16ptr=NULL, .defintval=5, TYPE_UINT16, 0}, \ - {CONFIG_STRING_MACRLC_IDENTITY_PM, HLP_MACRLC_IDENTITY_PM, PARAMFLAG_BOOL, .u8ptr=NULL, .defintval=0, TYPE_UINT8, 0}, \ - {CONFIG_STRING_MACRLC_LOCAL_N_ADDRESS_F1U, NULL, 0, .strptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \ - {CONFIG_STRING_MACRLC_TRANSPORT_S_SHM_PREFIX, NULL, 0, .strptr=NULL, .defstrval="nvipc", TYPE_STRING, 0}, \ - {CONFIG_STRING_MACRLC_TRANSPORT_S_POLL_CORE, NULL, 0, .i8ptr=NULL, .defintval=-1, TYPE_INT8, 0}, \ - {CONFIG_STRING_MACRLC_ANALOG_BEAMFORMING, HLP_MACRLC_AB, 0, .strptr=NULL, .defstrval="none", TYPE_STRING, 0}, \ - {CONFIG_STRING_MACRLC_BEAM_DURATION, HLP_MACRLC_BEAM_DURATION, 0, .u8ptr=NULL, .defintval=1, TYPE_UINT8, 0}, \ - {CONFIG_STRING_MACRLC_BEAMS_PERIOD, HLP_MACRLC_BEAMS_PERIOD, 0, .u8ptr=NULL, .defintval=1, TYPE_UINT8, 0}, \ - {CONFIG_STRING_MACRLC_BEAM_WEIGHTS_LIST, NULL, 0, .iptr=NULL, .defintarrayval=0, TYPE_INTARRAY,0}, \ - {CONFIG_STRING_MACRLC_DBT_FILE, HLP_MACRLC_DBT_FILE, 0, .strptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \ - {CONFIG_STRING_MACRLC_PUSCH_RSSI_THRESHOLD, HLP_MACRLC_PUSCH_RSSI_THRESHOLD, \ + {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}, \ + {MACRLC_LOCAL_N_PORTD, NULL, 0, .uptr=NULL, .defintval=50011, TYPE_UINT, 0}, \ + {MACRLC_REMOTE_N_PORTD, NULL, 0, .uptr=NULL, .defintval=50011, TYPE_UINT, 0}, \ + {MACRLC_TRANSPORT_S_PREFERENCE, NULL, 0, .strptr=NULL, .defstrval="local_RRC", TYPE_STRING, 0}, \ + {MACRLC_LOCAL_S_ADDRESS, NULL, 0, .uptr=NULL, .defstrval="127.0.0.1", TYPE_STRING, 0}, \ + {MACRLC_REMOTE_S_ADDRESS, NULL, 0, .uptr=NULL, .defstrval="127.0.0.2", TYPE_STRING, 0}, \ + {MACRLC_LOCAL_S_PORTC, NULL, 0, .uptr=NULL, .defintval=50020, TYPE_UINT, 0}, \ + {MACRLC_LOCAL_S_PORTD, NULL, 0, .uptr=NULL, .defintval=50021, TYPE_UINT, 0}, \ + {MACRLC_ULSCH_MAX_FRAME_INACTIVITY, NULL, 0, .uptr=NULL, .defintval=10, TYPE_UINT, 0}, \ + {MACRLC_PUSCHTARGETSNRX10, NULL, 0, .iptr=NULL, .defintval=200, TYPE_INT, 0}, \ + {MACRLC_PUCCHTARGETSNRX10, NULL, 0, .iptr=NULL, .defintval=150, TYPE_INT, 0}, \ + {MACRLC_UL_PRBBLACK_SNR_THRESHOLD, HLP_MACRLC_UL_PRBBLACK, 0, .iptr=NULL, .defintval=10, TYPE_INT, 0}, \ + {MACRLC_PUCCHFAILURETHRES, NULL, 0, .iptr=NULL, .defintval=10, TYPE_INT, 0}, \ + {MACRLC_PUSCHFAILURETHRES, NULL, 0, .iptr=NULL, .defintval=10, TYPE_INT, 0}, \ + {MACRLC_DL_BLER_TARGET_UPPER, HLP_MACRLC_DL_BLER_UP, 0, .dblptr=NULL, .defdblval=0.15, TYPE_DOUBLE, 0}, \ + {MACRLC_DL_BLER_TARGET_LOWER, HLP_MACRLC_DL_BLER_LO, 0, .dblptr=NULL, .defdblval=0.05, TYPE_DOUBLE, 0}, \ + {MACRLC_DL_MIN_MCS, HLP_MACRLC_DL_MIN_MCS, 0, .u8ptr=NULL, .defintval=0, TYPE_UINT8, 0}, \ + {MACRLC_DL_MAX_MCS, HLP_MACRLC_DL_MAX_MCS, 0, .u8ptr=NULL, .defintval=28, TYPE_UINT8, 0}, \ + {MACRLC_UL_BLER_TARGET_UPPER, HLP_MACRLC_UL_BLER_UP, 0, .dblptr=NULL, .defdblval=0.15, TYPE_DOUBLE, 0}, \ + {MACRLC_UL_BLER_TARGET_LOWER, HLP_MACRLC_UL_BLER_LO, 0, .dblptr=NULL, .defdblval=0.05, TYPE_DOUBLE, 0}, \ + {MACRLC_UL_MIN_MCS, HLP_MACRLC_UL_MIN_MCS, 0, .u8ptr=NULL, .defintval=0, TYPE_UINT8, 0}, \ + {MACRLC_UL_MAX_MCS, HLP_MACRLC_UL_MAX_MCS, 0, .u8ptr=NULL, .defintval=28, TYPE_UINT8, 0}, \ + {MACRLC_DL_HARQ_ROUND_MAX, HLP_MACRLC_DL_HARQ_MAX, 0, .u8ptr=NULL, .defintval=4, TYPE_UINT8, 0}, \ + {MACRLC_UL_HARQ_ROUND_MAX, HLP_MACRLC_UL_HARQ_MAX, 0, .u8ptr=NULL, .defintval=4, TYPE_UINT8, 0}, \ + {MACRLC_MIN_GRANT_PRB, HLP_MACRLC_MIN_GRANT_PRB, 0, .u16ptr=NULL, .defintval=5, TYPE_UINT16, 0}, \ + {MACRLC_IDENTITY_PM, HLP_MACRLC_IDENTITY_PM, PARAMFLAG_BOOL, .u8ptr=NULL, .defintval=0, TYPE_UINT8, 0}, \ + {MACRLC_LOCAL_N_ADDRESS_F1U, NULL, 0, .strptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \ + {MACRLC_TRANSPORT_S_SHM_PREFIX, NULL, 0, .strptr=NULL, .defstrval="nvipc", TYPE_STRING, 0}, \ + {MACRLC_TRANSPORT_S_POLL_CORE, NULL, 0, .i8ptr=NULL, .defintval=-1, TYPE_INT8, 0}, \ + {MACRLC_ANALOG_BEAMFORMING, HLP_MACRLC_AB, 0, .strptr=NULL, .defstrval="none", TYPE_STRING, 0}, \ + {MACRLC_BEAM_DURATION, HLP_MACRLC_BEAM_DURATION, 0, .u8ptr=NULL, .defintval=1, TYPE_UINT8, 0}, \ + {MACRLC_BEAMS_PERIOD, HLP_MACRLC_BEAMS_PERIOD, 0, .u8ptr=NULL, .defintval=1, TYPE_UINT8, 0}, \ + {MACRLC_BEAM_WEIGHTS_LIST, NULL, 0, .iptr=NULL, .defintarrayval=0, TYPE_INTARRAY,0}, \ + {MACRLC_DBT_FILE, HLP_MACRLC_DBT_FILE, 0, .strptr=NULL, .defstrval=NULL, TYPE_STRING, 0}, \ + {MACRLC_PUSCH_RSSI_THRESHOLD, HLP_MACRLC_PUSCH_RSSI_THRESHOLD, \ 0, .iptr=NULL, .defintval=0, TYPE_INT, 0}, \ - {CONFIG_STRING_MACRLC_PUCCH_RSSI_THRESHOLD, HLP_MACRLC_PUCCH_RSSI_THRESHOLD, \ + {MACRLC_PUCCH_RSSI_THRESHOLD, HLP_MACRLC_PUCCH_RSSI_THRESHOLD, \ 0, .iptr=NULL, .defintval=0, TYPE_INT, 0}, \ - {CONFIG_STRING_MACRLC_STATS_MAX_UE, HLP_MACRLC_STATS_MAX_UE, 0, .iptr=NULL, .defintval=8, TYPE_INT, 0}, \ + {MACRLC_STATS_MAX_UE, HLP_MACRLC_STATS_MAX_UE, 0, .iptr=NULL, .defintval=8, TYPE_INT, 0}, \ } // clang-format off -#define MACRLC_CC_IDX 0 -#define MACRLC_TRANSPORT_N_PREFERENCE_IDX 1 -#define MACRLC_LOCAL_N_ADDRESS_IDX 2 -#define MACRLC_REMOTE_N_ADDRESS_IDX 3 -#define MACRLC_LOCAL_N_PORTC_IDX 4 -#define MACRLC_REMOTE_N_PORTC_IDX 5 -#define MACRLC_LOCAL_N_PORTD_IDX 6 -#define MACRLC_REMOTE_N_PORTD_IDX 7 -#define MACRLC_TRANSPORT_S_PREFERENCE_IDX 8 -#define MACRLC_LOCAL_S_ADDRESS_IDX 9 -#define MACRLC_REMOTE_S_ADDRESS_IDX 10 -#define MACRLC_LOCAL_S_PORTC_IDX 11 -#define MACRLC_REMOTE_S_PORTC_IDX 12 -#define MACRLC_LOCAL_S_PORTD_IDX 13 -#define MACRLC_REMOTE_S_PORTD_IDX 14 -#define MACRLC_ULSCH_MAX_FRAME_INACTIVITY 15 -#define MACRLC_PUSCHTARGETSNRX10_IDX 16 -#define MACRLC_PUCCHTARGETSNRX10_IDX 17 -#define MACRLC_UL_PRBBLACK_SNR_THRESHOLD_IDX 18 -#define MACRLC_PUCCHFAILURETHRES_IDX 19 -#define MACRLC_PUSCHFAILURETHRES_IDX 20 -#define MACRLC_DL_BLER_TARGET_UPPER_IDX 21 -#define MACRLC_DL_BLER_TARGET_LOWER_IDX 22 -#define MACRLC_DL_MIN_MCS_IDX 23 -#define MACRLC_DL_MAX_MCS_IDX 24 -#define MACRLC_UL_BLER_TARGET_UPPER_IDX 25 -#define MACRLC_UL_BLER_TARGET_LOWER_IDX 26 -#define MACRLC_UL_MIN_MCS_IDX 27 -#define MACRLC_UL_MAX_MCS_IDX 28 -#define MACRLC_DL_HARQ_ROUND_MAX_IDX 29 -#define MACRLC_UL_HARQ_ROUND_MAX_IDX 30 -#define MACRLC_MIN_GRANT_PRB_IDX 31 -#define MACRLC_IDENTITY_PM_IDX 32 -#define MACRLC_LOCAL_N_ADDRESS_F1U_IDX 33 -#define MACRLC_TRANSPORT_S_SHM_PREFIX 34 -#define MACRLC_TRANSPORT_S_POLL_CORE 35 -#define MACRLC_ANALOG_BEAMFORMING_IDX 36 -#define MACRLC_ANALOG_BEAM_DURATION_IDX 37 -#define MACRLC_ANALOG_BEAMS_PERIOD_IDX 38 -#define MACRLC_BEAMWEIGHTS_IDX 39 -#define MACRLC_DBT_FILE_IDX 40 -#define MACRLC_PUSCH_RSSI_THRES_IDX 41 -#define MACRLC_PUCCH_RSSI_THRES_IDX 42 -#define MACRLC_STATS_MAX_UE_IDX 43 - #define MACRLCPARAMS_CHECK { \ { .s5 = { NULL } }, \ { .s5 = { NULL } }, \ @@ -198,11 +145,6 @@ { .s5 = { NULL } }, \ { .s5 = { NULL } }, \ { .s5 = { NULL } }, \ - { .s5 = { NULL } }, \ - { .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/openair2/GNB_APP/gnb_config.c b/openair2/GNB_APP/gnb_config.c index a67f01526d..4928d98183 100644 --- a/openair2/GNB_APP/gnb_config.c +++ b/openair2/GNB_APP/gnb_config.c @@ -653,7 +653,7 @@ void RCconfig_verify(configmodule_interface_t *cfg, ngran_node_t node_type) // check for some general sections verify_section_notset(cfg, NULL, CONFIG_STRING_L1_LIST); verify_section_notset(cfg, NULL, CONFIG_STRING_RU_LIST); - verify_section_notset(cfg, NULL, CONFIG_STRING_MACRLC_LIST); + verify_section_notset(cfg, NULL, MACRLC_LIST); verify_section_notset(cfg, NULL, CONFIG_STRING_NR_RLC_LIST); } else if (NODE_IS_DU(node_type)) { // verify that there is no bearer config @@ -828,40 +828,36 @@ void RCconfig_NR_L1(void) GET_PARAMS_LIST(L1_ParamList, L1_Params, L1PARAMS_DESC, CONFIG_STRING_L1_LIST, NULL); if (L1_ParamList.numelt > 0) { - AssertFatal(*L1_ParamList.paramarray[j][L1_THREAD_POOL_SIZE].uptr == 2022, + const paramdef_t *params = L1_ParamList.paramarray[j]; + const int np = sizeofArray(L1_Params); + AssertFatal(*gpd(params, np, L1_THREAD_POOL_SIZE)->uptr == 2022, "thread_pool_size removed, please use --thread-pool\n"); - gNB->ofdm_offset_divisor = *(L1_ParamList.paramarray[j][L1_OFDM_OFFSET_DIVISOR].uptr); - gNB->pucch0_thres = *(L1_ParamList.paramarray[j][L1_PUCCH0_DTX_THRESHOLD].uptr); - gNB->prach_thres = *(L1_ParamList.paramarray[j][L1_PRACH_DTX_THRESHOLD].uptr); - gNB->pusch_thres = *(L1_ParamList.paramarray[j][L1_PUSCH_DTX_THRESHOLD].uptr); - gNB->srs_thres = *(L1_ParamList.paramarray[j][L1_SRS_DTX_THRESHOLD].uptr); - gNB->max_ldpc_iterations = *(L1_ParamList.paramarray[j][L1_MAX_LDPC_ITERATIONS].uptr); - gNB->L1_rx_thread_core = *(L1_ParamList.paramarray[j][L1_RX_THREAD_CORE].iptr); - gNB->L1_tx_thread_core = *(L1_ParamList.paramarray[j][L1_TX_THREAD_CORE].iptr); - LOG_I(NR_PHY, "L1_RX_THREAD_CORE %d (%d)\n", *(L1_ParamList.paramarray[j][L1_RX_THREAD_CORE].iptr), L1_RX_THREAD_CORE); - gNB->TX_AMP = min(32767.0 / pow(10.0, .05 * (double)(*L1_ParamList.paramarray[j][L1_TX_AMP_BACKOFF_dB].uptr)), INT16_MAX); - gNB->phase_comp = *L1_ParamList.paramarray[j][L1_PHASE_COMP].uptr; - gNB->dmrs_num_antennas_per_thread = *(L1_ParamList.paramarray[j][NUM_ANTENNAS_PER_THREAD].uptr); - gNB->enable_analog_das = *(L1_ParamList.paramarray[j][L1_ANALOG_DAS].uptr); - LOG_I(NR_PHY, "TX_AMP = %d (-%d dBFS)\n", gNB->TX_AMP, *L1_ParamList.paramarray[j][L1_TX_AMP_BACKOFF_dB].uptr); + gNB->ofdm_offset_divisor = *gpd(params, np, L1_OFDM_OFFSET_DIVISOR)->uptr; + gNB->pucch0_thres = *gpd(params, np, L1_PUCCH0_DTX_THRESHOLD)->uptr; + gNB->prach_thres = *gpd(params, np, L1_PRACH_DTX_THRESHOLD)->uptr; + gNB->pusch_thres = *gpd(params, np, L1_PUSCH_DTX_THRESHOLD)->uptr; + gNB->srs_thres = *gpd(params, np, L1_SRS_DTX_THRESHOLD)->uptr; + gNB->max_ldpc_iterations = *gpd(params, np, L1_MAX_LDPC_ITERATIONS)->uptr; + gNB->L1_rx_thread_core = *gpd(params, np, L1_RX_THREAD_CORE)->iptr; + gNB->L1_tx_thread_core = *gpd(params, np, L1_TX_THREAD_CORE)->iptr; + LOG_I(NR_PHY, "thread cores for L1_RX %d L1_TX %d\n", gNB->L1_rx_thread_core, gNB->L1_tx_thread_core); + gNB->TX_AMP = min(32767.0 / pow(10.0, .05 * (double)(*gpd(params, np, L1_TX_AMP_BACKOFF_dB)->uptr)), INT16_MAX); + LOG_I(NR_PHY, "TX_AMP = %d (-%d dBFS)\n", gNB->TX_AMP, *gpd(params, np, L1_TX_AMP_BACKOFF_dB)->uptr); AssertFatal(gNB->TX_AMP > 300, "TX_AMP is too small, must be larger than 300 (is %d)\n", gNB->TX_AMP); + gNB->phase_comp = *gpd(params, np, L1_PHASE_COMP)->uptr; + gNB->dmrs_num_antennas_per_thread = *gpd(params, np, L1_NUM_ANTENNAS_PER_THREAD)->uptr; + gNB->enable_analog_das = *gpd(params, np, L1_ANALOG_DAS)->uptr; // Midhaul configuration - if (strcmp(*(L1_ParamList.paramarray[j][L1_TRANSPORT_N_PREFERENCE_IDX].strptr), "local_mac") == 0) { + if (strcmp(*gpd(params, np, L1_TRANSPORT_N_PREFERENCE)->strptr, "local_mac") == 0) { // do nothing - } else if (strcmp(*(L1_ParamList.paramarray[j][L1_TRANSPORT_N_PREFERENCE_IDX].strptr), "nfapi") == 0) { - gNB->eth_params_n.my_addr = strdup(*(L1_ParamList.paramarray[j][L1_LOCAL_N_ADDRESS_IDX].strptr)); - gNB->eth_params_n.remote_addr = strdup(*(L1_ParamList.paramarray[j][L1_REMOTE_N_ADDRESS_IDX].strptr)); - gNB->eth_params_n.my_portc = *(L1_ParamList.paramarray[j][L1_LOCAL_N_PORTC_IDX].iptr); - gNB->eth_params_n.remote_portc = *(L1_ParamList.paramarray[j][L1_REMOTE_N_PORTC_IDX].iptr); - gNB->eth_params_n.my_portd = *(L1_ParamList.paramarray[j][L1_LOCAL_N_PORTD_IDX].iptr); - gNB->eth_params_n.remote_portd = *(L1_ParamList.paramarray[j][L1_REMOTE_N_PORTD_IDX].iptr); - gNB->eth_params_n.transp_preference = ETH_UDP_MODE; + } else if (strcmp(*gpd(params, np, L1_TRANSPORT_N_PREFERENCE)->strptr, "nfapi") == 0) { + char *my_addr = strdup(*gpd(params, np, L1_LOCAL_N_ADDRESS)->strptr); + char *remote_addr = strdup(*gpd(params, np, L1_REMOTE_N_ADDRESS)->strptr); + int remote_portc = *gpd(params, np, L1_REMOTE_N_PORTC)->iptr; + int my_portd = *gpd(params, np, L1_LOCAL_N_PORTD)->iptr; + int remote_portd = *gpd(params, np, L1_REMOTE_N_PORTD)->iptr; - configure_nr_nfapi_pnf(gNB->eth_params_n.remote_addr, - gNB->eth_params_n.remote_portc, - gNB->eth_params_n.my_addr, - gNB->eth_params_n.my_portd, - gNB->eth_params_n.remote_portd); + configure_nr_nfapi_pnf(remote_addr, remote_portc, my_addr, my_portd, remote_portd); } else { // other midhaul, do nothing } @@ -1517,7 +1513,7 @@ void RCconfig_nr_macrlc(configmodule_interface_t *cfg) num_gnbs); // MAC / RLC - GET_PARAMS_LIST(MacRLC_ParamList, MacRLC_Params, MACRLCPARAMS_DESC, CONFIG_STRING_MACRLC_LIST, NULL, MACRLCPARAMS_CHECK); + GET_PARAMS_LIST(MacRLC_ParamList, MacRLC_Params, MACRLCPARAMS_DESC, MACRLC_LIST, NULL, MACRLCPARAMS_CHECK); nr_mac_config_t config = {0}; nr_pdsch_AntennaPorts_t *p = &config.pdsch_AntennaPorts; set_antenna_ports(&GNBParamList, &p->N1, &p->N2, &p->XP); @@ -1641,13 +1637,15 @@ void RCconfig_nr_macrlc(configmodule_interface_t *cfg) nr_rlc_configuration_t default_rlc_config; config_rlc(cfg, &default_rlc_config); - config.pusch.target_snrx10 = *(MacRLC_ParamList.paramarray[0][MACRLC_PUSCHTARGETSNRX10_IDX].iptr); - config.pusch.rssi_threshold = *(MacRLC_ParamList.paramarray[0][MACRLC_PUSCH_RSSI_THRES_IDX].iptr); - config.pucch.rssi_threshold = *(MacRLC_ParamList.paramarray[0][MACRLC_PUCCH_RSSI_THRES_IDX].iptr); - config.pucch.target_snrx10 = *(MacRLC_ParamList.paramarray[0][MACRLC_PUCCHTARGETSNRX10_IDX].iptr); - config.ul_prbblack_SNR_threshold = *(MacRLC_ParamList.paramarray[0][MACRLC_UL_PRBBLACK_SNR_THRESHOLD_IDX].iptr); - config.pucch.failure_thres = *(MacRLC_ParamList.paramarray[0][MACRLC_PUCCHFAILURETHRES_IDX].iptr); - config.pusch.failure_thres = *(MacRLC_ParamList.paramarray[0][MACRLC_PUSCHFAILURETHRES_IDX].iptr); + const paramdef_t *params = MacRLC_ParamList.paramarray[0]; + const int np = sizeofArray(MacRLC_Params); + config.pusch.target_snrx10 = *gpd(params, np, MACRLC_PUSCHTARGETSNRX10)->iptr; + config.pusch.rssi_threshold = *gpd(params, np, MACRLC_PUSCH_RSSI_THRESHOLD)->iptr; + config.pucch.rssi_threshold = *gpd(params, np, MACRLC_PUCCH_RSSI_THRESHOLD)->iptr; + config.pucch.target_snrx10 = *gpd(params, np, MACRLC_PUCCHTARGETSNRX10)->iptr; + config.ul_prbblack_SNR_threshold = *gpd(params, np, MACRLC_UL_PRBBLACK_SNR_THRESHOLD)->iptr; + config.pucch.failure_thres = *gpd(params, np, MACRLC_PUCCHFAILURETHRES)->iptr; + config.pusch.failure_thres = *gpd(params, np, MACRLC_PUSCHFAILURETHRES)->iptr; LOG_I(NR_MAC, "PUSCH Target %d RSSI thresh %d Failure %d, PUCCH Target %d RSSI thresh %d Failure %d\n", @@ -1662,71 +1660,75 @@ void RCconfig_nr_macrlc(configmodule_interface_t *cfg) mac_top_init_gNB(node_type, scc, &config, &default_rlc_config); for (j = 0; j < RC.nb_nr_macrlc_inst; j++) { - if (strcmp(*(MacRLC_ParamList.paramarray[j][MACRLC_TRANSPORT_N_PREFERENCE_IDX].strptr), "local_RRC") == 0) { + params = MacRLC_ParamList.paramarray[j]; // RC.nb_nr_macrlc_inst == 1 as per assert, but keep consistent + if (strcmp(*gpd(params, np, MACRLC_TRANSPORT_N_PREFERENCE)->strptr, "local_RRC") == 0) { // check number of instances is same as RRC/PDCP - } else if (strcmp(*(MacRLC_ParamList.paramarray[j][MACRLC_TRANSPORT_N_PREFERENCE_IDX].strptr), "f1") == 0 - || strcmp(*(MacRLC_ParamList.paramarray[j][MACRLC_TRANSPORT_N_PREFERENCE_IDX].strptr), "cudu") == 0) { - char **f1caddr = MacRLC_ParamList.paramarray[j][MACRLC_LOCAL_N_ADDRESS_IDX].strptr; + } else if (strcmp(*gpd(params, np, MACRLC_TRANSPORT_N_PREFERENCE)->strptr, "f1") == 0 + || strcmp(*gpd(params, np, MACRLC_TRANSPORT_N_PREFERENCE)->strptr, "cudu") == 0) { + char **f1caddr = gpd(params, np, MACRLC_LOCAL_N_ADDRESS)->strptr; RC.nrmac[j]->eth_params_n.my_addr = strdup(*f1caddr); - char **f1uaddr = MacRLC_ParamList.paramarray[j][MACRLC_LOCAL_N_ADDRESS_F1U_IDX].strptr; + char **f1uaddr = gpd(params, np, MACRLC_LOCAL_N_ADDRESS_F1U)->strptr; RC.nrmac[j]->f1u_addr = f1uaddr != NULL ? strdup(*f1uaddr) : strdup(*f1caddr); - RC.nrmac[j]->eth_params_n.remote_addr = strdup(*(MacRLC_ParamList.paramarray[j][MACRLC_REMOTE_N_ADDRESS_IDX].strptr)); - RC.nrmac[j]->eth_params_n.my_portc = *(MacRLC_ParamList.paramarray[j][MACRLC_LOCAL_N_PORTC_IDX].iptr); - RC.nrmac[j]->eth_params_n.remote_portc = *(MacRLC_ParamList.paramarray[j][MACRLC_REMOTE_N_PORTC_IDX].iptr); - RC.nrmac[j]->eth_params_n.my_portd = *(MacRLC_ParamList.paramarray[j][MACRLC_LOCAL_N_PORTD_IDX].iptr); - RC.nrmac[j]->eth_params_n.remote_portd = *(MacRLC_ParamList.paramarray[j][MACRLC_REMOTE_N_PORTD_IDX].iptr); + RC.nrmac[j]->eth_params_n.remote_addr = strdup(*gpd(params, np, MACRLC_REMOTE_N_ADDRESS)->strptr); + RC.nrmac[j]->eth_params_n.my_portc = 0; // not used + RC.nrmac[j]->eth_params_n.remote_portc = 0; // not used + RC.nrmac[j]->eth_params_n.my_portd = *gpd(params, np, MACRLC_LOCAL_N_PORTD)->iptr; + RC.nrmac[j]->eth_params_n.remote_portd = *gpd(params, np, MACRLC_REMOTE_N_PORTD)->iptr; RC.nrmac[j]->eth_params_n.transp_preference = ETH_UDP_MODE; } else { // other midhaul - AssertFatal(1 == 0, "MACRLC %d: %s unknown northbound midhaul\n", j, *(MacRLC_ParamList.paramarray[j][MACRLC_TRANSPORT_N_PREFERENCE_IDX].strptr)); + AssertFatal(1 == 0, "MACRLC %d: %s unknown northbound midhaul\n", j, *gpd(params, np, MACRLC_TRANSPORT_N_PREFERENCE)->strptr); } - if (strcmp(*(MacRLC_ParamList.paramarray[j][MACRLC_TRANSPORT_S_PREFERENCE_IDX].strptr), "local_L1") == 0) { - } else if (strcmp(*(MacRLC_ParamList.paramarray[j][MACRLC_TRANSPORT_S_PREFERENCE_IDX].strptr), "nfapi") == 0) { - RC.nrmac[j]->eth_params_s.my_addr = strdup(*(MacRLC_ParamList.paramarray[j][MACRLC_LOCAL_S_ADDRESS_IDX].strptr)); - RC.nrmac[j]->eth_params_s.remote_addr = strdup(*(MacRLC_ParamList.paramarray[j][MACRLC_REMOTE_S_ADDRESS_IDX].strptr)); - RC.nrmac[j]->eth_params_s.my_portc = *(MacRLC_ParamList.paramarray[j][MACRLC_LOCAL_S_PORTC_IDX].iptr); - RC.nrmac[j]->eth_params_s.remote_portc = *(MacRLC_ParamList.paramarray[j][MACRLC_REMOTE_S_PORTC_IDX].iptr); - RC.nrmac[j]->eth_params_s.my_portd = *(MacRLC_ParamList.paramarray[j][MACRLC_LOCAL_S_PORTD_IDX].iptr); - RC.nrmac[j]->eth_params_s.remote_portd = *(MacRLC_ParamList.paramarray[j][MACRLC_REMOTE_S_PORTD_IDX].iptr); - RC.nrmac[j]->eth_params_s.transp_preference = ETH_UDP_MODE; - - configure_nr_nfapi_vnf(RC.nrmac[j]->eth_params_s); - } else if(strcmp(*(MacRLC_ParamList.paramarray[j][MACRLC_TRANSPORT_S_PREFERENCE_IDX].strptr), "aerial") == 0){ + if (strcmp(*gpd(params, np, MACRLC_TRANSPORT_S_PREFERENCE)->strptr, "local_L1") == 0) { + } else if (strcmp(*gpd(params, np, MACRLC_TRANSPORT_S_PREFERENCE)->strptr, "nfapi") == 0) { + eth_params_t p = { + .my_addr = strdup(*gpd(params, np, MACRLC_LOCAL_S_ADDRESS)->strptr), + .remote_addr = strdup(*gpd(params, np, MACRLC_REMOTE_S_ADDRESS)->strptr), + .my_portc = *gpd(params, np, MACRLC_LOCAL_S_PORTC)->iptr, + .remote_portc = 0, // not used + .my_portd = *gpd(params, np, MACRLC_LOCAL_S_PORTD)->iptr, + .remote_portd = 0, // not used + }; + configure_nr_nfapi_vnf(p); + } else if(strcmp(*gpd(params, np, MACRLC_TRANSPORT_S_PREFERENCE)->strptr, "aerial") == 0){ #ifdef ENABLE_AERIAL - RC.nrmac[j]->nvipc_params_s.nvipc_shm_prefix = - strdup(*(MacRLC_ParamList.paramarray[j][MACRLC_TRANSPORT_S_SHM_PREFIX].strptr)); - RC.nrmac[j]->nvipc_params_s.nvipc_poll_core = *(MacRLC_ParamList.paramarray[j][MACRLC_TRANSPORT_S_POLL_CORE].i8ptr); - LOG_I(GNB_APP, "Configuring VNF for Aerial connection with prefix %s\n", RC.nrmac[j]->eth_params_s.local_if_name); - configure_nr_nfapi_vnf(RC.nrmac[j]->eth_params_s); + nvipc_params_t nvipc_p = { + .nvipc_shm_prefix = strdup(*gpd(params, np, MACRLC_TRANSPORT_S_SHM_PREFIX)->strptr), + .nvipc_poll_core = *gpd(params, np, MACRLC_TRANSPORT_S_POLL_CORE)->i8ptr, + }; + RC.nrmac[j]->nvipc_params_s = nvipc_p; + LOG_I(GNB_APP, "Configuring VNF for Aerial connection with prefix %s\n", nvipc_p.nvipc_shm_prefix); + eth_params_t p = {0}; // not actually used but API requires it + configure_nr_nfapi_vnf(p); #endif } else { // other midhaul - AssertFatal(1 == 0, "MACRLC %d: %s unknown southbound midhaul\n", j, *(MacRLC_ParamList.paramarray[j][MACRLC_TRANSPORT_S_PREFERENCE_IDX].strptr)); + AssertFatal(1 == 0, "MACRLC %d: %s unknown southbound midhaul\n", j, *gpd(params, np, MACRLC_TRANSPORT_S_PREFERENCE)->strptr); } - RC.nrmac[j]->ulsch_max_frame_inactivity = *(MacRLC_ParamList.paramarray[j][MACRLC_ULSCH_MAX_FRAME_INACTIVITY].uptr); - RC.nrmac[j]->stats_max_ue = *MacRLC_ParamList.paramarray[j][MACRLC_STATS_MAX_UE_IDX].iptr; + RC.nrmac[j]->ulsch_max_frame_inactivity = *gpd(params, np, MACRLC_ULSCH_MAX_FRAME_INACTIVITY)->uptr; + RC.nrmac[j]->stats_max_ue = *gpd(params, np, MACRLC_STATS_MAX_UE)->iptr; RC.nrmac[j]->print_ue_stats = RC.nrmac[j]->stats_max_ue > 0; NR_bler_options_t *dl_bler_options = &RC.nrmac[j]->dl_bler; - dl_bler_options->upper = *(MacRLC_ParamList.paramarray[j][MACRLC_DL_BLER_TARGET_UPPER_IDX].dblptr); - dl_bler_options->lower = *(MacRLC_ParamList.paramarray[j][MACRLC_DL_BLER_TARGET_LOWER_IDX].dblptr); - dl_bler_options->min_mcs = *(MacRLC_ParamList.paramarray[j][MACRLC_DL_MIN_MCS_IDX].u8ptr); - dl_bler_options->max_mcs = *(MacRLC_ParamList.paramarray[j][MACRLC_DL_MAX_MCS_IDX].u8ptr); + dl_bler_options->upper = *gpd(params, np, MACRLC_DL_BLER_TARGET_UPPER)->dblptr; + dl_bler_options->lower = *gpd(params, np, MACRLC_DL_BLER_TARGET_LOWER)->dblptr; + dl_bler_options->min_mcs = *gpd(params, np, MACRLC_DL_MIN_MCS)->u8ptr; + dl_bler_options->max_mcs = *gpd(params, np, MACRLC_DL_MAX_MCS)->u8ptr; if (config.disable_harq) dl_bler_options->harq_round_max = 1; else - dl_bler_options->harq_round_max = *(MacRLC_ParamList.paramarray[j][MACRLC_DL_HARQ_ROUND_MAX_IDX].u8ptr); + dl_bler_options->harq_round_max = *gpd(params, np, MACRLC_DL_HARQ_ROUND_MAX)->u8ptr; NR_bler_options_t *ul_bler_options = &RC.nrmac[j]->ul_bler; - ul_bler_options->upper = *(MacRLC_ParamList.paramarray[j][MACRLC_UL_BLER_TARGET_UPPER_IDX].dblptr); - ul_bler_options->lower = *(MacRLC_ParamList.paramarray[j][MACRLC_UL_BLER_TARGET_LOWER_IDX].dblptr); - ul_bler_options->min_mcs = *(MacRLC_ParamList.paramarray[j][MACRLC_UL_MIN_MCS_IDX].u8ptr); - ul_bler_options->max_mcs = *(MacRLC_ParamList.paramarray[j][MACRLC_UL_MAX_MCS_IDX].u8ptr); + ul_bler_options->upper = *gpd(params, np, MACRLC_UL_BLER_TARGET_UPPER)->dblptr; + ul_bler_options->lower = *gpd(params, np, MACRLC_UL_BLER_TARGET_LOWER)->dblptr; + ul_bler_options->min_mcs = *gpd(params, np, MACRLC_UL_MIN_MCS)->u8ptr; + ul_bler_options->max_mcs = *gpd(params, np, MACRLC_UL_MAX_MCS)->u8ptr; if (config.disable_harq) ul_bler_options->harq_round_max = 1; else - ul_bler_options->harq_round_max = *(MacRLC_ParamList.paramarray[j][MACRLC_UL_HARQ_ROUND_MAX_IDX].u8ptr); - RC.nrmac[j]->min_grant_prb = *(MacRLC_ParamList.paramarray[j][MACRLC_MIN_GRANT_PRB_IDX].u16ptr); - RC.nrmac[j]->identity_pm = *(MacRLC_ParamList.paramarray[j][MACRLC_IDENTITY_PM_IDX].u8ptr); + ul_bler_options->harq_round_max = *gpd(params, np, MACRLC_UL_HARQ_ROUND_MAX)->u8ptr; + RC.nrmac[j]->min_grant_prb = *gpd(params, np, MACRLC_MIN_GRANT_PRB)->u16ptr; + RC.nrmac[j]->identity_pm = *gpd(params, np, MACRLC_IDENTITY_PM)->u8ptr; // PRB Blacklist uint16_t prbbl[MAX_BWP_SIZE] = {0}; int num_ulprbbl = get_prb_blacklist(prbbl); @@ -1734,24 +1736,28 @@ void RCconfig_nr_macrlc(configmodule_interface_t *cfg) LOG_I(NR_PHY, "Copying %d blacklisted PRB to L1 context\n", num_ulprbbl); memcpy(RC.nrmac[j]->ulprbbl, prbbl, MAX_BWP_SIZE * sizeof(prbbl[0])); } - RC.nrmac[j]->beam_info.beam_mode = config_get_processedint(cfg, &MacRLC_ParamList.paramarray[j][MACRLC_ANALOG_BEAMFORMING_IDX]); + // config_get_processedint() takes only paramdef_t *, so cast const away + paramdef_t *p_ab = (paramdef_t *)gpd(params, np, MACRLC_ANALOG_BEAMFORMING); + RC.nrmac[j]->beam_info.beam_mode = config_get_processedint(cfg, p_ab); if (RC.nrmac[j]->beam_info.beam_mode != NO_BEAM_MODE) { if (RC.nrmac[j]->beam_info.beam_mode == PRECONFIGURED_BEAM_IDX) AssertFatal(NFAPI_MODE == NFAPI_MONOLITHIC, "Analog beamforming only supported for monolithic scenario\n"); NR_beam_info_t *beam_info = &RC.nrmac[j]->beam_info; - int beams_per_period = *MacRLC_ParamList.paramarray[j][MACRLC_ANALOG_BEAMS_PERIOD_IDX].u8ptr; + int beams_per_period = *gpd(params, np, MACRLC_BEAMS_PERIOD)->u8ptr; beam_info->beam_allocation = malloc16(beams_per_period * sizeof(beam_info->beam_allocation)); - beam_info->beam_duration = *MacRLC_ParamList.paramarray[j][MACRLC_ANALOG_BEAM_DURATION_IDX].u8ptr; + beam_info->beam_duration = *gpd(params, np, MACRLC_BEAM_DURATION)->u8ptr; beam_info->beams_per_period = beams_per_period; beam_info->beam_allocation_size = -1; // to be initialized once we have information on frame configuration } bool das_enabled = false; if (NFAPI_MODE == NFAPI_MONOLITHIC) { GET_PARAMS_LIST(L1_ParamList, L1_Params, L1PARAMS_DESC, CONFIG_STRING_L1_LIST, NULL); - das_enabled = *(L1_ParamList.paramarray[j][L1_ANALOG_DAS].uptr); + const paramdef_t *l1_params = L1_ParamList.paramarray[j]; + const int l1_np = sizeofArray(L1_Params); + das_enabled = *gpd(l1_params, l1_np, L1_ANALOG_DAS)->uptr; } // TODO config_isparamset doesn't seem to work for array types, checking numelt instead - int n = MacRLC_ParamList.paramarray[j][MACRLC_BEAMWEIGHTS_IDX].numelt; + int n = gpd(params, np, MACRLC_BEAM_WEIGHTS_LIST)->numelt; if (n > 0) { AssertFatal(!das_enabled, "No need to set beam weights in case of DAS\n"); int num_beam = n; @@ -1766,9 +1772,9 @@ void RCconfig_nr_macrlc(configmodule_interface_t *cfg) config.nb_bfw[1] = num_beam; // number of beams weights/indices config.bw_list = calloc_or_fail(n, sizeof(*config.bw_list)); for (int b = 0; b < n; b++) - config.bw_list[b] = MacRLC_ParamList.paramarray[j][MACRLC_BEAMWEIGHTS_IDX].iptr[b]; + config.bw_list[b] = gpd(params, np, MACRLC_BEAM_WEIGHTS_LIST)->iptr[b]; } else if (das_enabled) { - n = *MacRLC_ParamList.paramarray[j][MACRLC_ANALOG_BEAMS_PERIOD_IDX].u8ptr; + n = *gpd(params, np, MACRLC_BEAMS_PERIOD)->u8ptr; config.nb_bfw[0] = num_tx; // number of tx antennas config.nb_bfw[1] = n; // number of beams weights/indices config.bw_list = calloc_or_fail(n, sizeof(*config.bw_list)); @@ -1779,14 +1785,14 @@ void RCconfig_nr_macrlc(configmodule_interface_t *cfg) config.bt.num_weights_per_beam = 0; config.bt.beam_ids = NULL; config.bt.beam_weights = NULL; - char **fptr = MacRLC_ParamList.paramarray[j][MACRLC_DBT_FILE_IDX].strptr; + char **fptr = gpd(params, np, MACRLC_DBT_FILE)->strptr; if (fptr && *fptr && **fptr != '\0') { LOG_I(GNB_APP, "loading DBT table from file %s\n", *fptr); config.bt.beam_weights = read_dbt_from_csv(*fptr, &config.bt.num_beams, &config.bt.num_weights_per_beam, &config.bt.beam_ids); } else { char prefix[MAX_OPTNAME_SIZE * 2 + 8]; - snprintf(prefix, sizeof(prefix), CONFIG_STRING_MACRLC_LIST ".[%d]", j); + snprintf(prefix, sizeof(prefix), MACRLC_LIST ".[%d]", j); config.bt.beam_weights = read_dbt_from_config(prefix, &config.bt.num_beams, &config.bt.num_weights_per_beam, &config.bt.beam_ids); } @@ -1820,8 +1826,8 @@ void RCconfig_nr_macrlc(configmodule_interface_t *cfg) free(name); /* read_du_cell_info() allocated memory */ } else { // MacRLC_ParamList.numelt > 0 - LOG_E(PHY, "No %s configuration found\n", CONFIG_STRING_MACRLC_LIST); - // AssertFatal (0,"No " CONFIG_STRING_MACRLC_LIST " configuration found"); + LOG_E(PHY, "No %s configuration found\n", MACRLC_LIST); + // AssertFatal (0,"No " MACRLC_LIST " configuration found"); } } @@ -2297,7 +2303,7 @@ void NRRCConfig(void) RC.nb_nr_inst, NUMBER_OF_gNB_MAX); // Set num MACRLC instances - paramlist_def_t MACRLCParamList = {CONFIG_STRING_MACRLC_LIST, NULL, 0}; + paramlist_def_t MACRLCParamList = {MACRLC_LIST, NULL, 0}; config_getlist(config_get_if(), &MACRLCParamList, NULL, 0, NULL); RC.nb_nr_macrlc_inst = MACRLCParamList.numelt; @@ -2597,9 +2603,11 @@ ngran_node_t get_node_type(void) return ngran_gNB; // MAC/RLC params - GET_PARAMS_LIST(MacRLC_ParamList, MacRLC_Params, MACRLCPARAMS_DESC, CONFIG_STRING_MACRLC_LIST, NULL); + GET_PARAMS_LIST(MacRLC_ParamList, MacRLC_Params, MACRLCPARAMS_DESC, MACRLC_LIST, NULL); for (int j = 0; j < RC.nb_nr_macrlc_inst; j++) { - if (strcmp(*(MacRLC_ParamList.paramarray[j][MACRLC_TRANSPORT_N_PREFERENCE_IDX].strptr), "f1") == 0) { + const paramdef_t *params = MacRLC_ParamList.paramarray[j]; + const int np = sizeofArray(MacRLC_Params); + if (strcmp(*gpd(params, np, MACRLC_TRANSPORT_N_PREFERENCE)->strptr, "f1") == 0) { return ngran_gNB_DU; // MACRLCs present in config: it must be a DU } } diff --git a/openair2/GNB_APP/gnb_paramdef.h b/openair2/GNB_APP/gnb_paramdef.h index 65f6dda1ca..8265303969 100644 --- a/openair2/GNB_APP/gnb_paramdef.h +++ b/openair2/GNB_APP/gnb_paramdef.h @@ -645,49 +645,6 @@ typedef enum { #define CONFIG_STRING_L1_LIST "L1s" -/*----------------------------------------------------------------------------------------------------------------------------------------------------*/ -/*----------------------------------------------------------------------------------------------------------------------------------------------------*/ -/* MACRLC configuration section names */ -#define CONFIG_STRING_MACRLC_LIST "MACRLCs" - - -/* MACRLC configuration parameters names */ -#define CONFIG_STRING_MACRLC_CC "num_cc" -#define CONFIG_STRING_MACRLC_TRANSPORT_N_PREFERENCE "tr_n_preference" -#define CONFIG_STRING_MACRLC_LOCAL_N_ADDRESS "local_n_address" -#define CONFIG_STRING_MACRLC_REMOTE_N_ADDRESS "remote_n_address" -#define CONFIG_STRING_MACRLC_LOCAL_N_PORTC "local_n_portc" -#define CONFIG_STRING_MACRLC_REMOTE_N_PORTC "remote_n_portc" -#define CONFIG_STRING_MACRLC_LOCAL_N_PORTD "local_n_portd" -#define CONFIG_STRING_MACRLC_REMOTE_N_PORTD "remote_n_portd" -#define CONFIG_STRING_MACRLC_TRANSPORT_S_PREFERENCE "tr_s_preference" -#define CONFIG_STRING_MACRLC_TRANSPORT_S_SHM_PREFIX "tr_s_shm_prefix" -#define CONFIG_STRING_MACRLC_TRANSPORT_S_POLL_CORE "tr_s_poll_core" -#define CONFIG_STRING_MACRLC_LOCAL_S_ADDRESS "local_s_address" -#define CONFIG_STRING_MACRLC_REMOTE_S_ADDRESS "remote_s_address" -#define CONFIG_STRING_MACRLC_LOCAL_S_PORTC "local_s_portc" -#define CONFIG_STRING_MACRLC_REMOTE_S_PORTC "remote_s_portc" -#define CONFIG_STRING_MACRLC_LOCAL_S_PORTD "local_s_portd" -#define CONFIG_STRING_MACRLC_REMOTE_S_PORTD "remote_s_portd" - - -#define MACRLC_CC_IDX 0 -#define MACRLC_TRANSPORT_N_PREFERENCE_IDX 1 -#define MACRLC_LOCAL_N_ADDRESS_IDX 2 -#define MACRLC_REMOTE_N_ADDRESS_IDX 3 -#define MACRLC_LOCAL_N_PORTC_IDX 4 -#define MACRLC_REMOTE_N_PORTC_IDX 5 -#define MACRLC_LOCAL_N_PORTD_IDX 6 -#define MACRLC_REMOTE_N_PORTD_IDX 7 -#define MACRLC_TRANSPORT_S_PREFERENCE_IDX 8 -#define MACRLC_LOCAL_S_ADDRESS_IDX 9 -#define MACRLC_REMOTE_S_ADDRESS_IDX 10 -#define MACRLC_LOCAL_S_PORTC_IDX 11 -#define MACRLC_REMOTE_S_PORTC_IDX 12 -#define MACRLC_LOCAL_S_PORTD_IDX 13 -#define MACRLC_REMOTE_S_PORTD_IDX 14 -#define MACRLC_SCHED_MODE_IDX 15 - /*----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/ /* security configuration */ /*----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/ diff --git a/openair2/LAYER2/NR_MAC_gNB/mac_rrc_ul_f1ap.c b/openair2/LAYER2/NR_MAC_gNB/mac_rrc_ul_f1ap.c index 53da2d310e..7d5efc04d3 100644 --- a/openair2/LAYER2/NR_MAC_gNB/mac_rrc_ul_f1ap.c +++ b/openair2/LAYER2/NR_MAC_gNB/mac_rrc_ul_f1ap.c @@ -18,6 +18,7 @@ static f1ap_net_config_t read_DU_IP_config(const eth_params_t* f1_params, const char *f1u_ip_addr) { + AssertFatal(f1_params->my_portc == 0 && f1_params->remote_portc == 0, "portc not supported, must be 0\n"); f1ap_net_config_t nc = {0}; nc.CU_f1_ip_address= strdup(f1_params->remote_addr); diff --git a/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h b/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h index d66df35f6d..f7ea466a94 100644 --- a/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h +++ b/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h @@ -906,8 +906,6 @@ typedef struct gNB_MAC_INST_s { eth_params_t eth_params_n; /// address for F1U to bind, ports in eth_params_n char *f1u_addr; - /// Ethernet parameters for fronthaul interface - eth_params_t eth_params_s; /// Nvipc parameters for FAPI interface with Aerial nvipc_params_t nvipc_params_s; /// Module diff --git a/openair2/RRC/LTE/rrc_UE.c b/openair2/RRC/LTE/rrc_UE.c index 3a7b453bd0..c2e326d9cb 100644 --- a/openair2/RRC/LTE/rrc_UE.c +++ b/openair2/RRC/LTE/rrc_UE.c @@ -2819,8 +2819,6 @@ int decode_SIB1( const protocol_ctxt_t *const ctxt_pP, const uint8_t eNB_index, UE_rrc_inst[ctxt_pP->module_id].Info[eNB_index].SIB1systemInfoValueTag = sib1->systemInfoValueTag; if (!IS_SOFTMODEM_NOS1) { - int cell_valid = 0; - if (sib1->cellAccessRelatedInfo.cellBarred == LTE_SystemInformationBlockType1__cellAccessRelatedInfo__cellBarred_notBarred) { /* Cell is not barred */ int plmn; @@ -2863,24 +2861,11 @@ int decode_SIB1( const protocol_ctxt_t *const ctxt_pP, const uint8_t eNB_index, NAS_CELL_SELECTION_CNF (msg_p).rsrq = rsrq; NAS_CELL_SELECTION_CNF (msg_p).rsrp = rsrp; itti_send_msg_to_task(TASK_NAS_UE, ctxt_pP->instance, msg_p); - cell_valid = 1; UE_rrc_inst[ctxt_pP->module_id].selected_plmn_identity = plmn + 1; break; } } } - - if (cell_valid == 0) { - /* Cell can not be used, ask PHY to try the next one */ - MessageDef *msg_p; - msg_p = itti_alloc_new_message(TASK_RRC_UE, 0, PHY_FIND_NEXT_CELL_REQ); - itti_send_msg_to_task(TASK_PHY_UE, ctxt_pP->instance, msg_p); - LOG_E(RRC, - "Synched with a cell, but PLMN doesn't match our SIM " - "(selected_plmn_identity %d), the message PHY_FIND_NEXT_CELL_REQ " - "is sent but lost in current UE implementation!\n", - UE_rrc_inst[ctxt_pP->module_id].selected_plmn_identity); - } } VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_UE_DECODE_SIB1, VCD_FUNCTION_OUT ); @@ -4457,11 +4442,7 @@ void *rrc_ue_task( void *args_p ) { case RRC_STATE_IDLE: { /* Ask to layer 1 to find a cell matching the criterion */ - MessageDef *message_p; - message_p = itti_alloc_new_message(TASK_RRC_UE, 0, PHY_FIND_CELL_REQ); - PHY_FIND_CELL_REQ (message_p).earfcn_start = 1; - PHY_FIND_CELL_REQ (message_p).earfcn_end = 1; - itti_send_msg_to_task(TASK_PHY_UE, UE_MODULE_ID_TO_INSTANCE(ue_mod_id), message_p); + LOG_W(RRC, "PHY_FIND_CELL_REQ message to L1/PHY not implemented\n"); rrc_set_sub_state (ue_mod_id, RRC_SUB_STATE_IDLE_SEARCHING); break; } diff --git a/openair2/RRC/LTE/rrc_common.c b/openair2/RRC/LTE/rrc_common.c index 8ca158537f..e37c7a4da7 100644 --- a/openair2/RRC/LTE/rrc_common.c +++ b/openair2/RRC/LTE/rrc_common.c @@ -9,7 +9,6 @@ #include "rrc_defs.h" #include "rrc_extern.h" #include "LAYER2/MAC/mac_extern.h" -#include "COMMON/openair_defs.h" #include "common/platform_types.h" #include "RRC/L2_INTERFACE/openair_rrc_L2_interface.h" #include "LAYER2/RLC/rlc.h" diff --git a/openair2/RRC/LTE/utils.c b/openair2/RRC/LTE/utils.c deleted file mode 100644 index 016039cdf8..0000000000 --- a/openair2/RRC/LTE/utils.c +++ /dev/null @@ -1,156 +0,0 @@ -/* - * SPDX-License-Identifier: LicenseRef-CSSL-1.0 - */ - -#include "defs.h" -#include "extern.h" - - -//------------------------------------------------------------------------------------------------------------------// -uint16_t find_free_dtch_position(uint8_t Mod_id, uint16_t UE_CH_index) { - uint16_t i,j; - - if(UE_CH_index==0) { - j=0; - } else { - j=1; - } - - for(i=j; imacphy_exit("NO FREE DTCH LCHAN, exit"); - return 0; -} - -//-------------------------------------------------------------------------------------------// -uint8_t rrc_find_free_ue_index(uint8_t Mod_id) { - //-------------------------------------------------------------------------------------------// - uint16_t i; - - for(i=1; i<=NB_CNX_CH; i++) - if ( (CH_rrc_inst[Mod_id].Info.UE_info[i][0] == 0) && - (CH_rrc_inst[Mod_id].Info.UE_info[i][1] == 0) && - (CH_rrc_inst[Mod_id].Info.UE_info[i][2] == 0) && - (CH_rrc_inst[Mod_id].Info.UE_info[i][3] == 0) && - (CH_rrc_inst[Mod_id].Info.UE_info[i][4] == 0)) { - return i; - } - - return 0xff; -} - - -//-------------------------------------------------------------------------------------------// -unsigned short rrc_find_ue_index(unsigned char Mod_id, L2_ID Mac_id) { - //-------------------------------------------------------------------------------------------// - unsigned char i; - /* - for(i=0;i<=NB_CNX_CH;i++) - if( bcmp(Mac_id.L2_id,CH_rrc_inst[Mod_id].Info.UE_info[i].L2_id,sizeof(L2_ID))==0) - return i; - return i; - */ -} -//-------------------------------------------------------------------------------------------// -uint8_t rrc_is_node_isolated(uint8_t Mod_id) { - //-------------------------------------------------------------------------------------------// - /*uint8_t i; - for(i=0;iHeader->Rv_tb_idx=0; - // Rrc_buffer->W_idx=0; - //Rrc_buffer->R_idx=0; -} diff --git a/openair3/COMMON/messages_types.h b/openair3/COMMON/messages_types.h deleted file mode 100644 index de270ae027..0000000000 --- a/openair3/COMMON/messages_types.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * SPDX-License-Identifier: LicenseRef-CSSL-1.0 - */ - -#ifndef MESSAGES_TYPES_H_ -#define MESSAGES_TYPES_H_ - -#include "intertask_messages_types.h" -#include "timer_messages_types.h" - -#include "security_types.h" - -#include "gtpv1_u_messages_types.h" -#include "ip_forward_messages_types.h" -#include "s11_messages_types.h" -#include "s1ap_messages_types.h" -#include "nas_messages_types.h" -#include "s6a_messages_types.h" -#include "sctp_messages_types.h" -#include "sgw_lite_messages_types.h" -#include "udp_messages_types.h" -#include "mme_app_messages_types.h" -#include "m2ap_messages_types.h" -#include "ngap_messages_types.h" - - -#endif /* MESSAGES_TYPES_H_ */ 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..d1774b50f9 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,13 +175,10 @@ 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 - remote_s_portc = 50000; // pnf p5 port [!] local_s_portd = 50011; // vnf p7 port [!] - remote_s_portd = 50010; // pnf p7 port [!] tr_s_preference = "nfapi"; tr_n_preference = "local_RRC"; } 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..10e07193b2 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,13 +177,10 @@ 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 - remote_s_portc = 50000; // pnf p5 port [!] local_s_portd = 50011; // vnf p7 port [!] - remote_s_portd = 50010; // pnf p7 port [!] tr_s_preference = "aerial"; tr_n_preference = "local_RRC"; pusch_TargetSNRx10 = 280; # 150; 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..9ed2919bc1 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,13 +179,10 @@ 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 - remote_s_portc = 50000; // pnf p5 port [!] local_s_portd = 50011; // vnf p7 port [!] - remote_s_portd = 50010; // pnf p7 port [!] tr_s_preference = "nfapi"; tr_n_preference = "local_RRC"; } 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..acad81a2a2 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,14 +177,11 @@ 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 local_s_portc = 50001; // vnf p5 port - remote_s_portc = 50000; // pnf p5 port [!] local_s_portd = 50011; // vnf p7 port [!] - remote_s_portd = 50010; // pnf p7 port [!] tr_s_preference = "aerial"; tr_n_preference = "local_RRC"; pusch_FailureThres = 10; 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;