Commit 3ee1a481 authored by Chenyu's avatar Chenyu

debug

parent 0dde97b5
......@@ -615,7 +615,7 @@ void *rrc_enb_process_msg(void *notUsed) {
return NULL;
}
extern void tesths(void);//FINISH:test
// extern void tesths(void);//FINISH:test
int main( int argc, char **argv ) {
//uint8_t beta_ACK=0,beta_RI=0,beta_CQI=2;
......@@ -678,9 +678,9 @@ int main( int argc, char **argv ) {
#endif
*/
printf("witcomm111witcomm: \n");//FINISH:test
tesths();
printf("witcomm111witcomm \n");
// printf("witcomm111witcomm: \n");//FINISH:test
// tesths();
// printf("witcomm111witcomm \n");
NB_UE_INST=1;
......
......@@ -779,9 +779,11 @@ static void add_srb(int rnti, struct NR_SRB_ToAddMod *s)
__FILE__, __LINE__, __FUNCTION__, srb_id);
exit(1);
}
printf("1111111\n");//QUES
nr_pdcp_manager_lock(nr_pdcp_ue_manager);
printf("2222222\n");//QUES
ue = nr_pdcp_manager_get_ue(nr_pdcp_ue_manager, rnti);
printf("3333333\n");//QUES
if (ue->srb[srb_id-1] != NULL) {
LOG_W(PDCP, "%s:%d:%s: warning DRB %d already exist for ue %d, do nothing\n",
__FILE__, __LINE__, __FUNCTION__, srb_id, rnti);
......@@ -881,6 +883,7 @@ boolean_t nr_rrc_pdcp_config_asn1_req(
if (srb2add_list != NULL) {
for (i = 0; i < srb2add_list->list.count; i++) {
printf("-------i:%d,count:%d-----------\n",i,srb2add_list->list.count);//QUES
add_srb(rnti, srb2add_list->list.array[i]);
}
}
......
......@@ -59,10 +59,13 @@ int nr_pdcp_manager_get_enb_flag(nr_pdcp_ue_manager_t *_m)
void nr_pdcp_manager_lock(nr_pdcp_ue_manager_t *_m)
{
nr_pdcp_ue_manager_internal_t *m = _m;
printf("aaaaaaaaa\n");//QUES
if (pthread_mutex_lock(&m->lock)) {
LOG_E(PDCP, "%s:%d:%s: fatal\n", __FILE__, __LINE__, __FUNCTION__);
printf("bbbbbbbbb\n");//QUES
exit(1);
}
printf("ccccccccc\n");//QUES
}
void nr_pdcp_manager_unlock(nr_pdcp_ue_manager_t *_m)
......
......@@ -1528,22 +1528,28 @@ int8_t nr_rrc_ue_decode_ccch( const protocol_ctxt_t *const ctxt_pP, const NR_SRB
// Get configuration
// Release T300 timer
NR_UE_rrc_inst[ctxt_pP->module_id].Info[gNB_index].T300_active = 0;
printf("011111111111111111\n");//QUES
nr_rrc_ue_process_masterCellGroup(
ctxt_pP,
gNB_index,
&dl_ccch_msg->message.choice.c1->choice.rrcSetup->criticalExtensions.choice.rrcSetup->masterCellGroup);
printf("022222222222222222\n");//QUES
nr_sa_rrc_ue_process_radioBearerConfig(
ctxt_pP,
gNB_index,
&dl_ccch_msg->message.choice.c1->choice.rrcSetup->criticalExtensions.choice.rrcSetup->radioBearerConfig);
printf("033333333333333333\n");//QUES
nr_rrc_set_state (ctxt_pP->module_id, RRC_STATE_CONNECTED);
printf("044444444444444444\n");//QUES
nr_rrc_set_sub_state (ctxt_pP->module_id, RRC_SUB_STATE_CONNECTED);
printf("055555555555555555\n");//QUES
NR_UE_rrc_inst[ctxt_pP->module_id].Info[gNB_index].rnti = ctxt_pP->rnti;
rrc_ue_generate_RRCSetupComplete(
ctxt_pP,
gNB_index,
dl_ccch_msg->message.choice.c1->choice.rrcSetup->rrc_TransactionIdentifier,
NR_UE_rrc_inst[ctxt_pP->module_id].selected_plmn_identity);
printf("066666666666666666\n");//QUES
rval = 0;
break;
......@@ -2156,8 +2162,9 @@ nr_sa_rrc_ue_process_radioBearerConfig(
radioBearerConfig->srb_ToAddModList,
NULL,
NULL,
NR_UE_rrc_inst[ctxt_pP->module_id].cipheringAlgorithm |
(NR_UE_rrc_inst[ctxt_pP->module_id].integrityProtAlgorithm << 4),
// NR_UE_rrc_inst[ctxt_pP->module_id].cipheringAlgorithm |
// (NR_UE_rrc_inst[ctxt_pP->module_id].integrityProtAlgorithm << 4),
0xff,
kRRCenc,
kRRCint,
NULL,
......@@ -2337,8 +2344,9 @@ nr_sa_rrc_ue_process_radioBearerConfig(
NULL,
radioBearerConfig->drb_ToAddModList,
NULL,
NR_UE_rrc_inst[ctxt_pP->module_id].cipheringAlgorithm |
(NR_UE_rrc_inst[ctxt_pP->module_id].integrityProtAlgorithm << 4),
// NR_UE_rrc_inst[ctxt_pP->module_id].cipheringAlgorithm |
// (NR_UE_rrc_inst[ctxt_pP->module_id].integrityProtAlgorithm << 4),
0xff,
NULL,
NULL,
kUPenc,
......
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