Renamed SlotIndInfo to SlotTimingInfo [Issue-ID: ODUHIGH-354]

Change-Id: I17336dd4f9dc68e37a7a9ba645aa22dd7ec509d4
Signed-off-by: lal.harshita <Harshita.Lal@radisys.com>
(cherry picked from commit 56db1b2ff587365594f48f3274f806180eda4cb2)

diff --git a/src/5gnrmac/lwr_mac_fsm.c b/src/5gnrmac/lwr_mac_fsm.c
index 2627533..5b787a3 100644 (file)
--- a/src/5gnrmac/lwr_mac_fsm.c
+++ b/src/5gnrmac/lwr_mac_fsm.c
@@ -52,10 +52,10 @@ LwrMacCb lwrMacCb;
 
 uint8_t UnrestrictedSetNcsTable[MAX_ZERO_CORR_CFG_IDX];
 void fapiMacConfigRsp(uint16_t cellId);
-uint16_t sendTxDataReq(SlotIndInfo currTimingInfo, DlSchedInfo *dlInfo, p_fapi_api_queue_elem_t prevElem);
-uint16_t fillUlTtiReq(SlotIndInfo currTimingInfo, p_fapi_api_queue_elem_t prevElem);
-uint16_t fillUlDciReq(SlotIndInfo currTimingInfo, p_fapi_api_queue_elem_t prevElem);
-uint8_t lwr_mac_procStopReqEvt(SlotIndInfo slotInfo, p_fapi_api_queue_elem_t  prevElem);
+uint16_t sendTxDataReq(SlotTimingInfo currTimingInfo, DlSchedInfo *dlInfo, p_fapi_api_queue_elem_t prevElem);
+uint16_t fillUlTtiReq(SlotTimingInfo currTimingInfo, p_fapi_api_queue_elem_t prevElem);
+uint16_t fillUlDciReq(SlotTimingInfo currTimingInfo, p_fapi_api_queue_elem_t prevElem);
+uint8_t lwr_mac_procStopReqEvt(SlotTimingInfo slotInfo, p_fapi_api_queue_elem_t  prevElem);
 
 void lwrMacLayerInit(Region region, Pool pool)
 {
@@ -2371,7 +2371,7 @@ uint8_t lwr_mac_procStartReqEvt(void *msg)
  *
  ********************************************************************/
 
-uint8_t lwr_mac_procStopReqEvt(SlotIndInfo slotInfo, p_fapi_api_queue_elem_t  prevElem)
+uint8_t lwr_mac_procStopReqEvt(SlotTimingInfo slotInfo, p_fapi_api_queue_elem_t  prevElem)
 {
 #ifdef INTEL_FAPI
 #ifdef CALL_FLOW_DEBUG_LOG
@@ -3341,7 +3341,7 @@ uint8_t fillDlMsgTxDataReq(fapi_tx_pdu_desc_t *pduDesc, uint16_t pduIndex, DlMsg
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint16_t fillDlTtiReq(SlotIndInfo currTimingInfo)
+uint16_t fillDlTtiReq(SlotTimingInfo currTimingInfo)
 {
 #ifdef CALL_FLOW_DEBUG_LOG
    DU_LOG("\nCall Flow: ENTMAC -> ENTLWRMAC : DL_TTI_REQUEST\n");
@@ -3354,7 +3354,7 @@ uint16_t fillDlTtiReq(SlotIndInfo currTimingInfo)
    uint16_t cellIdx =0;
    uint16_t pduIndex = 0;
 
-   SlotIndInfo dlTtiReqTimingInfo;
+   SlotTimingInfo dlTtiReqTimingInfo;
    MacDlSlot *currDlSlot = NULLP;
    MacCellCfg macCellCfg;
    RntiType rntiType;
@@ -3588,7 +3588,7 @@ uint16_t fillDlTtiReq(SlotIndInfo currTimingInfo)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint16_t sendTxDataReq(SlotIndInfo currTimingInfo, DlSchedInfo *dlInfo, p_fapi_api_queue_elem_t prevElem)
+uint16_t sendTxDataReq(SlotTimingInfo currTimingInfo, DlSchedInfo *dlInfo, p_fapi_api_queue_elem_t prevElem)
 {
 #ifdef INTEL_FAPI
 #ifdef CALL_FLOW_DEBUG_LOG
@@ -3941,7 +3941,7 @@ void fillPucchPdu(fapi_ul_tti_req_pdu_t *ulTtiReqPdu, MacCellCfg *macCellCfg,\
  *         RFAILED - failure
  *
  ******************************************************************/
-uint16_t fillUlTtiReq(SlotIndInfo currTimingInfo, p_fapi_api_queue_elem_t prevElem)
+uint16_t fillUlTtiReq(SlotTimingInfo currTimingInfo, p_fapi_api_queue_elem_t prevElem)
 {
 #ifdef CALL_FLOW_DEBUG_LOG
    DU_LOG("\nCall Flow: ENTMAC -> ENTLWRMAC : UL_TTI_REQUEST\n");
@@ -3950,7 +3950,7 @@ uint16_t fillUlTtiReq(SlotIndInfo currTimingInfo, p_fapi_api_queue_elem_t prevEl
 #ifdef INTEL_FAPI
    uint16_t   cellIdx =0;
    uint8_t    pduIdx = -1;
-   SlotIndInfo ulTtiReqTimingInfo;
+   SlotTimingInfo ulTtiReqTimingInfo;
    MacUlSlot *currUlSlot = NULLP;
    MacCellCfg macCellCfg;
    fapi_ul_tti_req_t *ulTtiReq = NULLP;
@@ -4239,12 +4239,12 @@ uint8_t fillUlDciPdcchPdu(fapi_dci_pdu_t *ulDciReqPdu, DlSchedInfo *dlInfo, uint
  *         RFAILED - failure
  *
  ******************************************************************/
-uint16_t fillUlDciReq(SlotIndInfo currTimingInfo, p_fapi_api_queue_elem_t prevElem)
+uint16_t fillUlDciReq(SlotTimingInfo currTimingInfo, p_fapi_api_queue_elem_t prevElem)
 {
 #ifdef INTEL_FAPI
    uint8_t      cellIdx =0;
    uint8_t      numPduEncoded = 0;
-   SlotIndInfo  ulDciReqTimingInfo ={0};
+   SlotTimingInfo  ulDciReqTimingInfo ={0};
    MacDlSlot    *currDlSlot = NULLP;
    fapi_ul_dci_req_t        *ulDciReq =NULLP;
    p_fapi_api_queue_elem_t  ulDciElem;
@@ -4252,7 +4252,7 @@ uint16_t fillUlDciReq(SlotIndInfo currTimingInfo, p_fapi_api_queue_elem_t prevEl
    if(lwrMacCb.phyState == PHY_STATE_RUNNING)
    {
       GET_CELL_IDX(currTimingInfo.cellId, cellIdx);
-      memcpy(&ulDciReqTimingInfo, &currTimingInfo, sizeof(SlotIndInfo));
+      memcpy(&ulDciReqTimingInfo, &currTimingInfo, sizeof(SlotTimingInfo));
       currDlSlot = &macCb.macCell[cellIdx]->dlSlot[ulDciReqTimingInfo.slot % MAX_SLOTS];
 
          LWR_MAC_ALLOC(ulDciElem, (sizeof(fapi_api_queue_elem_t) + sizeof(fapi_ul_dci_req_t)));

diff --git a/src/5gnrmac/lwr_mac_fsm.h b/src/5gnrmac/lwr_mac_fsm.h
index b64224e..8234455 100644 (file)
--- a/src/5gnrmac/lwr_mac_fsm.h
+++ b/src/5gnrmac/lwr_mac_fsm.h
@@ -59,7 +59,7 @@ uint8_t lwr_mac_procConfigRspEvt(void *msg);
 uint8_t lwr_mac_procStartReqEvt(void *msg);
 void sendToLowerMac(uint16_t, uint32_t, void *);
 void procPhyMessages(uint16_t msgType, uint32_t msgSize, void *msg);
-uint16_t fillDlTtiReq(SlotIndInfo currTimingInfo);
+uint16_t fillDlTtiReq(SlotTimingInfo currTimingInfo);
 typedef uint8_t (*lwrMacFsmHdlr)(void *);
 void lwrMacLayerInit(Region region, Pool pool);
 

diff --git a/src/5gnrmac/lwr_mac_handle_phy.c b/src/5gnrmac/lwr_mac_handle_phy.c
index e58d203..9e00914 100644 (file)
--- a/src/5gnrmac/lwr_mac_handle_phy.c
+++ b/src/5gnrmac/lwr_mac_handle_phy.c
@@ -106,9 +106,9 @@ uint8_t procSlotInd(fapi_slot_ind_t *fapiSlotInd)
    /* fill Pst structure to send to lwr_mac to MAC */
    Pst pst;
    uint16_t ret = 0;
-   SlotIndInfo *slotInd = {0};
+   SlotTimingInfo *slotInd = {0};
 
-   MAC_ALLOC_SHRABL_BUF(slotInd, sizeof(SlotIndInfo));
+   MAC_ALLOC_SHRABL_BUF(slotInd, sizeof(SlotTimingInfo));
    if(slotInd)
    {
       slotInd->cellId = lwrMacCb.cellCb[0].cellId; 

diff --git a/src/5gnrmac/lwr_mac_upr_inf.c b/src/5gnrmac/lwr_mac_upr_inf.c
index 4a7319a..1dc79bd 100644 (file)
--- a/src/5gnrmac/lwr_mac_upr_inf.c
+++ b/src/5gnrmac/lwr_mac_upr_inf.c
@@ -229,7 +229,7 @@ uint8_t unpackRachInd(RachIndFunc func, Pst *pst, Buffer *mBuf)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t packSlotInd (Pst *pst, SlotIndInfo *slotInd)
+uint8_t packSlotInd (Pst *pst, SlotTimingInfo *slotInd)
 {
    if(pst->selector == ODU_SELECTOR_LWLC)
    {
@@ -266,7 +266,7 @@ uint8_t unpackSlotInd(SlotIndFunc func, Pst *pst, Buffer *mBuf)
 {
    if(pst->selector == ODU_SELECTOR_LWLC)
    {
-      SlotIndInfo *slotInd = NULLP;
+      SlotTimingInfo *slotInd = NULLP;
 
       /* unpack the address of the structure */
       CMCHKUNPK(oduUnpackPointer, (PTR *)&slotInd, mBuf);

diff --git a/src/5gnrmac/lwr_mac_upr_inf.h b/src/5gnrmac/lwr_mac_upr_inf.h
index 38d41e7..304ff80 100644 (file)
--- a/src/5gnrmac/lwr_mac_upr_inf.h
+++ b/src/5gnrmac/lwr_mac_upr_inf.h
@@ -73,7 +73,7 @@ typedef struct rachPduInfo
 typedef struct rachInd
 {
    uint16_t      cellId;
-   SlotIndInfo   timingInfo;
+   SlotTimingInfo   timingInfo;
    uint8_t       numPdu;
    RachPduInfo   rachPdu[MAX_RACH_PDU_PER_SLOT];
 }RachInd;
@@ -94,7 +94,7 @@ typedef struct crcInfo
 typedef struct crcInd
 {
    uint16_t      cellId;
-   SlotIndInfo   timingInfo;
+   SlotTimingInfo   timingInfo;
    uint16_t      numCrc;
    CrcInfo       crcInfo[MAX_CRCS_PER_SLOT];
 }CrcInd;
@@ -114,7 +114,7 @@ typedef struct
 typedef struct
 {
    uint16_t      cellId;
-   SlotIndInfo   timingInfo;
+   SlotTimingInfo   timingInfo;
    uint16_t      numPdus;
    RxDataIndPdu  pdus[MAX_ULSCH_PDUS_PER_TTI];
 }RxDataInd;
@@ -208,21 +208,21 @@ typedef struct
 typedef struct
 {
    uint16_t      cellId;
-   SlotIndInfo   slotInd;
+   SlotTimingInfo   slotInd;
    uint16_t      numUcis;
    UciIndPduInfo pdus[MAX_UCI_PDUS_PER_TTI];
 }UciInd;
 
-typedef uint8_t (*SlotIndFunc)(Pst *pst, SlotIndInfo *slotInd);
+typedef uint8_t (*SlotIndFunc)(Pst *pst, SlotTimingInfo *slotInd);
 typedef uint8_t (*RachIndFunc)(Pst *pst, RachInd *rachInd);
 typedef uint8_t (*CrcIndFunc)(Pst *pst, CrcInd *crcInd);
 typedef uint8_t (*RxDataIndFunc)(Pst *pst, RxDataInd *rxDataInd);
 typedef uint8_t (*StopIndFunc)(Pst *pst, uint16_t *cellId);
 typedef uint8_t (*UciIndFunc)(Pst *pst, UciInd *uciInd);
 
-uint8_t packSlotInd (Pst *pst, SlotIndInfo *slotInd);
+uint8_t packSlotInd (Pst *pst, SlotTimingInfo *slotInd);
 uint8_t unpackSlotInd(SlotIndFunc func, Pst *pst, Buffer *mBuf);
-uint8_t fapiMacSlotInd(Pst  *pst, SlotIndInfo  *slotInd);
+uint8_t fapiMacSlotInd(Pst  *pst, SlotTimingInfo  *slotInd);
 uint8_t packRachInd(Pst *pst, RachInd *rachInd);
 uint8_t unpackRachInd(RachIndFunc func, Pst *pst, Buffer *mBuf);
 uint8_t fapiMacRachInd(Pst *pst, RachInd *rachInd);

diff --git a/src/5gnrmac/mac.h b/src/5gnrmac/mac.h
index 9a9127b..246c8ae 100644 (file)
--- a/src/5gnrmac/mac.h
+++ b/src/5gnrmac/mac.h
@@ -195,7 +195,7 @@ struct macCellCb
    MacUeCfg    *ueCfgTmpData[MAX_NUM_UE];
    MacUeCb     ueCb[MAX_NUM_UE];
    MacCellCfg  macCellCfg;
-   SlotIndInfo currTime;
+   SlotTimingInfo currTime;
 };
 
 typedef struct macCb
@@ -219,14 +219,14 @@ void createMacRaCb(RachIndInfo *rachIndInfo);
 void fillMsg4DlData(MacDlData *dlData, uint16_t msg4PduLen, uint8_t *msg4Pdu);
 void fillMacCe(MacCeInfo  *macCeData, uint8_t *msg3Pdu);
 void macMuxPdu(MacDlData *dlData, MacCeInfo *macCeData, uint8_t *msg4TxPdu, uint16_t tbSize);
-uint8_t unpackRxData(uint16_t cellId, SlotIndInfo slotInfo, RxDataIndPdu *rxDataIndPdu);
+uint8_t unpackRxData(uint16_t cellId, SlotTimingInfo slotInfo, RxDataIndPdu *rxDataIndPdu);
 void fillMg4Pdu(DlMsgAlloc *msg4Alloc);
-void buildAndSendMuxPdu(SlotIndInfo currTimingInfo);
+void buildAndSendMuxPdu(SlotTimingInfo currTimingInfo);
 uint8_t macProcUlCcchInd(uint16_t cellId, uint16_t crnti, uint16_t rrcContSize, uint8_t *rrcContainer);
 uint8_t macProcShortBsr(uint16_t cellId, uint16_t crnti, uint8_t lcgId, uint32_t bufferSize);
-uint8_t macProcUlData(uint16_t cellId, uint16_t rnti, SlotIndInfo slotInfo, \
+uint8_t macProcUlData(uint16_t cellId, uint16_t rnti, SlotTimingInfo slotInfo, \
    uint8_t lcId, uint16_t pduLen, uint8_t *pdu);
-uint8_t sendSchedRptToRlc(DlSchedInfo dlInfo, SlotIndInfo slotInfo);
+uint8_t sendSchedRptToRlc(DlSchedInfo dlInfo, SlotTimingInfo slotInfo);
 #endif
 /**********************************************************************
   End of file

diff --git a/src/5gnrmac/mac_demux.c b/src/5gnrmac/mac_demux.c
index e3287f6..1ef38fe 100644 (file)
--- a/src/5gnrmac/mac_demux.c
+++ b/src/5gnrmac/mac_demux.c
@@ -44,7 +44,7 @@
  *         RFAILED
  *
  * ****************************************************************/
-uint8_t unpackRxData(uint16_t cellId, SlotIndInfo slotInfo, RxDataIndPdu *rxDataIndPdu)
+uint8_t unpackRxData(uint16_t cellId, SlotTimingInfo slotInfo, RxDataIndPdu *rxDataIndPdu)
 {
    uint8_t   ueIdx = 0;       /* Iterator for UE list */
    uint8_t   lcId = 0;        /* LC ID of a sub pdu */

diff --git a/src/5gnrmac/mac_msg_hdl.c b/src/5gnrmac/mac_msg_hdl.c
index 181d05e..76547de 100644 (file)
--- a/src/5gnrmac/mac_msg_hdl.c
+++ b/src/5gnrmac/mac_msg_hdl.c
@@ -299,7 +299,7 @@ uint8_t MacProcRlcDlData(Pst* pstInfo, RlcData *dlData)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t macProcUlData(uint16_t cellId, uint16_t rnti, SlotIndInfo slotInfo, \
+uint8_t macProcUlData(uint16_t cellId, uint16_t rnti, SlotTimingInfo slotInfo, \
 uint8_t lcId, uint16_t pduLen, uint8_t *pdu)
 {
    Pst         pst;
@@ -315,7 +315,7 @@ uint8_t lcId, uint16_t pduLen, uint8_t *pdu)
    memset(ulData, 0, sizeof(RlcData));
    ulData->cellId = cellId; 
    ulData->rnti = rnti;
-   memcpy(&ulData->slotInfo, &slotInfo, sizeof(SlotIndInfo));
+   memcpy(&ulData->slotInfo, &slotInfo, sizeof(SlotTimingInfo));
    ulData->slotInfo.cellId = cellId;
 
    /* Filling pdu info */
@@ -388,7 +388,7 @@ uint8_t MacProcRlcBoStatus(Pst* pst, RlcBoStatus* boStatus)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t sendSchedRptToRlc(DlSchedInfo dlInfo, SlotIndInfo slotInfo)
+uint8_t sendSchedRptToRlc(DlSchedInfo dlInfo, SlotTimingInfo slotInfo)
 {
    Pst      pst;
    uint8_t  lcIdx;

diff --git a/src/5gnrmac/mac_slot_ind.c b/src/5gnrmac/mac_slot_ind.c
index d8dc0e7..dcf3cc9 100644 (file)
--- a/src/5gnrmac/mac_slot_ind.c
+++ b/src/5gnrmac/mac_slot_ind.c
@@ -204,16 +204,16 @@ void fillMsg4Pdu(uint16_t cellId, DlMsgAlloc *msg4Alloc)
  * 
  *      Build and Sends the Muxed Pdu to Lower MAC.
  *           
- *  @param[in]  SlotIndInfo    *slotInd
+ *  @param[in]  SlotTimingInfo    *slotInd
  *  @return  void
  **/
 
-void buildAndSendMuxPdu(SlotIndInfo currTimingInfo)
+void buildAndSendMuxPdu(SlotTimingInfo currTimingInfo)
 {
    uint16_t  cellIdx;
    MacDlSlot *currDlSlot = NULLP;
-   SlotIndInfo muxTimingInfo;
-   memset(&muxTimingInfo, 0, sizeof(SlotIndInfo));
+   SlotTimingInfo muxTimingInfo;
+   memset(&muxTimingInfo, 0, sizeof(SlotTimingInfo));
 
    GET_CELL_IDX(currTimingInfo.cellId, cellIdx);
 
@@ -238,12 +238,12 @@ void buildAndSendMuxPdu(SlotIndInfo currTimingInfo)
  * 
  *      This API is invoked by MAC to send slot ind to scheduler.
  *           
- *  @param[in]  SlotIndInfo    *slotInd
+ *  @param[in]  SlotTimingInfo    *slotInd
  *  @return  
  *      -# ROK 
  *      -# RFAILED 
  **/
-int sendSlotIndMacToSch(SlotIndInfo *slotInd)
+int sendSlotIndMacToSch(SlotTimingInfo *slotInd)
 {
    /* fill Pst structure to send to lwr_mac to MAC */
    Pst pst;
@@ -311,7 +311,7 @@ int sendCellUpIndMacToDuApp(uint16_t cellId)
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t macProcSlotInd(SlotIndInfo slotInd)
+uint8_t macProcSlotInd(SlotTimingInfo slotInd)
 {
    uint16_t  cellIdx = 0;
 
@@ -348,12 +348,12 @@ uint8_t macProcSlotInd(SlotIndInfo slotInd)
  *           
  *  @param[in]  Pst            *pst
  *  @param[in]  SuId           suId 
- *  @param[in]  SlotIndInfo    *slotInd
+ *  @param[in]  SlotTimingInfo    *slotInd
  *  @return  
  *      -# ROK 
  *      -# RFAILED 
  **/
-uint8_t fapiMacSlotInd(Pst *pst, SlotIndInfo *slotInd)
+uint8_t fapiMacSlotInd(Pst *pst, SlotTimingInfo *slotInd)
 {
    uint8_t               ret = ROK;
    uint16_t              cellIdx;
@@ -380,7 +380,7 @@ uint8_t fapiMacSlotInd(Pst *pst, SlotIndInfo *slotInd)
    if(ret != ROK)
    {
       DU_LOG("\nERROR  -->  MAC : Sending of slot ind msg from MAC to SCH failed");
-      MAC_FREE_SHRABL_BUF(pst->region, pst->pool, slotInd, sizeof(SlotIndInfo));
+      MAC_FREE_SHRABL_BUF(pst->region, pst->pool, slotInd, sizeof(SlotTimingInfo));
       return ret;
    }
 
@@ -388,7 +388,7 @@ uint8_t fapiMacSlotInd(Pst *pst, SlotIndInfo *slotInd)
    if(ret != ROK)
    {
       DU_LOG("\nERROR  -->  MAC : macProcSlotInd failed");
-      MAC_FREE_SHRABL_BUF(pst->region, pst->pool, slotInd, sizeof(SlotIndInfo));
+      MAC_FREE_SHRABL_BUF(pst->region, pst->pool, slotInd, sizeof(SlotTimingInfo));
       return ret;
    }
 #endif
@@ -400,14 +400,14 @@ uint8_t fapiMacSlotInd(Pst *pst, SlotIndInfo *slotInd)
       if(ret != ROK)
       {
          DU_LOG("\nERROR  -->  MAC :Sending of slot ind msg from MAC to DU APP failed");
-         MAC_FREE_SHRABL_BUF(pst->region, pst->pool, slotInd, sizeof(SlotIndInfo));
+         MAC_FREE_SHRABL_BUF(pst->region, pst->pool, slotInd, sizeof(SlotTimingInfo));
          return ret;
       }
    }
 
    /*stoping Task*/
    ODU_STOP_TASK(startTime, PID_MAC_TTI_IND);
-   MAC_FREE_SHRABL_BUF(pst->region, pst->pool, slotInd, sizeof(SlotIndInfo));
+   MAC_FREE_SHRABL_BUF(pst->region, pst->pool, slotInd, sizeof(SlotTimingInfo));
 
 #ifdef INTEL_WLS_MEM
    lwrMacCb.phySlotIndCntr++;

diff --git a/src/5gnrsch/rg_sch_tom.c b/src/5gnrsch/rg_sch_tom.c
index 68d065d..bd1cbc6 100755 (executable)
--- a/src/5gnrsch/rg_sch_tom.c
+++ b/src/5gnrsch/rg_sch_tom.c
@@ -241,7 +241,7 @@ CmLteTimingInfo   *timeInfo,
 Bool              hqPres
 ));
 
-void schFillCrntTime( SlotIndInfo slotInd,Inst schInst);
+void schFillCrntTime( SlotTimingInfo slotInd,Inst schInst);
 
 #ifdef CA_DBG
 uint32_t delayedApiCnt;
@@ -2375,13 +2375,13 @@ TfuTimingAdvIndInfo *timingAdvInd
  *     4: Fill the Tfu structures for DL and UL Config requests  
  *     5: Handle the RGR Config messages per Cell
  *
- *  @param[in] SlotIndInfo    *slotInd
+ *  @param[in] SlotTimingInfo    *slotInd
  *  @param[in] Inst           schInst
  *  @return  Void
  **/
 Void rgSCHTomTtiInd
 (
-SlotIndInfo        *slotInd,
+SlotTimingInfo        *slotInd,
 Inst               schInst
 )
 {
@@ -7743,7 +7743,7 @@ RgSchCellCb        *cells[]
 }
 #endif
 void schFillCrntTime(
-   SlotIndInfo slotInd,
+   SlotTimingInfo slotInd,
    Inst        schInst)
 {
    uint8_t cellCount = 0;

diff --git a/src/5gnrsch/sch.c b/src/5gnrsch/sch.c
index 9d115f1..d2e5839 100644 (file)
--- a/src/5gnrsch/sch.c
+++ b/src/5gnrsch/sch.c
@@ -258,12 +258,12 @@ uint8_t SchProcGenCfgReq(Pst *pst, RgMngmt *cfg)
  *      a cell.
  *           
  *  @param[in]  Pst            *pst
- *  @param[in]  SlotIndInfo    *slotInd
+ *  @param[in]  SlotTimingInfo    *slotInd
  *  @return  S16
  *      -# ROK 
  *      -# RFAILED 
  **/
-uint8_t MacSchSlotInd(Pst *pst, SlotIndInfo *slotInd)
+uint8_t MacSchSlotInd(Pst *pst, SlotTimingInfo *slotInd)
 {
    Inst  inst = pst->dstInst-SCH_INST_START;
 

diff --git a/src/5gnrsch/sch.h b/src/5gnrsch/sch.h
index da957a1..15c1125 100644 (file)
--- a/src/5gnrsch/sch.h
+++ b/src/5gnrsch/sch.h
@@ -219,7 +219,7 @@ typedef struct schCellCb
    Inst          instIdx;                           /*!< Index of the scheduler instance */
    Inst          macInst;                           /*!< Index of the MAC instance */
    uint8_t       numSlots;                          /*!< Number of slots in current frame */
-   SlotIndInfo   slotInfo;                          /*!< SFN, Slot info being processed*/
+   SlotTimingInfo   slotInfo;                          /*!< SFN, Slot info being processed*/
    SchDlSlotInfo **schDlSlotInfo;                   /*!< SCH resource allocations in DL */
    SchUlSlotInfo **schUlSlotInfo;                   /*!< SCH resource allocations in UL */
    SchCellCfg    cellCfg;                           /*!< Cell ocnfiguration */
@@ -261,7 +261,7 @@ void schInitDlSlot(SchDlSlotInfo *schDlSlotInfo);
 uint8_t SchSendCfgCfm(Pst *pst, RgMngmt *cfm);
 short int schActvTmr(Ent ent,Inst inst);
 uint8_t schBroadcastAlloc(SchCellCb *cell, DlBrdcstAlloc *dlBrdcstAlloc,uint16_t slot);
-uint8_t schProcessSlotInd(SlotIndInfo *slotInd, Inst inst);
+uint8_t schProcessSlotInd(SlotTimingInfo *slotInd, Inst inst);
 uint8_t schUlResAlloc(SchCellCb *cell, Inst schInst);
 uint8_t schDlRsrcAllocMsg4(DlMsgAlloc *msg4Alloc, SchCellCb *cell, uint16_t slot, bool ssbPresent, bool sib1Present);
 uint16_t schCalcTbSize(uint32_t payLoadSize);

diff --git a/src/5gnrsch/sch_common.c b/src/5gnrsch/sch_common.c
index c077ec0..f3c52fc 100644 (file)
--- a/src/5gnrsch/sch_common.c
+++ b/src/5gnrsch/sch_common.c
@@ -166,7 +166,7 @@ int sendUlSchInfoToMac(UlSchedInfo *ulSchedInfo, Inst inst)
  *  @param[in]  UlSchedInfo *ulSchedInfo, UL scheduling info
  *  @return  void
  **/
-void schPrachResAlloc(SchCellCb *cell, UlSchedInfo *ulSchedInfo, SlotIndInfo prachOccasionTimingInfo)
+void schPrachResAlloc(SchCellCb *cell, UlSchedInfo *ulSchedInfo, SlotTimingInfo prachOccasionTimingInfo)
 {
    uint8_t  puschScs;
    uint8_t  numPrachRb = 0;
@@ -367,7 +367,7 @@ uint8_t fillUlSchedPucchFormat(uint8_t pucchFormat, SchPucchInfo *ulSchedPucch,\
  **/
 
 uint8_t fillUlSchedPucchDedicatedCfg(uint16_t numSlots, SchPucchCfg *pucchDedCfg,\
-   SlotIndInfo *slotInfo, SchPucchInfo *ulSchedPucch)
+   SlotTimingInfo *slotInfo, SchPucchInfo *ulSchedPucch)
 {
    uint8_t ret, resrcSetIdx, resrcIdx, schedReqIdx, srPeriodicity = 0;
    uint16_t srOffset = 0;
@@ -495,7 +495,7 @@ uint8_t schUlResAlloc(SchCellCb *cell, Inst schInst)
    int ret = ROK;
    UlSchedInfo ulSchedInfo;
    SchUlSlotInfo  *schUlSlotInfo = NULLP;
-   SlotIndInfo ulTimingInfo;
+   SlotTimingInfo ulTimingInfo;
    memset(&ulSchedInfo, 0, sizeof(UlSchedInfo));
 
    /* add PHY delta */

diff --git a/src/5gnrsch/sch_slot_ind.c b/src/5gnrsch/sch_slot_ind.c
index 4df452a..a936494 100644 (file)
--- a/src/5gnrsch/sch_slot_ind.c
+++ b/src/5gnrsch/sch_slot_ind.c
@@ -96,7 +96,7 @@ uint8_t sendDlAllocToMac(DlSchedInfo *dlSchedInfo, Inst inst)
  *         RFAILED - failure
  *
  * ****************************************************************/
-void schCalcSlotValues(SlotIndInfo slotInd, SchSlotValue *schSlotValue)
+void schCalcSlotValues(SlotTimingInfo slotInd, SchSlotValue *schSlotValue)
 {
    /****************************************************************
     * PHY_DELTA - the physical layer delta                         * 
@@ -227,7 +227,7 @@ uint8_t schFillBoGrantDlSchedInfo(SchCellCb *cell, DlSchedInfo *dlSchedInfo, DlM
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t schProcessSlotInd(SlotIndInfo *slotInd, Inst schInst)
+uint8_t schProcessSlotInd(SlotTimingInfo *slotInd, Inst schInst)
 {
    uint8_t  ssb_rep, ueIdx, lcgIdx, ret = ROK;
    uint16_t slot;
@@ -253,7 +253,7 @@ uint8_t schProcessSlotInd(SlotIndInfo *slotInd, Inst schInst)
       return RFAILED;
    }
    ssb_rep = cell->cellCfg.ssbSchCfg.ssbPeriod;
-   memcpy(&cell->slotInfo, slotInd, sizeof(SlotIndInfo));
+   memcpy(&cell->slotInfo, slotInd, sizeof(SlotTimingInfo));
    dlBrdcstAlloc->ssbIdxSupported = 1;
 
    slot = dlSchedInfo.schSlotValue.currentTime.slot;
@@ -401,13 +401,13 @@ uint8_t schProcessSlotInd(SlotIndInfo *slotInd, Inst schInst)
          }
          memset(dciInfo,0,sizeof(DciInfo));
          /* update the SFN and SLOT */
-         memcpy(&dlSchedInfo.schSlotValue.ulDciTime, slotInd, sizeof(SlotIndInfo));
+         memcpy(&dlSchedInfo.schSlotValue.ulDciTime, slotInd, sizeof(SlotTimingInfo));
          slot = dlSchedInfo.schSlotValue.ulDciTime.slot;
          /* Update PUSCH allocation */
          schFillPuschAlloc(ueCb, slot, totDataReq, &schPuschInfo);
          /* Fill DCI for UL grant */
          schFillUlDci(ueCb, schPuschInfo, dciInfo);
-         memcpy(&dciInfo->slotIndInfo, &dlSchedInfo.schSlotValue.ulDciTime, sizeof(SlotIndInfo));
+         memcpy(&dciInfo->slotIndInfo, &dlSchedInfo.schSlotValue.ulDciTime, sizeof(SlotTimingInfo));
          dlSchedInfo.ulGrant = dciInfo;
       }
    }

diff --git a/src/cm/common_def.h b/src/cm/common_def.h
index 9681393..0350c6f 100644 (file)
--- a/src/cm/common_def.h
+++ b/src/cm/common_def.h
@@ -230,12 +230,12 @@ typedef enum
    CELL_DOWN
 }OduCellStatus;
 
-typedef struct slotIndInfo
+typedef struct slotTimingInfo
 {
    uint16_t cellId;
    uint16_t sfn;
    uint16_t slot;
-}SlotIndInfo;
+}SlotTimingInfo;
 
 typedef struct PlmnIdentity
 {

diff --git a/src/cm/mac_sch_interface.c b/src/cm/mac_sch_interface.c
index 430e23a..c57f8eb 100644 (file)
--- a/src/cm/mac_sch_interface.c
+++ b/src/cm/mac_sch_interface.c
@@ -20,7 +20,7 @@
  *  @return  S16
  *      -# ROK
  **/
-uint8_t packMacSchSlotInd(Pst *pst, SlotIndInfo *slotInd)
+uint8_t packMacSchSlotInd(Pst *pst, SlotTimingInfo *slotInd)
 {
    Buffer *mBuf = NULLP;
    if (ODU_GET_MSG_BUF(pst->region, pst->pool, &mBuf) != ROK)

diff --git a/src/cm/mac_sch_interface.h b/src/cm/mac_sch_interface.h
index 321b12e..31dd8a7 100644 (file)
--- a/src/cm/mac_sch_interface.h
+++ b/src/cm/mac_sch_interface.h
@@ -807,11 +807,11 @@ typedef struct dlMsgAlloc
 
 typedef struct schSlotValue
 {
-   SlotIndInfo currentTime;
-   SlotIndInfo broadcastTime;
-   SlotIndInfo rarTime;
-   SlotIndInfo dlMsgTime;
-   SlotIndInfo ulDciTime;
+   SlotTimingInfo currentTime;
+   SlotTimingInfo broadcastTime;
+   SlotTimingInfo rarTime;
+   SlotTimingInfo dlMsgTime;
+   SlotTimingInfo ulDciTime;
 }SchSlotValue;
 
 typedef struct format0_0
@@ -852,7 +852,7 @@ typedef struct dciInfo
 {
    uint16_t      cellId;   
    uint16_t      crnti;          /* CRNI */
-   SlotIndInfo   slotIndInfo;    /* Slot Info: sfn, slot number */
+   SlotTimingInfo   slotIndInfo;    /* Slot Info: sfn, slot number */
    BwpCfg        bwpCfg;         /* BWP Cfg */
    CoresetCfg    coresetCfg;     /* Coreset1 Cfg */
    FormatType    formatType;     /* DCI Format */
@@ -948,7 +948,7 @@ typedef struct ulSchedInfo
 {
    uint16_t      cellId;         /* Cell Id */
    uint16_t      crnti;          /* CRNI */
-   SlotIndInfo   slotIndInfo;    /* Slot Info: sfn, slot number */
+   SlotTimingInfo   slotIndInfo;    /* Slot Info: sfn, slot number */
    uint8_t       dataType;       /* Type of info being scheduled */
    PrachSchInfo  prachSchInfo;   /* Prach scheduling info */
    SchPuschInfo  schPuschInfo;   /* Pusch scheduling info */
@@ -959,7 +959,7 @@ typedef struct rachIndInfo
 {
    uint16_t    cellId;
    uint16_t    crnti;
-   SlotIndInfo timingInfo;
+   SlotTimingInfo timingInfo;
    uint8_t     slotIdx;
    uint8_t     symbolIdx;
    uint8_t     freqIdx;
@@ -972,7 +972,7 @@ typedef struct crcIndInfo
 {
    uint16_t    cellId;
    uint16_t    crnti;
-   SlotIndInfo timingInfo;
+   SlotTimingInfo timingInfo;
    uint16_t    numCrcInd;
    uint8_t     crcInd[MAX_NUMBER_OF_CRC_IND_BITS];
 }CrcIndInfo;
@@ -1551,7 +1551,7 @@ typedef struct srUciIndInfo
 {
    uint16_t    cellId;
    uint16_t    crnti;
-   SlotIndInfo slotInd;
+   SlotTimingInfo slotInd;
    uint8_t     numSrBits;
    uint8_t     srPayload[MAX_SR_BITS_IN_BYTES];
 }SrUciIndInfo;
@@ -1600,7 +1600,7 @@ typedef uint8_t (*SchUeCfgRspFunc) ARGS((
 
 typedef uint8_t (*MacSchSlotIndFunc) ARGS((
          Pst         *pst,          /* Post structure */
-        SlotIndInfo *slotInd));    /* Slot Info */
+        SlotTimingInfo *slotInd));    /* Slot Info */
 
 typedef uint8_t (*MacSchBsrFunc)       ARGS((
    Pst                  *pst,
@@ -1636,7 +1636,7 @@ typedef uint8_t (*SchCellDeleteRspFunc) ARGS((
    SchCellDeleteRsp *schCellDeleteRsp));       /* Scheduler UE delete response */
 
 /* function declarations */
-uint8_t packMacSchSlotInd(Pst *pst, SlotIndInfo *slotInd);
+uint8_t packMacSchSlotInd(Pst *pst, SlotTimingInfo *slotInd);
 uint8_t packSchMacDlAlloc(Pst *pst, DlSchedInfo  *dlSchedInfo);
 uint8_t packSchMacUlSchInfo(Pst *pst, UlSchedInfo *ulSchedInfo);
 uint8_t packSchCellCfg(Pst *pst, SchCellCfg  *schCellCfg);
@@ -1657,8 +1657,8 @@ uint8_t packMacSchAddUeConfigReq(Pst *pst, SchUeCfg *ueCfgToSch);
 uint8_t MacSchAddUeConfigReq(Pst *pst, SchUeCfg *ueCfgToSch);
 uint8_t packSchUeCfgRsp(Pst *pst, SchUeCfgRsp *cfgRsp);
 uint8_t MacProcSchUeCfgRsp(Pst *pst, SchUeCfgRsp *cfgRsp);
-uint8_t MacSchSlotInd ARGS((Pst * pst, SlotIndInfo * slotInd));
-uint8_t packMacSchSlotInd(Pst * pst, SlotIndInfo * slotInd);
+uint8_t MacSchSlotInd ARGS((Pst * pst, SlotTimingInfo * slotInd));
+uint8_t packMacSchSlotInd(Pst * pst, SlotTimingInfo * slotInd);
 uint8_t unpackMacSchSlotInd(MacSchSlotIndFunc func, Pst *pst, Buffer  *mBuf);
 uint8_t packMacSchBsr(Pst *pst, UlBufferStatusRptInd *bsrInd);
 uint8_t MacSchBsr(Pst *pst, UlBufferStatusRptInd *bsrInd);

diff --git a/src/cm/rlc_mac_inf.h b/src/cm/rlc_mac_inf.h
index 45fc1ee..89748d9 100644 (file)
--- a/src/cm/rlc_mac_inf.h
+++ b/src/cm/rlc_mac_inf.h
@@ -55,7 +55,7 @@ typedef struct rlcSchedResultRpt
    uint16_t       cellId;       /*!< CELL ID */
    uint16_t       rnti;         /*!< Temporary CRNTI */
    uint8_t        numLc;        /*!< Number of logical channels scheduled */
-   SlotIndInfo    slotInfo;     /*!< Timing info */
+   SlotTimingInfo    slotInfo;     /*!< Timing info */
    RlcLcSchInfo   lcSch[MAX_NUM_LC];  /*!< Scheduled info of logical channels */
 }RlcSchedResultRpt;
 
@@ -72,7 +72,7 @@ typedef struct rlcData
 {
    uint16_t      cellId;       /*!< CELL ID */
    uint16_t      rnti;         /*!< Temporary CRNTI */
-   SlotIndInfo   slotInfo;     /*!< Timing info */
+   SlotTimingInfo   slotInfo;     /*!< Timing info */
    uint8_t       numPdu;       /*!< Number of RLC PDUs */
    RlcPduInfo    pduInfo[MAX_NUM_PDU];
    uint8_t       numLc;