#include "common_def.h"
#include "lrg.h"
#include "lrg.x"
-#include "rgu.h"
-#include "rgu.x"
#include "du_app_mac_inf.h"
#include "mac_sch_interface.h"
#include "lwr_mac_upr_inf.h"
#include "mac.h"
+#include "rlc_mac_inf.h"
#include "mac_upr_inf_api.h"
#include "lwr_mac.h"
#include "lwr_mac_fsm.h"
#include "mac_utils.h"
+#include "lwr_mac_phy.h"
+
+uint8_t ssbPeriodicity[6] = {5, 10, 20, 40, 80, 160};
uint8_t MacSchCellCfgReq(Pst *pst, MacCellCfg *macCellCfg);
* @return
* -# ROK
**/
-PUBLIC uint8_t MacSchGenCfgReq(Pst *pst, RgMngmt *cfg)
+uint8_t MacSchGenCfgReq(Pst *pst, RgMngmt *cfg)
{
printf("\nReceived Scheduler gen config at MAC");
pst->dstInst = DEFAULT_CELLS + 1;
* @return
* -# ROK
**/
-PUBLIC uint8_t SchSendCfgCfm(Pst *pst, RgMngmt *cfm)
+uint8_t SchSendCfgCfm(Pst *pst, RgMngmt *cfm)
{
printf("\nSending Scheduler config confirm to DU APP");
pst->dstEnt = ENTDUAPP;
{
Pst cfmPst;
uint16_t cellIdx;
- uint16_t ret = ROK;
+ uint8_t ret = ROK;
MacCellCb *macCellCb;
memset((uint8_t *)&cfmPst, 0, sizeof(Pst));
MAC_FREE_SHRABL_BUF(pst->region, pst->pool, macCellCfg->sib1Cfg.sib1Pdu, macCellCfg->sib1Cfg.sib1PduLen);
MAC_FREE_SHRABL_BUF(pst->region, pst->pool, macCellCfg ,sizeof(MacCellCfg));
}
-#ifdef INTEL_WLS
- LwrMacEnqueueWlsBlock();
-#endif
return ret;
} /* end of MacProcCellCfgReq */
Pst cfgPst;
uint8_t ret;
- memset((uint8_t *)&cfgPst, 0, sizeof(Pst));
+ memset(&cfgPst, 0, sizeof(Pst));
schCellCfg.cellId = macCellCfg->cellId;
schCellCfg.phyCellId = macCellCfg->phyCellId;
schCellCfg.bandwidth = macCellCfg->dlCarrCfg.bw;
schCellCfg.ssbSchCfg.ssbPbchPwr = macCellCfg->ssbCfg.ssbPbchPwr;
schCellCfg.ssbSchCfg.scsCommon = macCellCfg->ssbCfg.scsCmn;
schCellCfg.ssbSchCfg.ssbOffsetPointA = macCellCfg->ssbCfg.ssbOffsetPointA;
- schCellCfg.ssbSchCfg.ssbPeriod = macCellCfg->ssbCfg.ssbPeriod;
+ schCellCfg.ssbSchCfg.ssbPeriod = ssbPeriodicity[macCellCfg->ssbCfg.ssbPeriod];
schCellCfg.ssbSchCfg.ssbSubcOffset = macCellCfg->ssbCfg.ssbScOffset;
for(uint8_t idx=0; idx<SSB_MASK_SIZE; idx++)
{
uint16_t cellIdx;
MacCellCfgCfm macCellCfgCfm;
- memset((uint8_t *)&pst, 0, sizeof(Pst));
+ memset(&pst, 0, sizeof(Pst));
GET_CELL_IDX(cellId, cellIdx);
macCellCfgCfm.cellId = macCb.macCell[cellIdx]->macCellCfg.cellId;