X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Fmac.h;h=88eeb87257ea8134de41a4ecf12b7c67997d279a;hb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;hp=69fa37a3efa4e2776f19d0749ac6b33120899854;hpb=a5530e70a9d414952dadd1688aa9b4280c0dbb5a;p=o-du%2Fl2.git diff --git a/src/5gnrmac/mac.h b/src/5gnrmac/mac.h index 69fa37a3e..88eeb8725 100644 --- a/src/5gnrmac/mac.h +++ b/src/5gnrmac/mac.h @@ -67,8 +67,8 @@ #define SR_DELAY_TMR_2560MS 2560 #define MAC_LCID_CCCH 0 -#define MAC_DEDLC_MIN_LCID 1 -#define MAC_DEDLC_MAX_LCID 32 +#define MAC_LCID_MIN 1 +#define MAC_LCID_MAX 32 #define MAC_LCID_RESERVED_MIN 33 #define MAC_LCID_RESERVED_MAX 51 #define MAC_LCID_CCCH_48BIT 52 @@ -237,11 +237,13 @@ void createMacRaCb(uint16_t cellId, uint16_t crnti); void fillMsg4DlData(uint16_t cellId, MacDlData *dlData, 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, RxDataIndPdu *rxDataIndPdu); -uint8_t macSendUlCcchInd(uint8_t *rrcContainer, uint16_t cellId, uint16_t crnti); +uint8_t unpackRxData(uint16_t cellId, SlotIndInfo slotInfo, RxDataIndPdu *rxDataIndPdu); void fillMg4Pdu(Msg4Alloc *msg4Alloc); void buildAndSendMuxPdu(SlotIndInfo 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 lcId, uint16_t pduLen, uint8_t *pdu); #endif /********************************************************************** End of file