X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Fsch.h;h=2169519540fa5cf9950831ae61a16dd03d7b86ef;hb=9076bc05cb36d3ed99890b2e3f57f6d06f4a7e93;hp=5322e8c8868dabbfa1b33a69299c3d14952aeea2;hpb=6b44407d464a5a4e060999255233a7cfe78bb0fa;p=o-du%2Fl2.git

diff --git a/src/5gnrsch/sch.h b/src/5gnrsch/sch.h
index 5322e8c88..216951954 100644
--- a/src/5gnrsch/sch.h
+++ b/src/5gnrsch/sch.h
@@ -43,6 +43,9 @@
 
 #define CRC_FAILED 0
 #define CRC_PASSED 1
+
+#define RLC_HDR_SIZE  3   /* 3 bytes of RLC Header size */
+#define MAC_HDR_SIZE  3   /* 3 bytes of MAC Header */
 #define UL_GRANT_SIZE 224
 
 typedef struct schCellCb SchCellCb;
@@ -54,6 +57,12 @@ typedef enum
    SCH_UE_STATE_ACTIVE
 }SchUeState;
 
+typedef enum
+{
+   SCH_LC_STATE_INACTIVE,
+   SCH_LC_STATE_ACTIVE
+}SchLcState;
+
 /**
  * @brief
  * Structure holding LTE MAC's General Configuration information.
@@ -83,7 +92,7 @@ typedef struct schDlSlotInfo
    SsbInfo   ssbInfo[MAX_SSB_IDX];              /*!< SSB info */
    bool      sib1Pres;                          /*!< Flag to determine if SIB1 is present in this slot */
    RarInfo   *rarInfo;                          /*!< RAR info */
-   Msg4Info  *msg4Info;                         /*!< msg4 info */
+   DlMsgInfo *dlMsgInfo;                       /*!< DL dedicated Msg info */
 }SchDlSlotInfo;
 
 typedef struct schRaCb
@@ -116,7 +125,22 @@ typedef struct bsrInfo
    uint32_t   dataVol;   /* Data volume requested in bytes */
 }BsrInfo;
 
+typedef struct schLcCtxt
+{
+   uint8_t lcp;      // logical Channel Prioritization
+   SchLcState lcState;
+   uint16_t bo;
+}SchDlLcCtxt;
 
+typedef struct schUlLcCtxt
+{
+   SchLcState lcState;
+   uint8_t priority;
+   uint8_t lcGroup;
+   uint8_t schReqId;
+   uint8_t pbr;        // prioritisedBitRate
+   uint8_t bsd;        // bucketSizeDuration
+}SchUlLcCtxt;
 
 /**
  * @brief
@@ -131,6 +155,10 @@ typedef struct schUeCb
    SchCellCb  *cellCb;
    bool       srRcvd;
    BsrInfo    bsrInfo[MAX_NUM_LOGICAL_CHANNEL_GROUPS];
+   uint8_t       numUlLc;
+   SchUlLcCtxt   ulLcCtxt[MAX_NUM_LC];
+   uint8_t       numDlLc;
+   SchDlLcCtxt   dlLcCtxt[MAX_NUM_LC];
 }SchUeCb;
 
 /**
@@ -150,6 +178,8 @@ typedef struct schCellCb
    uint8_t       ssbStartSymbArr[SCH_MAX_SSB_BEAM]; /*!<start symbol per SSB beam */
    SchRaCb       raCb[MAX_NUM_UE];                  /*!< Rach Cb */
    uint16_t      numActvUe;
+   uint32_t      actvUeBitMap;
+   uint32_t      boIndBitMap;
    SchUeCb       ueCb[MAX_NUM_UE];
 }SchCellCb;
 
@@ -171,13 +201,16 @@ SchCb schCb[SCH_MAX_INST];
 uint8_t schBroadcastAlloc(SchCellCb *cell, DlBrdcstAlloc *dlBrdcstAlloc,uint16_t slot);
 uint8_t schProcessSlotInd(SlotIndInfo *slotInd, Inst inst);
 uint8_t schUlResAlloc(SchCellCb *cell, Inst schInst);
-uint8_t schDlRsrcAllocMsg4(Msg4Alloc *msg4Alloc, SchCellCb *cell, uint16_t slot);
+uint8_t schDlRsrcAllocMsg4(DlMsgAlloc *msg4Alloc, SchCellCb *cell, uint16_t slot);
 uint16_t schCalcTbSize(uint16_t payLoadSize);
 uint16_t schCalcNumPrb(uint16_t tbSize, uint16_t mcs, uint8_t numSymbols);
 uint16_t schAllocPucchResource(SchCellCb *cell, uint16_t crnti, uint16_t slot);
 uint8_t schProcessRachInd(RachIndInfo *rachInd, Inst schInst);
 uint8_t schFillUlDci(SchUeCb *ueCb, SchPuschInfo puschInfo, DciInfo *dciInfo);
 uint8_t schFillPuschAlloc(SchUeCb *ueCb, uint16_t pdcchSlot, uint32_t dataVol, SchPuschInfo *puschInfo);
+uint8_t schDlRsrcAllocDlMsg(DlMsgAlloc *dlMsgAlloc, SchCellCb *cell, uint16_t crnti,
+   uint16_t accumalatedSize, uint16_t slot);
+uint16_t schAccumalateLcBoSize(SchCellCb *cell, uint16_t ueIdx);
 
 /**********************************************************************
   End of file