X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fphy_stub%2Fl1_bdy1.c;h=a9183c71c2ee7c15ea172e21efed018256663873;hb=528b3d3a09d7486a0c549820bac601db60fde18e;hp=35d4252edd9bcfbc8f7e31f2d443e4b685f5a3c0;hpb=694adde1a08c393a8443fd5bbd4f036f5cf85403;p=o-du%2Fl2.git diff --git a/src/phy_stub/l1_bdy1.c b/src/phy_stub/l1_bdy1.c index 35d4252ed..a9183c71c 100644 --- a/src/phy_stub/l1_bdy1.c +++ b/src/phy_stub/l1_bdy1.c @@ -27,6 +27,7 @@ #include "lwr_mac_phy.h" #ifdef INTEL_FAPI #include "fapi.h" +#include "fapi_vendor_extension.h" #endif #include "lphy_stub.h" #include "lwr_mac_upr_inf.h" @@ -243,17 +244,18 @@ void l1HdlParamReq(uint32_t msgLen, void *msg) void l1HdlConfigReq(uint32_t msgLen, void *msg) { #ifdef INTEL_FAPI - fapi_config_req_t *configReq = (fapi_config_req_t *)msg; + p_fapi_api_queue_elem_t configReqElem = (p_fapi_api_queue_elem_t)msg; + fapi_config_req_t *configReq = (fapi_config_req_t *)(configReqElem +1); DU_LOG("\nPHY_STUB: Received Config Request in PHY"); /* Handling CONFIG RESPONSE */ - if(l1BldAndSndConfigRsp(msg)!= ROK) + if(l1BldAndSndConfigRsp(configReq)!= ROK) { printf("\nPHY_STUB: Failed Sending config Response"); } - MAC_FREE(configReq, msgLen); + MAC_FREE(msg, msgLen); #endif } @@ -338,7 +340,7 @@ uint16_t l1BuildAndSendRxDataInd(uint16_t slot, uint16_t sfn, fapi_ul_pusch_pdu_ uint8_t idx = 0; fapi_rx_data_indication_t *rxDataInd; fapi_pdu_ind_info_t *pduInfo; - uint8_t *pdu; + uint8_t *pdu = NULLP; uint16_t byteIdx = 0; uint32_t msgLen = 0; MsgType type; @@ -357,9 +359,14 @@ uint16_t l1BuildAndSendRxDataInd(uint16_t slot, uint16_t sfn, fapi_ul_pusch_pdu_ { msg5Sent = true; type = MSG_TYPE_MSG5; - msg5ShortBsrSent = false; } - + else if(!msgSecurityModeComp) + { + msgSecurityModeComp = true; + type = MSG_TYPE_SECURITY_MODE_COMPLETE; + } + else + return RFAILED; MAC_ALLOC(rxDataInd, sizeof(fapi_rx_data_indication_t)); if(!rxDataInd) @@ -369,7 +376,6 @@ uint16_t l1BuildAndSendRxDataInd(uint16_t slot, uint16_t sfn, fapi_ul_pusch_pdu_ } memset(rxDataInd, 0, sizeof(fapi_rx_data_indication_t)); - /* TODO: Fill the required values */ msgLen = sizeof(fapi_rx_data_indication_t) - sizeof(fapi_msg_t); rxDataInd->sfn = sfn; rxDataInd->slot = slot; @@ -400,30 +406,30 @@ uint16_t l1BuildAndSendRxDataInd(uint16_t slot, uint16_t sfn, fapi_ul_pusch_pdu_ { case MSG_TYPE_MSG3: { + DU_LOG("\nPHY_STUB: Forming MSG3 PDU "); /* For Initial RRC setup Request, MAC subheader format is R/R/LCId (1byte) LCId is CCCH(0) From 38.321 section 6.1.1 */ - DU_LOG("\nForming MSG3 PDU"); pdu[byteIdx++] = 0; /* Hardcoding MAC PDU */ - pdu[byteIdx++] = 181; - pdu[byteIdx++] = 99; - pdu[byteIdx++] = 20; - pdu[byteIdx++] = 170; - pdu[byteIdx++] = 132; - pdu[byteIdx++] = 96; + pdu[byteIdx++] = 16; + pdu[byteIdx++] = 00; + pdu[byteIdx++] = 00; + pdu[byteIdx++] = 00; + pdu[byteIdx++] = 00; + pdu[byteIdx++] = 103; break; } case MSG_TYPE_SHORT_BSR: { + DU_LOG("\nPHY_STUB: Forming SHORT BSR PDU "); uint8_t lcgId = 0; uint8_t bufferSizeIdx = 6; - DU_LOG("\nForming SHORT BSR PDU"); /* For Short BSR MAC subheader format is R/R/LcId (1Byte) LCId is 61 @@ -437,7 +443,7 @@ uint16_t l1BuildAndSendRxDataInd(uint16_t slot, uint16_t sfn, fapi_ul_pusch_pdu_ case MSG_TYPE_MSG5: { - DU_LOG("\nForming MSG5 PDU"); + DU_LOG("\nPHY_STUB: Forming MSG5 PDU"); uint8_t msg5PduLen = 33; /* For RRC setup complete MAC subheader format is R/F/LCId/L (2/3 bytes) @@ -452,8 +458,28 @@ uint16_t l1BuildAndSendRxDataInd(uint16_t slot, uint16_t sfn, fapi_ul_pusch_pdu_ msg5PduLen += 2; /* 2bytes of header */ memcpy(pdu, &msg5, msg5PduLen); byteIdx += msg5PduLen; /* 2 bytes of header */ + break; } + case MSG_TYPE_SECURITY_MODE_COMPLETE: + { + DU_LOG("\nPHY_STUB: Forming SECURITY MODE COMPLETE PDU"); + uint8_t pduLen = 33; + /* For security mode complete + MAC subheader format is R/F/LCId/L (2/3 bytes) + LCId is 1 for SRB1 + L is length of PDU i.e 6bytes here + From 38.321 section 6.1.1 + */ + uint8_t msg[] = {1, pduLen, 0, 0, 16, 0, 5, 223, 128, 16, 94, \ + 64, 3, 64, 89, 61, 138, 64, 0, 0, 0, 4, 0, 0, 4, 68, 11, 128, \ + 184, 56, 0, 0, 0, 0, 0}; + + pduLen += 2; /* 2bytes of header */ + memcpy(pdu, &msg, pduLen); + byteIdx += pduLen; /* 2 bytes of header */ + break; + } default: break; } /* End of switch(type) */ @@ -625,16 +651,15 @@ uint16_t l1BuildAndSendSlotIndication() S16 l1HdlStartReq(uint32_t msgLen, void *msg) { #ifdef INTEL_FAPI - fapi_start_req_t *startReq = (fapi_start_req_t *)msg; - if(lwrMacCb.phyState == PHY_STATE_CONFIGURED) { l1HdlSlotIndicaion(FALSE); - MAC_FREE(startReq, sizeof(fapi_start_req_t)); + MAC_FREE(msg, msgLen); } else { DU_LOG("\nPHY_STUB: Received Start Req in PHY State %d", lwrMacCb.phyState); + MAC_FREE(msg, msgLen); return RFAILED; } #endif @@ -662,8 +687,8 @@ S16 l1HdlStartReq(uint32_t msgLen, void *msg) S16 l1HdlDlTtiReq(uint16_t msgLen, void *msg) { #ifdef INTEL_FAPI - fapi_dl_tti_req_t *dlTtiReq; - dlTtiReq = (fapi_dl_tti_req_t *)msg; + p_fapi_api_queue_elem_t dlTtiElem = (p_fapi_api_queue_elem_t)msg; + fapi_dl_tti_req_t *dlTtiReq = (fapi_dl_tti_req_t *)(dlTtiElem +1); uint8_t pduCount = 0; @@ -686,7 +711,12 @@ S16 l1HdlDlTtiReq(uint16_t msgLen, void *msg) } else if(dlTtiReq->pdus[pduCount].pduType == 0) { - DU_LOG("\nPHY_STUB: PDCCH PDU"); + DU_LOG("\nPHY_STUB: PDCCH PDU"); + if(dlTtiReq->pdus[pduCount].pdu.pdcch_pdu.\ + coreSetType == 1) + { + dlDedMsg = true; + } } else if(dlTtiReq->pdus[pduCount].pduType == 1) { @@ -695,8 +725,7 @@ S16 l1HdlDlTtiReq(uint16_t msgLen, void *msg) } /* Free FAPI message */ - MAC_FREE(dlTtiReq, msgLen); - + MAC_FREE(msg, msgLen); #endif return ROK; } @@ -722,10 +751,16 @@ S16 l1HdlDlTtiReq(uint16_t msgLen, void *msg) S16 l1HdlTxDataReq(uint16_t msgLen, void *msg) { #ifdef INTEL_FAPI - fapi_tx_data_req_t *txDataReq; - txDataReq = (fapi_tx_data_req_t *)msg; + p_fapi_api_queue_elem_t txDataElem = (p_fapi_api_queue_elem_t)msg; + fapi_tx_data_req_t *txDataReq = (fapi_tx_data_req_t *)(txDataElem +1); + DU_LOG("\nPHY STUB: TX DATA Request at sfn=%d slot=%d",txDataReq->sfn,txDataReq->slot); - MAC_FREE(txDataReq, msgLen); + if(dlDedMsg) + { + DU_LOG("\nPHY_STUB: TxDataPdu for DED MSG sent"); + dlDedMsg = false; + } + MAC_FREE(msg, msgLen); #endif return ROK; } @@ -759,7 +794,6 @@ uint8_t fillPucchF0F1PduInfo(fapi_uci_o_pucch_f0f1_t *pduInfo, fapi_ul_pucch_pdu pduInfo->rnti = pucchPdu.rnti; pduInfo->timingAdvance = 0; pduInfo->rssi = 0; - pduInfo->uciBits[idx] = 0; //TODO: FAPI spec ver. 222.10.01 has no info about UCI Bits if(pduInfo->pduBitmap & SR_PDU_BITMASK) { pduInfo->srInfo.srIndication = SR_DETECTED; @@ -900,8 +934,8 @@ uint8_t l1BuildAndSendUciInd(uint16_t slot, uint16_t sfn, fapi_ul_pucch_pdu_t pu S16 l1HdlUlTtiReq(uint16_t msgLen, void *msg) { #ifdef INTEL_FAPI - fapi_ul_tti_req_t *ulTtiReq = NULLP; - ulTtiReq = (fapi_ul_tti_req_t *)msg; + p_fapi_api_queue_elem_t ulTtiElem = (p_fapi_api_queue_elem_t)msg; + fapi_ul_tti_req_t *ulTtiReq = (fapi_ul_tti_req_t *)(ulTtiElem +1); uint8_t numPdus = ulTtiReq->nPdus; #ifdef ODU_SLOT_IND_DEBUG_LOG @@ -947,7 +981,7 @@ S16 l1HdlUlTtiReq(uint16_t msgLen, void *msg) l1BuildAndSendRachInd(ulTtiReq->slot, ulTtiReq->sfn); } - MAC_FREE(ulTtiReq, msgLen); + MAC_FREE(msg, msgLen); #endif return ROK; } @@ -1012,18 +1046,17 @@ uint16_t l1BuildAndSendStopInd() S16 l1HdlStopReq(uint32_t msgLen, void *msg) { #ifdef INTEL_FAPI - fapi_stop_req_t *stopReq = (fapi_stop_req_t *)msg; - if(lwrMacCb.phyState == PHY_STATE_RUNNING) { l1HdlSlotIndicaion(TRUE); DU_LOG("\nPHY_STUB: Slot Indication is stopped successfully"); l1BuildAndSendStopInd(); - MAC_FREE(stopReq, msgLen); + MAC_FREE(msg, msgLen); } else { DU_LOG("\nPHY_STUB: Received Stop Req in PHY State %d", lwrMacCb.phyState); + MAC_FREE(msg, msgLen); return RFAILED; } #endif @@ -1155,9 +1188,8 @@ uint8_t l1BuildAndSendMsg5(uint16_t sfn, uint16_t slot) S16 l1HdlUlDciReq(uint16_t msgLen, void *msg) { #ifdef INTEL_FAPI - fapi_ul_dci_req_t *ulDciReq = NULLP; - - ulDciReq = (fapi_ul_dci_req_t *)msg; + p_fapi_api_queue_elem_t ulDciElem = (p_fapi_api_queue_elem_t)msg; + fapi_ul_dci_req_t *ulDciReq = (fapi_ul_dci_req_t *)(ulDciElem +1); uint8_t numPdus = ulDciReq->numPdus; while(numPdus) @@ -1171,7 +1203,7 @@ S16 l1HdlUlDciReq(uint16_t msgLen, void *msg) numPdus--; } - MAC_FREE(ulDciReq, msgLen); + MAC_FREE(msg, msgLen); #endif return ROK; }