Commit 44288d75 authored by heshanyun's avatar heshanyun

fix issue about ittiSIM and CplaneNG of withS1

parent 8965dd78
...@@ -819,17 +819,15 @@ rrc_gNB_process_NGAP_DOWNLINK_NAS( ...@@ -819,17 +819,15 @@ rrc_gNB_process_NGAP_DOWNLINK_NAS(
itti_send_msg_to_task (TASK_RRC_UE_SIM, instance, message_p); itti_send_msg_to_task (TASK_RRC_UE_SIM, instance, message_p);
LOG_I(NR_RRC, "Send DL NAS message \n"); LOG_I(NR_RRC, "Send DL NAS message \n");
#else #else
#if(0)
/* Transfer data to PDCP */ /* Transfer data to PDCP */
nr_rrc_data_req ( nr_rrc_data_req (
&ctxt, &ctxt,
ue_context_p->ue_context.Srb2.Srb_info.Srb_id, DCCH,
(*rrc_gNB_mui)++, (*rrc_gNB_mui)++,
SDU_CONFIRM_NO, SDU_CONFIRM_NO,
length, length,
buffer, buffer,
PDCP_TRANSMISSION_MODE_CONTROL); PDCP_TRANSMISSION_MODE_CONTROL);
#endif
#endif #endif
} }
break; break;
......
...@@ -580,8 +580,14 @@ int main( int argc, char **argv ) ...@@ -580,8 +580,14 @@ int main( int argc, char **argv )
init_pdcp(); init_pdcp();
if (RC.nb_nr_inst > 0) { if (RC.nb_nr_inst > 0) {
nr_read_config_and_init();
// don't create if node doesn't connect to RRC/S1/GTP // don't create if node doesn't connect to RRC/S1/GTP
AssertFatal(create_gNB_tasks(1) == 0,"cannot create ITTI tasks\n"); AssertFatal(create_gNB_tasks(1) == 0,"cannot create ITTI tasks\n");
for (int gnb_id = 0; gnb_id < RC.nb_nr_inst; gnb_id++) {
MessageDef *msg_p = itti_alloc_new_message (TASK_GNB_APP, 0, NRRRC_CONFIGURATION_REQ);
NRRRC_CONFIGURATION_REQ(msg_p) = RC.nrrrc[gnb_id]->configuration;
itti_send_msg_to_task (TASK_RRC_GNB, GNB_MODULE_ID_TO_INSTANCE(gnb_id), msg_p);
}
} else { } else {
printf("No ITTI, Initializing L1\n"); printf("No ITTI, Initializing L1\n");
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment