RARandSib1Transmission
[o-du/l2.git] / src / 5gnrmac / lwr_mac_fsm.c
index b1676f8..f32f051 100644 (file)
  #   limitations under the License.                                             #
  ################################################################################
  *******************************************************************************/
+
 #include <stdlib.h>
+#include <stdint.h>
+
+/* header include files -- defines (.h) */
+#include "envopt.h"        /* environment options */
+#include "envdep.h"        /* environment dependent */
+#include "envind.h"        /* environment independent */
+#include "gen.h"           /* general layer */
+#include "ssi.h"           /* system service interface */
+#include "cm_hash.h"       /* common hash list */
+#include "cm_mblk.h"       /* common memory link list library */
+#include "cm_llist.h"      /* common linked list library */
+#include "cm_err.h"        /* common error */
+#include "cm_lte.h"        /* common LTE */
+#include "lrg.h"           /* Layer manager interface includes*/
+#include "crg.h"           /* CRG interface includes*/
+#include "rgu.h"           /* RGU interface includes*/
+#include "tfu.h"           /* TFU interface includes */
+#include "rg_sch_inf.h"    /* SCH interface includes */
+#include "rg_prg.h"       /* PRG (MAC-MAC) interface includes*/
+#include "rg_env.h"       /* MAC environmental includes*/
+#include "rg.h"           /* MAC includes*/
+#include "rg_err.h"       /* MAC error includes*/
+#include "du_log.h"
 #include "lwr_mac_fsm.h"
 
-EXTERN void sendToPhy ARGS((U16 msgType, U32 msgLen, void *msg));
+/* header/extern include files (.x) */
+#include "gen.x"           /* general layer typedefs */
+#include "ssi.x"           /* system services typedefs */
+#include "cm5.x"           /* common timers */
+#include "cm_hash.x"       /* common hash list */
+#include "cm_lib.x"        /* common library */
+#include "cm_llist.x"      /* common linked list */
+#include "cm_mblk.x"       /* memory management */
+#include "cm_tkns.x"       /* common tokens */
+#include "cm_lte.x"       /* common tokens */
+#include "rgu.x"           /* RGU types */
+#include "tfu.x"           /* RGU types */
+#include "lrg.x"           /* layer management typedefs for MAC */
+#include "crg.x"           /* CRG interface includes */
+#include "rg_sch_inf.x"    /* SCH interface typedefs */
+#include "rg_prg.x"        /* PRG (MAC-MAC) Interface typedefs */
+#include "du_app_mac_inf.h"
+#include "mac.h"
+#include "rg.x"            /* typedefs for MAC */
+#include "lwr_mac_phy.h"
+#include "math.h"
+
+#define MIB_SFN_BITMASK 0xFC
+#define PDCCH_PDU_TYPE 0
+#define PDSCH_PDU_TYPE 1
+#define SSB_PDU_TYPE 3
+#define PRACH_PDU_TYPE 0
+#define PDU_PRESENT 1
+#define SETLENGTH(x, size) x += size
+
+extern void fapiMacConfigRsp();
+extern uint8_t UnrestrictedSetNcsTable[MAX_ZERO_CORR_CFG_IDX];
+
+/* Global variables */
+SlotIndInfo slotIndInfo;
+uint8_t slotIndIdx;
+
+uint16_t sendTxDataReq(CmLteTimingInfo *currTimingInfo, DlAlloc *dlInfo);
+
+void lwrMacInit()
+{
+#ifdef INTEL_WLS
+   uint8_t  idx;
+
+   /* Initializing WLS free mem list */
+   slotIndIdx = 1;
+   for(idx = 0; idx < WLS_MEM_FREE_PRD; idx++)
+   {
+      cmLListInit(&wlsBlockToFreeList[idx]);
+   }
+#endif
+}
 
  /*******************************************************************
   *
@@ -38,10 +113,11 @@ EXTERN void sendToPhy ARGS((U16 msgType, U32 msgLen, void *msg));
   * ****************************************************************/
 S16 lwr_mac_handleInvalidEvt(void *msg)
 {
-  printf("\n Error Indication Event[%d] received in state [%d]", clGlobalCp.event, clGlobalCp.phyState);
+  printf("\nLWR_MAC: Error Indication Event[%d] received in state [%d]", clGlobalCp.event, clGlobalCp.phyState);
   RETVALUE(ROK);
 }
 
+#ifdef FAPI
 /*******************************************************************
   *
   * @brief Fills FAPI message header
@@ -60,7 +136,7 @@ S16 lwr_mac_handleInvalidEvt(void *msg)
   * @return void
   *
   * ****************************************************************/
-PUBLIC void fillMsgHeader(fapi_msg_t *hdr, U16 msgType, U16 msgLen)
+PUBLIC void fillMsgHeader(fapi_msg_t *hdr, uint16_t msgType, uint16_t msgLen)
 {
    hdr->message_type_id = msgType;
    hdr->length = msgLen;
@@ -85,7 +161,8 @@ PUBLIC void fillMsgHeader(fapi_msg_t *hdr, U16 msgType, U16 msgLen)
   * @return void
   *
   * ****************************************************************/
-PUBLIC void fillTlvs(fapi_uint16_tlv_t *tlv, U16 tag, U16 length, U16 value, U16 *msgLen)
+PUBLIC void fillTlvs(fapi_uint16_tlv_t *tlv, uint16_t tag, uint16_t length,
+uint16_t value, uint32_t *msgLen)
 {
    tlv->tl.tag    = tag;
    tlv->tl.length = length;
@@ -107,9 +184,9 @@ PUBLIC void fillTlvs(fapi_uint16_tlv_t *tlv, U16 tag, U16 length, U16 value, U16
   * @params[in] Pointer to ClCellParam
   *             Value to be compared
   * @return void
-  * 
+  *
   ********************************************************************/
-PUBLIC void fillCyclicPrefix(U8 value, ClCellParam **cellPtr)
+PUBLIC void fillCyclicPrefix(uint8_t value, ClCellParam **cellPtr)
 {
    if((value & FAPI_NORMAL_CYCLIC_PREFIX_MASK) == FAPI_NORMAL_CYCLIC_PREFIX_MASK)
    {
@@ -143,7 +220,7 @@ PUBLIC void fillCyclicPrefix(U8 value, ClCellParam **cellPtr)
   *
   * ****************************************************************/
 
-PUBLIC void fillSubcarrierSpaceDl(U8 value, ClCellParam **cellPtr)
+PUBLIC void fillSubcarrierSpaceDl(uint8_t value, ClCellParam **cellPtr)
 {
    if((value & FAPI_15KHZ_MASK) == FAPI_15KHZ_MASK)
    {
@@ -185,7 +262,7 @@ PUBLIC void fillSubcarrierSpaceDl(U8 value, ClCellParam **cellPtr)
   *
   * ****************************************************************/
 
-PUBLIC void fillBandwidthDl(U16 value, ClCellParam **cellPtr)
+PUBLIC void fillBandwidthDl(uint16_t value, ClCellParam **cellPtr)
 {
    if((value & FAPI_5MHZ_BW_MASK) == FAPI_5MHZ_BW_MASK)
    {
@@ -202,7 +279,7 @@ PUBLIC void fillBandwidthDl(U16 value, ClCellParam **cellPtr)
    else if((value & FAPI_20MHZ_BW_MASK) == FAPI_20MHZ_BW_MASK)
    {
       (*cellPtr)->supportedBandwidthDl = BW_20MHZ;
-   } 
+   }
    else if((value & FAPI_40MHZ_BW_MASK) == FAPI_40MHZ_BW_MASK)
    {
       (*cellPtr)->supportedBandwidthDl = BW_40MHZ;
@@ -263,7 +340,7 @@ PUBLIC void fillBandwidthDl(U16 value, ClCellParam **cellPtr)
   *
   * ****************************************************************/
 
-PUBLIC void fillSubcarrierSpaceUl(U8 value, ClCellParam **cellPtr)
+PUBLIC void fillSubcarrierSpaceUl(uint8_t value, ClCellParam **cellPtr)
 {
    if((value & FAPI_15KHZ_MASK) == FAPI_15KHZ_MASK)
    {
@@ -298,17 +375,17 @@ PUBLIC void fillSubcarrierSpaceUl(U8 value, ClCellParam **cellPtr)
   *    Functionality:
   *         -checks the value with the bitmask and
   *          fills the cellPtr's UL Bandwidth
-  * 
+  *
   *
   *
   * @params[in] Pointer to ClCellParam
   *             Value to be compared
   * @return void
-  * 
+  *
   *
   * ****************************************************************/
 
-PUBLIC void fillBandwidthUl(U16 value, ClCellParam **cellPtr)
+PUBLIC void fillBandwidthUl(uint16_t value, ClCellParam **cellPtr)
 {
    if((value & FAPI_5MHZ_BW_MASK) == FAPI_5MHZ_BW_MASK)
    {
@@ -386,7 +463,7 @@ PUBLIC void fillBandwidthUl(U16 value, ClCellParam **cellPtr)
   *
   * ****************************************************************/
 
-PUBLIC void fillCCEmaping(U8 value,  ClCellParam **cellPtr)
+PUBLIC void fillCCEmaping(uint8_t value,  ClCellParam **cellPtr)
 {
    if ((value & FAPI_CCE_MAPPING_INTERLEAVED_MASK) == FAPI_CCE_MAPPING_INTERLEAVED_MASK)
    {
@@ -421,7 +498,7 @@ PUBLIC void fillCCEmaping(U8 value,  ClCellParam **cellPtr)
   *
   * ****************************************************************/
 
-PUBLIC void fillPucchFormat(U8 value, ClCellParam **cellPtr)
+PUBLIC void fillPucchFormat(uint8_t value, ClCellParam **cellPtr)
 {
    if((value & FAPI_FORMAT_0_MASK) == FAPI_FORMAT_0_MASK)
    {
@@ -467,7 +544,7 @@ PUBLIC void fillPucchFormat(U8 value, ClCellParam **cellPtr)
   *
   * ****************************************************************/
 
-PUBLIC void fillPdschMappingType(U8 value, ClCellParam **cellPtr)
+PUBLIC void fillPdschMappingType(uint8_t value, ClCellParam **cellPtr)
 {
    if((value & FAPI_PDSCH_MAPPING_TYPE_A_MASK) == FAPI_PDSCH_MAPPING_TYPE_A_MASK)
    {
@@ -501,7 +578,7 @@ PUBLIC void fillPdschMappingType(U8 value, ClCellParam **cellPtr)
   *
   * ****************************************************************/
 
-PUBLIC void fillPdschAllocationType(U8 value, ClCellParam **cellPtr)
+PUBLIC void fillPdschAllocationType(uint8_t value, ClCellParam **cellPtr)
 {
    if((value & FAPI_PDSCH_ALLOC_TYPE_0_MASK) == FAPI_PDSCH_ALLOC_TYPE_0_MASK)
    {
@@ -534,7 +611,7 @@ PUBLIC void fillPdschAllocationType(U8 value, ClCellParam **cellPtr)
   * @return void
   *
   ******************************************************************/
-PUBLIC void fillPrbMappingType(U8 value, ClCellParam **cellPtr)
+PUBLIC void fillPrbMappingType(uint8_t value, ClCellParam **cellPtr)
 {
    if((value & FAPI_PDSCH_VRB_TO_PRB_MAP_NON_INTLV_MASK) == FAPI_PDSCH_VRB_TO_PRB_MAP_NON_INTLV_MASK)
    {
@@ -568,7 +645,7 @@ PUBLIC void fillPrbMappingType(U8 value, ClCellParam **cellPtr)
   *
   ******************************************************************/
 
-PUBLIC void fillPdschDmrsConfigType(U8 value, ClCellParam **cellPtr)
+PUBLIC void fillPdschDmrsConfigType(uint8_t value, ClCellParam **cellPtr)
 {
   if((value & FAPI_PDSCH_DMRS_CONFIG_TYPE_1_MASK) == FAPI_PDSCH_DMRS_CONFIG_TYPE_1_MASK)
   {
@@ -601,7 +678,7 @@ PUBLIC void fillPdschDmrsConfigType(U8 value, ClCellParam **cellPtr)
   * @return void
   *
   ******************************************************************/
-PUBLIC void fillPdschDmrsLength(U8 value, ClCellParam **cellPtr)
+PUBLIC void fillPdschDmrsLength(uint8_t value, ClCellParam **cellPtr)
 {
    if(value == FAPI_PDSCH_DMRS_MAX_LENGTH_1)
    {
@@ -635,7 +712,7 @@ PUBLIC void fillPdschDmrsLength(U8 value, ClCellParam **cellPtr)
   *
   ******************************************************************/
 
-PUBLIC void fillPdschDmrsAddPos(U8 value, ClCellParam **cellPtr)
+PUBLIC void fillPdschDmrsAddPos(uint8_t value, ClCellParam **cellPtr)
 {
    if((value & FAPI_DMRS_ADDITIONAL_POS_0_MASK) == FAPI_DMRS_ADDITIONAL_POS_0_MASK)
    {
@@ -676,7 +753,7 @@ PUBLIC void fillPdschDmrsAddPos(U8 value, ClCellParam **cellPtr)
   * @return void
   *
   ******************************************************************/
-PUBLIC void fillModulationOrderDl(U8 value, ClCellParam **cellPtr)
+PUBLIC void fillModulationOrderDl(uint8_t value, ClCellParam **cellPtr)
 {
    if(value == 0 )
    {
@@ -718,7 +795,7 @@ PUBLIC void fillModulationOrderDl(U8 value, ClCellParam **cellPtr)
   *
   ******************************************************************/
 
-PUBLIC void fillPuschDmrsConfig(U8 value, ClCellParam **cellPtr)
+PUBLIC void fillPuschDmrsConfig(uint8_t value, ClCellParam **cellPtr)
 {
    if((value & FAPI_PUSCH_DMRS_CONFIG_TYPE_1_MASK) == FAPI_PUSCH_DMRS_CONFIG_TYPE_1_MASK)
    {
@@ -752,7 +829,7 @@ PUBLIC void fillPuschDmrsConfig(U8 value, ClCellParam **cellPtr)
   *
   ******************************************************************/
 
-PUBLIC void fillPuschDmrsLength(U8 value, ClCellParam **cellPtr)
+PUBLIC void fillPuschDmrsLength(uint8_t value, ClCellParam **cellPtr)
 {
    if(value  == FAPI_PUSCH_DMRS_MAX_LENGTH_1)
    {
@@ -786,7 +863,7 @@ PUBLIC void fillPuschDmrsLength(U8 value, ClCellParam **cellPtr)
   *
   ******************************************************************/
 
-PUBLIC void fillPuschDmrsAddPos(U8 value, ClCellParam **cellPtr)
+PUBLIC void fillPuschDmrsAddPos(uint8_t value, ClCellParam **cellPtr)
 {
    if((value & FAPI_DMRS_ADDITIONAL_POS_0_MASK) == FAPI_DMRS_ADDITIONAL_POS_0_MASK)
    {
@@ -828,7 +905,7 @@ PUBLIC void fillPuschDmrsAddPos(U8 value, ClCellParam **cellPtr)
   *
   ******************************************************************/
 
-PUBLIC void fillPuschMappingType(U8 value, ClCellParam **cellPtr)
+PUBLIC void fillPuschMappingType(uint8_t value, ClCellParam **cellPtr)
 {
    if((value & FAPI_PUSCH_MAPPING_TYPE_A_MASK) == FAPI_PUSCH_MAPPING_TYPE_A_MASK)
    {
@@ -862,7 +939,7 @@ PUBLIC void fillPuschMappingType(U8 value, ClCellParam **cellPtr)
   *
   ******************************************************************/
 
-PUBLIC void fillPuschAllocationType(U8 value, ClCellParam **cellPtr)
+PUBLIC void fillPuschAllocationType(uint8_t value, ClCellParam **cellPtr)
 {
    if((value & FAPI_PUSCH_ALLOC_TYPE_0_MASK) == FAPI_PUSCH_ALLOC_TYPE_0_MASK)
    {
@@ -896,7 +973,7 @@ PUBLIC void fillPuschAllocationType(U8 value, ClCellParam **cellPtr)
   *
   ******************************************************************/
 
-PUBLIC void fillPuschPrbMappingType(U8 value, ClCellParam **cellPtr)
+PUBLIC void fillPuschPrbMappingType(uint8_t value, ClCellParam **cellPtr)
 {
    if((value & FAPI_PUSCH_VRB_TO_PRB_MAP_NON_INTLV_MASK) == FAPI_PUSCH_VRB_TO_PRB_MAP_NON_INTLV_MASK)
    {
@@ -930,7 +1007,7 @@ PUBLIC void fillPuschPrbMappingType(U8 value, ClCellParam **cellPtr)
   *
   ******************************************************************/
 
-PUBLIC void fillModulationOrderUl(U8 value, ClCellParam **cellPtr)
+PUBLIC void fillModulationOrderUl(uint8_t value, ClCellParam **cellPtr)
 {
    if(value == 0)
    {
@@ -972,7 +1049,7 @@ PUBLIC void fillModulationOrderUl(U8 value, ClCellParam **cellPtr)
   *
   ******************************************************************/
 
-PUBLIC void fillPuschAggregationFactor(U8 value, ClCellParam **cellPtr)
+PUBLIC void fillPuschAggregationFactor(uint8_t value, ClCellParam **cellPtr)
 {
    if((value & FAPI_FORMAT_0_MASK) == FAPI_FORMAT_0_MASK)
    {
@@ -1014,7 +1091,7 @@ PUBLIC void fillPuschAggregationFactor(U8 value, ClCellParam **cellPtr)
   *
   ******************************************************************/
 
-PUBLIC void fillPrachLongFormat(U8 value, ClCellParam **cellPtr)
+PUBLIC void fillPrachLongFormat(uint8_t value, ClCellParam **cellPtr)
 {
    if((value & FAPI_PRACH_LF_FORMAT_0_MASK) == FAPI_PRACH_LF_FORMAT_0_MASK)
    {
@@ -1056,7 +1133,7 @@ PUBLIC void fillPrachLongFormat(U8 value, ClCellParam **cellPtr)
   *
   ******************************************************************/
 
-PUBLIC void fillPrachShortFormat(U8 value, ClCellParam **cellPtr)
+PUBLIC void fillPrachShortFormat(uint8_t value, ClCellParam **cellPtr)
 {
    if((value & FAPI_PRACH_SF_FORMAT_A1_MASK) == FAPI_PRACH_SF_FORMAT_A1_MASK)
    {
@@ -1118,7 +1195,7 @@ PUBLIC void fillPrachShortFormat(U8 value, ClCellParam **cellPtr)
   *
   ******************************************************************/
 
-PUBLIC void fillFdOccasions(U8 value, ClCellParam **cellPtr)
+PUBLIC void fillFdOccasions(uint8_t value, ClCellParam **cellPtr)
 {
    if(value == 0)
    {
@@ -1160,7 +1237,7 @@ PUBLIC void fillFdOccasions(U8 value, ClCellParam **cellPtr)
   *
   ******************************************************************/
 
-PUBLIC void fillRssiMeas(U8 value, ClCellParam **cellPtr)
+PUBLIC void fillRssiMeas(uint8_t value, ClCellParam **cellPtr)
 {
    if((value & FAPI_RSSI_REPORT_IN_DBM_MASK) == FAPI_RSSI_REPORT_IN_DBM_MASK)
    {
@@ -1193,39 +1270,36 @@ PUBLIC void fillRssiMeas(U8 value, ClCellParam **cellPtr)
   *
   * ****************************************************************/
 
-S16 getParamValue(fapi_uint16_tlv_t *tlv, U16 type)
+uint32_t getParamValue(fapi_uint16_tlv_t *tlv, uint16_t type)
 {
-    U16 valueLen;
-    void *temp, *posPtr;
-    valueLen = tlv->tl.length;
+    //uint16_t valueLen;
+    void *posPtr;
+    //valueLen = tlv->tl.length;
     posPtr   = &tlv->tl.tag;
     posPtr   += sizeof(tlv->tl.tag);
     posPtr   += sizeof(tlv->tl.length);
     /*TO DO: malloc to SSI memory */
     if(type == FAPI_UINT_8)
     {
-       temp = (U8 *)malloc(valueLen * sizeof(U8));
-       memcpy(temp, posPtr, valueLen);
-       return(*(U8 *)temp);
+       //temp = (uint8_t *)malloc(valueLen * sizeof(U8));
+       //memcpy(temp, posPtr, valueLen);
+       return(*(uint8_t *)posPtr);
     }
     else if(type == FAPI_UINT_16)
     {
-       temp = (U16 *)malloc(valueLen * sizeof(U16));
-       memcpy(temp, posPtr, valueLen);
-       return(*(U16 *)temp);
+       return(*(uint16_t *)posPtr);
     }
     else if(type == FAPI_UINT_32)
     {
-       temp = (U32 *)malloc(valueLen * sizeof(U32));
-       memcpy(temp, posPtr, valueLen);
-       return(*(U32 *)temp);
+       return(*(uint32_t *)posPtr);
     }
     else
     {
-      printf("\n Value Extraction failed" );
-      RETVALUE(RFAILED);
+      DU_LOG("\nLWR_MAC: Value Extraction failed" );
+      return RFAILED;
     }
 }
+#endif /* FAPI */
  /*******************************************************************
   *
   * @brief Sends FAPI Param req to PHY
@@ -1245,24 +1319,32 @@ S16 getParamValue(fapi_uint16_tlv_t *tlv, U16 type)
 
 S16 lwr_mac_handleParamReqEvt(void *msg)
 {
+#ifdef FAPI
    /* startGuardTimer(); */
-   fapi_param_req_t *paramReq = (fapi_param_req_t *)msg;
-   if(SGetSBuf(0, 0, (Data **)&paramReq, sizeof(fapi_param_req_t)) != ROK)
+   uint32_t msgLen;      //Length of message Body
+   msgLen = 0;
+   fapi_param_req_t *paramReq;
+       LWR_MAC_ALLOC(paramReq, sizeof(fapi_param_req_t));
+   if(paramReq != NULLP)
    {
-      printf("\nFailed to allocate memory for Param Request");
-      RETVALUE(LCM_REASON_MEM_NOAVAIL);
+      fillMsgHeader(&paramReq->header, FAPI_PARAM_REQUEST, msgLen);
+      DU_LOG("\nLWR_MAC: Sending Param Request to Phy");
+      LwrMacSendToPhy(paramReq->header.message_type_id, sizeof(fapi_param_req_t), (void *)paramReq);
+      return ROK;
    }
    else
    {
-      fillMsgHeader(&paramReq->header, FAPI_PARAM_REQUEST, 0);
-      sendToPhy(paramReq->header.message_type_id, sizeof(fapi_param_req_t), (void *)paramReq);
-      RETVALUE(ROK);
+      DU_LOG("\nLWR_MAC: Failed to allocate memory for Param Request");
+      return RFAILED;
    }
+#else
+   return ROK;
+#endif
 }
 
  /*******************************************************************
   *
-  * @brief Sends FAPI Param rsp to MAC via PHY
+  * @brief Sends FAPI Param Response to MAC via PHY
   *
   * @details
   *
@@ -1277,509 +1359,523 @@ S16 lwr_mac_handleParamReqEvt(void *msg)
   *
   * ****************************************************************/
 
-S16 lwr_mac_handleParamRspEvt(fapi_param_resp_t *paramRsp)
+S16 lwr_mac_handleParamRspEvt(void *msg)
 {
+#ifdef FAPI
   /* stopGuardTimer(); */
-   U16 index;
-   U32 encodedVal;
+   uint8_t index;
+   uint32_t encodedVal;
+       fapi_param_resp_t *paramRsp;
    ClCellParam *cellParam = NULLP;
-   if(paramRsp == NULLP)
-   {
-      printf("\n Param Request for State [%d] is unsuccessfull", clGlobalCp.phyState);
-      RETVALUE(RFAILED);
-   }
-   printf("\n Received EVENT[%d] at STATE[%d]", clGlobalCp.event, clGlobalCp.phyState);
-   SPutSBuf(0, 0, (Data *)paramRsp, paramRsp->header.length);
-   if(SGetSBuf(0, 0, (Data **)&cellParam, sizeof(ClCellParam)) != ROK)
-   {
-      printf("\nFailed to allocate memory for new cell");
-      RETVALUE(LCM_REASON_MEM_NOAVAIL);
-   }
 
-   printf("\n Filling TLVS into MAC API");
-   if(paramRsp->error_code == MSG_OK)
+   paramRsp = (fapi_param_resp_t *)msg;
+   DU_LOG("\nLWR_MAC: Received EVENT[%d] at STATE[%d]", clGlobalCp.event, clGlobalCp.phyState);
+
+   if(paramRsp != NULLP)
    {
-      for(index = 0; index < paramRsp->number_of_tlvs; index++)
+      MAC_ALLOC(cellParam, sizeof(ClCellParam));
+      if(cellParam != NULLP)
       {
-         switch(paramRsp->tlvs[index].tl.tag)
+         DU_LOG("\n LWR_MAC: Filling TLVS into MAC API");
+         if(paramRsp->error_code == MSG_OK)
          {
-            case FAPI_RELEASE_CAPABILITY_TAG:
-              encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_16);
-               if(encodedVal != RFAILED && (encodedVal & RELEASE_15) == RELEASE_15)
-               {
-                 cellParam->releaseCapability = RELEASE_15;
-               }
-               break;
-
-            case FAPI_PHY_STATE_TAG:
-              encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-              if(encodedVal != RFAILED && encodedVal != clGlobalCp.phyState)
-               {
-                 printf("\n PhyState mismatch [%d][%d]", clGlobalCp.phyState, clGlobalCp.event);
-                 RETVALUE(RFAILED);
-              }
-               break;
-
-            case FAPI_SKIP_BLANK_DL_CONFIG_TAG:
-              encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-               if(encodedVal != RFAILED && encodedVal != 0)
-               {
-                 cellParam->skipBlankDlConfig = SUPPORTED;
-               }
-               else
-               {
-                 cellParam->skipBlankDlConfig = NOT_SUPPORTED;
-               }
-               break;
-
-            case FAPI_SKIP_BLANK_UL_CONFIG_TAG:
-              encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-               if(encodedVal != RFAILED && encodedVal != 0)
-               {
-                 cellParam->skipBlankUlConfig = SUPPORTED;
-               }
-               else
-               {
-                 cellParam->skipBlankUlConfig = NOT_SUPPORTED;
-               }
-               break;
-
-            case FAPI_NUM_CONFIG_TLVS_TO_REPORT_TYPE_TAG:
-               cellParam->numTlvsToReport = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_16);
-               break;
-
-            case FAPI_CYCLIC_PREFIX_TAG:
-               encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-              if(encodedVal != RFAILED)
-              {
-                  fillCyclicPrefix(encodedVal, &cellParam);
-              }
-              break;
-
-            case FAPI_SUPPORTED_SUBCARRIER_SPACING_DL_TAG:
-               encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-              if(encodedVal != RFAILED) 
-              {
-                  fillSubcarrierSpaceDl(encodedVal, &cellParam);
-              }
-              break;
-
-            case FAPI_SUPPORTED_BANDWIDTH_DL_TAG:
-              encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_16);
-              if(encodedVal != RFAILED)
-              {
-                  fillBandwidthDl(encodedVal, &cellParam);
-              }
-              break;
-
-            case FAPI_SUPPORTED_SUBCARRIER_SPACING_UL_TAG:
-               encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-              if(encodedVal != RFAILED)
-              {
-                  fillSubcarrierSpaceUl(encodedVal, &cellParam);
-               }
-               break;
-
-            case FAPI_SUPPORTED_BANDWIDTH_UL_TAG:
-               encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_16);
-              if(encodedVal != RFAILED)
-              {
-                  fillBandwidthUl(encodedVal, &cellParam);
-              }
-              break;
-
-            case FAPI_CCE_MAPPING_TYPE_TAG:
-               encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-               if(encodedVal != RFAILED)
-              {
-                  fillCCEmaping(encodedVal, &cellParam);
-              }
-               break;
-
-            case FAPI_CORESET_OUTSIDE_FIRST_3_OFDM_SYMS_OF_SLOT_TAG:
-               encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-               if(encodedVal != RFAILED && encodedVal != 0)
-               {
-                  cellParam->coresetOutsideFirst3OfdmSymsOfSlot = SUPPORTED;
-               }
-               else
-               {
-                  cellParam->coresetOutsideFirst3OfdmSymsOfSlot = NOT_SUPPORTED;
-               }
-               break;
-
-            case FAPI_PRECODER_GRANULARITY_CORESET_TAG:
-              encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-               if(encodedVal != RFAILED && encodedVal != 0)
-               {
-                  cellParam->precoderGranularityCoreset = SUPPORTED;
-               }
-               else
-               {
-                  cellParam->precoderGranularityCoreset = NOT_SUPPORTED;
-               }
-               break;
-
-            case FAPI_PDCCH_MU_MIMO_TAG:
-              encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-               if(encodedVal != RFAILED && encodedVal != 0)
+            for(index = 0; index < paramRsp->number_of_tlvs; index++)
+            {
+               switch(paramRsp->tlvs[index].tl.tag)
                {
-                  cellParam->pdcchMuMimo = SUPPORTED;
-               }
-               else
-               {
-                  cellParam->pdcchMuMimo = NOT_SUPPORTED;
-              }
-               break;
-
-            case FAPI_PDCCH_PRECODER_CYCLING_TAG:
-               encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-               if(encodedVal != RFAILED && encodedVal != 0)
-               {
-                  cellParam->pdcchPrecoderCycling = SUPPORTED;
-               }
-               else
-               {
-                  cellParam->pdcchPrecoderCycling = NOT_SUPPORTED;
-              }
-               break;
-
-            case FAPI_MAX_PDCCHS_PER_SLOT_TAG:
-               cellParam->maxPdcchsPerSlot = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-               break;
-
-            case FAPI_PUCCH_FORMATS_TAG:
-               encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-               if(encodedVal != RFAILED)
-              {
-                  fillPucchFormat(encodedVal, &cellParam);
-              }
-               break;
-
-            case FAPI_MAX_PUCCHS_PER_SLOT_TAG:
-              cellParam->maxPucchsPerSlot   = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-               break;
-
-            case FAPI_PDSCH_MAPPING_TYPE_TAG:
-               encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-               if(encodedVal != RFAILED)
-              {
-                  fillPdschMappingType(encodedVal, &cellParam);
-              }
-               break;
-
-            case FAPI_PDSCH_ALLOCATION_TYPES_TAG:
-               encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-               if(encodedVal != RFAILED)
-              {
-                  fillPdschAllocationType(encodedVal, &cellParam);
-              }
-               break;
-
-            case FAPI_PDSCH_VRB_TO_PRB_MAPPING_TAG:
-               encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-               if(encodedVal != RFAILED)
-              {
-                  fillPrbMappingType(encodedVal, &cellParam);
-              }
-               break;
-
-            case FAPI_PDSCH_CBG_TAG:
-              encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-               if(encodedVal != RFAILED && encodedVal != 0)
-               {
-                  cellParam->pdschCbg = SUPPORTED;
-               }
-               else
-               {
-                  cellParam->pdschCbg = NOT_SUPPORTED;
-              }
-               break;
-
-            case FAPI_PDSCH_DMRS_CONFIG_TYPES_TAG:
-              encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-               if(encodedVal != RFAILED)
-              {
-                  fillPdschDmrsConfigType(encodedVal, &cellParam);
-              }
-               break;
-
-            case FAPI_PDSCH_DMRS_MAX_LENGTH_TAG:
-              encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-               if(encodedVal != RFAILED)
-              {
-                  fillPdschDmrsLength(encodedVal, &cellParam);
-              }
-               break;
-
-            case FAPI_PDSCH_DMRS_ADDITIONAL_POS_TAG:
-              encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-               if(encodedVal != RFAILED)
-              {
-                  fillPdschDmrsAddPos(encodedVal, &cellParam);
-              }
-               break;
-
-            case FAPI_MAX_PDSCHS_TBS_PER_SLOT_TAG:
-              cellParam->maxPdschsTBsPerSlot = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-               break;
-
-            case FAPI_MAX_NUMBER_MIMO_LAYERS_PDSCH_TAG:
-               encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-               if(encodedVal != RFAILED && encodedVal < FAPI_MAX_NUMBERMIMO_LAYERS_PDSCH)
-               {
-                  cellParam->maxNumberMimoLayersPdsch   = encodedVal;
-               }
-               break;
-
-            case FAPI_SUPPORTED_MAX_MODULATION_ORDER_DL_TAG:
-              encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-              if(encodedVal != RFAILED)
-              {
-                  fillModulationOrderDl(encodedVal, &cellParam);
-              }
-               break;
-
-            case FAPI_MAX_MU_MIMO_USERS_DL_TAG:
-               cellParam->maxMuMimoUsersDl         = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-               break;
-
-            case FAPI_PDSCH_DATA_IN_DMRS_SYMBOLS_TAG:
-               encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-               if(encodedVal != RFAILED && encodedVal != 0)
-               {
-                  cellParam->pdschDataInDmrsSymbols = SUPPORTED;
-               }
-               else
-               {
-                  cellParam->pdschDataInDmrsSymbols = NOT_SUPPORTED;
-              }
-               break;
-
-            case FAPI_PREMPTIONSUPPORT_TAG:
-              encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-               if(encodedVal != RFAILED && encodedVal != 0)
-               {
-                  cellParam->premptionSupport = SUPPORTED;
-               }
-               else
-               {
-                  cellParam->premptionSupport = NOT_SUPPORTED;
-              }
-               break;
-
-            case FAPI_PDSCH_NON_SLOT_SUPPORT_TAG:
-              encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-               if(encodedVal != RFAILED && encodedVal != 0)
-               {
-                  cellParam->pdschNonSlotSupport = SUPPORTED;
-               }
-               else
-               {
-                  cellParam->pdschNonSlotSupport = NOT_SUPPORTED;
-              }
-               break;
-
-            case FAPI_UCI_MUX_ULSCH_IN_PUSCH_TAG:
-              encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-               if(encodedVal != RFAILED && encodedVal != 0)
-               {
-                  cellParam->uciMuxUlschInPusch = SUPPORTED;
-               }
-               else
-               {
-                  cellParam->uciMuxUlschInPusch = NOT_SUPPORTED;
-              }
-               break;
-
-            case FAPI_UCI_ONLY_PUSCH_TAG:
-              encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-               if(encodedVal != RFAILED && encodedVal != 0)
-               {
-                  cellParam->uciOnlyPusch = SUPPORTED;
-               }
-               else
-               {
-                  cellParam->uciOnlyPusch = NOT_SUPPORTED;
-              }
-               break;
-
-            case FAPI_PUSCH_FREQUENCY_HOPPING_TAG:
-              encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-               if(encodedVal != RFAILED && encodedVal != 0)
-               {
-                  cellParam->puschFrequencyHopping = SUPPORTED;
-               }
-               else
-               {
-                  cellParam->puschFrequencyHopping = NOT_SUPPORTED;
-              }
-               break;
-
-           case FAPI_PUSCH_DMRS_CONFIG_TYPES_TAG:
-             encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-             if(encodedVal != RFAILED)
-             {
-                 fillPuschDmrsConfig(encodedVal, &cellParam);
-             }
-              break;
-
-           case FAPI_PUSCH_DMRS_MAX_LEN_TAG:
-             encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-             if(encodedVal != RFAILED)
-             {
-                 fillPuschDmrsLength(encodedVal, &cellParam);
-             }
-              break;
-
-           case FAPI_PUSCH_DMRS_ADDITIONAL_POS_TAG:
-             encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-             if(encodedVal != RFAILED)
-             {
-                 fillPuschDmrsAddPos(encodedVal, &cellParam);
-             }
-             break;
-
-           case FAPI_PUSCH_CBG_TAG:
-              encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-              if(encodedVal != RFAILED && encodedVal != 0)
-              {
-                 cellParam->puschCbg = SUPPORTED;
+                  case FAPI_RELEASE_CAPABILITY_TAG:
+                     encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_16);
+                     if(encodedVal != RFAILED && (encodedVal & RELEASE_15) == RELEASE_15)
+                     {
+                       cellParam->releaseCapability = RELEASE_15;
+                     }
+                     break;
+
+                  case FAPI_PHY_STATE_TAG:
+                     encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                     if(encodedVal != RFAILED && encodedVal != clGlobalCp.phyState)
+                     {
+                        printf("\n PhyState mismatch [%d][%d]", clGlobalCp.phyState, clGlobalCp.event);
+                       RETVALUE(RFAILED);
+                     }
+                     break;
+
+                  case FAPI_SKIP_BLANK_DL_CONFIG_TAG:
+                     encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                     if(encodedVal != RFAILED && encodedVal != 0)
+                     {
+                       cellParam->skipBlankDlConfig = SUPPORTED;
+                     }
+                     else
+                     {
+                       cellParam->skipBlankDlConfig = NOT_SUPPORTED;
+                     }
+                     break;
+
+                  case FAPI_SKIP_BLANK_UL_CONFIG_TAG:
+                     encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                     if(encodedVal != RFAILED && encodedVal != 0)
+                     {
+                       cellParam->skipBlankUlConfig = SUPPORTED;
+                     }
+                     else
+                     {
+                       cellParam->skipBlankUlConfig = NOT_SUPPORTED;
+                     }
+                     break;
+
+                  case FAPI_NUM_CONFIG_TLVS_TO_REPORT_TYPE_TAG:
+                     cellParam->numTlvsToReport = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_16);
+                     break;
+
+                  case FAPI_CYCLIC_PREFIX_TAG:
+                     encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                     if(encodedVal != RFAILED)
+                     {
+                        fillCyclicPrefix(encodedVal, &cellParam);
+                     }
+                     break;
+
+                  case FAPI_SUPPORTED_SUBCARRIER_SPACING_DL_TAG:
+                     encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                     if(encodedVal != RFAILED)
+                     {
+                        fillSubcarrierSpaceDl(encodedVal, &cellParam);
+                     }
+                     break;
+
+                  case FAPI_SUPPORTED_BANDWIDTH_DL_TAG:
+                     encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_16);
+                     if(encodedVal != RFAILED)
+                     {
+                        fillBandwidthDl(encodedVal, &cellParam);
+                     }
+                     break;
+
+                  case FAPI_SUPPORTED_SUBCARRIER_SPACING_UL_TAG:
+                     encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                     if(encodedVal != RFAILED)
+                     {
+                        fillSubcarrierSpaceUl(encodedVal, &cellParam);
+                     }
+                     break;
+
+                  case FAPI_SUPPORTED_BANDWIDTH_UL_TAG:
+                     encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_16);
+                     if(encodedVal != RFAILED)
+                     {
+                        fillBandwidthUl(encodedVal, &cellParam);
+                     }
+                     break;
+
+                  case FAPI_CCE_MAPPING_TYPE_TAG:
+                     encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                     if(encodedVal != RFAILED)
+                     {
+                        fillCCEmaping(encodedVal, &cellParam);
+                     }
+                     break;
+
+                  case FAPI_CORESET_OUTSIDE_FIRST_3_OFDM_SYMS_OF_SLOT_TAG:
+                     encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                     if(encodedVal != RFAILED && encodedVal != 0)
+                     {
+                        cellParam->coresetOutsideFirst3OfdmSymsOfSlot = SUPPORTED;
+                     }
+                     else
+                     {
+                        cellParam->coresetOutsideFirst3OfdmSymsOfSlot = NOT_SUPPORTED;
+                     }
+                     break;
+
+                  case FAPI_PRECODER_GRANULARITY_CORESET_TAG:
+                     encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                     if(encodedVal != RFAILED && encodedVal != 0)
+                     {
+                        cellParam->precoderGranularityCoreset = SUPPORTED;
+                     }
+                     else
+                     {
+                        cellParam->precoderGranularityCoreset = NOT_SUPPORTED;
+                     }
+                     break;
+
+                  case FAPI_PDCCH_MU_MIMO_TAG:
+                     encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                     if(encodedVal != RFAILED && encodedVal != 0)
+                     {
+                        cellParam->pdcchMuMimo = SUPPORTED;
+                     }
+                     else
+                     {
+                        cellParam->pdcchMuMimo = NOT_SUPPORTED;
+                     }
+                     break;
+
+                  case FAPI_PDCCH_PRECODER_CYCLING_TAG:
+                     encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                     if(encodedVal != RFAILED && encodedVal != 0)
+                     {
+                        cellParam->pdcchPrecoderCycling = SUPPORTED;
+                     }
+                     else
+                     {
+                        cellParam->pdcchPrecoderCycling = NOT_SUPPORTED;
+                     }
+                     break;
+
+                  case FAPI_MAX_PDCCHS_PER_SLOT_TAG:
+                     cellParam->maxPdcchsPerSlot = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                     break;
+
+                  case FAPI_PUCCH_FORMATS_TAG:
+                     encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                     if(encodedVal != RFAILED)
+                     {
+                        fillPucchFormat(encodedVal, &cellParam);
+                     }
+                     break;
+
+                  case FAPI_MAX_PUCCHS_PER_SLOT_TAG:
+                      cellParam->maxPucchsPerSlot   = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                     break;
+
+                  case FAPI_PDSCH_MAPPING_TYPE_TAG:
+                     encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                     if(encodedVal != RFAILED)
+                     {
+                        fillPdschMappingType(encodedVal, &cellParam);
+                     }
+                     break;
+
+                  case FAPI_PDSCH_ALLOCATION_TYPES_TAG:
+                     encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                     if(encodedVal != RFAILED)
+                     {
+                        fillPdschAllocationType(encodedVal, &cellParam);
+                     }
+                     break;
+
+                  case FAPI_PDSCH_VRB_TO_PRB_MAPPING_TAG:
+                     encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                     if(encodedVal != RFAILED)
+                     {
+                        fillPrbMappingType(encodedVal, &cellParam);
+                     }
+                     break;
+
+                  case FAPI_PDSCH_CBG_TAG:
+                     encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                     if(encodedVal != RFAILED && encodedVal != 0)
+                     {
+                        cellParam->pdschCbg = SUPPORTED;
+                     }
+                     else
+                     {
+                        cellParam->pdschCbg = NOT_SUPPORTED;
+                     }
+                     break;
+
+                  case FAPI_PDSCH_DMRS_CONFIG_TYPES_TAG:
+                     encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                     if(encodedVal != RFAILED)
+                     {
+                        fillPdschDmrsConfigType(encodedVal, &cellParam);
+                     }
+                     break;
+
+                  case FAPI_PDSCH_DMRS_MAX_LENGTH_TAG:
+                     encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                     if(encodedVal != RFAILED)
+                     {
+                        fillPdschDmrsLength(encodedVal, &cellParam);
+                     }
+                     break;
+
+                  case FAPI_PDSCH_DMRS_ADDITIONAL_POS_TAG:
+                     encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                     if(encodedVal != RFAILED)
+                     {
+                        fillPdschDmrsAddPos(encodedVal, &cellParam);
+                     }
+                     break;
+
+                  case FAPI_MAX_PDSCHS_TBS_PER_SLOT_TAG:
+                     cellParam->maxPdschsTBsPerSlot = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                     break;
+
+                  case FAPI_MAX_NUMBER_MIMO_LAYERS_PDSCH_TAG:
+                     encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                     if(encodedVal != RFAILED && encodedVal < FAPI_MAX_NUMBERMIMO_LAYERS_PDSCH)
+                     {
+                        cellParam->maxNumberMimoLayersPdsch   = encodedVal;
+                     }
+                     break;
+
+                  case FAPI_SUPPORTED_MAX_MODULATION_ORDER_DL_TAG:
+                     encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                     if(encodedVal != RFAILED)
+                     {
+                        fillModulationOrderDl(encodedVal, &cellParam);
+                     }
+                     break;
+
+                  case FAPI_MAX_MU_MIMO_USERS_DL_TAG:
+                     cellParam->maxMuMimoUsersDl         = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                     break;
+
+                  case FAPI_PDSCH_DATA_IN_DMRS_SYMBOLS_TAG:
+                     encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                     if(encodedVal != RFAILED && encodedVal != 0)
+                     {
+                        cellParam->pdschDataInDmrsSymbols = SUPPORTED;
+                     }
+                     else
+                     {
+                        cellParam->pdschDataInDmrsSymbols = NOT_SUPPORTED;
+                     }
+                     break;
+
+                  case FAPI_PREMPTIONSUPPORT_TAG:
+                     encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                     if(encodedVal != RFAILED && encodedVal != 0)
+                     {
+                        cellParam->premptionSupport = SUPPORTED;
+                     }
+                     else
+                     {
+                        cellParam->premptionSupport = NOT_SUPPORTED;
+                     }
+                     break;
+
+                  case FAPI_PDSCH_NON_SLOT_SUPPORT_TAG:
+                     encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                     if(encodedVal != RFAILED && encodedVal != 0)
+                     {
+                        cellParam->pdschNonSlotSupport = SUPPORTED;
+                     }
+                     else
+                     {
+                        cellParam->pdschNonSlotSupport = NOT_SUPPORTED;
+                     }
+                     break;
+
+                  case FAPI_UCI_MUX_ULSCH_IN_PUSCH_TAG:
+                     encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                     if(encodedVal != RFAILED && encodedVal != 0)
+                     {
+                        cellParam->uciMuxUlschInPusch = SUPPORTED;
+                     }
+                     else
+                     {
+                        cellParam->uciMuxUlschInPusch = NOT_SUPPORTED;
+                     }
+                     break;
+
+                  case FAPI_UCI_ONLY_PUSCH_TAG:
+                     encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                     if(encodedVal != RFAILED && encodedVal != 0)
+                     {
+                        cellParam->uciOnlyPusch = SUPPORTED;
+                     }
+                     else
+                     {
+                        cellParam->uciOnlyPusch = NOT_SUPPORTED;
+                     }
+                     break;
+
+                  case FAPI_PUSCH_FREQUENCY_HOPPING_TAG:
+                     encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                     if(encodedVal != RFAILED && encodedVal != 0)
+                     {
+                        cellParam->puschFrequencyHopping = SUPPORTED;
+                     }
+                     else
+                     {
+                        cellParam->puschFrequencyHopping = NOT_SUPPORTED;
+                     }
+                     break;
+
+                 case FAPI_PUSCH_DMRS_CONFIG_TYPES_TAG:
+                    encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                    if(encodedVal != RFAILED)
+                    {
+                       fillPuschDmrsConfig(encodedVal, &cellParam);
+                    }
+                    break;
+
+                 case FAPI_PUSCH_DMRS_MAX_LEN_TAG:
+                    encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                    if(encodedVal != RFAILED)
+                    {
+                       fillPuschDmrsLength(encodedVal, &cellParam);
+                    }
+                    break;
+
+                 case FAPI_PUSCH_DMRS_ADDITIONAL_POS_TAG:
+                    encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                    if(encodedVal != RFAILED)
+                    {
+                       fillPuschDmrsAddPos(encodedVal, &cellParam);
+                    }
+                    break;
+
+                 case FAPI_PUSCH_CBG_TAG:
+                    encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                    if(encodedVal != RFAILED && encodedVal != 0)
+                    {
+                       cellParam->puschCbg = SUPPORTED;
+                    }
+                    else
+                    {
+                       cellParam->puschCbg = NOT_SUPPORTED;
+                    }
+                    break;
+
+                case FAPI_PUSCH_MAPPING_TYPE_TAG:
+                   encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                   if(encodedVal != RFAILED)
+                   {
+                      fillPuschMappingType(encodedVal, &cellParam);
+                   }
+                   break;
+
+                case FAPI_PUSCH_ALLOCATION_TYPES_TAG:
+                   encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                   if(encodedVal != RFAILED)
+                   {
+                      fillPuschAllocationType(encodedVal, &cellParam);
+                   }
+                   break;
+
+                case FAPI_PUSCH_VRB_TO_PRB_MAPPING_TAG:
+                   encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                   if(encodedVal != RFAILED)
+                   {
+                      fillPuschPrbMappingType(encodedVal, &cellParam);
+                   }
+                   break;
+
+                case FAPI_PUSCH_MAX_PTRS_PORTS_TAG:
+                   encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                   if(encodedVal != RFAILED && encodedVal < FAPI_PUSCH_MAX_PTRS_PORTS_UB)
+                   {
+               cellParam->puschMaxPtrsPorts = encodedVal;
+                   }
+                   break;
+
+                case FAPI_MAX_PDUSCHS_TBS_PER_SLOT_TAG:
+                   cellParam->maxPduschsTBsPerSlot = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                   break;
+
+                case FAPI_MAX_NUMBER_MIMO_LAYERS_NON_CB_PUSCH_TAG:
+                   cellParam->maxNumberMimoLayersNonCbPusch = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                   break;
+
+                case FAPI_SUPPORTED_MODULATION_ORDER_UL_TAG:
+                   encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                   if(encodedVal != RFAILED)
+                   {
+                      fillModulationOrderUl(encodedVal, &cellParam);
+                   }
+                   break;
+
+                case FAPI_MAX_MU_MIMO_USERS_UL_TAG:
+                   cellParam->maxMuMimoUsersUl = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                   break;
+
+                case FAPI_DFTS_OFDM_SUPPORT_TAG:
+                   encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                   if(encodedVal != RFAILED && encodedVal != 0)
+                   {
+                      cellParam->dftsOfdmSupport = SUPPORTED;
+                   }
+                   else
+                   {
+                      cellParam->dftsOfdmSupport = NOT_SUPPORTED;
+                   }
+                   break;
+
+                case FAPI_PUSCH_AGGREGATION_FACTOR_TAG:
+                   encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                   if(encodedVal != RFAILED)
+                   {
+                      fillPuschAggregationFactor(encodedVal, &cellParam);
+                   }
+                   break;
+
+                case FAPI_PRACH_LONG_FORMATS_TAG:
+                   encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                   if(encodedVal != RFAILED)
+                   {
+                      fillPrachLongFormat(encodedVal, &cellParam);
+                   }
+                   break;
+
+                case FAPI_PRACH_SHORT_FORMATS_TAG:
+                   encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                   if(encodedVal != RFAILED)
+                   {
+                      fillPrachShortFormat(encodedVal, &cellParam);
+                   }
+                   break;
+
+                case FAPI_PRACH_RESTRICTED_SETS_TAG:
+                   encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                   if(encodedVal != RFAILED && encodedVal != 0)
+                   {
+                      cellParam->prachRestrictedSets = SUPPORTED;
+                   }
+                   else
+                   {
+                      cellParam->prachRestrictedSets = NOT_SUPPORTED;
+                   }
+                   break;
+
+               case FAPI_MAX_PRACH_FD_OCCASIONS_IN_A_SLOT_TAG:
+                  encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                  if(encodedVal != RFAILED)
+                  {
+                     fillFdOccasions(encodedVal, &cellParam);
+                  }
+                  break;
+
+               case FAPI_RSSI_MEASUREMENT_SUPPORT_TAG:
+                  encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
+                  if(encodedVal != RFAILED)
+                  {
+                     fillRssiMeas(encodedVal, &cellParam);
+                  }
+                  break;
+               default:
+               //printf("\n Invalid value for TLV[%x] at index[%d]", paramRsp->tlvs[index].tl.tag, index);
+                                       break;
               }
-              else
-              {
-                 cellParam->puschCbg = NOT_SUPPORTED;
-             }
-              break;
-
-          case FAPI_PUSCH_MAPPING_TYPE_TAG:
-            encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-            if(encodedVal != RFAILED)
-            {
-                fillPuschMappingType(encodedVal, &cellParam);
-            }
-             break;
-
-          case FAPI_PUSCH_ALLOCATION_TYPES_TAG:
-            encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-            if(encodedVal != RFAILED)
-            {
-                fillPuschAllocationType(encodedVal, &cellParam);
-            }
-            break;
-
-          case FAPI_PUSCH_VRB_TO_PRB_MAPPING_TAG:
-             encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-            if(encodedVal != RFAILED)
-            {
-                fillPuschPrbMappingType(encodedVal, &cellParam);
-            }
-            break;
-
-          case FAPI_PUSCH_MAX_PTRS_PORTS_TAG:
-             encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-             if(encodedVal != RFAILED && encodedVal < FAPI_PUSCH_MAX_PTRS_PORTS_UB)
-             {
-               cellParam->puschMaxPtrsPorts = encodedVal;
-            }
-             break;
-
-          case FAPI_MAX_PDUSCHS_TBS_PER_SLOT_TAG:
-             cellParam->maxPduschsTBsPerSlot = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-             break;
-
-          case FAPI_MAX_NUMBER_MIMO_LAYERS_NON_CB_PUSCH_TAG:
-             cellParam->maxNumberMimoLayersNonCbPusch = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-             break;
-
-          case FAPI_SUPPORTED_MODULATION_ORDER_UL_TAG:
-             encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-            if(encodedVal != RFAILED)
-            {
-                fillModulationOrderUl(encodedVal, &cellParam);
-            }
-            break;
-
-          case FAPI_MAX_MU_MIMO_USERS_UL_TAG:
-             cellParam->maxMuMimoUsersUl = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-             break;
-
-          case FAPI_DFTS_OFDM_SUPPORT_TAG:
-            encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-             if(encodedVal != RFAILED && encodedVal != 0)
-             {
-                cellParam->dftsOfdmSupport = SUPPORTED;
-             }
-             else
-             {
-                cellParam->dftsOfdmSupport = NOT_SUPPORTED;
-            }
-             break;
-
-          case FAPI_PUSCH_AGGREGATION_FACTOR_TAG:
-            encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-            if(encodedVal != RFAILED)
-            {
-                fillPuschAggregationFactor(encodedVal, &cellParam);
-            }
-            break;
-
-          case FAPI_PRACH_LONG_FORMATS_TAG:
-            encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-            if(encodedVal != RFAILED)
-            {
-                fillPrachLongFormat(encodedVal, &cellParam);
-            }
-            break;
-
-          case FAPI_PRACH_SHORT_FORMATS_TAG:
-             encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-            if(encodedVal != RFAILED)
-            {
-                fillPrachShortFormat(encodedVal, &cellParam);
-            }
-            break;
-
-          case FAPI_PRACH_RESTRICTED_SETS_TAG:
-            encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-             if(encodedVal != RFAILED && encodedVal != 0)
-             {
-                cellParam->prachRestrictedSets = SUPPORTED;
-             }
-             else
-             {
-                cellParam->prachRestrictedSets = NOT_SUPPORTED;
-            }
-             break;
-
-         case FAPI_MAX_PRACH_FD_OCCASIONS_IN_A_SLOT_TAG:
-           encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-           if(encodedVal != RFAILED)
-           {
-               fillFdOccasions(encodedVal, &cellParam);
-           }
-           break;
-
-         case FAPI_RSSI_MEASUREMENT_SUPPORT_TAG:
-           encodedVal = getParamValue(&paramRsp->tlvs[index], FAPI_UINT_8);
-           if(encodedVal != RFAILED)
-           {
-               fillRssiMeas(encodedVal, &cellParam);
-           }
-           break;
-
-         default:
-            printf("\n Invalid value for TLV[%d]", paramRsp->tlvs[index].tl.tag);
-           break;
-      }
-    }
-  }
-  else
-  {
-    printf("\n Error Indication Evnt received in state[%d] event[%d]", clGlobalCp.phyState, clGlobalCp.event);
-    RETVALUE(RFAILED);
-  }
-  RETVALUE(ROK);
+           }
+           MAC_FREE(cellParam, sizeof(ClCellParam));
+           sendToLowerMac(FAPI_CONFIG_REQUEST, 0, (void *)NULL);
+           return ROK;
+         }
+         else
+         {
+            DU_LOG("\n LWR_MAC: Invalid error code %d", paramRsp->error_code);
+            return RFAILED;
+         }
+     }
+     else
+     {
+        DU_LOG("\nLWR_MAC: Failed to allocate memory for cell param");
+        return RFAILED;
+     }
+   }
+   else
+   {
+       DU_LOG("\nLWR_MAC:  Param Response received from PHY is NULL");
+       return RFAILED;
+   }
+#else
+   return ROK;
+#endif
 }
 
  /*******************************************************************
@@ -1801,30 +1897,1261 @@ S16 lwr_mac_handleParamRspEvt(fapi_param_resp_t *paramRsp)
 
 S16 lwr_mac_handleConfigReqEvt(void *msg)
 {
-   RETVALUE(ROK);
+#ifdef FAPI
+   uint8_t index = 0;
+   uint32_t msgLen = 0;
+   uint32_t configReqSize;
+   RgCellCb  *cellParams;
+   MacCellCfg macCfgParams;
+   Inst inst = 0;
+
+   DU_LOG("\nLWR_MAC: Received EVENT[%d] at STATE[%d]", clGlobalCp.event, clGlobalCp.phyState);
+
+   fapi_config_req_t *configReq;
+   cellParams = rgCb[inst].cell;
+   macCfgParams = cellParams->macCellCfg;
+   configReqSize = sizeof(fapi_config_req_t) + (macCfgParams.numTlv * sizeof(fapi_uint16_tlv_t));
+       LWR_MAC_ALLOC(configReq, configReqSize);
+   if(configReq != NULL)
+   {
+      configReq->number_of_tlvs = macCfgParams.numTlv;
+
+      if(macCfgParams.dlCarrCfg.pres)
+      {
+         fillTlvs(&configReq->tlvs[index++], FAPI_DL_BANDWIDTH_TAG,            sizeof(uint16_t), macCfgParams.dlCarrCfg.bw, &msgLen);
+         fillTlvs(&configReq->tlvs[index++], FAPI_DL_FREQUENCY_TAG,            sizeof(uint32_t), macCfgParams.dlCarrCfg.freq, &msgLen);
+         fillTlvs(&configReq->tlvs[index++], FAPI_DL_K0_TAG,                   sizeof(uint16_t), macCfgParams.dlCarrCfg.k0[0], &msgLen);
+         fillTlvs(&configReq->tlvs[index++], FAPI_DL_GRIDSIZE_TAG,             sizeof(uint16_t), macCfgParams.dlCarrCfg.gridSize[0], &msgLen);
+         fillTlvs(&configReq->tlvs[index++], FAPI_NUM_TX_ANT_TAG,              sizeof(uint16_t), macCfgParams.dlCarrCfg.numAnt, &msgLen);
+      }
+      if(macCfgParams.ulCarrCfg.pres)
+      {
+         fillTlvs(&configReq->tlvs[index++], FAPI_UPLINK_BANDWIDTH_TAG,        sizeof(uint16_t), macCfgParams.ulCarrCfg.bw, &msgLen);
+         fillTlvs(&configReq->tlvs[index++], FAPI_UPLINK_FREQUENCY_TAG,        sizeof(uint32_t), macCfgParams.ulCarrCfg.freq, &msgLen);
+         fillTlvs(&configReq->tlvs[index++], FAPI_UL_K0_TAG,                   sizeof(uint16_t), macCfgParams.ulCarrCfg.k0[0], &msgLen);
+         fillTlvs(&configReq->tlvs[index++], FAPI_UL_GRID_SIZE_TAG,            sizeof(uint16_t), macCfgParams.ulCarrCfg.gridSize[0], &msgLen);
+         fillTlvs(&configReq->tlvs[index++], FAPI_NUM_RX_ANT_TAG,              sizeof(uint16_t), macCfgParams.ulCarrCfg.numAnt, &msgLen);
+      }
+      fillTlvs(&configReq->tlvs[index++], FAPI_FREQUENCY_SHIFT_7P5_KHZ_TAG,    sizeof(uint8_t), macCfgParams.freqShft, &msgLen);
+
+      /* fill cell config */
+      fillTlvs(&configReq->tlvs[index++], FAPI_PHY_CELL_ID_TAG,                sizeof(uint8_t), macCfgParams.phyCellId, &msgLen);
+      fillTlvs(&configReq->tlvs[index++], FAPI_FRAME_DUPLEX_TYPE_TAG,          sizeof(uint8_t), macCfgParams.dupType, &msgLen);
+
+      /* fill SSB configuration */
+      fillTlvs(&configReq->tlvs[index++], FAPI_SS_PBCH_POWER_TAG,              sizeof(uint32_t), macCfgParams.ssbCfg.ssbPbchPwr, &msgLen);
+      fillTlvs(&configReq->tlvs[index++], FAPI_BCH_PAYLOAD_TAG,                sizeof(uint8_t), macCfgParams.ssbCfg.bchPayloadFlag, &msgLen);
+      fillTlvs(&configReq->tlvs[index++], FAPI_SCS_COMMON_TAG,                 sizeof(uint8_t), macCfgParams.ssbCfg.scsCmn, &msgLen);
+
+      /* fill PRACH configuration */
+      fillTlvs(&configReq->tlvs[index++], FAPI_PRACH_SEQUENCE_LENGTH_TAG,      sizeof(uint8_t), macCfgParams.prachCfg.prachSeqLen, &msgLen);
+      fillTlvs(&configReq->tlvs[index++], FAPI_PRACH_SUBC_SPACING_TAG,         sizeof(uint8_t), macCfgParams.prachCfg.prachSubcSpacing, &msgLen);
+      fillTlvs(&configReq->tlvs[index++], FAPI_RESTRICTED_SET_CONFIG_TAG,      sizeof(uint8_t), macCfgParams.prachCfg.prachRstSetCfg, &msgLen);
+      fillTlvs(&configReq->tlvs[index++], FAPI_NUM_PRACH_FD_OCCASIONS_TAG,
+                               sizeof(uint8_t), macCfgParams.prachCfg.msg1Fdm, &msgLen);
+      fillTlvs(&configReq->tlvs[index++], FAPI_PRACH_ROOT_SEQUENCE_INDEX_TAG,  sizeof(uint16_t), macCfgParams.prachCfg.fdm[0].rootSeqIdx, &msgLen);
+      fillTlvs(&configReq->tlvs[index++], FAPI_NUM_ROOT_SEQUENCES_TAG,         sizeof(uint8_t), macCfgParams.prachCfg.fdm[0].numRootSeq, &msgLen);
+      fillTlvs(&configReq->tlvs[index++], FAPI_K1_TAG,                         sizeof(uint16_t), macCfgParams.prachCfg.fdm[0].k1, &msgLen);
+      fillTlvs(&configReq->tlvs[index++], FAPI_PRACH_ZERO_CORR_CONF_TAG ,      sizeof(uint8_t), macCfgParams.prachCfg.fdm[0].zeroCorrZoneCfg, &msgLen);
+      fillTlvs(&configReq->tlvs[index++], FAPI_NUM_UNUSED_ROOT_SEQUENCES_TAG,  sizeof(uint8_t), macCfgParams.prachCfg.fdm[0].numUnusedRootSeq, &msgLen);
+               if(macCfgParams.prachCfg.fdm[0].numUnusedRootSeq)
+               {
+                  LWR_MAC_ALLOC(macCfgParams.prachCfg.fdm[0].unsuedRootSeq ,
+                     sizeof(uint8_t)*macCfgParams.prachCfg.fdm[0].numUnusedRootSeq);
+                  fillTlvs(&configReq->tlvs[index++], FAPI_UNUSED_ROOT_SEQUENCES_TAG,\
+                     sizeof(uint8_t), *(macCfgParams.prachCfg.fdm[0].unsuedRootSeq), &msgLen);
+               }
+               else
+               {
+                  macCfgParams.prachCfg.fdm[0].unsuedRootSeq = NULL;
+               }
+
+      fillTlvs(&configReq->tlvs[index++], FAPI_SSB_PER_RACH_TAG,               sizeof(uint8_t), macCfgParams.prachCfg.ssbPerRach, &msgLen);
+      fillTlvs(&configReq->tlvs[index++], FAPI_PRACH_MULTIPLE_CARRIERS_IN_A_BAND_TAG,  sizeof(uint8_t), macCfgParams.prachCfg.prachMultCarrBand, &msgLen);
+
+      /* fill SSB table */
+      fillTlvs(&configReq->tlvs[index++], FAPI_SSB_OFFSET_POINT_A_TAG,         sizeof(uint16_t), macCfgParams.ssbCfg.ssbOffsetPointA, &msgLen);
+      fillTlvs(&configReq->tlvs[index++], FAPI_BETA_PSS_TAG,                   sizeof(uint8_t),  macCfgParams.ssbCfg.betaPss, &msgLen);
+      fillTlvs(&configReq->tlvs[index++], FAPI_SSB_PERIOD_TAG,                 sizeof(uint8_t),  macCfgParams.ssbCfg.ssbPeriod, &msgLen);
+      fillTlvs(&configReq->tlvs[index++], FAPI_SSB_SUBCARRIER_OFFSET_TAG,      sizeof(uint8_t),  macCfgParams.ssbCfg.ssbScOffset, &msgLen);
+      fillTlvs(&configReq->tlvs[index++], FAPI_MIB_TAG ,                       sizeof(uint32_t), macCfgParams.ssbCfg.mibPdu[0], &msgLen);
+      fillTlvs(&configReq->tlvs[index++], FAPI_SSB_MASK_TAG,                   sizeof(uint32_t), macCfgParams.ssbCfg.ssbMask[0], &msgLen);
+      fillTlvs(&configReq->tlvs[index++], FAPI_BEAM_ID_TAG,                    sizeof(uint8_t),  macCfgParams.ssbCfg.beamId[0], &msgLen);
+      fillTlvs(&configReq->tlvs[index++], FAPI_SS_PBCH_MULTIPLE_CARRIERS_IN_A_BAND_TAG, sizeof(uint8_t), macCfgParams.ssbCfg.multCarrBand, &msgLen);
+      fillTlvs(&configReq->tlvs[index++], FAPI_MULTIPLE_CELLS_SS_PBCH_IN_A_CARRIER_TAG, sizeof(uint8_t), macCfgParams.ssbCfg.multCellCarr, &msgLen);
+
+      /* fill TDD table */
+      fillTlvs(&configReq->tlvs[index++], FAPI_TDD_PERIOD_TAG,                 sizeof(uint8_t), macCfgParams.tddCfg.tddPeriod, &msgLen);
+      fillTlvs(&configReq->tlvs[index++], FAPI_SLOT_CONFIG_TAG,                sizeof(uint8_t), macCfgParams.tddCfg.slotCfg[0][0], &msgLen);
+
+      /* fill measurement config */
+      fillTlvs(&configReq->tlvs[index++], FAPI_RSSI_MESUREMENT_TAG,            sizeof(uint8_t), macCfgParams.rssiUnit, &msgLen);
+
+      fillMsgHeader(&configReq->header, FAPI_CONFIG_REQUEST, msgLen);
+      DU_LOG("\nLOWER_MAC: Sending Config Request to Phy");
+      /* TODO : Recheck the size / msglen to be sent to WLS_Put*/
+      LwrMacSendToPhy(configReq->header.message_type_id, msgLen, (void *)configReq);
+      return ROK;
+   }
+   else
+   {
+      DU_LOG("\nLOWER_MAC: Failed to allocate memory for config Request");
+      return RFAILED;
+   }
+#else
+   return ROK;
+#endif
 }
 
-S16 lwr_mac_handleConfigRspEvt(fapi_config_resp_t *configRsp)
+S16 lwr_mac_handleConfigRspEvt(void *msg)
 {
-   RETVALUE(ROK);
+#ifdef FAPI
+   fapi_config_resp_t *configRsp;
+       configRsp = (fapi_config_resp_t *)msg;
+   DU_LOG("\nLWR_MAC: Received EVENT[%d] at STATE[%d]", clGlobalCp.event, clGlobalCp.phyState);
+
+   if(configRsp != NULL)
+   {
+      if(configRsp->error_code == MSG_OK)
+      {
+         DU_LOG("\nLWR_MAC: PHY has moved to Configured state \n");
+         clGlobalCp.phyState = PHY_STATE_CONFIGURED;
+         /* TODO : 
+          * Store config response into an intermediate struture and send to MAC
+          * Support LC and LWLC for sending config rsp to MAC 
+          */
+         fapiMacConfigRsp();
+         return ROK;
+      }
+      else
+      {
+
+         DU_LOG("\n LWR_MAC: Invalid error code %d", configRsp->error_code);
+         return RFAILED;
+      }
+   }
+   else
+   {
+      DU_LOG("\nLOWER_MAC: Config Response received from PHY is NULL");
+      return RFAILED;
+   }
+#else
+   return ROK;
+#endif
 }
 
 S16 lwr_mac_handleStartReqEvt(void *msg)
 {
-  /*fapi_slot_ind_t *slotInd;
-  slotInd->header.message_type_id = FAPI_SLOT_INDICATION;
-  slotInd->sfn = 0;
-  slotInd->slot = 1;
-  phyToMac(slotInd->header.message_type_id, sizeof(fapi_slot_ind_t), (void *)slotInd);
-  */
-  RETVALUE(ROK);
+#ifdef FAPI
+   uint32_t msgLen = 0;
+   fapi_start_req_t *startReq;
+
+       LWR_MAC_ALLOC(startReq, sizeof(fapi_start_req_t));
+   if(startReq != NULL)
+   {
+      fillMsgHeader(&startReq->header, FAPI_START_REQUEST, msgLen);
+      DU_LOG("\nLWR_MAC: Sending Start Request to PHY");
+      LwrMacSendToPhy(startReq->header.message_type_id, sizeof(fapi_start_req_t), (void *)startReq);
+      return ROK;
+   }
+   else
+   {
+      DU_LOG("\nLWR_MAC: Failed to allocate memory for Start Request");
+      return RFAILED;
+   }
+#else
+   return ROK;
+#endif
 }
 
 S16 lwr_mac_handleStopReqEvt(void *msg)
 {
+#ifdef FAPI
    /* stop TX and RX operation return PHy to configured State
       send stop.indication to l2/l3 */
-   RETVALUE(ROK);
+#endif
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Modifes the received mibPdu to uint32 bit
+ *        and stores it in MacCellCfg
+ *
+ * @details
+ *
+ *    Function : setMibPdu
+ *
+ *    Functionality:
+ *         -Sets the MibPdu
+ *
+ * @params[in] Pointer to mibPdu
+ *             pointer to modified value
+ ******************************************************************/
+
+PUBLIC void setMibPdu(uint8_t *mibPdu, uint32_t *val)
+{
+   *mibPdu |= (((uint8_t)(slotIndInfo.sfn >> 2)) & MIB_SFN_BITMASK);
+   *val = (mibPdu[0] << 24 | mibPdu[1] << 16 | mibPdu[2] << 8);
+    DU_LOG("\nLWR_MAC: MIB PDU %x", *val);
+}
+
+#ifdef FAPI
+/*******************************************************************
+ *
+ * @brief fills SSB PDU required for DL TTI info in MAC
+ *
+ * @details
+ *
+ *    Function : fillSsbPdu
+ *
+ *    Functionality:
+ *         -Fills the SSB PDU info
+ *          stored in MAC
+ *
+ * @params[in] Pointer to FAPI DL TTI Req
+ *             Pointer to RgCellCb
+ *             Pointer to msgLen of DL TTI Info
+ * @return ROK
+ *
+ ******************************************************************/
+
+S16 fillSsbPdu(fapi_dl_tti_req_pdu_t *dlTtiReqPdu, MacCellCfg *macCellCfg,
+       MacDlSlot *currDlSlot,
+       uint32_t *msgLen, uint8_t ssbIdxCount) 
+{
+   uint32_t mibPayload = 0;
+   if(dlTtiReqPdu != NULL)
+   {
+      dlTtiReqPdu->pduType = SSB_PDU_TYPE;     /* SSB PDU */
+      dlTtiReqPdu->u.ssb_pdu.physCellId = macCellCfg->phyCellId;
+      dlTtiReqPdu->u.ssb_pdu.betaPss = macCellCfg->ssbCfg.betaPss;
+      dlTtiReqPdu->u.ssb_pdu.ssbBlockIndex = currDlSlot->dlInfo.brdcstAlloc.ssbInfo[ssbIdxCount].ssbIdx;
+      dlTtiReqPdu->u.ssb_pdu.ssbSubCarrierOffset = macCellCfg->ssbCfg.ssbScOffset;
+      /* ssbOfPdufstA to be filled in ssbCfg */
+      dlTtiReqPdu->u.ssb_pdu.ssbOffsetPointA = macCellCfg->ssbCfg.ssbOffsetPointA;
+      dlTtiReqPdu->u.ssb_pdu.bchPayloadFlag = macCellCfg->ssbCfg.bchPayloadFlag;
+      /* Bit manipulation for SFN */
+      setMibPdu(macCellCfg->ssbCfg.mibPdu, &mibPayload);
+      dlTtiReqPdu->u.ssb_pdu.bchPayload.v.bchPayload = mibPayload;
+      dlTtiReqPdu->u.ssb_pdu.preCodingAndBeamforming.numPrgs = 0;
+      dlTtiReqPdu->u.ssb_pdu.preCodingAndBeamforming.prgSize = 0;
+      dlTtiReqPdu->u.ssb_pdu.preCodingAndBeamforming.digBfInterfaces = 0;
+      dlTtiReqPdu->u.ssb_pdu.preCodingAndBeamforming.pmi_bfi[0].pmIdx = 0;
+      dlTtiReqPdu->u.ssb_pdu.preCodingAndBeamforming. \
+         pmi_bfi[0].beamIdx[0].beamidx = macCellCfg->ssbCfg.beamId[0];
+      dlTtiReqPdu->pduSize = sizeof(fapi_dl_ssb_pdu_t);  /* Size of SSB PDU */
+      SETLENGTH(*msgLen, sizeof(fapi_dl_ssb_pdu_t));
+      return ROK;
+    }
+    else
+    {
+       return RFAILED;
+    }
+}
+
+/*******************************************************************
+ *
+ * @brief fills Dl DCI PDU required for DL TTI info in MAC
+ *
+ * @details
+ *
+ *    Function : fillSib1DlDciPdu
+ *
+ *    Functionality:
+ *         -Fills the Dl DCI PDU
+ *
+ * @params[in] Pointer to fapi_dl_dci_t
+ *             Pointer to PdcchCfg
+ * @return ROK
+ *
+ ******************************************************************/
+
+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;
+
+      /* Size(in bits) of each field in DCI format 0_1 
+                * as mentioned in spec 38.214 */
+      uint8_t freqDomResAssignSize;
+      uint8_t timeDomResAssignSize = 4;
+      uint8_t VRB2PRBMapSize       = 1;
+      uint8_t modNCodSchemeSize    = 5;
+      uint8_t redundancyVerSize    = 2;
+      uint8_t sysInfoIndSize       = 1;
+      uint8_t reservedSize         = 15;
+
+      dlDciPtr->rnti = sib1PdcchInfo->dci.rnti;
+      dlDciPtr->scramblingId = sib1PdcchInfo->dci.scramblingId;    
+      dlDciPtr->scramblingRnti = sib1PdcchInfo->dci.scramblingRnti;
+      dlDciPtr->cceIndex = sib1PdcchInfo->dci.cceIndex;
+      dlDciPtr->aggregationLevel = sib1PdcchInfo->dci.aggregLevel;
+      dlDciPtr->pc_and_bform.numPrgs = sib1PdcchInfo->dci.beamPdcchInfo.numPrgs;
+      dlDciPtr->pc_and_bform.prgSize = sib1PdcchInfo->dci.beamPdcchInfo.prgSize;
+      dlDciPtr->pc_and_bform.digBfInterfaces = sib1PdcchInfo->dci.beamPdcchInfo.digBfInterfaces;
+      dlDciPtr->pc_and_bform.pmi_bfi[0].pmIdx = sib1PdcchInfo->dci.beamPdcchInfo.prg[0].pmIdx;
+      dlDciPtr->pc_and_bform.pmi_bfi[0].beamIdx[0].beamidx = sib1PdcchInfo->dci.beamPdcchInfo.prg[0].beamIdx[0];
+      dlDciPtr->beta_pdcch_1_0 = sib1PdcchInfo->dci.txPdcchPower.powerValue;           
+      dlDciPtr->powerControlOfssetSS = sib1PdcchInfo->dci.txPdcchPower.powerControlOffsetSS;
+
+      /* Calculating freq domain resource allocation field value and size
+       * coreset0Size = Size of coreset 0
+       * RBStart = Starting Virtual Rsource block
+       * RBLen = length of contiguously allocted RBs
+       * Spec 38.214 Sec 5.1.2.2.2
+       */
+      coreset0Size= sib1PdcchInfo->coreset0Cfg.coreSet0Size;
+               rbStart = 0;              /* For SIB1 */
+      //rbStart = sib1PdcchInfo->dci.pdschCfg->freqAlloc.rbStart;
+      rbLen = sib1PdcchInfo->dci.pdschCfg->freqAlloc.rbSize;
+
+      if((rbLen >=1) && (rbLen <= coreset0Size - rbStart))
+      {
+         if((rbLen - 1) <= floor(coreset0Size / 2))
+            freqDomResAssign = (coreset0Size * (rbLen-1)) + rbStart;
+         else
+            freqDomResAssign = (coreset0Size * (coreset0Size - rbLen + 1)) \
+               + (coreset0Size - 1 - rbStart);
+
+         freqDomResAssignSize = ceil(log2(coreset0Size * (coreset0Size + 1) / 2));
+      }
+
+      /* Fetching DCI field values */
+      timeDomResAssign = sib1PdcchInfo->dci.pdschCfg->timeAlloc.
+                         rowIndex -1;
+      VRB2PRBMap       = sib1PdcchInfo->dci.pdschCfg->freqAlloc.\
+                         vrbPrbMapping;
+      modNCodScheme    = sib1PdcchInfo->dci.pdschCfg->codeword[0].mcsIndex;
+      redundancyVer    = sib1PdcchInfo->dci.pdschCfg->codeword[0].rvIndex;
+      sysInfoInd       = 0;           /* 0 for SIB1; 1 for SI messages */
+      reserved         = 0;
+
+      /* Reversing bits in each DCI field */
+      freqDomResAssign = reverseBits(freqDomResAssign, freqDomResAssignSize);
+      timeDomResAssign = reverseBits(timeDomResAssign, timeDomResAssignSize);
+      VRB2PRBMap       = reverseBits(VRB2PRBMap, VRB2PRBMapSize);
+      modNCodScheme    = reverseBits(modNCodScheme, modNCodSchemeSize);
+      redundancyVer    = reverseBits(redundancyVer, redundancyVerSize);
+      sysInfoInd       = reverseBits(sysInfoInd, sysInfoIndSize);
+
+     /* Calulating total number of bytes in buffer */
+     dlDciPtr->payloadSizeBits = freqDomResAssignSize + timeDomResAssignSize\
+              + VRB2PRBMapSize + modNCodSchemeSize + redundancyVerSize\
+              + sysInfoIndSize + reservedSize;
+
+     numBytes = dlDciPtr->payloadSizeBits / 8;
+     if(dlDciPtr->payloadSizeBits % 8)
+        numBytes += 1;
+
+     if(numBytes > DCI_PAYLOAD_BYTE_LEN)
+     {
+        DU_LOG("\nLWR_MAC : Total bytes for DCI is more than expected");
+        return;
+     }
+
+     /* Initialize buffer */
+     for(bytePos = 0; bytePos < numBytes; bytePos++)
+        dlDciPtr->payload[bytePos] = 0;
+
+     bytePos = numBytes - 1;
+     bitPos = 0;
+
+     /* Packing DCI format fields */
+     fillDlDciPayload(dlDciPtr->payload, &bytePos, &bitPos,\
+        freqDomResAssign, freqDomResAssignSize);
+     fillDlDciPayload(dlDciPtr->payload, &bytePos, &bitPos,\
+        timeDomResAssign, timeDomResAssignSize);
+     fillDlDciPayload(dlDciPtr->payload, &bytePos, &bitPos,\
+        VRB2PRBMap, VRB2PRBMapSize);
+     fillDlDciPayload(dlDciPtr->payload, &bytePos, &bitPos,\
+        modNCodScheme, modNCodSchemeSize);
+     fillDlDciPayload(dlDciPtr->payload, &bytePos, &bitPos,\
+        redundancyVer, redundancyVerSize);
+     fillDlDciPayload(dlDciPtr->payload, &bytePos, &bitPos,\
+        sysInfoInd, sysInfoIndSize);
+     fillDlDciPayload(dlDciPtr->payload, &bytePos, &bitPos,\
+        reserved, reservedSize);
+
+   }
+} /* fillSib1DlDciPdu */
+
+/*******************************************************************
+ *
+ * @brief fills Dl DCI PDU required for DL TTI info in MAC
+ *
+ * @details
+ *
+ *    Function : fillRarDlDciPdu
+ *
+ *    Functionality:
+ *         -Fills the Dl DCI PDU
+ *
+ * @params[in] Pointer to fapi_dl_dci_t
+ *             Pointer to PdcchCfg
+ * @return ROK
+ *
+ ******************************************************************/
+
+void fillRarDlDciPdu(fapi_dl_dci_t *dlDciPtr, PdcchCfg *rarPdcchInfo)
+{
+       if(dlDciPtr != NULLP)
+       {
+               uint8_t numBytes;
+               uint8_t bytePos;
+               uint8_t bitPos;
+
+               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;
+
+               /* Size(in bits) of each field in DCI format 1_0 */
+               uint8_t freqDomResAssignSize;
+               uint8_t timeDomResAssignSize = 4;
+               uint8_t VRB2PRBMapSize       = 1;
+               uint8_t modNCodSchemeSize    = 5;
+               uint8_t tbScalingSize        = 2;
+               uint8_t reservedSize         = 16;
+
+               dlDciPtr->rnti = rarPdcchInfo->dci.rnti;
+               dlDciPtr->scramblingId = rarPdcchInfo->dci.scramblingId;    
+               dlDciPtr->scramblingRnti = rarPdcchInfo->dci.scramblingRnti;
+               dlDciPtr->cceIndex = rarPdcchInfo->dci.cceIndex;
+               dlDciPtr->aggregationLevel = rarPdcchInfo->dci.aggregLevel;
+               dlDciPtr->pc_and_bform.numPrgs = rarPdcchInfo->dci.beamPdcchInfo.numPrgs;
+               dlDciPtr->pc_and_bform.prgSize = rarPdcchInfo->dci.beamPdcchInfo.prgSize;
+               dlDciPtr->pc_and_bform.digBfInterfaces = rarPdcchInfo->dci.beamPdcchInfo.digBfInterfaces;
+               dlDciPtr->pc_and_bform.pmi_bfi[0].pmIdx = rarPdcchInfo->dci.beamPdcchInfo.prg[0].pmIdx;
+               dlDciPtr->pc_and_bform.pmi_bfi[0].beamIdx[0].beamidx = rarPdcchInfo->dci.beamPdcchInfo.prg[0].beamIdx[0];
+               dlDciPtr->beta_pdcch_1_0 = rarPdcchInfo->dci.txPdcchPower.powerValue;           
+               dlDciPtr->powerControlOfssetSS = rarPdcchInfo->dci.txPdcchPower.powerControlOffsetSS;
+
+               /* Calculating freq domain resource allocation field value and size
+                * coreset0Size = Size of coreset 0
+                * RBStart = Starting Virtual Rsource block
+                * RBLen = length of contiguously allocted RBs
+                * Spec 38.214 Sec 5.1.2.2.2
+                */
+
+               /* TODO: Fill values of coreset0Size, rbStart and rbLen */
+               coreset0Size= rarPdcchInfo->coreset0Cfg.coreSet0Size;
+               rbStart = 0;              /* For SIB1 */
+               //rbStart = rarPdcchInfo->dci.pdschCfg->freqAlloc.rbStart;
+               rbLen = rarPdcchInfo->dci.pdschCfg->freqAlloc.rbSize;
+
+               if((rbLen >=1) && (rbLen <= coreset0Size - rbStart))
+               {
+                       if((rbLen - 1) <= floor(coreset0Size / 2))
+                               freqDomResAssign = (coreset0Size * (rbLen-1)) + rbStart;
+                       else
+                               freqDomResAssign = (coreset0Size * (coreset0Size - rbLen + 1)) \
+                                                                                + (coreset0Size - 1 - rbStart);
+
+                       freqDomResAssignSize = ceil(log2(coreset0Size * (coreset0Size + 1) / 2));
+               }
+
+               /* Fetching DCI field values */
+               timeDomResAssign = rarPdcchInfo->dci.pdschCfg->timeAlloc.rowIndex -1;
+               VRB2PRBMap       = rarPdcchInfo->dci.pdschCfg->freqAlloc.vrbPrbMapping;
+               modNCodScheme    = rarPdcchInfo->dci.pdschCfg->codeword[0].mcsIndex;
+               tbScaling        = 0; /* configured to 0 scaling */
+               reserved         = 0;
+
+               /* Reversing bits in each DCI field */
+               freqDomResAssign = reverseBits(freqDomResAssign, freqDomResAssignSize);
+               timeDomResAssign = reverseBits(timeDomResAssign, timeDomResAssignSize);
+               VRB2PRBMap       = reverseBits(VRB2PRBMap, VRB2PRBMapSize);
+               modNCodScheme    = reverseBits(modNCodScheme, modNCodSchemeSize);
+               tbScaling        = reverseBits(tbScaling, tbScalingSize); 
+
+               /* Calulating total number of bytes in buffer */
+               dlDciPtr->payloadSizeBits = freqDomResAssignSize + timeDomResAssignSize\
+                                                                                        + VRB2PRBMapSize + modNCodSchemeSize + tbScalingSize + reservedSize;
+
+               numBytes = dlDciPtr->payloadSizeBits / 8;
+               if(dlDciPtr->payloadSizeBits % 8)
+                       numBytes += 1;
+
+               if(numBytes > DCI_PAYLOAD_BYTE_LEN)
+               {
+                       DU_LOG("\nLWR_MAC : Total bytes for DCI is more than expected");
+                       return;
+               }
+
+               /* Initialize buffer */
+               for(bytePos = 0; bytePos < numBytes; bytePos++)
+                       dlDciPtr->payload[bytePos] = 0;
+
+               bytePos = numBytes - 1;
+               bitPos = 0;
+
+               /* Packing DCI format fields */
+               fillDlDciPayload(dlDciPtr->payload, &bytePos, &bitPos,\
+                               freqDomResAssign, freqDomResAssignSize);
+               fillDlDciPayload(dlDciPtr->payload, &bytePos, &bitPos,\
+                               timeDomResAssign, timeDomResAssignSize);
+               fillDlDciPayload(dlDciPtr->payload, &bytePos, &bitPos,\
+                               VRB2PRBMap, VRB2PRBMapSize);
+               fillDlDciPayload(dlDciPtr->payload, &bytePos, &bitPos,\
+                               modNCodScheme, modNCodSchemeSize);
+               fillDlDciPayload(dlDciPtr->payload, &bytePos, &bitPos,\
+                               tbScaling, tbScalingSize);
+               fillDlDciPayload(dlDciPtr->payload, &bytePos, &bitPos,\
+                               reserved, reservedSize);
+       }
+} /* fillRarDlDciPdu */
+
+/*******************************************************************
+ *
+ * @brief fills PDCCH PDU required for DL TTI info in MAC
+ *
+ * @details
+ *
+ *    Function : fillPdcchPdu
+ *
+ *    Functionality:
+ *         -Fills the Pdcch PDU info
+ *          stored in MAC
+ *
+ * @params[in] Pointer to FAPI DL TTI Req
+ *             Pointer to PdcchCfg
+ *             Pointer to msgLen of DL TTI Info
+ * @return ROK
+ *
+ ******************************************************************/
+
+S16 fillPdcchPdu(fapi_dl_tti_req_pdu_t *dlTtiReqPdu, PdcchCfg *pdcchInfo,
+uint32_t *msgLen)
+{
+    if(dlTtiReqPdu != NULLP)
+    {
+       dlTtiReqPdu->pduType = PDCCH_PDU_TYPE;
+       dlTtiReqPdu->u.pdcch_pdu.bwpSize = pdcchInfo->pdcchBwpCfg.BWPSize;
+       dlTtiReqPdu->u.pdcch_pdu.bwpPart = pdcchInfo->pdcchBwpCfg.BWPStart;
+       dlTtiReqPdu->u.pdcch_pdu.subCarrierSpacing = pdcchInfo->pdcchBwpCfg.subcarrierSpacing; 
+       dlTtiReqPdu->u.pdcch_pdu.cyclicPrefix = pdcchInfo->pdcchBwpCfg.cyclicPrefix; 
+       dlTtiReqPdu->u.pdcch_pdu.startSymbolIndex = pdcchInfo->coreset0Cfg.startSymbolIndex;
+       dlTtiReqPdu->u.pdcch_pdu.durationSymbols = pdcchInfo->coreset0Cfg.durationSymbols;
+       memcpy(dlTtiReqPdu->u.pdcch_pdu.freqDomainResource, pdcchInfo->coreset0Cfg.freqDomainResource, 6);
+       dlTtiReqPdu->u.pdcch_pdu.cceRegMappingType = pdcchInfo->coreset0Cfg.cceRegMappingType;
+       dlTtiReqPdu->u.pdcch_pdu.regBundleSize = pdcchInfo->coreset0Cfg.regBundleSize;
+       dlTtiReqPdu->u.pdcch_pdu.interleaverSize = pdcchInfo->coreset0Cfg.interleaverSize;
+       dlTtiReqPdu->u.pdcch_pdu.coreSetSize = pdcchInfo->coreset0Cfg.coreSetType;
+       dlTtiReqPdu->u.pdcch_pdu.shiftIndex =  pdcchInfo->coreset0Cfg.shiftIndex;
+       dlTtiReqPdu->u.pdcch_pdu.precoderGranularity = pdcchInfo->coreset0Cfg.precoderGranularity;
+       dlTtiReqPdu->u.pdcch_pdu.numDlDci = pdcchInfo->numDlDci;
+                LWR_MAC_ALLOC(dlTtiReqPdu->u.pdcch_pdu.dlDci, sizeof(fapi_dl_dci_t));
+       if(pdcchInfo->dci.rnti == SI_RNTI)
+                {
+          fillSib1DlDciPdu(dlTtiReqPdu->u.pdcch_pdu.dlDci, pdcchInfo);
+       }
+                else
+                {
+          fillRarDlDciPdu(dlTtiReqPdu->u.pdcch_pdu.dlDci, pdcchInfo);
+                }
+
+       dlTtiReqPdu->pduSize = sizeof(fapi_dl_pdcch_pdu_t);
+       SETLENGTH(*msgLen, sizeof(fapi_dl_pdcch_pdu_t));
+
+    }
+    return ROK;
+
+}
+
+/*******************************************************************
+ *
+ * @brief fills PDSCH PDU required for DL TTI info in MAC
+ *
+ * @details
+ *
+ *    Function : fillPdschPdu
+ *
+ *    Functionality:
+ *         -Fills the Pdsch PDU info
+ *          stored in MAC
+ *
+ * @params[in] Pointer to FAPI DL TTI Req
+ *             Pointer to PdschCfg
+ *             Pointer to msgLen of DL TTI Info
+ * @return ROK
+ *
+ ******************************************************************/
+
+void fillPdschPdu(fapi_dl_tti_req_pdu_t *dlTtiReqPdu, PdschCfg *pdschInfo,
+uint32_t *msgLen, uint16_t pduIndex)
+{
+    uint8_t idx;
+
+    if(dlTtiReqPdu != NULLP)
+    {
+       dlTtiReqPdu->pduType = PDSCH_PDU_TYPE;
+       dlTtiReqPdu->u.pdsch_pdu.pduBitMap = pdschInfo->pduBitmap;
+       dlTtiReqPdu->u.pdsch_pdu.rnti = pdschInfo->rnti;         
+       dlTtiReqPdu->u.pdsch_pdu.pduIndex = pduIndex;
+       dlTtiReqPdu->u.pdsch_pdu.bwpSize = pdschInfo->pdschBwpCfg.BWPSize;       
+       dlTtiReqPdu->u.pdsch_pdu.bwpStart = pdschInfo->pdschBwpCfg.BWPStart;
+       dlTtiReqPdu->u.pdsch_pdu.subCarrierSpacing = pdschInfo->pdschBwpCfg.subcarrierSpacing;
+       dlTtiReqPdu->u.pdsch_pdu.cyclicPrefix = pdschInfo->pdschBwpCfg.cyclicPrefix;
+       dlTtiReqPdu->u.pdsch_pdu.nrOfCodeWords = pdschInfo->numCodewords;
+       for(idx = 0; idx < MAX_CODEWORDS ; idx++)
+       { 
+          dlTtiReqPdu->u.pdsch_pdu.cwInfo[idx].targetCodeRate = pdschInfo->codeword[idx].targetCodeRate;
+          dlTtiReqPdu->u.pdsch_pdu.cwInfo[idx].qamModOrder = pdschInfo->codeword[idx].qamModOrder;
+          dlTtiReqPdu->u.pdsch_pdu.cwInfo[idx].mcsIndex = pdschInfo->codeword[idx].mcsIndex;
+          dlTtiReqPdu->u.pdsch_pdu.cwInfo[idx].mcsTable = pdschInfo->codeword[idx].mcsTable;
+          dlTtiReqPdu->u.pdsch_pdu.cwInfo[idx].rvIndex = pdschInfo->codeword[idx].rvIndex;
+          dlTtiReqPdu->u.pdsch_pdu.cwInfo[idx].tbSize = pdschInfo->codeword[idx].tbSize;
+       }
+       dlTtiReqPdu->u.pdsch_pdu.dataScramblingId = pdschInfo->dataScramblingId;       
+       dlTtiReqPdu->u.pdsch_pdu.nrOfLayers = pdschInfo->numLayers;
+       dlTtiReqPdu->u.pdsch_pdu.transmissionScheme = pdschInfo->transmissionScheme;
+       dlTtiReqPdu->u.pdsch_pdu.refPoint = pdschInfo->refPoint;
+       dlTtiReqPdu->u.pdsch_pdu.dlDmrsSymbPos = pdschInfo->dmrs.dlDmrsSymbPos;
+       dlTtiReqPdu->u.pdsch_pdu.dmrsConfigType = pdschInfo->dmrs.dmrsConfigType;
+       dlTtiReqPdu->u.pdsch_pdu.dlDmrsScramblingId = pdschInfo->dmrs.dlDmrsScramblingId;
+       dlTtiReqPdu->u.pdsch_pdu.scid = pdschInfo->dmrs.scid;
+       dlTtiReqPdu->u.pdsch_pdu.numDmrsCdmGrpsNoData = pdschInfo->dmrs.numDmrsCdmGrpsNoData;
+       dlTtiReqPdu->u.pdsch_pdu.dmrsPorts = pdschInfo->dmrs.dmrsPorts;
+       dlTtiReqPdu->u.pdsch_pdu.resourceAlloc = pdschInfo->freqAlloc.resourceAlloc;
+       /* since we are using type-1, hence rbBitmap excluded */
+       dlTtiReqPdu->u.pdsch_pdu.rbStart = pdschInfo->freqAlloc.rbStart;
+       dlTtiReqPdu->u.pdsch_pdu.rbSize = pdschInfo->freqAlloc.rbSize;
+       dlTtiReqPdu->u.pdsch_pdu.vrbToPrbMapping = pdschInfo->freqAlloc.vrbPrbMapping;
+       dlTtiReqPdu->u.pdsch_pdu.startSymbIndex = pdschInfo->timeAlloc.startSymbolIndex;
+       dlTtiReqPdu->u.pdsch_pdu.nrOfSymbols = pdschInfo->timeAlloc.numSymbols;
+       dlTtiReqPdu->u.pdsch_pdu.preCodingAndBeamforming.numPrgs = pdschInfo->beamPdschInfo.numPrgs;
+       dlTtiReqPdu->u.pdsch_pdu.preCodingAndBeamforming.prgSize = pdschInfo->beamPdschInfo.prgSize;
+       dlTtiReqPdu->u.pdsch_pdu.preCodingAndBeamforming.digBfInterfaces = pdschInfo->beamPdschInfo.digBfInterfaces;
+       dlTtiReqPdu->u.pdsch_pdu.preCodingAndBeamforming.pmi_bfi[0]. \
+          pmIdx = pdschInfo->beamPdschInfo.prg[0].pmIdx;
+       dlTtiReqPdu->u.pdsch_pdu.preCodingAndBeamforming.pmi_bfi[0]. \
+          beamIdx[0].beamidx = pdschInfo->beamPdschInfo.prg[0].beamIdx[0];
+       dlTtiReqPdu->u.pdsch_pdu.powerControlOffset = pdschInfo->txPdschPower.powerControlOffset;  
+       dlTtiReqPdu->u.pdsch_pdu.powerControlOffsetSS = pdschInfo->txPdschPower.powerControlOffsetSS;
+       dlTtiReqPdu->pduSize = sizeof(fapi_dl_pdsch_pdu_t);
+       SETLENGTH(*msgLen, sizeof(fapi_dl_pdsch_pdu_t));
+
+    }
+
+}
+
+/***********************************************************************
+ *
+ * @brief calculates the total size to be allocated for DL TTI Req
+ *
+ * @details
+ *
+ *    Function : calcDlTtiReqPduCount
+ *
+ *    Functionality:
+ *         -calculates the total pdu count to be allocated for DL TTI Req
+ *
+ * @params[in]    DlBrdcstAlloc *cellBroadcastInfo
+ * @return count
+ *
+ * ********************************************************************/
+uint8_t calcDlTtiReqPduCount(DlAlloc *dlInfo)
+{
+   uint8_t count = 0;
+   uint8_t idx = 0;
+       if(dlInfo->isBroadcastPres)
+       {
+      if(dlInfo->brdcstAlloc.ssbTrans)
+      {
+         for(idx = 0; idx < dlInfo->brdcstAlloc.ssbIdxSupported; idx++)
+         {
+            count++;
+         }
+      }
+      if(dlInfo->brdcstAlloc.sib1Trans)
+      {
+         count += 2;
+      }
+   }
+       if(dlInfo->isRarPres)
+       {
+          count += 2;
+       }
+   return count;
+}
+
+/***********************************************************************
+ *
+ * @brief calculates the total size to be allocated for DL TTI Req
+ *
+ * @details
+ *
+ *    Function : calcTxDataReqPduCount
+ *
+ *    Functionality:
+ *         -calculates the total pdu count to be allocated for DL TTI Req
+ *
+ * @params[in]    DlBrdcstAlloc *cellBroadcastInfo
+ * @return count
+ *
+ * ********************************************************************/
+uint8_t calcTxDataReqPduCount(DlAlloc *dlInfo)
+{
+   uint8_t count = 0;
+       if(dlInfo->isBroadcastPres && dlInfo->brdcstAlloc.sib1Trans)
+       {
+         count++;
+   }
+       if(dlInfo->isRarPres)
+       {
+          count++;
+       }
+   return count;
+}
+/***********************************************************************
+ *
+ * @brief fills the SIB1 TX-DATA request message
+ *
+ * @details
+ *
+ *    Function : fillSib1TxDataReq
+ *
+ *    Functionality:
+ *         - fills the SIB1 TX-DATA request message
+ *
+ * @params[in]    fapi_tx_pdu_desc_t *pduDesc
+ * @params[in]    macCellCfg consist of SIB1 pdu
+ * @params[in]    uint32_t *msgLen
+ * @params[in]    uint16_t pduIndex
+ * @return ROK
+ *
+ * ********************************************************************/
+uint8_t fillSib1TxDataReq(fapi_tx_pdu_desc_t *pduDesc,MacCellCfg *macCellCfg,
+   uint32_t *msgLen, uint16_t pduIndex)
+{
+   uint32_t pduLen = 0;
+       uint32_t *sib1TxdataValue = NULLP;
+
+       pduDesc[pduIndex].pduIndex = pduIndex;
+       pduDesc[pduIndex].numTlvs = 1;
+
+       /* fill the TLV */
+       /* as of now, memory is allocated from SSI, later WLS memory needs to be taken */
+       pduDesc[pduIndex].tlvs[0].tl.tag = 1; /* pointer to be sent */
+       pduDesc[pduIndex].tlvs[0].tl.length = macCellCfg->sib1Cfg.sib1PduLen;
+       LWR_MAC_ALLOC(sib1TxdataValue,macCellCfg->sib1Cfg.sib1PduLen);
+       if(sib1TxdataValue == NULLP)
+       {
+          return RFAILED;
+       }
+       memcpy(sib1TxdataValue,macCellCfg->sib1Cfg.sib1Pdu,
+          macCellCfg->sib1Cfg.sib1PduLen);
+       pduDesc[pduIndex].tlvs[0].value = sib1TxdataValue;
+
+   /* The total length of the PDU description and      PDU data */
+       pduLen += 8; /* size of PDU length 2 bytes, PDU index 2 bytes, numTLV 4 bytes */
+       pduLen += sizeof(fapi_uint32_tlv_t); /* only 1 TLV is present */
+   pduDesc[pduIndex].pduLength = pduLen; 
+       msgLen += pduLen;
+
+#ifndef INTEL_WLS   
+   MAC_FREE(sib1TxdataValue,macCellCfg->sib1Cfg.sib1PduLen);
+#endif
+
+
+       return ROK;
+}
+
+/***********************************************************************
+ *
+ * @brief fills the RAR TX-DATA request message
+ *
+ * @details
+ *
+ *    Function : fillRarTxDataReq
+ *
+ *    Functionality:
+ *         - fills the RAR TX-DATA request message
+ *
+ * @params[in]    fapi_tx_pdu_desc_t *pduDesc
+ * @params[in]    RarInfo *rarInfo
+ * @params[in]    uint32_t *msgLen
+ * @params[in]    uint16_t pduIndex
+ * @return ROK
+ *
+ * ********************************************************************/
+uint8_t fillRarTxDataReq(fapi_tx_pdu_desc_t *pduDesc, RarInfo *rarInfo,
+   uint32_t *msgLen, uint16_t pduIndex)
+{
+   uint32_t pduLen = 0;
+       uint32_t *rarTxdataValue = NULLP;
+
+       pduDesc[pduIndex].pduIndex = pduIndex;
+       pduDesc[pduIndex].numTlvs = 1;
+
+       /* fill the TLV */
+       /* as of now, memory is allocated from SSI, later WLS memory needs to be taken */
+       pduDesc[pduIndex].tlvs[0].tl.tag = 1; /* pointer to be sent */
+       pduDesc[pduIndex].tlvs[0].tl.length = rarInfo->rarPduLen;
+       LWR_MAC_ALLOC(rarTxdataValue,rarInfo->rarPduLen);
+       if(rarTxdataValue == NULLP)
+       {
+          return RFAILED;
+       }
+       memcpy(rarTxdataValue,rarInfo->rarPdu,rarInfo->rarPduLen);
+       pduDesc[pduIndex].tlvs[0].value = (uint32_t)rarTxdataValue;
+
+   /* The total length of the PDU description and      PDU data */
+       pduLen += 8; /* size of PDU length 2 bytes, PDU index 2 bytes, numTLV 4 bytes */
+       pduLen += sizeof(fapi_uint32_tlv_t); /* only 1 TLV is present */
+   pduDesc[pduIndex].pduLength = pduLen; 
+       msgLen += pduLen;
+
+/* TODO: The pointer value which was stored, needs to be free-ed at PHY *
+ * But since we did not implement WLS, this has to be done here
+ */
+#ifndef INTEL_WLS   
+   MAC_FREE(rarTxdataValue,rarInfo->rarPduLen);
+#endif
+
+       return ROK;
+}
+
+#endif
+
+/*******************************************************************
+ *
+ * @brief Sends DL TTI Request to PHY
+ *
+ * @details
+ *
+ *    Function : handleDlTtiReq
+ *
+ *    Functionality:
+ *         -Sends FAPI DL TTI req to PHY
+ *
+ * @params[in]    timing info
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint16_t handleDlTtiReq(CmLteTimingInfo *currTimingInfo)
+{
+#ifdef FAPI
+       uint8_t idx;
+       uint8_t nPdu = 0;
+       uint8_t numPduEncoded = 0;
+       uint16_t pduIndex = 0;
+       uint32_t msgLen = 0;
+       fapi_dl_tti_req_t *dlTtiReq = NULLP;
+       RgCellCb  *cellCbParams = NULLP;
+       MacDlSlot *currDlSlot = NULLP;
+       MacCellCfg macCellCfg;
+       memset(&macCellCfg, 0, sizeof(MacCellCfg));
+       Inst inst = 0;
+
+       if(clGlobalCp.phyState == PHY_STATE_RUNNING)
+       {
+               cellCbParams = rgCb[inst].cell;
+               macCellCfg = cellCbParams->macCellCfg;
+
+               if(currTimingInfo != NULLP)
+               {
+                  LWR_MAC_ALLOC(dlTtiReq, sizeof(fapi_dl_tti_req_t));
+                       if(dlTtiReq != NULLP)
+                       {
+                               dlTtiReq->sfn = currTimingInfo->sfn;
+                               dlTtiReq->slot = currTimingInfo->slot;
+                               currDlSlot = &macCb.macCell->dlSlot[dlTtiReq->slot % MAX_SLOT_SUPPORTED];
+                               dlTtiReq->nPdus = calcDlTtiReqPduCount(&currDlSlot->dlInfo);  /* get total Pdus */
+                               nPdu = dlTtiReq->nPdus;
+                               dlTtiReq->nGroup = 0;
+                               if(dlTtiReq->nPdus > 0)
+                               {
+                                  LWR_MAC_ALLOC(dlTtiReq->pdus, (nPdu * sizeof(fapi_dl_tti_req_pdu_t)));
+               if(!dlTtiReq->pdus)
+               {
+                  DU_LOG("\nLWR_MAC: Memory allocation failed");
+                  return RFAILED;
+               }
+          
+                                       if(currDlSlot->dlInfo.isBroadcastPres)
+                                       {
+                                               if(currDlSlot->dlInfo.brdcstAlloc.ssbTrans)
+                                               {
+                                                       if(dlTtiReq->pdus != NULLP)
+                                                       {
+                                                               for(idx = 0; idx < currDlSlot->dlInfo.brdcstAlloc.ssbIdxSupported; idx++)
+                                                               {
+                                                                       if(idx > 0)
+                                                                               dlTtiReq->pdus++;
+                                                                       fillSsbPdu(&dlTtiReq->pdus[numPduEncoded], &macCellCfg, currDlSlot, &msgLen, idx);
+                                                                       numPduEncoded++;
+                                                               }
+                                                       }
+                                                       printf("\033[1;31m");
+                                                       DU_LOG("\nLWR_MAC: MIB sent..");
+                                                       printf("\033[0m");
+                                               }
+                                               if(currDlSlot->dlInfo.brdcstAlloc.sib1Trans)
+                                               {
+                                                       /* Filling SIB1 param */
+                                                       if(numPduEncoded != nPdu)
+                                                       {
+                                                               fillPdcchPdu(&dlTtiReq->pdus[numPduEncoded],&currDlSlot->dlInfo.brdcstAlloc.\
+                                                                               sib1Alloc.sib1PdcchCfg, &msgLen);
+                                                               numPduEncoded++;
+                                                               fillPdschPdu(&dlTtiReq->pdus[numPduEncoded],&currDlSlot->dlInfo.brdcstAlloc.\
+                                                                               sib1Alloc.sib1PdschCfg, &msgLen, pduIndex);
+                                                               pduIndex++;
+                                                               numPduEncoded++;
+                                                       }
+                                                       printf("\033[1;34m");
+                                                       DU_LOG("\nLWR_MAC: SIB1 sent...");
+                                                       printf("\033[0m");
+                                               }
+                                       }
+                                       if(currDlSlot->dlInfo.isRarPres)
+                                       {
+                                               /* Filling RAR param */
+                                fillRarPdu(&currDlSlot->dlInfo.rarAlloc.rarInfo);
+                                               fillPdcchPdu(&dlTtiReq->pdus[numPduEncoded], &currDlSlot->dlInfo.rarAlloc.rarPdcchCfg, &msgLen);
+                                               numPduEncoded++;
+                                               fillPdschPdu(&dlTtiReq->pdus[numPduEncoded], &currDlSlot->dlInfo.rarAlloc.rarPdschCfg,
+                                                  &msgLen, pduIndex);
+                                               numPduEncoded++;
+                                               pduIndex++;
+
+                                               printf("\033[1;32m");
+                                               DU_LOG("\nLWR_MAC: RAR sent...");
+                                               printf("\033[0m");
+                                       }
+
+                                       msgLen += sizeof(fapi_dl_tti_req_t) - sizeof(fapi_msg_t);
+                                       fillMsgHeader(&dlTtiReq->header, FAPI_DL_TTI_REQUEST, msgLen);
+                                       /* TODO : Recheck the size / msglen to be sent to WLS_Put*/
+                                       LwrMacSendToPhy(dlTtiReq->header.message_type_id, msgLen, (void *)dlTtiReq);
+
+                                       /* send Tx-DATA req message */
+                                       sendTxDataReq(currTimingInfo, &currDlSlot->dlInfo);
+                               }
+                               else
+                               {
+                                       msgLen = sizeof(fapi_dl_tti_req_t) - sizeof(fapi_msg_t);
+                                       fillMsgHeader(&dlTtiReq->header, FAPI_DL_TTI_REQUEST, msgLen);
+                                       /* TODO : Recheck the size / msglen to be sent to WLS_Put*/
+                                       LwrMacSendToPhy(dlTtiReq->header.message_type_id, msgLen, (void *)dlTtiReq);
+                               }
+                               return ROK;
+                       }
+                       else
+                       {
+                               DU_LOG("\nLWR_MAC: Failed to allocate memory for DL TTI Request");
+                               return RFAILED;
+                       }
+               }
+      else
+      {
+         DU_LOG("\nLWR_MAC: Current TTI Info is NULL");
+         return RFAILED;
+      }
+   }
+   else
+   {
+       lwr_mac_handleInvalidEvt(currTimingInfo);
+                return RFAILED;
+   }
+#endif
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Sends TX data Request to PHY
+ *
+ * @details
+ *
+ *    Function : sendTxDataReq
+ *
+ *    Functionality:
+ *         -Sends FAPI TX data req to PHY
+ *
+ * @params[in]    timing info
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint16_t sendTxDataReq(CmLteTimingInfo *currTimingInfo, DlAlloc *dlInfo)
+{
+#ifdef FAPI
+       uint8_t nPdu = 0;
+       uint32_t msgLen = 0;
+   uint16_t pduIndex = 0;
+       fapi_tx_data_req_t *txDataReq = NULLP;
+       Inst inst = 0;
+
+       /* send TX_Data request message */
+       nPdu = calcTxDataReqPduCount(dlInfo);
+       if(nPdu > 0)
+       {
+      LWR_MAC_ALLOC(txDataReq,sizeof(fapi_tx_data_req_t));
+               if(txDataReq == NULLP)
+               {
+                       DU_LOG("\nLWR_MAC: Failed to allocate memory for TX data Request");
+                       return RFAILED;
+               }
+               txDataReq->sfn = currTimingInfo->sfn;
+               txDataReq->slot = currTimingInfo->slot;
+      LWR_MAC_ALLOC(txDataReq->pduDesc,nPdu*sizeof(fapi_tx_pdu_desc_t));
+               if(txDataReq->pduDesc == NULLP)
+               {
+                       DU_LOG("\nLWR_MAC: Failed to allocate memory for pduDesc TX data Request");
+                       return RFAILED;
+               }
+
+               if(dlInfo->brdcstAlloc.sib1Trans)
+               {
+                       fillSib1TxDataReq(txDataReq->pduDesc,
+                                       &rgCb[inst].cell->macCellCfg, &msgLen, pduIndex);
+                       pduIndex++;
+                       txDataReq->numPdus++;
+               }
+               if(dlInfo->isRarPres)
+               {
+                       /* mux and form RAR pdu */
+                       //fillRarPdu(&dlInfo->rarAlloc.rarInfo);
+                       fillRarTxDataReq(txDataReq->pduDesc,
+                                       &dlInfo->rarAlloc.rarInfo, &msgLen, pduIndex);
+                       pduIndex++;
+                       txDataReq->numPdus++;
+               }
+
+               msgLen += sizeof(fapi_tx_data_req_t) - sizeof(fapi_msg_t);
+               fillMsgHeader(&txDataReq->header, FAPI_TX_DATA_REQUEST, msgLen);
+               LwrMacSendToPhy(txDataReq->header.message_type_id, msgLen,(void *)txDataReq);
+       }
+#endif
+       return ROK;
+}
+
+/***********************************************************************
+ *
+ * @brief calculates the total size to be allocated for UL TTI Req
+ *
+ * @details
+ *
+ *    Function : getnPdus
+ *
+ *    Functionality:
+ *         -calculates the total pdu count to be allocated for UL TTI Req
+ *
+ * @params[in] Pointer to fapi Ul TTI Req
+ *             Pointer to CurrUlSlot
+ * @return count
+ * ********************************************************************/
+#ifdef FAPI
+uint8_t getnPdus(fapi_ul_tti_req_t *ulTtiReq, MacUlSlot *currUlSlot)
+{
+       uint8_t pduCount = 0;
+
+       if(currUlSlot != NULLP)
+   {
+          if(currUlSlot->ulCellInfo.dataType & SCH_DATATYPE_PRACH)
+          {
+             pduCount++;
+             ulTtiReq->rachPresent = PDU_PRESENT;
+               }
+               if(currUlSlot->ulCellInfo.dataType & SCH_DATATYPE_PUSCH_UCI)
+               {
+                  pduCount++;
+                       ulTtiReq->nUlsch = PDU_PRESENT;
+               }
+               if(currUlSlot->ulCellInfo.dataType & SCH_DATATYPE_UCI)
+               {
+                  pduCount++;
+                       ulTtiReq->nUlcch = PDU_PRESENT;
+               }
+               if(currUlSlot->ulCellInfo.dataType & SCH_DATATYPE_SRS)
+               {
+                  pduCount++;
+               }
+   }
+       return pduCount;
+} 
+#endif 
+
+/***********************************************************************
+ *
+ * @brief Set the value of zero correlation config in PRACH PDU
+ *
+ * @details
+ *
+ *    Function : setNumCs
+ *
+ *    Functionality:
+ *         -Set the value of zero correlation config in PRACH PDU
+ *
+ * @params[in] Pointer to zero correlation config
+ *             Pointer to MacCellCfg
+ * ********************************************************************/
+
+void setNumCs(uint8_t *numCs, MacCellCfg *macCellCfg)
+{
+#ifdef FAPI
+   uint8_t idx;
+       if(macCellCfg != NULLP)
+       {
+          idx = macCellCfg->prachCfg.fdm[0].zeroCorrZoneCfg; 
+          *numCs = UnrestrictedSetNcsTable[idx];
+       }
+#endif
+}
+
+/***********************************************************************
+ *
+ * @brief Fills the PRACH PDU in UL TTI Request
+ *
+ * @details
+ *
+ *    Function : fillPrachPdu
+ *
+ *    Functionality:
+ *         -Fills the PRACH PDU in UL TTI Request
+ *
+ * @params[in] Pointer to Prach Pdu
+ *             Pointer to CurrUlSlot
+ *             Pointer to macCellCfg
+ *             Pointer to msgLen
+ * ********************************************************************/
+
+#ifdef FAPI
+void fillPrachPdu(fapi_ul_tti_req_pdu_t *ulTtiReqPdu, MacCellCfg *macCellCfg, MacUlSlot *currUlSlot, uint32_t *msgLen)
+{
+   if(ulTtiReqPdu != NULLP)
+   {
+      ulTtiReqPdu->pduType = PRACH_PDU_TYPE; 
+      ulTtiReqPdu->u.prach_pdu.physCellId = macCellCfg->phyCellId;
+      ulTtiReqPdu->u.prach_pdu.numPrachOcas = currUlSlot->ulCellInfo.prachSchInfo.numPrachOcas;
+      ulTtiReqPdu->u.prach_pdu.prachFormat = \
+               currUlSlot->ulCellInfo.prachSchInfo.prachFormat;
+      ulTtiReqPdu->u.prach_pdu.numRa = currUlSlot->ulCellInfo.prachSchInfo.numRa;
+      ulTtiReqPdu->u.prach_pdu.prachStartSymbol = \
+               currUlSlot->ulCellInfo.prachSchInfo.prachStartSymb;
+      setNumCs(&ulTtiReqPdu->u.prach_pdu.numCs, macCellCfg);
+      ulTtiReqPdu->u.prach_pdu.beamforming.numPrgs = 0;
+      ulTtiReqPdu->u.prach_pdu.beamforming.prgSize = 0;
+      ulTtiReqPdu->u.prach_pdu.beamforming.digBfInterfaces = 0;
+      ulTtiReqPdu->u.prach_pdu.beamforming.pmi_bfi[0].pmIdx = 0;
+      ulTtiReqPdu->u.prach_pdu.beamforming.pmi_bfi[0].beamIdx[0].beamidx = 0;
+      ulTtiReqPdu->pduSize = sizeof(fapi_ul_prach_pdu_t); 
+      SETLENGTH(*msgLen, sizeof(fapi_dl_pdsch_pdu_t));
+   }
+}
+#endif
+
+/*******************************************************************
+ *
+ * @brief Sends UL TTI Request to PHY
+ *
+ * @details
+ *
+ *    Function : handleUlTtiReq
+ *
+ *    Functionality:
+ *         -Sends FAPI Param req to PHY
+ *
+ * @params[in]  Pointer to CmLteTimingInfo
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ ******************************************************************/
+uint16_t handleUlTtiReq(CmLteTimingInfo *currTimingInfo)
+{
+#ifdef FAPI
+   uint32_t msgLen = 0;
+   fapi_ul_tti_req_t *ulTtiReq = NULLP;
+   fapi_ul_tti_req_pdu_t *ulTtiReqPdu = NULLP;
+   RgCellCb  *cellCbParams = NULLP;
+   MacUlSlot *currUlSlot = NULLP;
+   MacCellCfg macCellCfg;
+       memset(&macCellCfg, 0, sizeof(MacCellCfg));
+   Inst inst = 0;
+
+   if(clGlobalCp.phyState == PHY_STATE_RUNNING)
+   {
+      cellCbParams = rgCb[inst].cell;
+      macCellCfg = cellCbParams->macCellCfg;
+
+      if(currTimingInfo != NULLP)
+      {
+         LWR_MAC_ALLOC(ulTtiReq, sizeof(fapi_ul_tti_req_t));
+         if(ulTtiReq != NULLP)
+         {
+            ulTtiReq->sfn = currTimingInfo->sfn;
+            ulTtiReq->slot = currTimingInfo->slot;
+            currUlSlot = &macCb.macCell->ulSlot[ulTtiReq->slot % MAX_SLOT_SUPPORTED];
+                ulTtiReq->nPdus = getnPdus(ulTtiReq, currUlSlot);
+            ulTtiReq->nGroup = 0;
+            if(ulTtiReq->nPdus > 0)
+            {
+                                  LWR_MAC_ALLOC(ulTtiReqPdu, (ulTtiReq->nPdus *
+                                       sizeof(fapi_ul_tti_req_pdu_t)));
+               /* Fill Prach Pdu */
+               if(ulTtiReq->rachPresent)
+               {
+                 if(ulTtiReqPdu != NULLP)
+                 {
+                    fillPrachPdu(ulTtiReqPdu, &macCellCfg, currUlSlot, &msgLen);
+                    ulTtiReq->pdus = ulTtiReqPdu;
+                 }
+                 msgLen = sizeof(fapi_ul_tti_req_t) - sizeof(fapi_msg_t);
+                 fillMsgHeader(&ulTtiReq->header, FAPI_UL_TTI_REQUEST, msgLen);
+                 DU_LOG("\nLWR_MAC: Sending UL TTI Request");
+                 LwrMacSendToPhy(ulTtiReq->header.message_type_id, msgLen, (void *)ulTtiReq);
+               }
+            } 
+            else
+            {
+                msgLen = sizeof(fapi_ul_tti_req_t) - sizeof(fapi_msg_t);
+                fillMsgHeader(&ulTtiReq->header, FAPI_UL_TTI_REQUEST, msgLen);
+                DU_LOG("\nLWR_MAC: Sending UL TTI Request");
+                LwrMacSendToPhy(ulTtiReq->header.message_type_id, msgLen, (void *)ulTtiReq);
+            }
+                               return ROK;
+         }
+             else
+             {
+                DU_LOG("\nLWR_MAC: Failed to allocate memory for UL TTI Request");
+            return RFAILED;
+         }
+      }
+      else
+      {
+         DU_LOG("\nLWR_MAC: Current TTI Info in UL is NULL");
+         return RFAILED;
+      }
+   }
+   else
+   {
+       lwr_mac_handleInvalidEvt(currTimingInfo);
+   }
+#endif
+   return ROK;
 }
 
 lwrMacFsmHdlr fapiEvtHdlr[MAX_STATE][MAX_EVENT] =
@@ -1836,7 +3163,6 @@ lwrMacFsmHdlr fapiEvtHdlr[MAX_STATE][MAX_EVENT] =
        lwr_mac_handleConfigReqEvt,
        lwr_mac_handleConfigRspEvt,
        lwr_mac_handleInvalidEvt,
-       lwr_mac_handleInvalidEvt
    },
    {
        /* PHY_STATE_CONFIGURED */
@@ -1845,7 +3171,6 @@ lwrMacFsmHdlr fapiEvtHdlr[MAX_STATE][MAX_EVENT] =
        lwr_mac_handleConfigReqEvt,
        lwr_mac_handleConfigRspEvt,
        lwr_mac_handleStartReqEvt,
-       lwr_mac_handleInvalidEvt
    },
    {
        /* PHY_STATE_RUNNING */
@@ -1854,13 +3179,12 @@ lwrMacFsmHdlr fapiEvtHdlr[MAX_STATE][MAX_EVENT] =
        lwr_mac_handleConfigReqEvt,
        lwr_mac_handleConfigRspEvt,
        lwr_mac_handleInvalidEvt,
-       lwr_mac_handleStopReqEvt
    }
 };
 
 /*******************************************************************
  *
- * @brief Sends message to Lower Mac Fsm Event Handler
+ * @brief Sends message to LWR_MAC Fsm Event Handler
  *
  * @details
  *
@@ -1876,12 +3200,11 @@ lwrMacFsmHdlr fapiEvtHdlr[MAX_STATE][MAX_EVENT] =
  * @return void
  *
 ******************************************************************/
-S16 sendToLowerMac(U16 msgType, U32 msgLen, void *msg)
+void sendToLowerMac(uint16_t msgType, uint32_t msgLen, void *msg)
 {
    clGlobalCp.event = msgType;
-   fapiEvtHdlr[clGlobalCp.phyState][msgType](msg);
+   fapiEvtHdlr[clGlobalCp.phyState][clGlobalCp.event](msg);
 }
-
 /**********************************************************************
          End of file
 **********************************************************************/