X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fphy_stub%2Fl1_bdy1.c;h=a9183c71c2ee7c15ea172e21efed018256663873;hb=528b3d3a09d7486a0c549820bac601db60fde18e;hp=5f31761100601e07a03888245806de5a19962a80;hpb=42f73fef5ef8722af83284e0f146b2da693a1f68;p=o-du%2Fl2.git

diff --git a/src/phy_stub/l1_bdy1.c b/src/phy_stub/l1_bdy1.c
index 5f3176110..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
 
 }
@@ -412,12 +414,12 @@ uint16_t l1BuildAndSendRxDataInd(uint16_t slot, uint16_t sfn, fapi_ul_pusch_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;
 	 }
@@ -649,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
@@ -686,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;
 
@@ -724,8 +725,7 @@ S16 l1HdlDlTtiReq(uint16_t msgLen, void *msg)
    }
 
    /* Free FAPI message */
-   MAC_FREE(dlTtiReq, msgLen);
-
+   MAC_FREE(msg, msgLen);
 #endif
    return ROK;
 }
@@ -751,15 +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);
    if(dlDedMsg)
    {
       DU_LOG("\nPHY_STUB: TxDataPdu for DED MSG sent");
       dlDedMsg = false;
    }
-   MAC_FREE(txDataReq, msgLen);
+   MAC_FREE(msg, msgLen);
 #endif
    return ROK;
 }
@@ -793,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;
@@ -934,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
@@ -981,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;
 }
@@ -1046,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
@@ -1189,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)
@@ -1205,7 +1203,7 @@ S16 l1HdlUlDciReq(uint16_t msgLen, void *msg)
       numPdus--;
    }
 
-   MAC_FREE(ulDciReq, msgLen);
+   MAC_FREE(msg, msgLen);
 #endif
    return ROK;
 }