Skip to content

O
OpenXG-RAN
Commit 183e029c authored by Raymond Knopp's avatar Raymond Knopp
Browse files
Options

removed some logging

parent da97a8f0
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 13 deletions
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures_sl.c
View file @ 183e029c
......@@ -745,9 +745,9 @@ void nr_ue_process_mac_sl_pdu(int module_idP,
if ((rx_ind->rx_indication_body + pdu_id)->rx_slsch_pdu.ack_nack == 0)
return;
LOG_I(NR_MAC, "In %s : processing PDU %d (with length %d) of %d total number of PDUs...\n", __FUNCTION__, pdu_id, pdu_len, rx_ind->number_pdus);
LOG_D(NR_MAC, "In %s : processing PDU %d (with length %d) of %d total number of PDUs...\n", __FUNCTION__, pdu_id, pdu_len, rx_ind->number_pdus);
NR_SLSCH_MAC_SUBHEADER_FIXED *sl_sch_subheader = (NR_SLSCH_MAC_SUBHEADER_FIXED *) pduP;
LOG_I(NR_PHY, "Rx V %d R %d SRC %d DST %d\n", sl_sch_subheader->V, sl_sch_subheader->R, sl_sch_subheader->SRC, sl_sch_subheader->DST);
LOG_D(NR_PHY, "Rx V %d R %d SRC %d DST %d\n", sl_sch_subheader->V, sl_sch_subheader->R, sl_sch_subheader->SRC, sl_sch_subheader->DST);
pduP += sizeof(*sl_sch_subheader);
pdu_len -= sizeof(*sl_sch_subheader);
while (!done && pdu_len > 0) {
......@@ -755,13 +755,13 @@ void nr_ue_process_mac_sl_pdu(int module_idP,
uint16_t mac_subheader_len = 0x0001; // default to fixed-length subheader = 1-oct
uint8_t rx_lcid = ((NR_MAC_SUBHEADER_LONG *)(pduP))->LCID;
LOG_I(NR_MAC, "[UE %x] LCID %d, PDU length %d\n", mac->src_id, rx_lcid, pdu_len);
LOG_D(NR_MAC, "[UE %x] LCID %d, PDU length %d\n", mac->src_id, rx_lcid, pdu_len);
switch(rx_lcid){
// MAC CE
case SL_SCH_LCID_4_19:
if (!get_mac_len(pduP, pdu_len, &mac_len, &mac_subheader_len))
return;
LOG_I(NR_MAC, "%4d.%2d : SLSCH -> LCID %d %d bytes\n", frame, slot, rx_lcid, mac_len);
LOG_D(NR_MAC, "%4d.%2d : SLSCH -> LCID %d %d bytes\n", frame, slot, rx_lcid, mac_len);
mac_rlc_data_ind(module_idP,
mac->src_id,
......@@ -778,7 +778,7 @@ void nr_ue_process_mac_sl_pdu(int module_idP,
case SL_SCH_LCID_SL_CSI_REPORT:
break;
case SL_SCH_LCID_SL_PADDING:
LOG_I(NR_MAC,"Received padding\n");
LOG_D(NR_MAC,"Received padding\n");
done = 1;
break;
case SL_SCH_LCID_SCCH_PC5_NOT_PROT:
......@@ -798,8 +798,8 @@ void nr_ue_process_mac_sl_pdu(int module_idP,
}
pduP += ( mac_subheader_len + mac_len );
pdu_len -= ( mac_subheader_len + mac_len );
LOG_I(NR_MAC,"mac_subhead_len + mac_len = %d\n",mac_subheader_len + mac_len);
LOG_I(NR_MAC,"pdu_len %d\n",pdu_len);
LOG_D(NR_MAC,"mac_subhead_len + mac_len = %d\n",mac_subheader_len + mac_len);
LOG_D(NR_MAC,"pdu_len %d\n",pdu_len);
if (pdu_len < 0)
LOG_E(NR_MAC, "[UE %d][%d.%d] nr_ue_process_mac_pdu_sl, residual mac pdu length %d < 0!\n", module_idP, frame, slot, pdu_len);
}
......
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
View file @ 183e029c
......@@ -3283,7 +3283,7 @@ bool nr_ue_sl_pssch_scheduler(NR_UE_MAC_INST_t *mac,
if (!schedule_slsch) return false;
LOG_I(NR_MAC,"SLSCH : slsch_pdu_length_max %d\n",slsch_pdu_length_max);
LOG_D(NR_MAC,"SLSCH : slsch_pdu_length_max %d\n",slsch_pdu_length_max);
const uint8_t sh_size = sizeof(NR_MAC_SUBHEADER_LONG);
uint8_t *pdu = tx_config->tx_config_list[0].tx_pscch_pssch_config_pdu.slsch_payload;
......@@ -3305,7 +3305,7 @@ bool nr_ue_sl_pssch_scheduler(NR_UE_MAC_INST_t *mac,
int buflen = tx_config->tx_config_list[0].tx_pscch_pssch_config_pdu.tb_size;
LOG_I(NR_MAC, "[UE%d] TTI-%d:%d TX PSCCH_PSSCH REQ TBS %d\n", sl_ind->module_id, frame, slot, buflen);
LOG_D(NR_MAC, "[UE%d] TTI-%d:%d TX PSCCH_PSSCH REQ TBS %d\n", sl_ind->module_id, frame, slot, buflen);
NR_SLSCH_MAC_SUBHEADER_FIXED *sl_sch_subheader = (NR_SLSCH_MAC_SUBHEADER_FIXED *) pdu;
sl_sch_subheader->V = 0;
......@@ -3315,7 +3315,7 @@ bool nr_ue_sl_pssch_scheduler(NR_UE_MAC_INST_t *mac,
pdu += sizeof(NR_SLSCH_MAC_SUBHEADER_FIXED);
LOG_D(NR_PHY, "V %d, R %d, SRC %d, DST %d\n", sl_sch_subheader->V, sl_sch_subheader->R, sl_sch_subheader->SRC, sl_sch_subheader->DST);
int buflen_remain = buflen - sizeof(NR_SLSCH_MAC_SUBHEADER_FIXED);
LOG_I(NR_PHY, "buflen_remain after adding SL_SCH_MAC_SUBHEADER_FIXED %d\n", buflen_remain);
LOG_D(NR_PHY, "buflen_remain after adding SL_SCH_MAC_SUBHEADER_FIXED %d\n", buflen_remain);
int num_sdus=0;
while (buflen_remain > 0) {
......@@ -3345,7 +3345,7 @@ bool nr_ue_sl_pssch_scheduler(NR_UE_MAC_INST_t *mac,
buflen_remain);
if (sdu_length > 0) {
LOG_I(NR_MAC, "In %s: [UE %d] [%d.%d] SL-DXCH -> SLSCH, Generating SL MAC sub-PDU for SDU %d, length %d bytes, RB with LCID 0x%02x (buflen (TBS) %d bytes)\n",
LOG_D(NR_MAC, "In %s: [UE %d] [%d.%d] SL-DXCH -> SLSCH, Generating SL MAC sub-PDU for SDU %d, length %d bytes, RB with LCID 0x%02x (buflen (TBS) %d bytes)\n",
__FUNCTION__,
0,
frame,
......@@ -3363,7 +3363,7 @@ bool nr_ue_sl_pssch_scheduler(NR_UE_MAC_INST_t *mac,
sdu_length_total += sdu_length;
total_mac_pdu_header_len += sh_size;
buflen_remain -= (sh_size + sdu_length);
LOG_I(NR_PHY, "buflen_remain %d, subtracting (sh_size + sdu_length) %d, total_mac_pdu_header_len %hhu sdu total length %d, sdu_length %d\n", buflen_remain, (sh_size + sdu_length), total_mac_pdu_header_len, sdu_length_total, sdu_length);
LOG_D(NR_PHY, "buflen_remain %d, subtracting (sh_size + sdu_length) %d, total_mac_pdu_header_len %hhu sdu total length %d, sdu_length %d\n", buflen_remain, (sh_size + sdu_length), total_mac_pdu_header_len, sdu_length_total, sdu_length);
num_sdus++;
} else {
......@@ -3391,7 +3391,7 @@ bool nr_ue_sl_pssch_scheduler(NR_UE_MAC_INST_t *mac,
}
if (buflen_remain > 0) {
LOG_I(NR_MAC, "In %s filling remainder %d bytes to the UL PDU \n", __FUNCTION__, buflen_remain);
LOG_D(NR_MAC, "In %s filling remainder %d bytes to the UL PDU \n", __FUNCTION__, buflen_remain);
((NR_MAC_SUBHEADER_FIXED *) pdu)->R = 0;
((NR_MAC_SUBHEADER_FIXED *) pdu)->LCID = SL_SCH_LCID_SL_PADDING;
pdu++;
......
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