Skip to content

O
OpenXG-RAN
Commit e53bac96 authored by Tien-Thinh Nguyen's avatar Tien-Thinh Nguyen
Browse files
Options

remove debug messages

parent bc5781aa
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 34 deletions
openair2/LAYER2/MAC/config.c
View file @ e53bac96
...@@ -1403,7 +1403,7 @@ rrc_mac_config_req_ue( ...@@ -1403,7 +1403,7 @@ rrc_mac_config_req_ue(
} }
for (k = 0; k < MAX_NUM_LCID_DATA; k++) { for (k = 0; k < MAX_NUM_LCID_DATA; k++) {
LOG_I(MAC,"[UE %d] logical channel %d channel id %d, groupL2Id %d\n", Mod_idP,k,UE_mac_inst[Mod_idP].sl_info[k].LCID, UE_mac_inst[Mod_idP].sl_info[k].groupL2Id ); LOG_D(MAC,"[UE %d] logical channel %d channel id %d, groupL2Id %d\n", Mod_idP,k,UE_mac_inst[Mod_idP].sl_info[k].LCID, UE_mac_inst[Mod_idP].sl_info[k].groupL2Id );
} }
} }
if (destinationL2Id){ if (destinationL2Id){
...@@ -1422,30 +1422,28 @@ rrc_mac_config_req_ue( ...@@ -1422,30 +1422,28 @@ rrc_mac_config_req_ue(
} }
for (k = 0; k < MAX_NUM_LCID_DATA; k++) { for (k = 0; k < MAX_NUM_LCID_DATA; k++) {
LOG_I(MAC,"[UE %d] logical channel %d channel id %d, destinationL2Id %d\n", Mod_idP,k,UE_mac_inst[Mod_idP].sl_info[k].LCID, UE_mac_inst[Mod_idP].sl_info[k].destinationL2Id); LOG_D(MAC,"[UE %d] logical channel %d channel id %d, destinationL2Id %d\n", Mod_idP,k,UE_mac_inst[Mod_idP].sl_info[k].LCID, UE_mac_inst[Mod_idP].sl_info[k].destinationL2Id);
} }
} }
} else if ((logicalChannelIdentity >= MAX_NUM_LCID_DATA) && (logicalChannelIdentity < MAX_NUM_LCID)) { } else if ((logicalChannelIdentity >= MAX_NUM_LCID_DATA) && (logicalChannelIdentity < MAX_NUM_LCID)) {
// if (destinationL2Id){ LOG_I(MAC,"[UE %d] Configure LCID %d for PC5S\n", Mod_idP, logicalChannelIdentity );
LOG_I(MAC,"[UE %d] Configure LCID %d for PC5S\n", Mod_idP, logicalChannelIdentity ); j = 0;
j = 0; k = 0;
k = 0; for (k = MAX_NUM_LCID_DATA; k < MAX_NUM_LCID; k++) {
for (k = MAX_NUM_LCID_DATA; k < MAX_NUM_LCID; k++) { if ((UE_mac_inst[Mod_idP].sl_info[k].LCID == 0) && (j == 0)) j = k+1;
if ((UE_mac_inst[Mod_idP].sl_info[k].LCID == 0) && (j == 0)) j = k+1; if ((UE_mac_inst[Mod_idP].sl_info[k].LCID == logicalChannelIdentity)) break;
if ((UE_mac_inst[Mod_idP].sl_info[k].LCID == logicalChannelIdentity)) break; //&& (UE_mac_inst[Mod_idP].sl_info[k].destinationL2Id == *destinationL2Id)) break; //(LCID, D) already exists!
//&& (UE_mac_inst[Mod_idP].sl_info[k].destinationL2Id == *destinationL2Id)) break; //(LCID, D) already exists! }
} if ((k == MAX_NUM_LCID) && (j > 0)) {
if ((k == MAX_NUM_LCID) && (j > 0)) { UE_mac_inst[Mod_idP].sl_info[j-1].LCID = logicalChannelIdentity;
UE_mac_inst[Mod_idP].sl_info[j-1].LCID = logicalChannelIdentity; if (destinationL2Id) UE_mac_inst[Mod_idP].sl_info[j-1].destinationL2Id = *destinationL2Id;
if (destinationL2Id) UE_mac_inst[Mod_idP].sl_info[j-1].destinationL2Id = *destinationL2Id; UE_mac_inst[Mod_idP].sl_info[j-1].sourceL2Id = *sourceL2Id;
UE_mac_inst[Mod_idP].sl_info[j-1].sourceL2Id = *sourceL2Id; UE_mac_inst[Mod_idP].numCommFlows++;
UE_mac_inst[Mod_idP].numCommFlows++;
} }
for (k = MAX_NUM_LCID_DATA; k < MAX_NUM_LCID; k++) { for (k = MAX_NUM_LCID_DATA; k < MAX_NUM_LCID; k++) {
LOG_I(MAC,"[UE %d] logical channel %d channel id %d, destinationL2Id %d\n", Mod_idP,k,UE_mac_inst[Mod_idP].sl_info[k].LCID, UE_mac_inst[Mod_idP].sl_info[k].destinationL2Id); LOG_D(MAC,"[UE %d] logical channel %d channel id %d, destinationL2Id %d\n", Mod_idP,k,UE_mac_inst[Mod_idP].sl_info[k].LCID, UE_mac_inst[Mod_idP].sl_info[k].destinationL2Id);
} }
// }
} }
...@@ -1466,10 +1464,10 @@ rrc_mac_config_req_ue( ...@@ -1466,10 +1464,10 @@ rrc_mac_config_req_ue(
} }
for (k = 0; k < MAX_NUM_LCID_DATA; k++) { for (k = 0; k < MAX_NUM_LCID_DATA; k++) {
LOG_I(MAC,"[UE %d] channel id %d, destinationL2Id %d, groupL2Id %d\n", Mod_idP, UE_mac_inst[Mod_idP].sl_info[k].LCID, UE_mac_inst[Mod_idP].sl_info[k].destinationL2Id, UE_mac_inst[Mod_idP].sl_info[k].groupL2Id); LOG_D(MAC,"[UE %d] channel id %d, destinationL2Id %d, groupL2Id %d\n", Mod_idP, UE_mac_inst[Mod_idP].sl_info[k].LCID, UE_mac_inst[Mod_idP].sl_info[k].destinationL2Id, UE_mac_inst[Mod_idP].sl_info[k].groupL2Id);
} }
} else if ((logicalChannelIdentity >= MAX_NUM_LCID_DATA) && (logicalChannelIdentity < MAX_NUM_LCID)) { } else if ((logicalChannelIdentity >= MAX_NUM_LCID_DATA) && (logicalChannelIdentity < MAX_NUM_LCID)) {
//Todo - remove RBID for PCS5 //remove RBID for PCS5
LOG_I(MAC,"[UE %d] Remove (logicalChannelIdentity %d)\n", Mod_idP, logicalChannelIdentity ); LOG_I(MAC,"[UE %d] Remove (logicalChannelIdentity %d)\n", Mod_idP, logicalChannelIdentity );
k = 0; k = 0;
for (k = MAX_NUM_LCID_DATA; k < MAX_NUM_LCID; k++) { for (k = MAX_NUM_LCID_DATA; k < MAX_NUM_LCID; k++) {
...@@ -1483,7 +1481,7 @@ rrc_mac_config_req_ue( ...@@ -1483,7 +1481,7 @@ rrc_mac_config_req_ue(
} }
for (k = MAX_NUM_LCID_DATA; k < MAX_NUM_LCID; k++) { for (k = MAX_NUM_LCID_DATA; k < MAX_NUM_LCID; k++) {
LOG_I(MAC,"[UE %d] channel id %d, destinationL2Id %d, groupL2Id %d\n", Mod_idP, UE_mac_inst[Mod_idP].sl_info[k].LCID, UE_mac_inst[Mod_idP].sl_info[k].destinationL2Id, UE_mac_inst[Mod_idP].sl_info[k].groupL2Id); LOG_D(MAC,"[UE %d] channel id %d, destinationL2Id %d, groupL2Id %d\n", Mod_idP, UE_mac_inst[Mod_idP].sl_info[k].LCID, UE_mac_inst[Mod_idP].sl_info[k].destinationL2Id, UE_mac_inst[Mod_idP].sl_info[k].groupL2Id);
} }
} }
......
openair2/LAYER2/MAC/ue_procedures.c
View file @ e53bac96
...@@ -776,7 +776,7 @@ void ue_send_sl_sdu(module_id_t module_idP, ...@@ -776,7 +776,7 @@ void ue_send_sl_sdu(module_id_t module_idP,
int i = 0; int i = 0;
int j = 0; int j = 0;
for (i=0; i< MAX_NUM_LCID; i++) for (i=0; i< MAX_NUM_LCID; i++)
if ((UE_mac_inst[module_idP].sl_info[i].groupL2Id == destinationL2Id) && (UE_mac_inst[module_idP].sl_info[i].sourceL2Id != sourceL2Id)) { if ((UE_mac_inst[module_idP].sl_info[i].groupL2Id == destinationL2Id) && (UE_mac_inst[module_idP].sl_info[i].sourceL2Id != sourceL2Id)) {
lcid = UE_mac_inst[module_idP].sl_info[i].LCID; lcid = UE_mac_inst[module_idP].sl_info[i].LCID;
break; break;
} }
...@@ -794,13 +794,7 @@ void ue_send_sl_sdu(module_id_t module_idP, ...@@ -794,13 +794,7 @@ void ue_send_sl_sdu(module_id_t module_idP,
break; break;
} }
} }
// if (UE_mac_inst[module_idP].sl_info[i].groupL2Id == destinationL2Id) break;
} }
/*
int j = 0;
for (j=0; j< MAX_NUM_LCID; j++)
if (UE_mac_inst[module_idP].sl_info[j].destinationL2Id == sourceL2Id) break;
*/
//match the destinationL2Id with UE L2Id or groupL2ID //match the destinationL2Id with UE L2Id or groupL2ID
if (!(((destinationL2Id == UE_mac_inst[module_idP].sourceL2Id) && (j < MAX_NUM_LCID)) | ((destinationL2Id == UE_mac_inst[module_idP].sourceL2Id) && (longh->LCID >= MAX_NUM_LCID_DATA)) | (i < MAX_NUM_LCID))){ if (!(((destinationL2Id == UE_mac_inst[module_idP].sourceL2Id) && (j < MAX_NUM_LCID)) | ((destinationL2Id == UE_mac_inst[module_idP].sourceL2Id) && (longh->LCID >= MAX_NUM_LCID_DATA)) | (i < MAX_NUM_LCID))){
...@@ -808,8 +802,7 @@ void ue_send_sl_sdu(module_id_t module_idP, ...@@ -808,8 +802,7 @@ void ue_send_sl_sdu(module_id_t module_idP,
return; return;
} }
LOG_I( MAC, "[longh->LCID %d] \n", longh->LCID); LOG_D( MAC, "DestinationL2Id: 0x%08x, sl_rbid %d, longh->LCID %d \n", destinationL2Id, lcid, longh->LCID );
LOG_I( MAC, "[DestinationL2Id: 0x%08x, sl_rbid %d] \n", destinationL2Id, lcid );
if (longh->F==1) { if (longh->F==1) {
...@@ -834,7 +827,7 @@ void ue_send_sl_sdu(module_id_t module_idP, ...@@ -834,7 +827,7 @@ void ue_send_sl_sdu(module_id_t module_idP,
NULL); NULL);
} else { //SL_DISCOVERY } else { //SL_DISCOVERY
uint16_t len = sdu_len; uint16_t len = sdu_len;
LOG_I( MAC, "SL DISCOVERY \n"); LOG_D( MAC, "SL DISCOVERY \n");
mac_rrc_data_ind(module_idP, mac_rrc_data_ind(module_idP,
CC_id, CC_id,
frameP,subframeP, frameP,subframeP,
......
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