Commit ddb238b8 authored by Raymond Knopp's avatar Raymond Knopp

removal of logging

preparation for UE CONTEXT Release from CU
parent 6bbc8169
...@@ -1843,7 +1843,7 @@ void fill_uci_harq_indication(PHY_VARS_eNB *eNB, ...@@ -1843,7 +1843,7 @@ void fill_uci_harq_indication(PHY_VARS_eNB *eNB,
pdu->ul_cqi_information.tl.tag = NFAPI_UL_CQI_INFORMATION_TAG; pdu->ul_cqi_information.tl.tag = NFAPI_UL_CQI_INFORMATION_TAG;
int SNRtimes10 = dB_fixed_times10(uci->stat) - 300;//(10*eNB->measurements.n0_power_dB[0]); int SNRtimes10 = dB_fixed_times10(uci->stat) - 300;//(10*eNB->measurements.n0_power_dB[0]);
if (SNRtimes10 < -100) LOG_I(PHY,"uci->stat %d \n",uci->stat); if (SNRtimes10 < -100) LOG_D(PHY,"uci->stat %d \n",uci->stat);
if (SNRtimes10 < -640) pdu->ul_cqi_information.ul_cqi=0; if (SNRtimes10 < -640) pdu->ul_cqi_information.ul_cqi=0;
else if (SNRtimes10 > 635) pdu->ul_cqi_information.ul_cqi=255; else if (SNRtimes10 > 635) pdu->ul_cqi_information.ul_cqi=255;
......
...@@ -482,12 +482,13 @@ int DU_handle_DL_RRC_MESSAGE_TRANSFER(instance_t instance, ...@@ -482,12 +482,13 @@ int DU_handle_DL_RRC_MESSAGE_TRANSFER(instance_t instance,
break; break;
case DL_DCCH_MessageType__c1_PR_rrcConnectionRelease: case DL_DCCH_MessageType__c1_PR_rrcConnectionRelease:
// handle RRCConnectionRelease // handle RRCConnectionRelease
LOG_I(DU_F1AP,"Received RRCConnectionRelease\n");
break; break;
case DL_DCCH_MessageType__c1_PR_securityModeCommand: case DL_DCCH_MessageType__c1_PR_securityModeCommand:
LOG_I(DU_F1AP,"Received securityModeCommand\n"); LOG_I(DU_F1AP,"Received securityModeCommand\n");
break; break;
case DL_DCCH_MessageType__c1_PR_ueCapabilityEnquiry: case DL_DCCH_MessageType__c1_PR_ueCapabilityEnquiry:
LOG_I(DU_F1AP,"Received sueCapabilityEnquiry\n"); LOG_I(DU_F1AP,"Received ueCapabilityEnquiry\n");
break; break;
case DL_DCCH_MessageType__c1_PR_counterCheck: case DL_DCCH_MessageType__c1_PR_counterCheck:
#if (RRC_VERSION >= MAKE_VERSION(10, 0, 0)) #if (RRC_VERSION >= MAKE_VERSION(10, 0, 0))
......
...@@ -686,7 +686,7 @@ rx_sdu(const module_id_t enb_mod_idP, ...@@ -686,7 +686,7 @@ rx_sdu(const module_id_t enb_mod_idP,
//UE_list->UE_template[CC_idP][UE_id].estimated_ul_buffer += UE_list->UE_template[CC_idP][UE_id].estimated_ul_buffer / 4; //UE_list->UE_template[CC_idP][UE_id].estimated_ul_buffer += UE_list->UE_template[CC_idP][UE_id].estimated_ul_buffer / 4;
} }
LOG_I(MAC, LOG_D(MAC,
"[eNB %d] CC_id %d Frame %d : ULSCH -> UL-DCCH, received %d bytes form UE %d on LCID %d \n", "[eNB %d] CC_id %d Frame %d : ULSCH -> UL-DCCH, received %d bytes form UE %d on LCID %d \n",
enb_mod_idP, CC_idP, frameP, rx_lengths[i], UE_id, enb_mod_idP, CC_idP, frameP, rx_lengths[i], UE_id,
rx_lcids[i]); rx_lcids[i]);
......
...@@ -604,15 +604,15 @@ void rlc_data_ind ( ...@@ -604,15 +604,15 @@ void rlc_data_ind (
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
//#if defined(TRACE_RLC_PAYLOAD) #if defined(TRACE_RLC_PAYLOAD)
LOG_I(RLC, PROTOCOL_CTXT_FMT"[%s %u] Display of rlc_data_ind: size %u\n", LOG_D(RLC, PROTOCOL_CTXT_FMT"[%s %u] Display of rlc_data_ind: size %u\n",
PROTOCOL_CTXT_ARGS(ctxt_pP), PROTOCOL_CTXT_ARGS(ctxt_pP),
(srb_flagP) ? "SRB" : "DRB", (srb_flagP) ? "SRB" : "DRB",
rb_idP, rb_idP,
sdu_sizeP); sdu_sizeP);
// rlc_util_print_hex_octets(RLC, (unsigned char*)sdu_pP->data, sdu_sizeP); // rlc_util_print_hex_octets(RLC, (unsigned char*)sdu_pP->data, sdu_sizeP);
//#endif #endif
#if T_TRACER #if T_TRACER
if (ctxt_pP->enb_flag) if (ctxt_pP->enb_flag)
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#include "assertions.h" #include "assertions.h"
#include "common/utils/LOG/vcd_signal_dumper.h" #include "common/utils/LOG/vcd_signal_dumper.h"
#define DEBUG_MAC_INTERFACE 1 //#define DEBUG_MAC_INTERFACE 1
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
struct mac_data_ind mac_rlc_deserialize_tb ( struct mac_data_ind mac_rlc_deserialize_tb (
...@@ -260,7 +260,7 @@ void mac_rlc_data_ind ( ...@@ -260,7 +260,7 @@ void mac_rlc_data_ind (
#ifdef DEBUG_MAC_INTERFACE #ifdef DEBUG_MAC_INTERFACE
if (num_tbP) { if (num_tbP) {
LOG_I(RLC, PROTOCOL_CTXT_FMT" MAC_RLC_DATA_IND on channel %d (%d), rb max %d, tb_sizeP %d\n", LOG_D(RLC, PROTOCOL_CTXT_FMT" MAC_RLC_DATA_IND on channel %d (%d), rb max %d, tb_sizeP %d\n",
PROTOCOL_CTXT_ARGS(&ctxt), PROTOCOL_CTXT_ARGS(&ctxt),
channel_idP, channel_idP,
RLC_MAX_LC, RLC_MAX_LC,
......
...@@ -1063,8 +1063,14 @@ void release_UE_in_freeList(module_id_t mod_id) ...@@ -1063,8 +1063,14 @@ void release_UE_in_freeList(module_id_t mod_id)
} }
} }
} }
if (RC.rrc[mod_id]->node_type == ngran_eNB) {
rrc_mac_remove_ue(mod_id,rnti); rrc_mac_remove_ue(mod_id,rnti);
rrc_rlc_remove_ue(&ctxt); rrc_rlc_remove_ue(&ctxt);
}
else if (RC.rrc[mod_id]->node_type == ngran_eNB_CU || RC.rrc[mod_id]->node_type == ngran_ng_eNB_CU) {
// send UE_CONTEXT_RELEASE
AssertFatal(1==0,"Need to added context removal\n");
}
pdcp_remove_UE(&ctxt); pdcp_remove_UE(&ctxt);
if(remove_UEContext){ if(remove_UEContext){
...@@ -6571,7 +6577,13 @@ rrc_eNB_decode_ccch( ...@@ -6571,7 +6577,13 @@ rrc_eNB_decode_ccch(
LOG_I(RRC, PROTOCOL_RRC_CTXT_UE_FMT" Can't create new context for UE random UE identity (0x%" PRIx64 ")\n", LOG_I(RRC, PROTOCOL_RRC_CTXT_UE_FMT" Can't create new context for UE random UE identity (0x%" PRIx64 ")\n",
PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP), PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP),
random_value); random_value);
if (RC.rrc[ctxt_pP->module_id] == ngran_eNB)
rrc_mac_remove_ue(ctxt_pP->module_id,ctxt_pP->rnti); rrc_mac_remove_ue(ctxt_pP->module_id,ctxt_pP->rnti);
else if (RC.rrc[ctxt_pP->module_id]->node_type == ngran_eNB_CU ||
RC.rrc[ctxt_pP->module_id]->node_type == ngran_ng_eNB_CU)
AssertFatal(1==0,"Need to added context removal\n");
return -1; return -1;
} }
} }
...@@ -8107,6 +8119,7 @@ rrc_rx_tx( ...@@ -8107,6 +8119,7 @@ rrc_rx_tx(
// ue_context_p->ue_context.ue_release_timer_s1 = 0; // ue_context_p->ue_context.ue_release_timer_s1 = 0;
#if defined(ENABLE_USE_MME) #if defined(ENABLE_USE_MME)
#if defined(ENABLE_ITTI) #if defined(ENABLE_ITTI)
if (RC.rrc[ctxt_pP->module_id]->node_type != ngran_eNB_DU)
rrc_eNB_generate_RRCConnectionRelease(ctxt_pP, ue_context_p); rrc_eNB_generate_RRCConnectionRelease(ctxt_pP, ue_context_p);
#endif #endif
#else #else
...@@ -8141,6 +8154,7 @@ rrc_rx_tx( ...@@ -8141,6 +8154,7 @@ rrc_rx_tx(
ue_context_p->ue_context.ue_release_timer_thres_rrc = 100; ue_context_p->ue_context.ue_release_timer_thres_rrc = 100;
#if defined(ENABLE_USE_MME) #if defined(ENABLE_USE_MME)
#if defined(ENABLE_ITTI) #if defined(ENABLE_ITTI)
if (RC.rrc[ctxt_pP->module_id]->node_type != ngran_eNB_DU) {
int e_rab; int e_rab;
MessageDef *msg_complete_p = NULL; MessageDef *msg_complete_p = NULL;
MessageDef *msg_delete_tunnels_p = NULL; MessageDef *msg_delete_tunnels_p = NULL;
...@@ -8180,6 +8194,7 @@ rrc_rx_tx( ...@@ -8180,6 +8194,7 @@ rrc_rx_tx(
RC.rrc[ctxt_pP->module_id], RC.rrc[ctxt_pP->module_id],
rrc_ue_s1ap_ids); rrc_ue_s1ap_ids);
} }
}
#endif #endif
#endif #endif
rrc_release_info.RRC_release_ctrl[release_num].flag = 0; rrc_release_info.RRC_release_ctrl[release_num].flag = 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