removed NUMBER_NR_UE_MAX

openair1/PHY/INIT/nr_init.c

@@ -456,7 +456,7 @@ void init_nr_transport(PHY_VARS_gNB *gNB) {
     }
   }
 
-  for (i=0; i<NUMBER_OF_NR_UE_MAX; i++) {
+  for (i=0; i<NUMBER_OF_NR_ULSCH_MAX; i++) {
 
     LOG_I(PHY,"Allocating Transport Channel Buffer for ULSCH, UE %d\n",i);
 
@@ -488,8 +488,6 @@ void init_nr_transport(PHY_VARS_gNB *gNB) {
 
   gNB->rx_total_gain_dB=130;
 
-  for(i=0; i<NUMBER_OF_NR_UE_MAX; i++)
-    gNB->mu_mimo_mode[i].dl_pow_off = 2;
 
   //fp->pucch_config_common.deltaPUCCH_Shift = 1;
 }

openair1/SCHED_NR/phy_procedures_nr_gNB.c

@@ -222,10 +222,10 @@ void phy_procedures_gNB_TX(PHY_VARS_gNB *gNB,
   if (do_prach_rx(fp,frame,slot)) L1_nr_prach_procedures(gNB,frame,slot/fp->slots_per_subframe);
 */
 
-void nr_ulsch_procedures(PHY_VARS_gNB *gNB, gNB_L1_rxtx_proc_t *proc, int UE_id, uint8_t harq_pid) {
+void nr_ulsch_procedures(PHY_VARS_gNB *gNB, gNB_L1_rxtx_proc_t *proc, int ULSCH_id, uint8_t harq_pid) {
   
   NR_DL_FRAME_PARMS                    *frame_parms           = &gNB->frame_parms;
-  nfapi_nr_ul_config_ulsch_pdu         *rel15_ul              = &gNB->ulsch[UE_id+1][0]->harq_processes[harq_pid]->ulsch_pdu;
+  nfapi_nr_ul_config_ulsch_pdu         *rel15_ul              = &gNB->ulsch[ULSCH_id+1][0]->harq_processes[harq_pid]->ulsch_pdu;
   nfapi_nr_ul_config_ulsch_pdu_rel15_t *nfapi_ulsch_pdu_rel15 = &rel15_ul->ulsch_pdu_rel15;
   
   //uint8_t ret;
@@ -243,7 +243,7 @@ void nr_ulsch_procedures(PHY_VARS_gNB *gNB, gNB_L1_rxtx_proc_t *proc, int UE_id,
   //------------------- ULSCH unscrambling -------------------
   //----------------------------------------------------------
 
-  nr_ulsch_unscrambling(gNB->pusch_vars[UE_id]->llr,
+  nr_ulsch_unscrambling(gNB->pusch_vars[ULSCH_id]->llr,
                         G,
                         0,
                         Nid_cell,
@@ -255,8 +255,8 @@ void nr_ulsch_procedures(PHY_VARS_gNB *gNB, gNB_L1_rxtx_proc_t *proc, int UE_id,
 
   //ret = nr_ulsch_decoding(gNB,
   nr_ulsch_decoding(gNB,
-                    UE_id,
-                    gNB->pusch_vars[UE_id]->llr,
+                    ULSCH_id,
+                    gNB->pusch_vars[ULSCH_id]->llr,
                     frame_parms,
                     proc->frame_rx,
                     nfapi_ulsch_pdu_rel15->number_symbols,
@@ -293,20 +293,20 @@ void phy_procedures_gNB_common_RX(PHY_VARS_gNB *gNB, gNB_L1_rxtx_proc_t *proc) {
 
 void phy_procedures_gNB_uespec_RX(PHY_VARS_gNB *gNB, gNB_L1_rxtx_proc_t *proc, uint8_t symbol_start, uint8_t symbol_end) {
   
-  uint8_t UE_id;
+  uint8_t ULSCH_id;
   uint8_t symbol;
   uint8_t harq_pid = 0; // [hna] Previously in LTE, the harq_pid was obtained from the subframe number (Synchronous HARQ)
                         //       In NR, this should be signaled through uplink scheduling dci (i.e, DCI 0_0, 0_1) (Asynchronous HARQ)  
 
-  for (UE_id = 0; UE_id < NUMBER_OF_NR_UE_MAX; UE_id++) {
+  for (ULSCH_id = 0; ULSCH_id < NUMBER_OF_NR_ULSCH_MAX; ULSCH_id++) {
     
     for(symbol = symbol_start; symbol < symbol_end; symbol++) {
 
-      nr_rx_pusch(gNB, UE_id, proc->frame_rx, proc->slot_rx, symbol, harq_pid);
+      nr_rx_pusch(gNB, ULSCH_id, proc->frame_rx, proc->slot_rx, symbol, harq_pid);
 
     }
       
-    nr_ulsch_procedures(gNB, proc, UE_id, harq_pid);
+    nr_ulsch_procedures(gNB, proc, ULSCH_id, harq_pid);
         
   }
 

openair2/COMMON/platform_constants.h

@@ -98,7 +98,7 @@
 #endif
 
 #define NUMBER_OF_NR_DLSCH_MAX 2//16
-#define NUMBER_OF_NR_ULSCH_MAX 16
+#define NUMBER_OF_NR_ULSCH_MAX 2//16
 
 #define MAX_MANAGED_ENB_PER_MOBILE  2
 #define MAX_MANAGED_GNB_PER_MOBILE  2

openair2/RRC/NR/nr_rrc_defs.h

@@ -78,7 +78,7 @@
 /*I will change the name of the structure for compile purposes--> hope not to undo this process*/
 
 typedef unsigned int uid_nr_t;
-#define NR_UID_LINEAR_ALLOCATOR_BITMAP_SIZE (((NUMBER_OF_NR_UE_MAX/8)/sizeof(unsigned int)) + 1)
+#define NR_UID_LINEAR_ALLOCATOR_BITMAP_SIZE (((MAX_MOBILES_PER_GNB/8)/sizeof(unsigned int)) + 1)
 
 typedef struct nr_uid_linear_allocator_s {
   unsigned int   bitmap[NR_UID_LINEAR_ALLOCATOR_BITMAP_SIZE];
@@ -113,7 +113,6 @@ typedef enum UE_STATE_NR_e {
 } NR_UE_STATE_t;
 
 
-//#define NUMBER_OF_NR_UE_MAX MAX_MOBILES_PER_RG
 #define RRM_FREE(p)       if ( (p) != NULL) { free(p) ; p=NULL ; }
 #define RRM_MALLOC(t,n)   (t *) malloc16( sizeof(t) * n )
 #define RRM_CALLOC(t,n)   (t *) malloc16( sizeof(t) * n)

targets/COMMON/openairinterface5g_limits.h

@@ -15,27 +15,23 @@
 // This problem will be fixed in the future.
 #                ifndef UESIM_EXPANSION
 #                    define NUMBER_OF_UE_MAX 16
-#                    define NUMBER_OF_NR_UE_MAX 16
 #                    define NUMBER_OF_UCI_VARS_MAX 56
 #                    define NUMBER_OF_CONNECTED_eNB_MAX 3
 #                    define NUMBER_OF_CONNECTED_gNB_MAX 3
 #            	 else
 #                    define NUMBER_OF_UE_MAX 256
-#                    define NUMBER_OF_NR_UE_MAX 16
 #                    define NUMBER_OF_UCI_VARS_MAX 256
 #                    define NUMBER_OF_CONNECTED_eNB_MAX 1
 #                    define NUMBER_OF_CONNECTED_gNB_MAX 3
 #                endif
 #            else
 #                    define NUMBER_OF_UE_MAX 256
-#                    define NUMBER_OF_NR_UE_MAX 256
 #                    define NUMBER_OF_UCI_VARS_MAX 256
 #                    define NUMBER_OF_CONNECTED_eNB_MAX 1
 #                    define NUMBER_OF_CONNECTED_gNB_MAX 1
 #            endif
 #        else
 #                    define NUMBER_OF_UE_MAX 1
-#                    define NUMBER_OF_NR_UE_MAX 1
 #                    define NUMBER_OF_UCI_VARS_MAX 56
 #                    define NUMBER_OF_CONNECTED_eNB_MAX 1
 #                    define NUMBER_OF_CONNECTED_gNB_MAX 1
@@ -53,20 +49,17 @@ and the other are using MAX_MOBILES_PER_ENB in for-loop.
 */
 #            ifndef UESIM_EXPANSION
 #                define NUMBER_OF_UE_MAX 16
-#                define NUMBER_OF_NR_UE_MAX 20
 #                define NUMBER_OF_UCI_VARS_MAX 56
 #                define NUMBER_OF_CONNECTED_eNB_MAX 3
 #                define NUMBER_OF_CONNECTED_gNB_MAX 3
 #            else
 #                define NUMBER_OF_UE_MAX 256
-#                define NUMBER_OF_NR_UE_MAX 20
 #                define NUMBER_OF_UCI_VARS_MAX 256
 #                define NUMBER_OF_CONNECTED_eNB_MAX 1
 #                define NUMBER_OF_CONNECTED_gNB_MAX 3
 #            endif
 #        else
 #                define NUMBER_OF_UE_MAX 256
-#                define NUMBER_OF_NR_UE_MAX 256
 #                define NUMBER_OF_UCI_VARS_MAX 256
 #                define NUMBER_OF_CONNECTED_eNB_MAX 1
 #                define NUMBER_OF_CONNECTED_gNB_MAX 1
@@ -76,7 +69,6 @@ and the other are using MAX_MOBILES_PER_ENB in for-loop.
 #            undef  NUMBER_OF_gNB_MAX
 
 #            undef  NUMBER_OF_UE_MAX
-#            undef  NUMBER_OF_NR_UE_MAX
 
 #            undef  NUMBER_OF_RU_MAX
 #            undef  NUMBER_OF_NR_RU_MAX
@@ -85,7 +77,6 @@ and the other are using MAX_MOBILES_PER_ENB in for-loop.
 #            define NUMBER_OF_gNB_MAX 3
 
 #            define NUMBER_OF_UE_MAX 3
-#            define NUMBER_OF_NR_UE_MAX 3
 
 #            define NUMBER_OF_RU_MAX 3
 #            define NUMBER_OF_NR_RU_MAX 3
@@ -95,7 +86,6 @@ and the other are using MAX_MOBILES_PER_ENB in for-loop.
 #            undef  NUMBER_OF_gNB_MAX
 
 #            undef  NUMBER_OF_UE_MAX
-#            undef  NUMBER_OF_NR_UE_MAX
 
 #            undef  NUMBER_OF_CONNECTED_eNB_MAX
 #            undef  NUMBER_OF_CONNECTED_gNB_MAX
@@ -107,7 +97,6 @@ and the other are using MAX_MOBILES_PER_ENB in for-loop.
 #            define NUMBER_OF_gNB_MAX 2
 
 #            define NUMBER_OF_UE_MAX 120
-#            define NUMBER_OF_NR_UE_MAX 120
 
 #            define NUMBER_OF_RU_MAX 16
 #            define NUMBER_OF_NR_RU_MAX 16