X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Fmac_demux.c;h=ae4082797c262f6fd3f448bf5d73c494ce55ea9f;hb=6d01b1cb797bb2b47115eee21ad7d1a6ff3fcfe7;hp=733b1973cccce7138d753d2f6d33646af6100e48;hpb=65443172dd60a6ea312bd3a15959dbf54ad7f045;p=o-du%2Fl2.git diff --git a/src/5gnrmac/mac_demux.c b/src/5gnrmac/mac_demux.c index 733b1973c..ae4082797 100644 --- a/src/5gnrmac/mac_demux.c +++ b/src/5gnrmac/mac_demux.c @@ -46,15 +46,15 @@ * ****************************************************************/ uint8_t unpackRxData(uint16_t cellId, SlotIndInfo slotInfo, RxDataIndPdu *rxDataIndPdu) { - uint8_t ueIdx; /* Iterator for UE list */ - uint8_t lcId; /* LC ID of a sub pdu */ - uint8_t fBit = 0; /* Value of F Bit in MAC sub-header */ - uint8_t idx = 0; /* Iterator for received PDU */ - uint16_t length; /* Length of payload in a sub-PDU */ - uint8_t *pdu; /* Payload in sub-PDU */ - uint16_t pduLen; /* Length of undecoded PDU */ - uint8_t *rxDataPdu; /* Received PDU in Rx Data Ind */ - uint16_t cellIdx; /* Cell Index */ + uint8_t ueIdx = 0; /* Iterator for UE list */ + uint8_t lcId = 0; /* LC ID of a sub pdu */ + uint8_t fBit = 0; /* Value of F Bit in MAC sub-header */ + uint8_t idx = 0; /* Iterator for received PDU */ + uint16_t length = 0; /* Length of payload in a sub-PDU */ + uint8_t *pdu = NULLP; /* Payload in sub-PDU */ + uint16_t pduLen = 0; /* Length of undecoded PDU */ + uint8_t *rxDataPdu = NULLP; /* Received PDU in Rx Data Ind */ + uint16_t cellIdx = 0; /* Cell Index */ uint8_t ret =ROK; GET_CELL_IDX(cellId, cellIdx); @@ -85,7 +85,7 @@ uint8_t unpackRxData(uint16_t cellId, SlotIndInfo slotInfo, RxDataIndPdu *rxData MAC_ALLOC_SHRABL_BUF(pdu, length); if(!pdu) { - DU_LOG("\nMAC : UL CCCH PDU memory allocation failed"); + DU_LOG("\nERROR --> MAC : UL CCCH PDU memory allocation failed"); return RFAILED; } idx++; @@ -103,7 +103,7 @@ uint8_t unpackRxData(uint16_t cellId, SlotIndInfo slotInfo, RxDataIndPdu *rxData case MAC_LCID_MIN ... MAC_LCID_MAX : { - DU_LOG("\nMAC : PDU received for LC ID %d", lcId); + DU_LOG("\nINFO --> MAC : PDU received for LC ID %d", lcId); pduLen--; idx++; @@ -119,7 +119,7 @@ uint8_t unpackRxData(uint16_t cellId, SlotIndInfo slotInfo, RxDataIndPdu *rxData MAC_ALLOC_SHRABL_BUF(pdu, length); if(!pdu) { - DU_LOG("\nMAC : Memory allocation failed while demuxing Rx Data PDU"); + DU_LOG("\nERROR --> MAC : Memory allocation failed while demuxing Rx Data PDU"); return RFAILED; } pduLen--; @@ -137,7 +137,7 @@ uint8_t unpackRxData(uint16_t cellId, SlotIndInfo slotInfo, RxDataIndPdu *rxData macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4TbSize); memset(&macCb.macCell[cellIdx]->macRaCb[ueIdx], 0, sizeof(MacRaCbInfo)); } - + /* Send UL Data to RLC */ ret = macProcUlData(cellId, rxDataIndPdu->rnti, slotInfo, lcId, length, pdu); @@ -205,7 +205,7 @@ uint8_t unpackRxData(uint16_t cellId, SlotIndInfo slotInfo, RxDataIndPdu *rxData default: { - DU_LOG("\nMAC : Invalid LC Id %d", lcId); + DU_LOG("\nERROR --> MAC : Invalid LC Id %d", lcId); return RFAILED; } } /* End of switch */