X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fphy_stub%2Fl1_bdy1.c;h=21533df7810bcb588ef677a71eead34392fb9c04;hb=ed6746a6081339633c3baa314251fcc11b98ce10;hp=1583030eb1a9996bb8c830c9534ca5968e487ea9;hpb=ba78fa13b01e0729fe0a6a7a18cbf1d52cdcda1c;p=o-du%2Fl2.git

diff --git a/src/phy_stub/l1_bdy1.c b/src/phy_stub/l1_bdy1.c
index 1583030eb..21533df78 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,7 +244,8 @@ 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 +1);
+   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");
 
@@ -347,6 +349,7 @@ uint16_t l1BuildAndSendRxDataInd(uint16_t slot, uint16_t sfn, fapi_ul_pusch_pdu_
    {
       msg3Sent = true;
       type = MSG_TYPE_MSG3;
+      sleep(2);
    }
    else if(!msg5ShortBsrSent)
    {
@@ -358,11 +361,21 @@ uint16_t l1BuildAndSendRxDataInd(uint16_t slot, uint16_t sfn, fapi_ul_pusch_pdu_
       msg5Sent = true;
       type = MSG_TYPE_MSG5;
    }
+   else if(!msgRegistrationComp)
+   {
+      msgRegistrationComp = true;
+      type = MSG_TYPE_REGISTRATION_COMPLETE; 
+   }
    else if(!msgSecurityModeComp)
    {
       msgSecurityModeComp = true;
       type = MSG_TYPE_SECURITY_MODE_COMPLETE;
    }
+   else if(!msgRrcReconfiguration)
+   {
+      msgRrcReconfiguration = true;
+      type = MSG_TYPE_RRC_RECONFIG_COMPLETE;
+   }
    else
       return RFAILED;
 
@@ -421,63 +434,99 @@ uint16_t l1BuildAndSendRxDataInd(uint16_t slot, uint16_t sfn, fapi_ul_pusch_pdu_
 
 	    break;
 	 }
-
       case MSG_TYPE_SHORT_BSR:
-	 {
-	    DU_LOG("\nPHY_STUB: Forming SHORT BSR PDU ");
-	    uint8_t lcgId = 0;
-	    uint8_t bufferSizeIdx = 6;
-            
-	    /* For Short BSR
-	       MAC subheader format is R/R/LcId (1Byte)
-	       LCId is 61
-	       From 38.321 section 6.1.1
-	     */
-	    pdu[byteIdx++] = 61;    // LCID
-	    pdu[byteIdx++] = (lcgId << 5) | bufferSizeIdx;
+      {
+	 DU_LOG("\nPHY_STUB: Forming SHORT BSR PDU ");
+	 uint8_t lcgId = 0;
+	 uint8_t bufferSizeIdx = 6;
+
+	 /* For Short BSR
+	    MAC subheader format is R/R/LcId (1Byte)
+	    LCId is 61
+	    From 38.321 section 6.1.1
+	  */
+	 pdu[byteIdx++] = 61;    // LCID
+	 pdu[byteIdx++] = (lcgId << 5) | bufferSizeIdx;
 
-	    break;
-	 }
+	 break;
+      }
 
       case MSG_TYPE_MSG5:
-	 {
-	    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)
-	       LCId is 1 for SRB1
-	       L is length of PDU i.e 6bytes here 
-	       From 38.321 section 6.1.1
-	     */
-	    uint8_t msg5[] = {1, msg5PduLen, 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, \
+      {
+	 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)
+	    LCId is 1 for SRB1
+	    L is length of PDU i.e 6bytes here 
+	    From 38.321 section 6.1.1
+	  */
+	 uint8_t msg5[] = {1, msg5PduLen, 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};
 
-	    msg5PduLen += 2;  /* 2bytes of header */
-	    memcpy(pdu, &msg5, msg5PduLen);
-	    byteIdx += msg5PduLen; /* 2 bytes of header */
-	    break;
-	 }
+	 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};
+      {
+	 DU_LOG("\nPHY_STUB: Forming SECURITY MODE COMPLETE PDU");
+	 uint8_t  pduLen = 12;
+	 /* For security mode complete where RRC Container is dummy
+	    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, 3, 0x2a, 0x40, 0, 0, 0, 0, 0, 0, 0, 0};
+
+	 pduLen += 2;  /* 2bytes of header */
+	 memcpy(pdu, &msg, pduLen);
+	 byteIdx += pduLen; /* 2 bytes of header */
+	 break;
+      }
+      case MSG_TYPE_REGISTRATION_COMPLETE:
+      {
+          
+	  DU_LOG("\nPHY_STUB: Forming RRC REGISTRATION COMPLETE PDU");
+	  uint8_t  pduLen = 12;
+	  /* For rrc reconfig complete where RRC Container is dummy
+	  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, 0x04, 0x3a, 0x81, 0xbf, 0, 0x21, 0x80, 0, \
+	  0, 0, 0};
+	
+	  pduLen += 2;  /* 2bytes of header */
+	  memcpy(pdu, &msg, pduLen);
+	  byteIdx += pduLen; /* 2 bytes of header */
+          break;
+      }
+      case MSG_TYPE_RRC_RECONFIG_COMPLETE:
+      {
+         DU_LOG("\nPHY_STUB: Forming RRC RECONFIGURATION COMPLETE PDU");
+         uint8_t  pduLen = 14;
+	 /* For rrc reconfig complete where RRC Container is dummy
+	 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, 6, 8, 64, 0, 0, 0, 0, \
+	                  0, 0, 0, 0, 0};
+	
+	 pduLen += 2;  /* 2bytes of header */
+	 memcpy(pdu, &msg, pduLen);
+	 byteIdx += pduLen; /* 2 bytes of header */
+	 break;
 
-	    pduLen += 2;  /* 2bytes of header */
-	    memcpy(pdu, &msg, pduLen);
-	    byteIdx += pduLen; /* 2 bytes of header */
-	    break;
-	 }
+      }
+      
       default:
 	 break;
    } /* End of switch(type) */
@@ -685,8 +734,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;
 
@@ -723,8 +772,7 @@ S16 l1HdlDlTtiReq(uint16_t msgLen, void *msg)
    }
 
    /* Free FAPI message */
-   MAC_FREE(dlTtiReq, msgLen);
-
+   MAC_FREE(msg, msgLen);
 #endif
    return ROK;
 }
@@ -750,15 +798,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;
 }
@@ -932,8 +981,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
@@ -955,8 +1004,8 @@ S16 l1HdlUlTtiReq(uint16_t msgLen, void *msg)
       }
       if(ulTtiReq->pdus[numPdus-1].pduType == 1)
       {
-	 DU_LOG("\nPHY STUB: PUSCH PDU");			
-         l1BuildAndSendRxDataInd(ulTtiReq->slot, ulTtiReq->sfn, \
+	 DU_LOG("\nPHY STUB: PUSCH PDU");
+	 l1BuildAndSendRxDataInd(ulTtiReq->slot, ulTtiReq->sfn, \
 	       ulTtiReq->pdus[numPdus-1].pdu.pusch_pdu); 
       }
       if(ulTtiReq->pdus[numPdus-1].pduType == 2)
@@ -979,7 +1028,7 @@ S16 l1HdlUlTtiReq(uint16_t msgLen, void *msg)
       l1BuildAndSendRachInd(ulTtiReq->slot, ulTtiReq->sfn);
    }
 
-   MAC_FREE(ulTtiReq, msgLen);
+   MAC_FREE(msg, msgLen);
 #endif
    return ROK;
 }
@@ -1044,18 +1093,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
@@ -1187,9 +1235,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)
@@ -1203,7 +1250,7 @@ S16 l1HdlUlDciReq(uint16_t msgLen, void *msg)
       numPdus--;
    }
 
-   MAC_FREE(ulDciReq, msgLen);
+   MAC_FREE(msg, msgLen);
 #endif
    return ROK;
 }