X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Fmac_mux.c;h=18167d7013cc8dfd546ece2e446462603b0a4ee8;hb=3330932565e15a749fd5dd5039cdea2862ca51cc;hp=d9321f4ee0b03b65b9f9a997267a00902bdd2152;hpb=8d9ebf64c8a64bf1346685833fe79970c4ef3d14;p=o-du%2Fl2.git diff --git a/src/5gnrmac/mac_mux.c b/src/5gnrmac/mac_mux.c index d9321f4ee..18167d701 100644 --- a/src/5gnrmac/mac_mux.c +++ b/src/5gnrmac/mac_mux.c @@ -16,59 +16,40 @@ ################################################################################ *******************************************************************************/ -#include -#include /* 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 "common_def.h" #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" - -/* 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_sch_interface.h" +#include "lwr_mac_upr_inf.h" #include "mac.h" -#include "rg.x" /* typedefs for MAC */ +#include "mac_utils.h" -void packBytes(uint8_t *buf, uint8_t *bytePos, uint8_t *bitPos, uint32_t val, uint8_t valSize) +/******************************************************************* + * + * @brief pack the bits + * + * @details + * + * Function : packBytes + * + * Functionality: + * pack the bits in the corresponding byte + * + * @params[in] buffer pointer, byte and bit position, value and its size + * @return void + * + * ****************************************************************/ +void packBytes(uint8_t *buf, uint16_t *bytePos, uint8_t *bitPos, uint32_t val, uint8_t valSize) { uint32_t temp; uint8_t bytePart1; uint32_t bytePart2; uint8_t bytePart1Size; uint32_t bytePart2Size; - + if(*bitPos - valSize + 1 >= 0) { bytePart1 = (uint8_t)val; @@ -76,11 +57,11 @@ void packBytes(uint8_t *buf, uint8_t *bytePos, uint8_t *bitPos, uint32_t val, ui buf[*bytePos] |= bytePart1; if(*bitPos - valSize < 0) { - *bitPos = 7; - (*bytePos)++; + *bitPos = 7; + (*bytePos)++; } else - *bitPos -= valSize; + *bitPos -= valSize; } else { @@ -90,7 +71,7 @@ void packBytes(uint8_t *buf, uint8_t *bytePos, uint8_t *bitPos, uint32_t val, ui bytePart1 = (val >> bytePart2Size) << (*bitPos -bytePart1Size +1); bytePart2 = (~((~temp) << bytePart2Size)) & val; - + buf[*bytePos] |= bytePart1; (*bytePos)++; *bitPos = 7; @@ -98,29 +79,48 @@ void packBytes(uint8_t *buf, uint8_t *bytePos, uint8_t *bitPos, uint32_t val, ui } } +/******************************************************************* + * + * @brief fill the RAR PDU + * + * @details + * + * Function : fillRarPdu + * + * Functionality: + * The RAR PDU will be MUXed and formed + * + * @params[in] RAR info + * @return void + * + * ****************************************************************/ void fillRarPdu(RarInfo *rarInfo) { uint8_t *rarPdu = rarInfo->rarPdu; - uint16_t totalBits; - uint8_t numBytes; - uint8_t bytePos; - uint8_t bitPos; + uint16_t totalBits = 0; + uint8_t numBytes = 0; + uint16_t bytePos= 0; + uint8_t bitPos = 0; /* RAR subheader fields */ - uint8_t EBit; - uint8_t TBit; - uint8_t rapId; + uint8_t EBit = 0; + uint8_t TBit = 0; + uint8_t rapId = 0; /* RAR payload fields */ - uint8_t RBit; - uint16_t timeAdv; - uint32_t ulGrant; - uint16_t tmpCrnti; + uint8_t RBit = 0; + uint16_t timeAdv = 0; + uint32_t ulGrant = 0; + uint16_t tmpCrnti = 0; + uint8_t paddingLcid = 63; /* Size(in bits) of RAR subheader files */ uint8_t EBitSize = 1; uint8_t TBitSize = 1; uint8_t rapidSize = 6; + uint8_t paddingLcidSize = 6; + uint8_t paddingSize = 8; + /* Size(in bits) of RAR payload fields */ uint8_t RBitSize = 1; @@ -132,7 +132,7 @@ void fillRarPdu(RarInfo *rarInfo) EBit = 0; TBit = 1; rapId = rarInfo->RAPID; - + RBit = 0; timeAdv = rarInfo->ta; ulGrant = 0; /* this will be done when implementing msg3 */ @@ -140,19 +140,22 @@ void fillRarPdu(RarInfo *rarInfo) /* Calulating total number of bytes in buffer */ totalBits = EBitSize + TBitSize + rapidSize + RBitSize + timeAdvSize \ - + ulGrantSize + tmpCrntiSize; - + + ulGrantSize + tmpCrntiSize; + + /* add padding size */ + totalBits += RBitSize*2 + paddingLcidSize + paddingSize; + /* Calulating total number of bytes in buffer */ numBytes = totalBits/8; if(totalBits % 8) numBytes += 1; - - rarInfo->rarPduLen = numBytes; + + rarInfo->rarPduLen = numBytes; /* Initialize buffer */ for(bytePos = 0; bytePos < numBytes; bytePos++) rarPdu[bytePos] = 0; - + bytePos = 0; bitPos = 7; @@ -164,6 +167,210 @@ void fillRarPdu(RarInfo *rarInfo) packBytes(rarPdu, &bytePos, &bitPos, timeAdv, timeAdvSize); packBytes(rarPdu, &bytePos, &bitPos, ulGrant, ulGrantSize); packBytes(rarPdu, &bytePos, &bitPos, tmpCrnti, tmpCrntiSize); + + /* padding of 2 bytes */ + packBytes(rarPdu, &bytePos, &bitPos, RBit, RBitSize*2); + packBytes(rarPdu, &bytePos, &bitPos, paddingLcid, paddingLcidSize); + packBytes(rarPdu, &bytePos, &bitPos, 0, paddingSize); + +} + +/******************************************************************* + * + * @brief Database required to form MAC PDU + * + * @details + * + * Function : createMacRaCb + * + * Functionality: + * stores the required params for muxing + * + * @params[in] Pointer to cellId, + * crnti + * @return void + * + * ****************************************************************/ +void createMacRaCb(RachIndInfo *rachIndInfo) +{ + uint8_t ueIdx = 0; + uint16_t crnti = 0; + uint16_t cellIdx = 0; + + GET_CELL_IDX(rachIndInfo->cellId, cellIdx); + + crnti = getNewCrnti(&macCb.macCell[cellIdx]->crntiMap); + if(crnti == -1) + return; + + GET_UE_IDX(crnti, ueIdx); + ueIdx = ueIdx -1; + + /* store in rach ind structure */ + rachIndInfo->crnti = crnti; + + /* store in raCb */ + macCb.macCell[cellIdx]->macRaCb[ueIdx].cellId = rachIndInfo->cellId; + macCb.macCell[cellIdx]->macRaCb[ueIdx].crnti = crnti; +} + +/************************************************* + * @brief fill RLC DL Data + * + * @details + * + * Function : fillMsg4DlData + * This function sends Dl Data + * to form MAC SDUs + * + * @param[in] MacDlData *dlData + * msg4Pdu pointer + ************************************************/ + +void fillMsg4DlData(MacDlData *dlData, uint16_t msg4PduLen, uint8_t *msg4Pdu) +{ + uint8_t idx = 0; + + dlData->numPdu = 1; + dlData->pduInfo[idx].lcId = MAC_LCID_CCCH; + dlData->pduInfo[idx].pduLen = msg4PduLen; + memcpy(dlData->pduInfo[idx].dlPdu, msg4Pdu, msg4PduLen); +} + +/************************************************* + * @brief fill Mac Ce Info + * + * @details + * + * Function : fillMacCe + * This function fills Mac ce identities + * + * @param[in] RlcMacData *dlData + * Msg3Pdu Data + ************************************************/ + +void fillMacCe(MacCeInfo *macCeInfo, uint8_t *msg3Pdu) +{ + uint8_t idx; + macCeInfo->numCes = 1; + for(idx = 0; idx < macCeInfo->numCes; idx++) + { + macCeInfo->macCe[idx].macCeLcid = MAC_LCID_CRI; + memcpy(macCeInfo->macCe[idx].macCeValue, \ + msg3Pdu, MAX_CRI_SIZE); + } +} + +/******************************************************************* + * + * @brief Forms MAC PDU + * + * @details + * + * Function : macMuxPdu + * + * Functionality: + * The MAC PDU will be MUXed and formed + * + * @params[in] MacDlData *, MacCeInfo *, txPdu *, tbSize + * @return void + * ****************************************************************/ + +void macMuxPdu(MacDlData *dlData, MacCeInfo *macCeData, uint8_t *txPdu, uint16_t tbSize) +{ + uint16_t bytePos = 0; + uint8_t bitPos = 7; + uint8_t idx = 0; + uint8_t macPdu[tbSize]; + memset(macPdu, 0, (tbSize * sizeof(uint8_t))); + + /* subheader fields */ + uint8_t RBit = 0; /* Reserved bit */ + uint8_t FBit =0; /* Format Indicator */ + uint8_t lcid =0; /* LCID */ + uint16_t lenField = 0; /* Length field */ + + /* subheader field size (in bits) */ + uint8_t RBitSize = 1; + uint8_t FBitSize = 1; + uint8_t lcidSize = 6; + uint8_t lenFieldSize = 0; /* 8-bit or 16-bit L field */ + + /* PACK ALL MAC CE */ + if(macCeData != NULLP) + { + for(idx = 0; idx < macCeData->numCes; idx++) + { + lcid = macCeData->macCe[idx].macCeLcid; + switch(lcid) + { + case MAC_LCID_CRI: + { + /* Packing fields into MAC PDU R/R/LCID */ + packBytes(macPdu, &bytePos, &bitPos, RBit, (RBitSize * 2)); + packBytes(macPdu, &bytePos, &bitPos, lcid, lcidSize); + memcpy(&macPdu[bytePos], macCeData->macCe[idx].macCeValue,\ + MAX_CRI_SIZE); + bytePos += MAX_CRI_SIZE; + break; + } + default: + DU_LOG("\nERROR --> MAC: Invalid LCID %d in mac pdu",lcid); + break; + } + } + } + + /* PACK ALL MAC SDUs */ + for(idx = 0; idx < dlData->numPdu; idx++) + { + lcid = dlData->pduInfo[idx].lcId; + switch(lcid) + { + case MAC_LCID_CCCH: + case MAC_LCID_MIN ... MAC_LCID_MAX : + { + lenField = dlData->pduInfo[idx].pduLen; + if(dlData->pduInfo[idx].pduLen > 255) + { + FBit = 1; + lenFieldSize = 16; + + } + else + { + FBit = 0; + lenFieldSize = 8; + } + /* Packing fields into MAC PDU R/F/LCID/L */ + packBytes(macPdu, &bytePos, &bitPos, RBit, RBitSize); + packBytes(macPdu, &bytePos, &bitPos, FBit, FBitSize); + packBytes(macPdu, &bytePos, &bitPos, lcid, lcidSize); + packBytes(macPdu, &bytePos, &bitPos, lenField, lenFieldSize); + memcpy(&macPdu[bytePos], dlData->pduInfo[idx].dlPdu, lenField); + bytePos += lenField; + break; + } + + default: + DU_LOG("\nERROR --> MAC: Invalid LCID %d in mac pdu",lcid); + break; + } + } + if(bytePos < tbSize && (tbSize-bytePos >= 1)) + { + /* padding remaining bytes */ + RBitSize = 2; + lcid = MAC_LCID_PADDING; + packBytes(macPdu, &bytePos, &bitPos, RBit, RBitSize); + packBytes(macPdu, &bytePos, &bitPos, lcid, lcidSize); + } + + /*Storing the muxed pdu */ + if(txPdu != NULLP) + { + memcpy(txPdu, macPdu, tbSize); + } } /**********************************************************************