Remove all gNB num_cc parameters in MACRLCs and L1s sections

These parameters are not used.
This commit is contained in:
Robert Schmidt
2026-04-01 21:38:40 +02:00
parent 8a48fca140
commit 7cf92f4bae
125 changed files with 8 additions and 248 deletions
@@ -157,7 +157,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "f1"; tr_n_preference = "f1";
local_n_address = "127.0.0.5"; local_n_address = "127.0.0.5";
@@ -171,7 +170,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 200; prach_dtx_threshold = 200;
pucch0_dtx_threshold = 150; pucch0_dtx_threshold = 150;
@@ -162,7 +162,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "f1"; tr_n_preference = "f1";
local_n_address = "192.168.71.171"; local_n_address = "192.168.71.171";
@@ -176,7 +175,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 200; prach_dtx_threshold = 200;
pucch0_dtx_threshold = 150; pucch0_dtx_threshold = 150;
@@ -191,7 +191,6 @@ rlc = {
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "f1"; tr_n_preference = "f1";
local_n_address = "127.0.0.5"; local_n_address = "127.0.0.5";
@@ -205,7 +204,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 200; prach_dtx_threshold = 200;
pucch0_dtx_threshold = 30; pucch0_dtx_threshold = 30;
@@ -156,7 +156,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "f1"; tr_n_preference = "f1";
local_n_address = "172.21.19.98"; local_n_address = "172.21.19.98";
@@ -171,7 +170,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 100; prach_dtx_threshold = 100;
pucch0_dtx_threshold = 10; pucch0_dtx_threshold = 10;
@@ -156,7 +156,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "f1"; tr_n_preference = "f1";
local_n_address = "172.21.19.99"; local_n_address = "172.21.19.99";
@@ -171,7 +170,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 100; prach_dtx_threshold = 100;
pucch0_dtx_threshold = 10; pucch0_dtx_threshold = 10;
@@ -2,7 +2,6 @@
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "nfapi"; tr_n_preference = "nfapi";
remote_n_address = "192.168.71.140"; // vnf addr remote_n_address = "192.168.71.140"; // vnf addr
local_n_address = "192.168.71.141"; // pnf addr local_n_address = "192.168.71.141"; // pnf addr
@@ -4,7 +4,6 @@ usrp-tx-thread-config = 1;
tune-offset = 30720000; tune-offset = 30720000;
L1s = ({ L1s = ({
num_cc = 1;
tr_n_preference = "nfapi"; tr_n_preference = "nfapi";
remote_n_address = "127.0.0.1"; // vnf addr remote_n_address = "127.0.0.1"; // vnf addr
local_n_address = "127.0.0.1"; // pnf addr local_n_address = "127.0.0.1"; // pnf addr
@@ -173,7 +173,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "nfapi"; tr_s_preference = "nfapi";
remote_s_address = "192.168.71.141"; // pnf addr [!] remote_s_address = "192.168.71.141"; // pnf addr [!]
local_s_address = "192.168.71.140"; // vnf addr local_s_address = "192.168.71.140"; // vnf addr
@@ -175,7 +175,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "nfapi"; tr_s_preference = "nfapi";
remote_s_address = "127.0.0.1"; // pnf addr [!] remote_s_address = "127.0.0.1"; // pnf addr [!]
local_s_address = "127.0.0.1"; // vnf addr local_s_address = "127.0.0.1"; // vnf addr
@@ -180,7 +180,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
remote_s_address = "127.0.0.1"; // pnf addr [!] remote_s_address = "127.0.0.1"; // pnf addr [!]
local_s_address = "127.0.0.2"; // vnf addr local_s_address = "127.0.0.2"; // vnf addr
local_s_portc = 50001; // vnf p5 port local_s_portc = 50001; // vnf p5 port
@@ -180,7 +180,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
remote_s_address = "127.0.0.1"; // pnf addr [!] remote_s_address = "127.0.0.1"; // pnf addr [!]
local_s_address = "127.0.0.2"; // vnf addr local_s_address = "127.0.0.2"; // vnf addr
local_s_portc = 50001; // vnf p5 port local_s_portc = 50001; // vnf p5 port
@@ -179,7 +179,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
remote_s_address = "127.0.0.1"; // pnf addr [!] remote_s_address = "127.0.0.1"; // pnf addr [!]
local_s_address = "127.0.0.2"; // vnf addr local_s_address = "127.0.0.2"; // vnf addr
local_s_portc = 50001; // vnf p5 port local_s_portc = 50001; // vnf p5 port
@@ -161,7 +161,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
} }
@@ -169,7 +168,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0 ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
} }
@@ -173,7 +173,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 220; pusch_TargetSNRx10 = 220;
@@ -184,7 +183,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 120 prach_dtx_threshold = 120
pucch0_dtx_threshold = 80; pucch0_dtx_threshold = 80;
@@ -173,7 +173,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
} }
@@ -181,7 +180,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
} }
); );
@@ -173,7 +173,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
} }
@@ -181,7 +180,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
} }
); );
@@ -170,13 +170,11 @@ gNBs =
); );
MACRLCs = ({ MACRLCs = ({
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
}); });
L1s = ({ L1s = ({
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
}); });
@@ -172,13 +172,11 @@ gNBs =
); );
MACRLCs = ({ MACRLCs = ({
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
}); });
L1s = ({ L1s = ({
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
}); });
@@ -180,7 +180,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 200; pusch_TargetSNRx10 = 200;
@@ -190,7 +189,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0 ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
} }
@@ -197,7 +197,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 150; pusch_TargetSNRx10 = 150;
@@ -209,7 +208,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 150; prach_dtx_threshold = 150;
pucch0_dtx_threshold = 150; pucch0_dtx_threshold = 150;
@@ -205,7 +205,6 @@ rlc = {
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 150; pusch_TargetSNRx10 = 150;
@@ -217,7 +216,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 150; prach_dtx_threshold = 150;
pucch0_dtx_threshold = 150; pucch0_dtx_threshold = 150;
@@ -172,7 +172,6 @@ gNBs =
); );
MACRLCs = ({ MACRLCs = ({
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 200; pusch_TargetSNRx10 = 200;
@@ -185,7 +184,6 @@ MACRLCs = ({
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 120; prach_dtx_threshold = 120;
#pucch0_dtx_threshold = 120; #pucch0_dtx_threshold = 120;
@@ -172,7 +172,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
ulsch_max_slots_inactivity = 100; ulsch_max_slots_inactivity = 100;
@@ -183,7 +182,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
pusch_proc_threads = 8; pusch_proc_threads = 8;
prach_dtx_threshold = 200; prach_dtx_threshold = 200;
@@ -178,7 +178,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 320; pusch_TargetSNRx10 = 320;
@@ -192,7 +191,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 120; prach_dtx_threshold = 120;
pusch_dtx_threshold = 20; pusch_dtx_threshold = 20;
@@ -174,7 +174,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 200; pusch_TargetSNRx10 = 200;
@@ -185,7 +184,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 130 prach_dtx_threshold = 130
pucch0_dtx_threshold = 80; pucch0_dtx_threshold = 80;
@@ -171,7 +171,6 @@ gNBs = (
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 320; pusch_TargetSNRx10 = 320;
@@ -185,7 +184,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 120; prach_dtx_threshold = 120;
max_ldpc_iterations = 15; max_ldpc_iterations = 15;
@@ -171,7 +171,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 200; pusch_TargetSNRx10 = 200;
@@ -182,7 +181,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 120; prach_dtx_threshold = 120;
pucch0_dtx_threshold = 100; pucch0_dtx_threshold = 100;
@@ -174,7 +174,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 150; pusch_TargetSNRx10 = 150;
@@ -184,7 +183,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 150; prach_dtx_threshold = 150;
#pucch0_dtx_threshold = 150; #pucch0_dtx_threshold = 150;
@@ -176,7 +176,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 200; pusch_TargetSNRx10 = 200;
@@ -186,7 +185,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 200; prach_dtx_threshold = 200;
# pucch0_dtx_threshold = 150; # pucch0_dtx_threshold = 150;
@@ -166,7 +166,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 200; pusch_TargetSNRx10 = 200;
@@ -176,7 +175,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 200; prach_dtx_threshold = 200;
# pucch0_dtx_threshold = 150; # pucch0_dtx_threshold = 150;
@@ -174,7 +174,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 250; pusch_TargetSNRx10 = 250;
@@ -184,7 +183,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 120; prach_dtx_threshold = 120;
pucch0_dtx_threshold = 100; pucch0_dtx_threshold = 100;
@@ -167,7 +167,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 200; pusch_TargetSNRx10 = 200;
@@ -197,7 +196,6 @@ prs_config = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 120; prach_dtx_threshold = 120;
} }
@@ -143,16 +143,14 @@ gNBs:
MACRLCs: MACRLCs:
- num_cc: 1 - tr_s_preference: local_L1
tr_s_preference: local_L1
tr_n_preference: local_RRC tr_n_preference: local_RRC
pusch_TargetSNRx10: 200 pusch_TargetSNRx10: 200
pucch_TargetSNRx10: 200 pucch_TargetSNRx10: 200
stats_max_ue: 17 stats_max_ue: 17
L1s: L1s:
- num_cc: 1 - tr_n_preference: local_mac
tr_n_preference: local_mac
prach_dtx_threshold: 200 prach_dtx_threshold: 200
# pucch0_dtx_threshold = 150; # pucch0_dtx_threshold = 150;
@@ -178,7 +178,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 200; pusch_TargetSNRx10 = 200;
@@ -189,7 +188,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 150; prach_dtx_threshold = 150;
pucch0_dtx_threshold = 30; pucch0_dtx_threshold = 30;
@@ -146,15 +146,13 @@ gNBs:
MACRLCs: MACRLCs:
- num_cc: 1 - tr_s_preference: local_L1
tr_s_preference: local_L1
tr_n_preference: local_RRC tr_n_preference: local_RRC
pusch_TargetSNRx10: 200 pusch_TargetSNRx10: 200
pucch_TargetSNRx10: 200 pucch_TargetSNRx10: 200
L1s: L1s:
- num_cc: 1 - tr_n_preference: local_mac
tr_n_preference: local_mac
prach_dtx_threshold: 200 prach_dtx_threshold: 200
# pucch0_dtx_threshold = 150; # pucch0_dtx_threshold = 150;
@@ -169,7 +169,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 150; pusch_TargetSNRx10 = 150;
@@ -179,7 +178,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
pusch_proc_threads = 8; pusch_proc_threads = 8;
prach_dtx_threshold = 120; prach_dtx_threshold = 120;
@@ -173,7 +173,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
} }
@@ -181,7 +180,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 120; prach_dtx_threshold = 120;
tx_amp_backoff_dB = 30; tx_amp_backoff_dB = 30;
@@ -177,7 +177,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 200; pusch_TargetSNRx10 = 200;
@@ -187,7 +186,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 120; prach_dtx_threshold = 120;
pucch0_dtx_threshold = 50; pucch0_dtx_threshold = 50;
@@ -179,7 +179,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 200; pusch_TargetSNRx10 = 200;
@@ -190,7 +189,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 120; prach_dtx_threshold = 120;
pucch0_dtx_threshold = 50; pucch0_dtx_threshold = 50;
@@ -168,7 +168,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 200; pusch_TargetSNRx10 = 200;
@@ -179,7 +178,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 120; prach_dtx_threshold = 120;
pucch0_dtx_threshold = 100; pucch0_dtx_threshold = 100;
@@ -19,7 +19,6 @@ pdu_sessions = ({ dnn = "oai"; nssai_sst = 1; });
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_n_preference = "nfapi"; tr_n_preference = "nfapi";
remote_n_address = "127.0.0.1"; //Proxy IP remote_n_address = "127.0.0.1"; //Proxy IP
local_n_address = "127.0.0.1"; local_n_address = "127.0.0.1";
@@ -188,7 +188,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 200; pusch_TargetSNRx10 = 200;
@@ -198,7 +197,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 120; prach_dtx_threshold = 120;
pucch0_dtx_threshold = 150; pucch0_dtx_threshold = 150;
@@ -184,7 +184,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 200; pusch_TargetSNRx10 = 200;
@@ -194,7 +193,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 120; prach_dtx_threshold = 120;
} }
@@ -192,7 +192,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 200; pusch_TargetSNRx10 = 200;
@@ -202,7 +201,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 200; prach_dtx_threshold = 200;
# pucch0_dtx_threshold = 150; # pucch0_dtx_threshold = 150;
@@ -179,7 +179,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 200; pusch_TargetSNRx10 = 200;
@@ -189,7 +188,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0 ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
} }
@@ -183,7 +183,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 200; pusch_TargetSNRx10 = 200;
@@ -193,7 +192,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
} }
); );
@@ -184,7 +184,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
} }
@@ -192,7 +191,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 120; prach_dtx_threshold = 120;
pucch0_dtx_threshold = 80; pucch0_dtx_threshold = 80;
@@ -172,7 +172,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
ulsch_max_slots_inactivity = 100; ulsch_max_slots_inactivity = 100;
@@ -183,7 +182,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
pusch_proc_threads = 8; pusch_proc_threads = 8;
prach_dtx_threshold = 200; prach_dtx_threshold = 200;
@@ -175,7 +175,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 220; pusch_TargetSNRx10 = 220;
@@ -185,7 +184,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 150; prach_dtx_threshold = 150;
# pucch0_dtx_threshold = 150; # pucch0_dtx_threshold = 150;
@@ -188,7 +188,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 220; pusch_TargetSNRx10 = 220;
@@ -198,7 +197,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 150; prach_dtx_threshold = 150;
# pucch0_dtx_threshold = 150; # pucch0_dtx_threshold = 150;
@@ -189,7 +189,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
# pusch_TargetSNRx10 = 200; # pusch_TargetSNRx10 = 200;
@@ -199,7 +198,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 120; prach_dtx_threshold = 120;
# pucch0_dtx_threshold = 150; # pucch0_dtx_threshold = 150;
@@ -167,7 +167,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 200; pusch_TargetSNRx10 = 200;
@@ -178,7 +177,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 120; prach_dtx_threshold = 120;
pucch0_dtx_threshold = 100; pucch0_dtx_threshold = 100;
-2
View File
@@ -305,7 +305,6 @@ Example configuration snippet:
... ...
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 180; pusch_TargetSNRx10 = 180;
@@ -322,7 +321,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 120; prach_dtx_threshold = 120;
pucch0_dtx_threshold = 100; pucch0_dtx_threshold = 100;
@@ -183,7 +183,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
} }
@@ -191,7 +190,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
} }
); );
-2
View File
@@ -13,7 +13,6 @@
/* L1 configuration parameters names */ /* L1 configuration parameters names */
#define L1_CC "num_cc"
#define L1_LOCAL_N_ADDRESS "local_n_address" #define L1_LOCAL_N_ADDRESS "local_n_address"
#define L1_REMOTE_N_ADDRESS "remote_n_address" #define L1_REMOTE_N_ADDRESS "remote_n_address"
#define L1_LOCAL_N_PORTC "local_n_portc" #define L1_LOCAL_N_PORTC "local_n_portc"
@@ -45,7 +44,6 @@
/*----------------------------------------------------------------------------------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------------------------------------------------------------------------------*/
// clang-format off // clang-format off
#define L1PARAMS_DESC { \ #define L1PARAMS_DESC { \
{L1_CC, NULL, 0, .uptr=NULL, .defintval=1, TYPE_UINT, 0}, \
{L1_TRANSPORT_N_PREFERENCE, NULL, 0, .strptr=NULL, .defstrval="local_mac", TYPE_STRING, 0}, \ {L1_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_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_ADDRESS, NULL, 0, .strptr=NULL, .defstrval="127.0.0.2", TYPE_STRING, 0}, \
-3
View File
@@ -15,7 +15,6 @@
#define MACRLC_LIST "MACRLCs" #define MACRLC_LIST "MACRLCs"
/* MACRLC configuration parameters names */ /* MACRLC configuration parameters names */
#define MACRLC_CC "num_cc"
#define MACRLC_TRANSPORT_N_PREFERENCE "tr_n_preference" #define MACRLC_TRANSPORT_N_PREFERENCE "tr_n_preference"
#define MACRLC_LOCAL_N_ADDRESS "local_n_address" #define MACRLC_LOCAL_N_ADDRESS "local_n_address"
#define MACRLC_LOCAL_N_ADDRESS_F1U "local_n_address_f1u" #define MACRLC_LOCAL_N_ADDRESS_F1U "local_n_address_f1u"
@@ -87,7 +86,6 @@
/*-------------------------------------------------------------------------------------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------------------------------------------------------------------------------------*/
// clang-format off // clang-format off
#define MACRLCPARAMS_DESC { \ #define MACRLCPARAMS_DESC { \
{MACRLC_CC, NULL, 0, .uptr=NULL, .defintval=50011, TYPE_UINT, 0}, \
{MACRLC_TRANSPORT_N_PREFERENCE, NULL, 0, .strptr=NULL, .defstrval="local_L1", TYPE_STRING, 0}, \ {MACRLC_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_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_REMOTE_N_ADDRESS, NULL, 0, .uptr=NULL, .defstrval="127.0.0.2", TYPE_STRING, 0}, \
@@ -159,7 +157,6 @@
{ .s5 = { NULL } }, \ { .s5 = { NULL } }, \
{ .s5 = { NULL } }, \ { .s5 = { NULL } }, \
{ .s5 = { NULL } }, \ { .s5 = { NULL } }, \
{ .s5 = { NULL } }, \
{ .s2 = { config_check_intrange, {0, 31} } }, /* DL min MCS */ \ { .s2 = { config_check_intrange, {0, 31} } }, /* DL min MCS */ \
{ .s2 = { config_check_intrange, {0, 31} } }, /* DL max MCS */ \ { .s2 = { config_check_intrange, {0, 31} } }, /* DL max MCS */ \
{ .s5 = { NULL } }, \ { .s5 = { NULL } }, \
@@ -162,7 +162,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "f1"; tr_n_preference = "f1";
local_n_address = "127.0.0.3"; local_n_address = "127.0.0.3";
@@ -175,7 +174,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 120; prach_dtx_threshold = 120;
pucch0_dtx_threshold = 150; pucch0_dtx_threshold = 150;
@@ -158,7 +158,6 @@ gNBs =
); );
MACRLCs = ({ MACRLCs = ({
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "f1"; tr_n_preference = "f1";
local_n_address = "127.0.0.4"; local_n_address = "127.0.0.4";
@@ -169,7 +168,6 @@ MACRLCs = ({
}); });
L1s = ({ L1s = ({
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 200; prach_dtx_threshold = 200;
pucch0_dtx_threshold = 150; pucch0_dtx_threshold = 150;
@@ -158,7 +158,6 @@ gNBs =
); );
MACRLCs = ({ MACRLCs = ({
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "f1"; tr_n_preference = "f1";
local_n_address = "127.0.0.5"; local_n_address = "127.0.0.5";
@@ -169,7 +168,6 @@ MACRLCs = ({
}); });
L1s = ({ L1s = ({
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 200; prach_dtx_threshold = 200;
pucch0_dtx_threshold = 150; pucch0_dtx_threshold = 150;
@@ -167,7 +167,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "f1"; tr_n_preference = "f1";
local_n_address = "172.21.16.51"; local_n_address = "172.21.16.51";
@@ -188,7 +187,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 100; prach_dtx_threshold = 100;
pucch0_dtx_threshold = 80; pucch0_dtx_threshold = 80;
@@ -167,7 +167,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "f1"; tr_n_preference = "f1";
local_n_address = "172.21.16.51"; local_n_address = "172.21.16.51";
@@ -192,7 +191,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
enable_das = 1; enable_das = 1;
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 100; prach_dtx_threshold = 100;
pucch0_dtx_threshold = 80; pucch0_dtx_threshold = 80;
@@ -167,7 +167,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "f1"; tr_n_preference = "f1";
local_n_address = "172.21.16.51"; local_n_address = "172.21.16.51";
@@ -188,7 +187,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 100; prach_dtx_threshold = 100;
pucch0_dtx_threshold = 80; pucch0_dtx_threshold = 80;
@@ -167,7 +167,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "f1"; tr_n_preference = "f1";
local_n_address = "172.21.16.51"; local_n_address = "172.21.16.51";
@@ -188,7 +187,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 100; prach_dtx_threshold = 100;
pucch0_dtx_threshold = 80; pucch0_dtx_threshold = 80;
@@ -156,7 +156,6 @@ gNBs =
); );
MACRLCs = ({ MACRLCs = ({
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "f1"; tr_n_preference = "f1";
local_n_address = "127.0.0.4"; local_n_address = "127.0.0.4";
@@ -167,7 +166,6 @@ MACRLCs = ({
}); });
L1s = ({ L1s = ({
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 200; prach_dtx_threshold = 200;
pucch0_dtx_threshold = 150; pucch0_dtx_threshold = 150;
@@ -156,7 +156,6 @@ gNBs =
); );
MACRLCs = ({ MACRLCs = ({
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "f1"; tr_n_preference = "f1";
local_n_address = "127.0.0.5"; local_n_address = "127.0.0.5";
@@ -167,7 +166,6 @@ MACRLCs = ({
}); });
L1s = ({ L1s = ({
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 200; prach_dtx_threshold = 200;
pucch0_dtx_threshold = 150; pucch0_dtx_threshold = 150;
@@ -7,7 +7,6 @@ log_config = {
}; };
L1s = ({ L1s = ({
num_cc = 1;
tr_n_preference = "nfapi"; tr_n_preference = "nfapi";
remote_n_address = "127.0.0.1"; // vnf addr remote_n_address = "127.0.0.1"; // vnf addr
local_n_address = "127.0.0.1"; // pnf addr local_n_address = "127.0.0.1"; // pnf addr
@@ -7,7 +7,6 @@ log_config = {
}; };
L1s = ({ L1s = ({
num_cc = 1;
tr_n_preference = "nfapi"; tr_n_preference = "nfapi";
remote_n_address = "127.0.0.1"; // vnf addr remote_n_address = "127.0.0.1"; // vnf addr
local_n_address = "127.0.0.1"; // pnf addr local_n_address = "127.0.0.1"; // pnf addr
@@ -175,7 +175,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
remote_s_address = "127.0.0.1"; // pnf addr [!] remote_s_address = "127.0.0.1"; // pnf addr [!]
local_s_address = "127.0.0.1"; // vnf addr local_s_address = "127.0.0.1"; // vnf addr
local_s_portc = 50001; // vnf p5 port local_s_portc = 50001; // vnf p5 port
@@ -177,7 +177,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
remote_s_address = "127.0.0.1"; // pnf addr [!] remote_s_address = "127.0.0.1"; // pnf addr [!]
local_s_address = "127.0.0.2"; // vnf addr local_s_address = "127.0.0.2"; // vnf addr
local_s_portc = 50001; // vnf p5 port local_s_portc = 50001; // vnf p5 port
@@ -179,7 +179,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
remote_s_address = "127.0.0.1"; // pnf addr [!] remote_s_address = "127.0.0.1"; // pnf addr [!]
local_s_address = "127.0.0.2"; // vnf addr local_s_address = "127.0.0.2"; // vnf addr
local_s_portc = 50001; // vnf p5 port local_s_portc = 50001; // vnf p5 port
@@ -177,7 +177,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
local_s_if_name = "lo:"; local_s_if_name = "lo:";
remote_s_address = "127.0.0.1"; // pnf addr [!] remote_s_address = "127.0.0.1"; // pnf addr [!]
local_s_address = "127.0.0.2"; // vnf addr local_s_address = "127.0.0.2"; // vnf addr
@@ -204,7 +204,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
# pusch_TargetSNRx10 = 200; # pusch_TargetSNRx10 = 200;
@@ -214,7 +213,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 120; prach_dtx_threshold = 120;
# pucch0_dtx_threshold = 150; # pucch0_dtx_threshold = 150;
@@ -208,7 +208,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
#pusch_TargetSNRx10 = 200; #pusch_TargetSNRx10 = 200;
@@ -218,7 +217,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 120; prach_dtx_threshold = 120;
# pucch0_dtx_threshold = 150; # pucch0_dtx_threshold = 150;
@@ -166,7 +166,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 200; pusch_TargetSNRx10 = 200;
@@ -176,7 +175,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 120; prach_dtx_threshold = 120;
pucch0_dtx_threshold = 100; pucch0_dtx_threshold = 100;
@@ -193,7 +193,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 150; pusch_TargetSNRx10 = 150;
@@ -203,7 +202,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 120; prach_dtx_threshold = 120;
pucch0_dtx_threshold = 150; pucch0_dtx_threshold = 150;
@@ -192,7 +192,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 150; pusch_TargetSNRx10 = 150;
@@ -202,7 +201,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 120; prach_dtx_threshold = 120;
pucch0_dtx_threshold = 150; pucch0_dtx_threshold = 150;
@@ -192,7 +192,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 150; pusch_TargetSNRx10 = 150;
@@ -202,7 +201,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 120; prach_dtx_threshold = 120;
pucch0_dtx_threshold = 150; pucch0_dtx_threshold = 150;
@@ -175,7 +175,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 200; pusch_TargetSNRx10 = 200;
@@ -194,7 +193,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 250; prach_dtx_threshold = 250;
pucch0_dtx_threshold = 100; pucch0_dtx_threshold = 100;
@@ -173,7 +173,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
#pusch_TargetSNRx10 = 150; #pusch_TargetSNRx10 = 150;
@@ -183,7 +182,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 120; prach_dtx_threshold = 120;
#pucch0_dtx_threshold = 120; #pucch0_dtx_threshold = 120;
@@ -170,7 +170,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 150; pusch_TargetSNRx10 = 150;
@@ -183,7 +182,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 120; prach_dtx_threshold = 120;
pucch0_dtx_threshold = 100; pucch0_dtx_threshold = 100;
@@ -175,7 +175,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 150; pusch_TargetSNRx10 = 150;
@@ -185,7 +184,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
pusch_proc_threads = 8; pusch_proc_threads = 8;
prach_dtx_threshold = 120; prach_dtx_threshold = 120;
@@ -205,7 +205,6 @@ rlc = {
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
} }
@@ -213,7 +212,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 120; prach_dtx_threshold = 120;
} }
@@ -207,7 +207,6 @@ rlc = {
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
} }
@@ -215,7 +214,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 120; prach_dtx_threshold = 120;
} }
@@ -206,7 +206,6 @@ rlc = {
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
} }
@@ -214,7 +213,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 120; prach_dtx_threshold = 120;
} }
@@ -171,7 +171,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
ulsch_max_slots_inactivity = 100; ulsch_max_slots_inactivity = 100;
@@ -182,7 +181,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
pusch_proc_threads = 8; pusch_proc_threads = 8;
ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0 ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
@@ -186,7 +186,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 150; pusch_TargetSNRx10 = 150;
@@ -196,7 +195,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 120; prach_dtx_threshold = 120;
pucch0_dtx_threshold = 150; pucch0_dtx_threshold = 150;
@@ -220,7 +220,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 150; pusch_TargetSNRx10 = 150;
@@ -232,7 +231,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 150; prach_dtx_threshold = 150;
pucch0_dtx_threshold = 150; pucch0_dtx_threshold = 150;
@@ -220,7 +220,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 150; pusch_TargetSNRx10 = 150;
@@ -232,7 +231,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 150; prach_dtx_threshold = 150;
pucch0_dtx_threshold = 150; pucch0_dtx_threshold = 150;
@@ -171,7 +171,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 150; pusch_TargetSNRx10 = 150;
@@ -181,7 +180,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 120; prach_dtx_threshold = 120;
pucch0_dtx_threshold = 150; pucch0_dtx_threshold = 150;
@@ -175,7 +175,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 200; pusch_TargetSNRx10 = 200;
@@ -190,7 +189,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 110; prach_dtx_threshold = 110;
pucch0_dtx_threshold = 80; pucch0_dtx_threshold = 80;
@@ -178,7 +178,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 250; pusch_TargetSNRx10 = 250;
@@ -190,7 +189,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 120; prach_dtx_threshold = 120;
pusch_dtx_threshold = 20; pusch_dtx_threshold = 20;
@@ -174,7 +174,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 180; pusch_TargetSNRx10 = 180;
@@ -190,7 +189,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 100; prach_dtx_threshold = 100;
pucch0_dtx_threshold = 10; pucch0_dtx_threshold = 10;
@@ -172,7 +172,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 180; pusch_TargetSNRx10 = 180;
@@ -187,7 +186,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 130 prach_dtx_threshold = 130
pucch0_dtx_threshold = 80; pucch0_dtx_threshold = 80;
@@ -174,7 +174,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 180; pusch_TargetSNRx10 = 180;
@@ -189,7 +188,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 130 prach_dtx_threshold = 130
pucch0_dtx_threshold = 80; pucch0_dtx_threshold = 80;
@@ -170,7 +170,6 @@ gNBs = (
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 300; pusch_TargetSNRx10 = 300;
@@ -181,7 +180,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 120; prach_dtx_threshold = 120;
pucch0_dtx_threshold = 80; pucch0_dtx_threshold = 80;
@@ -170,7 +170,6 @@ gNBs = (
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 300; pusch_TargetSNRx10 = 300;
@@ -181,7 +180,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 120; prach_dtx_threshold = 120;
pucch0_dtx_threshold = 80; pucch0_dtx_threshold = 80;
@@ -194,7 +194,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 150; pusch_TargetSNRx10 = 150;
@@ -204,7 +203,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 120; prach_dtx_threshold = 120;
pucch0_dtx_threshold = 100; pucch0_dtx_threshold = 100;
@@ -171,7 +171,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 200; pusch_TargetSNRx10 = 200;
@@ -181,7 +180,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 200; prach_dtx_threshold = 200;
} }
@@ -174,7 +174,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 250; pusch_TargetSNRx10 = 250;
@@ -189,7 +188,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 200; prach_dtx_threshold = 200;
pucch0_dtx_threshold = 100; pucch0_dtx_threshold = 100;
@@ -175,7 +175,6 @@ gNBs =
MACRLCs = ( MACRLCs = (
{ {
num_cc = 1;
tr_s_preference = "local_L1"; tr_s_preference = "local_L1";
tr_n_preference = "local_RRC"; tr_n_preference = "local_RRC";
pusch_TargetSNRx10 = 180; pusch_TargetSNRx10 = 180;
@@ -191,7 +190,6 @@ MACRLCs = (
L1s = ( L1s = (
{ {
num_cc = 1;
tr_n_preference = "local_mac"; tr_n_preference = "local_mac";
prach_dtx_threshold = 100; prach_dtx_threshold = 100;
pucch0_dtx_threshold = 80; pucch0_dtx_threshold = 80;

Some files were not shown because too many files have changed in this diff Show More