Merge remote-tracking branch 'origin/develop' into bandwidth-testing-abs
# Conflicts: # executables/nr-uesoftmodem.c # executables/nr-uesoftmodem.h # executables/softmodem-common.h # openair1/PHY/MODULATION/slot_fep_nr.c # openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c # openair1/SCHED_NR/fapi_nr_l1.c # openair1/SCHED_NR_UE/phy_procedures_nr_ue.c # openair2/LAYER2/NR_MAC_UE/mac_proto.h # openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c # openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c # openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c # openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
This commit is contained in:
@@ -236,9 +236,10 @@ MACRLCs = (
|
||||
|
||||
L1s = (
|
||||
{
|
||||
num_cc = 1;
|
||||
tr_n_preference = "local_mac";
|
||||
pusch_proc_threads = 8;
|
||||
num_cc = 1;
|
||||
tr_n_preference = "local_mac";
|
||||
pusch_proc_threads = 8;
|
||||
ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
|
||||
}
|
||||
);
|
||||
|
||||
|
||||
@@ -219,6 +219,7 @@ 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
|
||||
}
|
||||
);
|
||||
|
||||
|
||||
@@ -231,10 +231,11 @@ MACRLCs = (
|
||||
|
||||
L1s = (
|
||||
{
|
||||
num_cc = 1;
|
||||
tr_n_preference = "local_mac";
|
||||
num_cc = 1;
|
||||
tr_n_preference = "local_mac";
|
||||
pusch_proc_threads = 6;
|
||||
}
|
||||
ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
|
||||
}
|
||||
);
|
||||
|
||||
RUs = (
|
||||
|
||||
Reference in New Issue
Block a user