L1-L2 Integration fixes.[Issue-ID: ODUHIGH-252]

[o-du/l2.git] / src / phy_stub / l1_bdy1.c

diff --git a/src/phy_stub/l1_bdy1.c b/src/phy_stub/l1_bdy1.c
index 5f31761..1583030 100644 (file)
--- a/src/phy_stub/l1_bdy1.c
+++ b/src/phy_stub/l1_bdy1.c
@@ -243,17 +243,17 @@ 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;
+   fapi_config_req_t *configReq = (fapi_config_req_t *)(msg +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 +412,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 +649,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
@@ -793,7 +792,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;