X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Fmac.h;h=647299f6d757ddd48160c5b37e0d57f00227f677;hb=95d4c229dc30cec27c98ee66b5b689779a48dcc9;hp=10538aa01f5dc611632c0f4138e429a4d38b192a;hpb=6636207100c598cd70537d177670ef131e263931;p=o-du%2Fl2.git

diff --git a/src/5gnrmac/mac.h b/src/5gnrmac/mac.h
index 10538aa01..647299f6d 100644
--- a/src/5gnrmac/mac.h
+++ b/src/5gnrmac/mac.h
@@ -75,7 +75,7 @@ typedef enum
    CELL_STATE_UP,
    CELL_TO_BE_STOPPED,
    CELL_STOP_IN_PROGRESS,
-}CellState;	   
+}MacCellStatus;	   
 
 typedef enum
 {
@@ -124,6 +124,7 @@ typedef struct macCbInfo
    uint8_t     *msg4Pdu;    /* storing DL-CCCH Ind Pdu */
    uint16_t    msg4PduLen;  /* storing DL-CCCH Ind Pdu Len */
    DlHarqProcCb msg4HqInfo; /* HARQ process info for msg 4 */
+   bool         *macMsg4Status;
 }MacRaCbInfo;
 
 typedef struct macCe
@@ -228,19 +229,20 @@ typedef struct macUeCb
 
 struct macCellCb
 {
-   uint16_t    cellId;
-   uint16_t    numOfSlots;
-   CellState   state;
-   uint16_t    crntiMap;
-   MacRaCbInfo macRaCb[MAX_NUM_UE];
-   MacDlSlot   dlSlot[MAX_SLOTS];
-   MacUlSlot   ulSlot[MAX_SLOTS];
-   uint16_t    numActvUe;
-   MacUeCfg    *ueCfgTmpData[MAX_NUM_UE];
-   MacUeRecfg  *ueRecfgTmpData[MAX_NUM_UE];
-   MacUeCb     ueCb[MAX_NUM_UE];
-   MacCellCfg  macCellCfg;
-   SlotTimingInfo currTime;
+   uint16_t        cellId;
+   uint16_t        numOfSlots;
+   MacCellStatus   state;
+   uint16_t        crntiMap;
+   MacRaCbInfo     macRaCb[MAX_NUM_UE];
+   MacDlSlot       dlSlot[MAX_SLOTS];
+   MacUlSlot       ulSlot[MAX_SLOTS];
+   uint16_t        numActvUe;
+   MacUeCreateReq  *ueCfgTmpData[MAX_NUM_UE];
+   MacUeRecfg      *ueRecfgTmpData[MAX_NUM_UE];
+   MacUeCb         ueCb[MAX_NUM_UE];
+   MacCellCfg      macCellCfg;
+   uint8_t         numerology;
+   SlotTimingInfo  currTime;
 };
 
 typedef struct macCb
@@ -267,7 +269,7 @@ 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, SlotTimingInfo slotInfo, RxDataIndPdu *rxDataIndPdu);
-void fillMg4Pdu(DlMsgAlloc *msg4Alloc);
+void fillMg4Pdu(DlMsgSchInfo *msg4Alloc);
 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);