X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Flwr_mac_fsm.c;h=4ae21ccc025da152cad285c5cb248ffb410cb626;hb=3275b4a8aec68cc23c20062f157c9f3a494d6271;hp=9808c783829cd517aa0326a08c4b3805fc9b9ca7;hpb=514d4c21e79d37636005186dd9ac5510742b7618;p=o-du%2Fl2.git diff --git a/src/5gnrmac/lwr_mac_fsm.c b/src/5gnrmac/lwr_mac_fsm.c index 9808c7838..4ae21ccc0 100644 --- a/src/5gnrmac/lwr_mac_fsm.c +++ b/src/5gnrmac/lwr_mac_fsm.c @@ -86,7 +86,7 @@ void lwrMacLayerInit() * ****************************************************************/ uint8_t lwr_mac_procInvalidEvt(void *msg) { - printf("\nLWR_MAC: Error Indication Event[%d] received in state [%d]", lwrMacCb.event, lwrMacCb.phyState); + DU_LOG("\nERROR --> LWR_MAC: Error Indication Event[%d] received in state [%d]", lwrMacCb.event, lwrMacCb.phyState); return ROK; } @@ -1265,7 +1265,7 @@ uint32_t getParamValue(fapi_uint16_tlv_t *tlv, uint16_t type) } else { - DU_LOG("\nLWR_MAC: Value Extraction failed" ); + DU_LOG("\nERROR --> LWR_MAC: Value Extraction failed" ); return RFAILED; } } @@ -1290,7 +1290,7 @@ void setMibPdu(uint8_t *mibPdu, uint32_t *val, uint16_t sfn) { *mibPdu |= (((uint8_t)(sfn >> 2)) & MIB_SFN_BITMASK); *val = (mibPdu[0] << 24 | mibPdu[1] << 16 | mibPdu[2] << 8); - DU_LOG("\nLWR_MAC: MIB PDU %x", *val); + DU_LOG("\nDEBUG --> LWR_MAC: MIB PDU %x", *val); } /******************************************************************* @@ -1332,7 +1332,7 @@ uint8_t lwr_mac_procParamReqEvt(void *msg) LWR_MAC_ALLOC(headerElem, (sizeof(fapi_api_queue_elem_t) + sizeof(fapi_msg_header_t))); if(!headerElem) { - DU_LOG("\nLWR_MAC: Memory allocation failed for param req header"); + DU_LOG("\nERROR --> LWR_MAC: Memory allocation failed for param req header"); LWR_MAC_FREE(paramReqElem, (sizeof(fapi_api_queue_elem_t) + sizeof(fapi_param_req_t))); return RFAILED; } @@ -1342,12 +1342,12 @@ uint8_t lwr_mac_procParamReqEvt(void *msg) msgHeader->num_msg = 1; msgHeader->handle = 0; - DU_LOG("\nLWR_MAC: Sending Param Request to Phy"); + DU_LOG("\nDEBUG --> LWR_MAC: Sending Param Request to Phy"); LwrMacSendToL1(headerElem); } else { - DU_LOG("\nLWR_MAC: Failed to allocate memory for Param Request"); + DU_LOG("\nERROR --> LWR_MAC: Failed to allocate memory for Param Request"); return RFAILED; } #endif @@ -1381,14 +1381,14 @@ uint8_t lwr_mac_procParamRspEvt(void *msg) ClCellParam *cellParam = NULLP; paramRsp = (fapi_param_resp_t *)msg; - DU_LOG("\nLWR_MAC: Received EVENT[%d] at STATE[%d]", lwrMacCb.event, lwrMacCb.phyState); + DU_LOG("\nINFO --> LWR_MAC: Received EVENT[%d] at STATE[%d]", lwrMacCb.event, lwrMacCb.phyState); if(paramRsp != NULLP) { MAC_ALLOC(cellParam, sizeof(ClCellParam)); if(cellParam != NULLP) { - DU_LOG("\n LWR_MAC: Filling TLVS into MAC API"); + DU_LOG("\nDEBUG --> LWR_MAC: Filling TLVS into MAC API"); if(paramRsp->error_code == MSG_OK) { for(index = 0; index < paramRsp->number_of_tlvs; index++) @@ -1407,7 +1407,7 @@ uint8_t lwr_mac_procParamRspEvt(void *msg) encodedVal = getParamValue(¶mRsp->tlvs[index], FAPI_UINT_8); if(encodedVal != RFAILED && encodedVal != lwrMacCb.phyState) { - printf("\n PhyState mismatch [%d][%d]", lwrMacCb.phyState, lwrMacCb.event); + DU_LOG("\nERROR --> PhyState mismatch [%d][%d]", lwrMacCb.phyState, lwrMacCb.event); return RFAILED; } break; @@ -1861,7 +1861,7 @@ uint8_t lwr_mac_procParamRspEvt(void *msg) } break; default: - //printf("\n Invalid value for TLV[%x] at index[%d]", paramRsp->tlvs[index].tl.tag, index); + //DU_LOG("\nERROR --> Invalid value for TLV[%x] at index[%d]", paramRsp->tlvs[index].tl.tag, index); break; } } @@ -1871,19 +1871,19 @@ uint8_t lwr_mac_procParamRspEvt(void *msg) } else { - DU_LOG("\n LWR_MAC: Invalid error code %d", paramRsp->error_code); + DU_LOG("\nERROR --> LWR_MAC: Invalid error code %d", paramRsp->error_code); return RFAILED; } } else { - DU_LOG("\nLWR_MAC: Failed to allocate memory for cell param"); + DU_LOG("\nERROR --> LWR_MAC: Failed to allocate memory for cell param"); return RFAILED; } } else { - DU_LOG("\nLWR_MAC: Param Response received from PHY is NULL"); + DU_LOG("\nERROR --> LWR_MAC: Param Response received from PHY is NULL"); return RFAILED; } #else @@ -1912,7 +1912,7 @@ uint8_t lwr_mac_procIqSamplesReqEvt(void *msg) LWR_MAC_ALLOC(iqSampleElem, (sizeof(fapi_api_queue_elem_t) + sizeof(fapi_vendor_ext_iq_samples_req_t))); if(!iqSampleElem) { - DU_LOG("\nLWR_MAC: Memory allocation failed for IQ sample req"); + DU_LOG("\nERROR --> LWR_MAC: Memory allocation failed for IQ sample req"); return RFAILED; } FILL_FAPI_LIST_ELEM(iqSampleElem, NULLP, FAPI_VENDOR_EXT_UL_IQ_SAMPLES, 1, \ @@ -1940,7 +1940,7 @@ uint8_t lwr_mac_procIqSamplesReqEvt(void *msg) LWR_MAC_ALLOC(headerElem, (sizeof(fapi_api_queue_elem_t) + sizeof(fapi_msg_header_t))); if(!headerElem) { - DU_LOG("\nLWR_MAC: Memory allocation failed for FAPI header in lwr_mac_procIqSamplesReqEvt"); + DU_LOG("\nERROR --> LWR_MAC: Memory allocation failed for FAPI header in lwr_mac_procIqSamplesReqEvt"); return RFAILED; } FILL_FAPI_LIST_ELEM(headerElem, iqSampleElem, FAPI_VENDOR_MSG_HEADER_IND, 1, \ @@ -1949,7 +1949,7 @@ uint8_t lwr_mac_procIqSamplesReqEvt(void *msg) msgHeader->num_msg = 1; msgHeader->handle = 0; - DU_LOG("\nLWR_MAC: Sending IQ Sample request to Phy"); + DU_LOG("\nINFO --> LWR_MAC: Sending IQ Sample request to Phy"); LwrMacSendToL1(headerElem); return ROK; } @@ -1989,7 +1989,7 @@ uint8_t lwr_mac_procConfigReqEvt(void *msg) p_fapi_api_queue_elem_t vendorMsgQElem; p_fapi_api_queue_elem_t cfgReqQElem; - DU_LOG("\nLWR_MAC: Received EVENT[%d] at STATE[%d]", lwrMacCb.event, \ + DU_LOG("\nINFO --> LWR_MAC: Received EVENT[%d] at STATE[%d]", lwrMacCb.event, \ lwrMacCb.phyState); cellId = (uint16_t *)msg; @@ -2006,7 +2006,7 @@ uint8_t lwr_mac_procConfigReqEvt(void *msg) LWR_MAC_ALLOC(vendorMsgQElem, (sizeof(fapi_api_queue_elem_t) + sizeof(fapi_vendor_msg_t))); if(!vendorMsgQElem) { - DU_LOG("\nLWR_MAC: Memory allocation failed for vendor msg in config req"); + DU_LOG("\nERROR --> LWR_MAC: Memory allocation failed for vendor msg in config req"); return RFAILED; } FILL_FAPI_LIST_ELEM(vendorMsgQElem, NULLP, FAPI_VENDOR_MESSAGE, 1, sizeof(fapi_vendor_msg_t)); @@ -2021,7 +2021,7 @@ uint8_t lwr_mac_procConfigReqEvt(void *msg) LWR_MAC_ALLOC(cfgReqQElem, (sizeof(fapi_api_queue_elem_t) + sizeof(fapi_config_req_t))); if(!cfgReqQElem) { - DU_LOG("\nLWR_MAC: Memory allocation failed for config req"); + DU_LOG("\nERROR --> LWR_MAC: Memory allocation failed for config req"); LWR_MAC_ALLOC(vendorMsgQElem, (sizeof(fapi_api_queue_elem_t) + sizeof(fapi_vendor_msg_t))); return RFAILED; } @@ -2158,7 +2158,7 @@ uint8_t lwr_mac_procConfigReqEvt(void *msg) LWR_MAC_ALLOC(headerElem, (sizeof(fapi_api_queue_elem_t) + sizeof(fapi_msg_header_t))); if(!headerElem) { - DU_LOG("\nLWR_MAC: Memory allocation failed for vendor msg in config req"); + DU_LOG("\nERROR --> LWR_MAC: Memory allocation failed for vendor msg in config req"); LWR_MAC_ALLOC(cfgReqQElem, (sizeof(fapi_api_queue_elem_t) + sizeof(fapi_config_req_t))); LWR_MAC_ALLOC(vendorMsgQElem, (sizeof(fapi_api_queue_elem_t) + sizeof(fapi_vendor_msg_t))); return RFAILED; @@ -2169,7 +2169,7 @@ uint8_t lwr_mac_procConfigReqEvt(void *msg) msgHeader->num_msg = 2; /* Config req msg and vendor specific msg */ msgHeader->handle = 0; - DU_LOG("\nLWR_MAC: Sending Config Request to Phy"); + DU_LOG("\nDEBUG --> LWR_MAC: Sending Config Request to Phy"); LwrMacSendToL1(headerElem); #endif @@ -2199,14 +2199,14 @@ uint8_t lwr_mac_procConfigRspEvt(void *msg) fapi_config_resp_t *configRsp; configRsp = (fapi_config_resp_t *)msg; - DU_LOG("\nLWR_MAC: Received EVENT[%d] at STATE[%d]", lwrMacCb.event, \ + DU_LOG("\nINFO --> LWR_MAC: Received EVENT[%d] at STATE[%d]", lwrMacCb.event, \ lwrMacCb.phyState); if(configRsp != NULL) { if(configRsp->error_code == MSG_OK) { - DU_LOG("\nLWR_MAC: PHY has moved to Configured state \n"); + DU_LOG("\nDEBUG --> LWR_MAC: PHY has moved to Configured state \n"); lwrMacCb.phyState = PHY_STATE_CONFIGURED; lwrMacCb.cellCb[0].state = PHY_STATE_CONFIGURED; /* TODO : @@ -2217,13 +2217,13 @@ uint8_t lwr_mac_procConfigRspEvt(void *msg) } else { - DU_LOG("\n LWR_MAC: Invalid error code %d", configRsp->error_code); + DU_LOG("\nERROR --> LWR_MAC: Invalid error code %d", configRsp->error_code); return RFAILED; } } else { - DU_LOG("\nLWR_MAC: Config Response received from PHY is NULL"); + DU_LOG("\nERROR --> LWR_MAC: Config Response received from PHY is NULL"); return RFAILED; } #endif @@ -2261,7 +2261,7 @@ uint8_t lwr_mac_procStartReqEvt(void *msg) LWR_MAC_ALLOC(vendorMsgElem, (sizeof(fapi_api_queue_elem_t) + sizeof(fapi_vendor_msg_t))); if(!vendorMsgElem) { - DU_LOG("\nLWR_MAC: Memory allocation failed for vendor msg in start req"); + DU_LOG("\nERROR --> LWR_MAC: Memory allocation failed for vendor msg in start req"); return RFAILED; } FILL_FAPI_LIST_ELEM(vendorMsgElem, NULLP, FAPI_VENDOR_MESSAGE, 1, sizeof(fapi_vendor_msg_t)); @@ -2279,7 +2279,7 @@ uint8_t lwr_mac_procStartReqEvt(void *msg) LWR_MAC_ALLOC(startReqElem, (sizeof(fapi_api_queue_elem_t) + sizeof(fapi_start_req_t))); if(!startReqElem) { - DU_LOG("\nLWR_MAC: Memory allocation failed for start req"); + DU_LOG("\nERROR --> LWR_MAC: Memory allocation failed for start req"); LWR_MAC_ALLOC(vendorMsgElem, (sizeof(fapi_api_queue_elem_t) + sizeof(fapi_vendor_msg_t))); return RFAILED; } @@ -2294,7 +2294,7 @@ uint8_t lwr_mac_procStartReqEvt(void *msg) LWR_MAC_ALLOC(headerElem, (sizeof(fapi_api_queue_elem_t) + sizeof(fapi_msg_header_t))); if(!headerElem) { - DU_LOG("\nLWR_MAC: Memory allocation failed for vendor msg in config req"); + DU_LOG("\nERROR --> LWR_MAC: Memory allocation failed for vendor msg in config req"); LWR_MAC_ALLOC(startReqElem, (sizeof(fapi_api_queue_elem_t) + sizeof(fapi_start_req_t))); LWR_MAC_ALLOC(vendorMsgElem, (sizeof(fapi_api_queue_elem_t) + sizeof(fapi_vendor_msg_t))); return RFAILED; @@ -2306,7 +2306,7 @@ uint8_t lwr_mac_procStartReqEvt(void *msg) msgHeader->handle = 0; /* Send to PHY */ - DU_LOG("\nLWR_MAC: Sending Start Request to Phy"); + DU_LOG("\nDEBUG --> LWR_MAC: Sending Start Request to Phy"); LwrMacSendToL1(headerElem); #endif return ROK; @@ -2346,7 +2346,7 @@ uint8_t lwr_mac_procStopReqEvt(void *msg) LWR_MAC_ALLOC(vendorMsgElem, (sizeof(fapi_api_queue_elem_t) + sizeof(fapi_vendor_msg_t))); if(!vendorMsgElem) { - DU_LOG("\nLWR_MAC: Memory allocation failed for vendor msg in stop req"); + DU_LOG("\nERROR --> LWR_MAC: Memory allocation failed for vendor msg in stop req"); return RFAILED; } FILL_FAPI_LIST_ELEM(vendorMsgElem, NULLP, FAPI_VENDOR_MESSAGE, 1, sizeof(fapi_vendor_msg_t)); @@ -2359,7 +2359,7 @@ uint8_t lwr_mac_procStopReqEvt(void *msg) LWR_MAC_ALLOC(stopReqElem, (sizeof(fapi_api_queue_elem_t) + sizeof(fapi_stop_req_t))); if(!stopReqElem) { - DU_LOG("\nLWR_MAC: Memory allocation failed for stop req"); + DU_LOG("\nERROR --> LWR_MAC: Memory allocation failed for stop req"); LWR_MAC_FREE(vendorMsgElem, (sizeof(fapi_api_queue_elem_t) + sizeof(fapi_vendor_msg_t))); return RFAILED; } @@ -2373,7 +2373,7 @@ uint8_t lwr_mac_procStopReqEvt(void *msg) LWR_MAC_ALLOC(headerElem, (sizeof(fapi_api_queue_elem_t) + sizeof(fapi_msg_header_t))); if(!headerElem) { - DU_LOG("\nLWR_MAC: Memory allocation failed for header in stop req"); + DU_LOG("\nERROR --> LWR_MAC: Memory allocation failed for header in stop req"); LWR_MAC_FREE(stopReqElem, (sizeof(fapi_api_queue_elem_t) + sizeof(fapi_stop_req_t))); LWR_MAC_FREE(vendorMsgElem, (sizeof(fapi_api_queue_elem_t) + sizeof(fapi_vendor_msg_t))); return RFAILED; @@ -2385,7 +2385,7 @@ uint8_t lwr_mac_procStopReqEvt(void *msg) msgHeader->handle = 0; /* Send to PHY */ - DU_LOG("\nLWR_MAC: Sending Stop Request to Phy"); + DU_LOG("\nINFO --> LWR_MAC: Sending Stop Request to Phy"); LwrMacSendToL1(headerElem); #endif @@ -2463,24 +2463,24 @@ void fillSib1DlDciPdu(fapi_dl_dci_t *dlDciPtr, PdcchCfg *sib1PdcchInfo) { if(dlDciPtr != NULLP) { - uint8_t numBytes; - uint8_t bytePos; - uint8_t bitPos; - - uint16_t coreset0Size; - uint16_t rbStart; - uint16_t rbLen; - uint32_t freqDomResAssign; - uint32_t timeDomResAssign; - uint8_t VRB2PRBMap; - uint32_t modNCodScheme; - uint8_t redundancyVer; - uint32_t sysInfoInd; - uint32_t reserved; + uint8_t numBytes=0; + uint8_t bytePos=0; + uint8_t bitPos=0; + + uint16_t coreset0Size=0; + uint16_t rbStart=0; + uint16_t rbLen=0; + uint32_t freqDomResAssign=0; + uint32_t timeDomResAssign=0; + uint8_t VRB2PRBMap=0; + uint32_t modNCodScheme=0; + uint8_t redundancyVer=0; + uint32_t sysInfoInd=0; + uint32_t reserved=0; /* Size(in bits) of each field in DCI format 0_1 * as mentioned in spec 38.214 */ - uint8_t freqDomResAssignSize; + uint8_t freqDomResAssignSize = 0; uint8_t timeDomResAssignSize = 4; uint8_t VRB2PRBMapSize = 1; uint8_t modNCodSchemeSize = 5; @@ -2552,7 +2552,7 @@ void fillSib1DlDciPdu(fapi_dl_dci_t *dlDciPtr, PdcchCfg *sib1PdcchInfo) if(numBytes > FAPI_DCI_PAYLOAD_BYTE_LEN) { - DU_LOG("\nLWR_MAC : Total bytes for DCI is more than expected"); + DU_LOG("\nERROR --> LWR_MAC : Total bytes for DCI is more than expected"); return; } @@ -2603,22 +2603,22 @@ void fillRarDlDciPdu(fapi_dl_dci_t *dlDciPtr, PdcchCfg *rarPdcchInfo) { if(dlDciPtr != NULLP) { - uint8_t numBytes; - uint8_t bytePos; - uint8_t bitPos; + uint8_t numBytes =0; + uint8_t bytePos =0; + uint8_t bitPos =0; - uint16_t coreset0Size; - uint16_t rbStart; - uint16_t rbLen; - uint32_t freqDomResAssign; - uint8_t timeDomResAssign; - uint8_t VRB2PRBMap; - uint8_t modNCodScheme; - uint8_t tbScaling; - uint32_t reserved; + uint16_t coreset0Size =0; + uint16_t rbStart =0; + uint16_t rbLen =0; + uint32_t freqDomResAssign =0; + uint8_t timeDomResAssign =0; + uint8_t VRB2PRBMap =0; + uint8_t modNCodScheme =0; + uint8_t tbScaling =0; + uint32_t reserved =0; /* Size(in bits) of each field in DCI format 1_0 */ - uint8_t freqDomResAssignSize; + uint8_t freqDomResAssignSize = 0; uint8_t timeDomResAssignSize = 4; uint8_t VRB2PRBMapSize = 1; uint8_t modNCodSchemeSize = 5; @@ -2686,7 +2686,7 @@ void fillRarDlDciPdu(fapi_dl_dci_t *dlDciPtr, PdcchCfg *rarPdcchInfo) if(numBytes > FAPI_DCI_PAYLOAD_BYTE_LEN) { - DU_LOG("\nLWR_MAC : Total bytes for DCI is more than expected"); + DU_LOG("\nERROR --> LWR_MAC : Total bytes for DCI is more than expected"); return; } @@ -2842,7 +2842,7 @@ void fillDlMsgDlDciPdu(fapi_dl_dci_t *dlDciPtr, PdcchCfg *pdcchInfo,\ if(numBytes > FAPI_DCI_PAYLOAD_BYTE_LEN) { - DU_LOG("\nLWR_MAC : Total bytes for DCI is more than expected"); + DU_LOG("\nERROR --> LWR_MAC : Total bytes for DCI is more than expected"); return; } @@ -2930,7 +2930,7 @@ uint8_t fillPdcchPdu(fapi_dl_tti_req_pdu_t *dlTtiReqPdu, DlSchedInfo *dlInfo, \ } else { - DU_LOG("\nLWR_MAC: Failed filling PDCCH Pdu"); + DU_LOG("\nERROR --> LWR_MAC: Failed filling PDCCH Pdu"); return RFAILED; } dlTtiReqPdu->pduType = PDCCH_PDU_TYPE; @@ -3304,10 +3304,10 @@ uint8_t fillDlMsgTxDataReq(fapi_tx_pdu_desc_t *pduDesc, DlMsgInfo *dlMsgInfo, uint16_t fillDlTtiReq(SlotIndInfo currTimingInfo) { #ifdef INTEL_FAPI - uint8_t idx; + uint8_t idx =0; uint8_t nPdu = 0; uint8_t numPduEncoded = 0; - uint16_t cellIdx; + uint16_t cellIdx =0; uint16_t pduIndex = 0; SlotIndInfo dlTtiReqTimingInfo; @@ -3315,7 +3315,7 @@ uint16_t fillDlTtiReq(SlotIndInfo currTimingInfo) MacCellCfg macCellCfg; RntiType rntiType; fapi_dl_tti_req_t *dlTtiReq = NULLP; - fapi_msg_header_t *msgHeader; + fapi_msg_header_t *msgHeader = NULLP; p_fapi_api_queue_elem_t dlTtiElem; p_fapi_api_queue_elem_t headerElem; @@ -3340,7 +3340,7 @@ uint16_t fillDlTtiReq(SlotIndInfo currTimingInfo) LWR_MAC_ALLOC(headerElem, (sizeof(fapi_api_queue_elem_t) + sizeof(fapi_msg_header_t))); if(!headerElem) { - DU_LOG("\nLWR_MAC: Memory allocation failed for header in DL TTI req"); + DU_LOG("\nERROR --> LWR_MAC: Memory allocation failed for header in DL TTI req"); LWR_MAC_FREE(dlTtiElem, (sizeof(fapi_api_queue_elem_t) + sizeof(fapi_dl_tti_req_t))); return RFAILED; } @@ -3376,9 +3376,9 @@ uint16_t fillDlTtiReq(SlotIndInfo currTimingInfo) numPduEncoded++; } } - printf("\033[1;31m"); - DU_LOG("\nLWR_MAC: MIB sent.."); - printf("\033[0m"); + DU_LOG("\033[1;31m"); + DU_LOG("\nDEBUG --> LWR_MAC: MIB sent.."); + DU_LOG("\033[0m"); } if(currDlSlot->dlInfo.brdcstAlloc.sib1Trans) { @@ -3396,9 +3396,9 @@ uint16_t fillDlTtiReq(SlotIndInfo currTimingInfo) pduIndex++; numPduEncoded++; } - printf("\033[1;34m"); - DU_LOG("\nLWR_MAC: SIB1 sent..."); - printf("\033[0m"); + DU_LOG("\033[1;34m"); + DU_LOG("\nDEBUG --> LWR_MAC: SIB1 sent..."); + DU_LOG("\033[0m"); } } if(currDlSlot->dlInfo.rarAlloc != NULLP) @@ -3415,22 +3415,22 @@ uint16_t fillDlTtiReq(SlotIndInfo currTimingInfo) numPduEncoded++; pduIndex++; - printf("\033[1;32m"); - DU_LOG("\nLWR_MAC: RAR sent..."); - printf("\033[0m"); + DU_LOG("\033[1;32m"); + DU_LOG("\nDEBUG --> LWR_MAC: RAR sent..."); + DU_LOG("\033[0m"); } if(currDlSlot->dlInfo.dlMsgAlloc != NULLP) { if(currDlSlot->dlInfo.dlMsgAlloc->dlMsgInfo.dlMsgPdu != NULLP) { /* Filling Msg4 param */ - printf("\033[1;32m"); + DU_LOG("\033[1;32m"); if(currDlSlot->dlInfo.dlMsgAlloc->dlMsgInfo.isMsg4Pdu) { rntiType = TC_RNTI_TYPE; fillPdcchPdu(&dlTtiReq->pdus[numPduEncoded], \ &currDlSlot->dlInfo, rntiType, CORESET_TYPE0); - DU_LOG("\nLWR_MAC: MSG4 sent..."); + DU_LOG("\nDEBUG --> LWR_MAC: MSG4 sent..."); } else { @@ -3438,9 +3438,9 @@ uint16_t fillDlTtiReq(SlotIndInfo currTimingInfo) rntiType = C_RNTI_TYPE; fillPdcchPdu(&dlTtiReq->pdus[numPduEncoded], \ &currDlSlot->dlInfo, rntiType, CORESET_TYPE1); - DU_LOG("\nLWR_MAC: DL MSG sent..."); + DU_LOG("\nDEBUG --> LWR_MAC: DL MSG sent..."); } - printf("\033[0m"); + DU_LOG("\033[0m"); numPduEncoded++; fillPdschPdu(&dlTtiReq->pdus[numPduEncoded], @@ -3458,7 +3458,7 @@ uint16_t fillDlTtiReq(SlotIndInfo currTimingInfo) } #ifdef ODU_SLOT_IND_DEBUG_LOG - DU_LOG("\nLWR_MAC: Sending DL TTI Request"); + DU_LOG("\nDEBUG --> LWR_MAC: Sending DL TTI Request"); #endif LwrMacSendToL1(headerElem); @@ -3468,7 +3468,7 @@ uint16_t fillDlTtiReq(SlotIndInfo currTimingInfo) else { #ifdef ODU_SLOT_IND_DEBUG_LOG - DU_LOG("\nLWR_MAC: Sending DL TTI Request"); + DU_LOG("\nDEBUG --> LWR_MAC: Sending DL TTI Request"); #endif LwrMacSendToL1(headerElem); } @@ -3477,7 +3477,7 @@ uint16_t fillDlTtiReq(SlotIndInfo currTimingInfo) } else { - DU_LOG("\nLWR_MAC: Failed to allocate memory for DL TTI Request"); + DU_LOG("\nERROR --> LWR_MAC: Failed to allocate memory for DL TTI Request"); memset(currDlSlot, 0, sizeof(MacDlSlot)); return RFAILED; } @@ -3513,10 +3513,10 @@ uint16_t sendTxDataReq(SlotIndInfo currTimingInfo, DlSchedInfo *dlInfo) uint8_t nPdu = 0; uint16_t cellIdx; uint16_t pduIndex = 0; - fapi_tx_data_req_t *txDataReq; - fapi_msg_header_t *msgHeader; - p_fapi_api_queue_elem_t txDataElem; - p_fapi_api_queue_elem_t headerElem; + fapi_tx_data_req_t *txDataReq =NULLP; + fapi_msg_header_t *msgHeader =NULLP; + p_fapi_api_queue_elem_t txDataElem = 0; + p_fapi_api_queue_elem_t headerElem =0; GET_CELL_IDX(currTimingInfo.cellId, cellIdx); @@ -3527,7 +3527,7 @@ uint16_t sendTxDataReq(SlotIndInfo currTimingInfo, DlSchedInfo *dlInfo) LWR_MAC_ALLOC(txDataElem, (sizeof(fapi_api_queue_elem_t) + sizeof(fapi_tx_data_req_t))); if(txDataElem == NULLP) { - DU_LOG("\nLWR_MAC: Failed to allocate memory for TX data Request"); + DU_LOG("\nERROR --> LWR_MAC: Failed to allocate memory for TX data Request"); return RFAILED; } @@ -3573,7 +3573,7 @@ uint16_t sendTxDataReq(SlotIndInfo currTimingInfo, DlSchedInfo *dlInfo) LWR_MAC_ALLOC(headerElem, (sizeof(fapi_api_queue_elem_t) + sizeof(fapi_msg_header_t))); if(!headerElem) { - DU_LOG("\nLWR_MAC: Memory allocation failed for TxDataReq header"); + DU_LOG("\nERROR --> LWR_MAC: Memory allocation failed for TxDataReq header"); LWR_MAC_FREE(txDataElem, (sizeof(fapi_api_queue_elem_t) + sizeof(fapi_tx_data_req_t))); return RFAILED; } @@ -3583,7 +3583,7 @@ uint16_t sendTxDataReq(SlotIndInfo currTimingInfo, DlSchedInfo *dlInfo) msgHeader->num_msg = 1; msgHeader->handle = 0; - DU_LOG("\nLWR_MAC: Sending TX DATA Request"); + DU_LOG("\nDEBUG --> LWR_MAC: Sending TX DATA Request"); LwrMacSendToL1(headerElem); } #endif @@ -3708,6 +3708,21 @@ void fillPrachPdu(fapi_ul_tti_req_pdu_t *ulTtiReqPdu, MacCellCfg *macCellCfg, Ma } } +/******************************************************************* + * + * @brief Filling PUSCH PDU in UL TTI Request + * + * @details + * + * Function : fillPuschPdu + * + * Functionality: Filling PUSCH PDU in UL TTI Request + * + * @params[in] + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ void fillPuschPdu(fapi_ul_tti_req_pdu_t *ulTtiReqPdu, MacCellCfg *macCellCfg, MacUlSlot *currUlSlot) { if(ulTtiReqPdu != NULLP) @@ -3725,10 +3740,9 @@ void fillPuschPdu(fapi_ul_tti_req_pdu_t *ulTtiReqPdu, MacCellCfg *macCellCfg, Ma ulTtiReqPdu->pdu.pusch_pdu.cyclicPrefix = \ macCellCfg->initialUlBwp.bwp.cyclicPrefix; ulTtiReqPdu->pdu.pusch_pdu.targetCodeRate = 308; - ulTtiReqPdu->pdu.pusch_pdu.qamModOrder = 2; - ulTtiReqPdu->pdu.pusch_pdu.mcsIndex = \ - currUlSlot->ulInfo.schPuschInfo.tbInfo.mcs; - ulTtiReqPdu->pdu.pusch_pdu.mcsTable = 0; + ulTtiReqPdu->pdu.pusch_pdu.qamModOrder = currUlSlot->ulInfo.schPuschInfo.tbInfo.qamOrder; + ulTtiReqPdu->pdu.pusch_pdu.mcsIndex = currUlSlot->ulInfo.schPuschInfo.tbInfo.mcs; + ulTtiReqPdu->pdu.pusch_pdu.mcsTable = currUlSlot->ulInfo.schPuschInfo.tbInfo.mcsTable; ulTtiReqPdu->pdu.pusch_pdu.transformPrecoding = 1; ulTtiReqPdu->pdu.pusch_pdu.dataScramblingId = currUlSlot->ulInfo.cellId; ulTtiReqPdu->pdu.pusch_pdu.nrOfLayers = 1; @@ -3773,6 +3787,21 @@ void fillPuschPdu(fapi_ul_tti_req_pdu_t *ulTtiReqPdu, MacCellCfg *macCellCfg, Ma } } +/******************************************************************* + * + * @brief Fill PUCCH PDU in Ul TTI Request + * + * @details + * + * Function : fillPucchPdu + * + * Functionality: Fill PUCCH PDU in Ul TTI Request + * + * @params[in] + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ void fillPucchPdu(fapi_ul_tti_req_pdu_t *ulTtiReqPdu, MacCellCfg *macCellCfg,\ MacUlSlot *currUlSlot) { @@ -3789,22 +3818,25 @@ void fillPucchPdu(fapi_ul_tti_req_pdu_t *ulTtiReqPdu, MacCellCfg *macCellCfg,\ ulTtiReqPdu->pdu.pucch_pdu.cyclicPrefix = macCellCfg->initialUlBwp.bwp.cyclicPrefix; ulTtiReqPdu->pdu.pucch_pdu.formatType = currUlSlot->ulInfo.schPucchInfo.pucchFormat; /* Supporting PUCCH Format 0 */ ulTtiReqPdu->pdu.pucch_pdu.multiSlotTxIndicator = 0; /* No Multi Slot transmission */ - ulTtiReqPdu->pdu.pucch_pdu.pi2Bpsk = 0; /* Disabled */ + ulTtiReqPdu->pdu.pucch_pdu.prbStart = currUlSlot->ulInfo.schPucchInfo.fdAlloc.startPrb; ulTtiReqPdu->pdu.pucch_pdu.prbSize = currUlSlot->ulInfo.schPucchInfo.fdAlloc.numPrb; ulTtiReqPdu->pdu.pucch_pdu.startSymbolIndex = currUlSlot->ulInfo.schPucchInfo.tdAlloc.startSymb; ulTtiReqPdu->pdu.pucch_pdu.nrOfSymbols = currUlSlot->ulInfo.schPucchInfo.tdAlloc.numSymb; - ulTtiReqPdu->pdu.pucch_pdu.freqHopFlag = 0; /* Disabled */ - ulTtiReqPdu->pdu.pucch_pdu.secondHopPrb = 0; + ulTtiReqPdu->pdu.pucch_pdu.freqHopFlag = currUlSlot->ulInfo.schPucchInfo.intraFreqHop; + ulTtiReqPdu->pdu.pucch_pdu.secondHopPrb = currUlSlot->ulInfo.schPucchInfo.secondPrbHop; ulTtiReqPdu->pdu.pucch_pdu.groupHopFlag = 0; ulTtiReqPdu->pdu.pucch_pdu.sequenceHopFlag = 0; ulTtiReqPdu->pdu.pucch_pdu.hoppingId = 0; - ulTtiReqPdu->pdu.pucch_pdu.initialCyclicShift = 0; + + ulTtiReqPdu->pdu.pucch_pdu.initialCyclicShift = currUlSlot->ulInfo.schPucchInfo.initialCyclicShift; + ulTtiReqPdu->pdu.pucch_pdu.dataScramblingId = 0; /* Valid for Format 2, 3, 4 */ - ulTtiReqPdu->pdu.pucch_pdu.timeDomainOccIdx = 0; /* Valid for Format 1 */ - ulTtiReqPdu->pdu.pucch_pdu.preDftOccIdx = 0; /* Valid for Format 4 */ - ulTtiReqPdu->pdu.pucch_pdu.preDftOccLen = 0; /* Valid for Format 4 */ - ulTtiReqPdu->pdu.pucch_pdu.addDmrsFlag = 0; /* Valid for Format 3, 4 */ + ulTtiReqPdu->pdu.pucch_pdu.timeDomainOccIdx = currUlSlot->ulInfo.schPucchInfo.timeDomOCC; + ulTtiReqPdu->pdu.pucch_pdu.preDftOccIdx = currUlSlot->ulInfo.schPucchInfo.occIdx; /* Valid for Format 4 only */ + ulTtiReqPdu->pdu.pucch_pdu.preDftOccLen = currUlSlot->ulInfo.schPucchInfo.occLen; /* Valid for Format 4 only */ + ulTtiReqPdu->pdu.pucch_pdu.pi2Bpsk = currUlSlot->ulInfo.schPucchInfo.cmnFormatCfg.pi2BPSK; + ulTtiReqPdu->pdu.pucch_pdu.addDmrsFlag = currUlSlot->ulInfo.schPucchInfo.cmnFormatCfg.addDmrs;/* Valid for Format 3, 4 only */ ulTtiReqPdu->pdu.pucch_pdu.dmrsScramblingId = 0; /* Valid for Format 2 */ ulTtiReqPdu->pdu.pucch_pdu.dmrsCyclicShift = 0; /* Valid for Format 4 */ ulTtiReqPdu->pdu.pucch_pdu.srFlag = currUlSlot->ulInfo.schPucchInfo.srFlag; @@ -3841,13 +3873,13 @@ void fillPucchPdu(fapi_ul_tti_req_pdu_t *ulTtiReqPdu, MacCellCfg *macCellCfg,\ uint16_t fillUlTtiReq(SlotIndInfo currTimingInfo) { #ifdef INTEL_FAPI - uint16_t cellIdx; + uint16_t cellIdx =0; uint8_t pduIdx = -1; SlotIndInfo ulTtiReqTimingInfo; MacUlSlot *currUlSlot = NULLP; MacCellCfg macCellCfg; fapi_ul_tti_req_t *ulTtiReq = NULLP; - fapi_msg_header_t *msgHeader; + fapi_msg_header_t *msgHeader = NULLP; p_fapi_api_queue_elem_t ulTtiElem; p_fapi_api_queue_elem_t headerElem; @@ -3899,7 +3931,7 @@ uint16_t fillUlTtiReq(SlotIndInfo currTimingInfo) LWR_MAC_ALLOC(headerElem, (sizeof(fapi_api_queue_elem_t) + sizeof(fapi_msg_header_t))); if(!headerElem) { - DU_LOG("\nLWR_MAC: Memory allocation failed for UL TTI req header"); + DU_LOG("\nERROR --> LWR_MAC: Memory allocation failed for UL TTI req header"); LWR_MAC_FREE(ulTtiElem, (sizeof(fapi_api_queue_elem_t) + sizeof(fapi_ul_tti_req_t))); return RFAILED; } @@ -3909,7 +3941,7 @@ uint16_t fillUlTtiReq(SlotIndInfo currTimingInfo) msgHeader->num_msg = 1; msgHeader->handle = 0; #ifdef ODU_SLOT_IND_DEBUG_LOG - DU_LOG("\nLWR_MAC: Sending UL TTI Request"); + DU_LOG("\nDEBUG --> LWR_MAC: Sending UL TTI Request"); #endif LwrMacSendToL1(headerElem); @@ -3918,7 +3950,7 @@ uint16_t fillUlTtiReq(SlotIndInfo currTimingInfo) } else { - DU_LOG("\nLWR_MAC: Failed to allocate memory for UL TTI Request"); + DU_LOG("\nERROR --> LWR_MAC: Failed to allocate memory for UL TTI Request"); memset(currUlSlot, 0, sizeof(MacUlSlot)); return RFAILED; } @@ -3952,19 +3984,19 @@ void fillUlDciPdu(fapi_dl_dci_t *ulDciPtr, DciInfo *schDciInfo) { if(ulDciPtr != NULLP) { - uint8_t numBytes; - uint8_t bytePos; - uint8_t bitPos; + uint8_t numBytes =0; + uint8_t bytePos =0; + uint8_t bitPos =0; uint8_t coreset1Size = 0; uint16_t rbStart = 0; uint16_t rbLen = 0; uint8_t dciFormatId = 0; - uint32_t freqDomResAssign; - uint8_t timeDomResAssign; - uint8_t freqHopFlag; - uint8_t modNCodScheme; - uint8_t ndi; + uint32_t freqDomResAssign =0; + uint8_t timeDomResAssign =0; + uint8_t freqHopFlag =0; + uint8_t modNCodScheme =0; + uint8_t ndi =0; uint8_t redundancyVer = 0; uint8_t harqProcessNum = 0; uint8_t puschTpc = 0; @@ -4027,7 +4059,7 @@ void fillUlDciPdu(fapi_dl_dci_t *ulDciPtr, DciInfo *schDciInfo) harqProcessNum = schDciInfo->format.format0_0.harqProcId; puschTpc = schDciInfo->format.format0_0.tpcCmd; ul_SlInd = schDciInfo->format.format0_0.sUlCfgd; - + /* Reversing bits in each DCI field */ dciFormatId = reverseBits(dciFormatId, dciFormatIdSize); freqDomResAssign = reverseBits(freqDomResAssign, freqDomResAssignSize); @@ -4049,7 +4081,7 @@ void fillUlDciPdu(fapi_dl_dci_t *ulDciPtr, DciInfo *schDciInfo) if(numBytes > FAPI_DCI_PAYLOAD_BYTE_LEN) { - DU_LOG("\nLWR_MAC : Total bytes for DCI is more than expected"); + DU_LOG("\nERROR --> LWR_MAC : Total bytes for DCI is more than expected"); return; } @@ -4147,12 +4179,12 @@ uint8_t fillUlDciPdcchPdu(fapi_dci_pdu_t *ulDciReqPdu, DlSchedInfo *dlInfo, uint uint16_t fillUlDciReq(SlotIndInfo currTimingInfo) { #ifdef INTEL_FAPI - uint8_t cellIdx; + uint8_t cellIdx =0; uint8_t numPduEncoded = 0; - SlotIndInfo ulDciReqTimingInfo; + SlotIndInfo ulDciReqTimingInfo ={0}; MacDlSlot *currDlSlot = NULLP; - fapi_ul_dci_req_t *ulDciReq; - fapi_msg_header_t *msgHeader; + fapi_ul_dci_req_t *ulDciReq =NULLP; + fapi_msg_header_t *msgHeader =NULLP; p_fapi_api_queue_elem_t ulDciElem; p_fapi_api_queue_elem_t headerElem; @@ -4189,7 +4221,7 @@ uint16_t fillUlDciReq(SlotIndInfo currTimingInfo) LWR_MAC_ALLOC(headerElem, (sizeof(fapi_api_queue_elem_t) + sizeof(fapi_msg_header_t))); if(!headerElem) { - DU_LOG("\nLWR_MAC: Memory allocation failed for UL DCI req header"); + DU_LOG("\nERROR --> LWR_MAC: Memory allocation failed for UL DCI req header"); LWR_MAC_FREE(ulDciElem, (sizeof(fapi_api_queue_elem_t) + sizeof(fapi_ul_dci_req_t))); return RFAILED; } @@ -4199,14 +4231,14 @@ uint16_t fillUlDciReq(SlotIndInfo currTimingInfo) msgHeader->num_msg = 1; msgHeader->handle = 0; #ifdef ODU_SLOT_IND_DEBUG_LOG - DU_LOG("\nLWR_MAC: Sending UL DCI Request"); + DU_LOG("\nDEBUG --> LWR_MAC: Sending UL DCI Request"); #endif LwrMacSendToL1(headerElem); } } else { - DU_LOG("\nLWR_MAC: Failed to allocate memory for UL DCI Request"); + DU_LOG("\nERROR --> LWR_MAC: Failed to allocate memory for UL DCI Request"); memset(currDlSlot, 0, sizeof(MacDlSlot)); return RFAILED; }