Modify for rru.

openair2/RRC/LTE/rrc_eNB.c

@@ -2226,7 +2226,7 @@ rrc_eNB_generate_RRCConnectionReestablishmentReject(
  }
   T(T_ENB_RRC_CONNECTION_REESTABLISHMENT_REJECT, T_INT(ctxt_pP->module_id), T_INT(ctxt_pP->frame),
     T_INT(ctxt_pP->subframe), T_INT(ctxt_pP->rnti));
-
+  if (ue_context_pP != NULL) {
   eNB_RRC_UE_t *ue_p = &ue_context_pP->ue_context; 
 
   ue_p->Srb0.Tx_buffer.payload_size =
@@ -2251,6 +2251,9 @@ rrc_eNB_generate_RRCConnectionReestablishmentReject(
         PROTOCOL_RRC_CTXT_UE_FMT" [RAPROC] Logical Channel DL-CCCH, Generating LTE_RRCConnectionReestablishmentReject (bytes %d)\n",
         PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP),
         ue_p->Srb0.Tx_buffer.payload_size);
+  } else {
+    LOG_I(RRC,"rrc_eNB_generate_RRCConnectionReestablishmentReject : ue_contextpP is NULL\n");
+  }
 }
 
 //-----------------------------------------------------------------------------

targets/RT/USER/lte-enb.c

@@ -1178,6 +1178,7 @@ void init_eNB_afterRU(void) {
     for (CC_id=0; CC_id<RC.nb_CC[inst]; CC_id++) {
       LOG_I(PHY,"RC.nb_CC[inst:%d][CC_id:%d]:%p\n", inst, CC_id, RC.eNB[inst][CC_id]);
       eNB                                  =  RC.eNB[inst][CC_id];
+      phy_vars_eNB_malloc(eNB);
       phy_init_lte_eNB(eNB,0,0);
 
       // map antennas and PRACH signals to eNB RX

targets/RT/USER/lte-softmodem.c

@@ -842,6 +842,10 @@ int main( int argc, char **argv ) {
   // RU thread and some L1 procedure aren't necessary in VNF or L2 FAPI simulator.
   // but RU thread deals with pre_scd and this is necessary in VNF and simulator.
   // some initialization is necessary and init_ru_vnf do this.
+  if (NFAPI_MODE == NFAPI_MODE_PNF) {
+    NUMBER_OF_UCI_VARS_MAX = 4*16 + NUMBER_OF_UE_MAX;
+    printf("PNF : NUMBER_OF_UCI_VARS_MAX = %d\n",NUMBER_OF_UCI_VARS_MAX);
+  }
   if (RC.nb_RU >0 && NFAPI_MODE!=NFAPI_MODE_VNF) {
     printf("Initializing RU threads\n");
     init_RU(get_softmodem_params()->rf_config_file,get_softmodem_params()->clock_source,get_softmodem_params()->timing_source,get_softmodem_params()->send_dmrs_sync);