maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/multi-ue-fixes' into integration_2022_wk51

Browse Source
This commit is contained in:
Robert Schmidt
2022-12-22 15:04:00 +01:00
parent b6bc11635d 3a24b66ecf
commit cc6d1ecded
6 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/openairinterface5g_limits.h
-2
View File
@@ -27,7 +27,6 @@
# ifndef PHYSIM # ifndef PHYSIM
# ifndef UE_EXPANSION # ifndef UE_EXPANSION
# define NUMBER_OF_UE_MAX 40 # define NUMBER_OF_UE_MAX 40
# define NUMBER_OF_NR_UE_MAX 4
# define NUMBER_OF_CONNECTED_eNB_MAX 1 # define NUMBER_OF_CONNECTED_eNB_MAX 1
# define NUMBER_OF_CONNECTED_gNB_MAX 1 # define NUMBER_OF_CONNECTED_gNB_MAX 1
# else # else
@@ -37,7 +36,6 @@
# endif # endif
# else # else
# define NUMBER_OF_UE_MAX 4 # define NUMBER_OF_UE_MAX 4
# define NUMBER_OF_NR_UE_MAX 4
# define NUMBER_OF_CONNECTED_eNB_MAX 1 # define NUMBER_OF_CONNECTED_eNB_MAX 1
# define NUMBER_OF_CONNECTED_gNB_MAX 1 # define NUMBER_OF_CONNECTED_gNB_MAX 1
# endif # endif
openair1/SIMULATION/NR_PHY/ulsim.c
+1 -1
View File
@@ -308,7 +308,7 @@ int main(int argc, char **argv)
int tx_offset; int tx_offset;
int32_t txlev_sum = 0, atxlev[4]; int32_t txlev_sum = 0, atxlev[4];
int start_rb = 0; int start_rb = 0;
int UE_id =0; // [hna] only works for UE_id = 0 because NUMBER_OF_NR_UE_MAX is set to 1 (phy_init_nr_gNB causes segmentation fault) int UE_id = 0;
int print_perf = 0; int print_perf = 0;
cpuf = get_cpu_freq_GHz(); cpuf = get_cpu_freq_GHz();
int msg3_flag = 0; int msg3_flag = 0;
openair2/COMMON/platform_constants.h
+4
View File
@@ -119,6 +119,10 @@
#define CH_OFFSET 0x0004 #define CH_OFFSET 0x0004
#define CH_SHIFT 2 #define CH_SHIFT 2
// RLC Entity
#define RLC_TX_MAXSIZE 10000000
#define RLC_RX_MAXSIZE 10000000
// RLC_AM_SEND_MRW // RLC_AM_SEND_MRW
# define SEND_MRW_OFF 15 # define SEND_MRW_OFF 15
# define SEND_MRW_ON 240 # define SEND_MRW_ON 240
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
+1 -1
View File
@@ -628,7 +628,7 @@ void pf_dl(module_id_t module_id,
} }
} }
qsort(UE_sched, sizeof(*UE_sched), sizeofArray(UE_sched), comparator); qsort(UE_sched, sizeofArray(UE_sched), sizeof(UEsched_t), comparator);
UEsched_t *iterator = UE_sched; UEsched_t *iterator = UE_sched;
const int min_rbSize = 5; const int min_rbSize = 5;
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+1 -1
View File
@@ -1703,7 +1703,7 @@ void pf_ul(module_id_t module_id,
curUE++; curUE++;
} }
qsort(UE_sched, sizeof(*UE_sched), sizeofArray(UE_sched), comparator); qsort(UE_sched, sizeofArray(UE_sched), sizeof(UEsched_t), comparator);
UEsched_t *iterator=UE_sched; UEsched_t *iterator=UE_sched;
/* Loop UE_sched to find max coeff and allocate transmission */ /* Loop UE_sched to find max coeff and allocate transmission */
openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
+6 -6
View File
@@ -758,8 +758,8 @@ static void add_rlc_srb(int rnti, struct NR_SRB_ToAddMod *s, NR_RLC_BearerConfig
poll_byte = -1; poll_byte = -1;
max_retx_threshold = 8; max_retx_threshold = 8;
sn_field_length = 12; sn_field_length = 12;
nr_rlc_am = new_nr_rlc_entity_am(10000000, nr_rlc_am = new_nr_rlc_entity_am(RLC_RX_MAXSIZE,
10000000, RLC_TX_MAXSIZE,
deliver_sdu, ue, deliver_sdu, ue,
successful_delivery, ue, successful_delivery, ue,
max_retx_reached, ue, max_retx_reached, ue,
@@ -840,8 +840,8 @@ static void add_drb_am(int rnti, struct NR_DRB_ToAddMod *s, NR_RLC_BearerConfig_
if (ue->drb[drb_id-1] != NULL) { if (ue->drb[drb_id-1] != NULL) {
LOG_W(RLC, "%s:%d:%s: DRB %d already exists for UE with RNTI %04x, do nothing\n", __FILE__, __LINE__, __FUNCTION__, drb_id, rnti); LOG_W(RLC, "%s:%d:%s: DRB %d already exists for UE with RNTI %04x, do nothing\n", __FILE__, __LINE__, __FUNCTION__, drb_id, rnti);
} else { } else {
nr_rlc_am = new_nr_rlc_entity_am(10000000, nr_rlc_am = new_nr_rlc_entity_am(RLC_RX_MAXSIZE,
10000000, RLC_TX_MAXSIZE,
deliver_sdu, ue, deliver_sdu, ue,
successful_delivery, ue, successful_delivery, ue,
max_retx_reached, ue, max_retx_reached, ue,
@@ -912,8 +912,8 @@ static void add_drb_um(int rnti, struct NR_DRB_ToAddMod *s, NR_RLC_BearerConfig_
if (ue->drb[drb_id-1] != NULL) { if (ue->drb[drb_id-1] != NULL) {
LOG_W(RLC, "DEBUG add_drb_um %s:%d:%s: warning DRB %d already exist for ue %d, do nothing\n", __FILE__, __LINE__, __FUNCTION__, drb_id, rnti); LOG_W(RLC, "DEBUG add_drb_um %s:%d:%s: warning DRB %d already exist for ue %d, do nothing\n", __FILE__, __LINE__, __FUNCTION__, drb_id, rnti);
} else { } else {
nr_rlc_um = new_nr_rlc_entity_um(100000000, nr_rlc_um = new_nr_rlc_entity_um(RLC_RX_MAXSIZE,
100000000, RLC_TX_MAXSIZE,
deliver_sdu, ue, deliver_sdu, ue,
t_reassembly, t_reassembly,
sn_field_length); sn_field_length);