fix merge miss and 256UE bug

openair1/PHY/defs.h

@@ -1706,7 +1706,7 @@ typedef struct UE_RX_RECEIVE_INFO_s {
   /// ue_num
   uint16_t       ue_num;
   /// DLSCH info
-  UE_RX_INFO     ue_rx_info[20];
+  UE_RX_INFO     ue_rx_info[25];
 } UE_RX_RECEIVE_INFO;
 
 typedef struct eNB_RX_RECEIVE_INFO_s {
@@ -1725,7 +1725,7 @@ typedef struct eNB_RX_RECEIVE_INFO_s {
   /// ue_num
   uint16_t        ue_num;
   // ULSCH info
-  eNB_RX_INFO     ulsch_info[20];
+  eNB_RX_INFO     ulsch_info[35];
 } eNB_RX_RECEIVE_INFO;
 #endif
 

openair1/SCHED/fapi_l1.c

@@ -95,7 +95,11 @@ void handle_nfapi_hi_dci0_hi_pdu(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,
   phich->config[phich->num_hi].first_rb = hi_dci0_config_pdu->hi_pdu.hi_pdu_rel8.resource_block_start;
   phich->config[phich->num_hi].n_DMRS   = hi_dci0_config_pdu->hi_pdu.hi_pdu_rel8.cyclic_shift_2_for_drms;
   phich->num_hi++;
+#ifndef UE_EXPANSION_SIM2
   AssertFatal(phich->num_hi<32,"Maximum number of phich reached in subframe\n");
+#else
+  AssertFatal(phich->num_hi<36,"Maximum number of phich reached in subframe\n");
+#endif
 }
 
 void handle_nfapi_bch_pdu(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,

targets/RT/USER/lte-ue.c

@@ -280,6 +280,10 @@ void init_UE(int nb_inst,int eMBMS_active, int uecap_xer_in) {
     UE->rfdevice.host_type = RAU_HOST;
     //    UE->rfdevice.type      = NONE_DEV;
     PHY_VARS_UE *UE = PHY_vars_UE_g[inst][0];
+   AssertFatal(0 == pthread_create(&UE->proc.pthread_ue,
+                                    &UE->proc.attr_ue,
+                                    UE_thread,
+                                    (void*)UE), "");
 #else
 #ifdef NAS_UE
     MessageDef *message_p;
@@ -290,13 +294,17 @@ void init_UE(int nb_inst,int eMBMS_active, int uecap_xer_in) {
   }
 
 #ifdef UE_EXPANSION_SIM2
-    pthread_mutex_init(&mutex_send, NULL);
-    pthread_cond_init(&cond_send, NULL);
-
-    pthread_create(&PHY_vars_UE_g[0][0]->proc.pthread_phy_send, NULL, UE_phy_send, (void*)PHY_vars_UE_g[0][0]);
-    pthread_create(&PHY_vars_UE_g[0][0]->proc.pthread_time, NULL, UE_time_sync,(void*)NULL);
-    pthread_create(&PHY_vars_UE_g[0][0]->proc.pthread_phy_stub, NULL, UE_phy_rev, (void*)NULL);
-
+  pthread_mutex_init(&mutex_send[0], NULL);
+  pthread_mutex_init(&mutex_send[1], NULL);
+  pthread_cond_init(&cond_send[0], NULL);
+  pthread_cond_init(&cond_send[1], NULL);
+
+  for(inst=0;inst<RX_NB_TH;inst++){
+    pthread_create(&PHY_vars_UE_g[0][0]->proc.pthread_phy_send, NULL, UE_phy_send, (void*)&inst);
+    usleep(1000);
+  }
+  pthread_create(&PHY_vars_UE_g[0][0]->proc.pthread_time, NULL, UE_time_sync,(void*)NULL);
+  pthread_create(&PHY_vars_UE_g[0][0]->proc.pthread_phy_stub, NULL, UE_phy_rev, (void*)NULL);
 #endif
   printf("UE threads created by %ld\n", gettid());
 #if 0