#include "rg_prg.x" /* PRG Interface includes */
#include "lrg.x" /* LRG Interface includes */
-#include "du_mgr_mac_inf.h"
+#include "du_app_mac_inf.h"
#include "rg.x" /* MAC includes */
/* local defines */
for(idx = 0; idx < datReq->nmbOfUeGrantPerTti; idx++)
{
- timingInfo.subframe = (U8)((datReq->datReq[idx].transId >> 8) & 0XFF);
+ timingInfo.slot = (U8)((datReq->datReq[idx].transId >> 8) & 0XFF);
timingInfo.sfn = (U16)((datReq->datReq[idx].transId >> 16) & 0xFFFF);
- sf = &cell->subFrms[(timingInfo.subframe % RG_NUM_SUB_FRAMES)];
+ sf = &cell->subFrms[(timingInfo.slot % RG_NUM_SUB_FRAMES)];
if( (sf->txDone == TRUE) ||
(!RG_TIMEINFO_SAME(sf->schdTime,timingInfo)))
{
#if (ERRCLASS & ERRCLS_DEBUG)
- /* Transmission is already done for this subframe. This is a delayed
+ /* Transmission is already done for this slot. This is a delayed
* datReq. So discard */
rgFillDgnParams(inst,&dgn, LRG_USTA_DGNVAL_MEM);
rgLMMStaInd(inst,LCM_CATEGORY_PROTOCOL, LCM_EVENT_UI_INV_EVT,
/*Get the timing Info*/
/* ADD Changes for Downlink UE Timing Optimization */
#ifdef LTEMAC_DLUE_TMGOPTMZ
- timingInfo.subframe = (U8)((datReq->transId >> 8) & 0XFF);
+ timingInfo.slot = (U8)((datReq->transId >> 8) & 0XFF);
timingInfo.sfn = (U16)((datReq->transId >> 16) & 0xFFFF);
#endif
}
/*Get the timing Info*/
/* ADD Changes for Downlink UE Timing Optimization */
#ifdef LTEMAC_DLUE_TMGOPTMZ
- timingInfo.subframe = (U8)(datReq->transId & 0XFF);
+ timingInfo.slot = (U8)(datReq->transId & 0XFF);
timingInfo.sfn = (U16)((datReq->transId >> 8) & 0xFFFF);
#endif
}
/* ADD Changes for Downlink UE Timing Optimization */
#ifdef LTEMAC_DLUE_TMGOPTMZ
- RG_ARRAY_BOUND_CHECK(0, cell->subFrms, (timingInfo.subframe % RG_NUM_SUB_FRAMES));
- sf = &cell->subFrms[(timingInfo.subframe % RG_NUM_SUB_FRAMES)];
+ RG_ARRAY_BOUND_CHECK(0, cell->subFrms, (timingInfo.slot % RG_NUM_SUB_FRAMES));
+ sf = &cell->subFrms[(timingInfo.slot % RG_NUM_SUB_FRAMES)];
ret = rgROMUpdDlSfRemDataCnt(cell, sf);
/*Added check for RFAILED as above function can return RFAILED*/
}
}
- timingInfo.subframe = (U8)((datReq->transId >> 8) & 0XFF);
+ timingInfo.slot = (U8)((datReq->transId >> 8) & 0XFF);
timingInfo.sfn = (U16)((datReq->transId >> 16) & 0xFFFF);
- sf = &cell->subFrms[(timingInfo.subframe % RG_NUM_SUB_FRAMES)];
+ sf = &cell->subFrms[(timingInfo.slot % RG_NUM_SUB_FRAMES)];
if( (sf->txDone == TRUE) ||
(!RG_TIMEINFO_SAME(sf->schdTime,timingInfo)))
{
#if (ERRCLASS & ERRCLS_DEBUG)
- /* Transmission is already done for this subframe. This is a delayed
+ /* Transmission is already done for this slot. This is a delayed
* datReq. So discard */
rgFillDgnParams(inst,&dgn, LRG_USTA_DGNVAL_MEM);
rgLMMStaInd(inst,LCM_CATEGORY_PROTOCOL, LCM_EVENT_UI_INV_EVT,
TRC2(rgROMHndlBcchPcchDatReq);
- timingInfo.subframe = (U8)(datReq->transId & 0XFF);
+ timingInfo.slot = (U8)(datReq->transId & 0XFF);
timingInfo.sfn = (U16)((datReq->transId >> 8) & 0xFFFF);
- sf = &cell->subFrms[(timingInfo.subframe % RG_NUM_SUB_FRAMES)];
+ sf = &cell->subFrms[(timingInfo.slot % RG_NUM_SUB_FRAMES)];
if( (sf->txDone == TRUE) ||
(!RG_TIMEINFO_SAME(sf->schdTime,timingInfo)))
{
#if (ERRCLASS & ERRCLS_DEBUG)
- /* Transmission is already done for this subframe. This is a delayed
+ /* Transmission is already done for this slot. This is a delayed
* datReq. So discard */
rgFillDgnParams(inst,&dgn, LRG_USTA_DGNVAL_MEM);
rgLMMStaInd(inst,LCM_CATEGORY_PROTOCOL, LCM_EVENT_UI_INV_EVT,
bcch = rgDBMGetBcchOnDlsch(cell,datReq->lcId);
if (bcch )
{
- /* Store BCCH-DLSCH data received in Scheduled subframe */
+ /* Store BCCH-DLSCH data received in Scheduled slot */
sf->bcch.tb = datReq->pdu;
SCpyMsgMsg(datReq->pdu, RG_GET_MEM_REGION(rgCb[inst]),
bch = rgDBMGetBcchOnBch(cell);
if ((bch) && (bch->lcId == datReq->lcId))
{
- /* Store BCH data received in Scheduled subframe */
+ /* Store BCH data received in Scheduled slot */
sf->bch.tb = datReq->pdu;
RETVALUE(ROK);
}
pcch = rgDBMGetPcch(cell);
if ((pcch) && (pcch->lcId == datReq->lcId))
{
- /* Store PCCH-DLSCH data received in Scheduled subframe */
+ /* Store PCCH-DLSCH data received in Scheduled slot */
sf->pcch.tb = datReq->pdu;
RETVALUE(ROK);
}
if(((cell = rgCb[inst].cell) != NULLP)
&& (cell->cellId == staRsp->cellId))
{
- RgInfDedBoRpt boRpt;
Pst schPst;
- boRpt.cellSapId = cell->schInstMap.cellSapId;
- boRpt.cellId = staRsp->cellId;
- boRpt.rnti = staRsp->rnti;
- boRpt.lcId = staRsp->lcId;
- boRpt.bo = staRsp->boReport.bo;
- boRpt.oldestSduArrTime = staRsp->boReport.oldestSduArrTime;
- boRpt.staPduBo = staRsp->boReport.staPduBo;
- boRpt.oldestSduArrTime = staRsp->boReport.oldestSduArrTime;
- rgGetPstToInst(&schPst,inst, cell->schInstMap.schInst);
+#ifdef UNUSED_VAR
+ RgInfDedBoRpt boRpt
+ boRpt.cellSapId = cell->schInstMap.cellSapId;
+ boRpt.cellId = staRsp->cellId;
+ boRpt.rnti = staRsp->rnti;
+ boRpt.lcId = staRsp->lcId;
+ boRpt.bo = staRsp->boReport.bo;
+ boRpt.oldestSduArrTime = staRsp->boReport.oldestSduArrTime;
+ boRpt.staPduBo = staRsp->boReport.staPduBo;
+ boRpt.oldestSduArrTime = staRsp->boReport.oldestSduArrTime;
+#endif
+ rgGetPstToInst(&schPst,inst, cell->schInstMap.schInst);
schPst.event = 0;
//TODO: commented for compilation without SCH RgMacSchDedBoUpdt(&schPst, &boRpt);
RETVALUE(ROK);
S32 bo
)
{
- RgInfDedBoRpt boRpt;
+
RgCellCb *cell;
//if ((cell = rgDBMGetCellCb(cellId)) != NULLP)
if (((cell = rgCb[inst].cell) != NULLP) &&
(cell->cellId == cellId))
- {
+ {
Pst schPst;
- boRpt.cellSapId = cell->schInstMap.cellSapId;
- boRpt.cellId = cellId;
- boRpt.rnti = rnti;
- boRpt.lcId = lcId;
- boRpt.bo = bo;
+#ifdef UNUSED_VAR
+ RgInfDedBoRpt boRpt;
+ boRpt.cellSapId = cell->schInstMap.cellSapId;
+ boRpt.cellId = cellId;
+ boRpt.rnti = rnti;
+ boRpt.lcId = lcId;
+ boRpt.bo = bo;
+#endif
rgGetPstToInst(&schPst,inst, cell->schInstMap.schInst);
schPst.event = 0;
//TODO: commented for compilation without SCH RgMacSchDedBoUpdtReq (&schPst,&boRpt);
{
Pst schPst;
Inst macInst = cell->macInst - RG_INST_START;
- RgInfCmnBoRpt boRpt;
+ //RgInfCmnBoRpt boRpt;
TRC2(rgROMHndlCcchStaRsp);
-
-
+#ifdef UNUSED_VAR
+ RgInfCmnBoRpt boRpt;
boRpt.cellSapId = cell->schInstMap.cellSapId;
boRpt.cellId = staRsp->cellId;
boRpt.u.rnti = staRsp->u.rnti;
boRpt.lcId = staRsp->lcId;
boRpt.lcType = staRsp->lcType;
boRpt.bo = staRsp->bo;
+#endif
rgGetPstToInst(&schPst,macInst, cell->schInstMap.schInst);
//TODO: commented for compilation without SCH RgMacSchCmnBoUpdt(&schPst, &boRpt);
#endif
{
Pst schPst;
- RgInfCmnBoRpt boRpt;
+ //RgInfCmnBoRpt boRpt;
Inst macInst = cell->macInst - RG_INST_START;
TRC2(rgROMHndlBcchPcchStaRsp);
nextBchSfn = (cell->crntTime.sfn + 4 - (cell->crntTime.sfn%4)) % RG_MAX_SFN;
if ((staRsp->u.timeToTx.sfn != nextBchSfn) ||
- ((staRsp->u.timeToTx.sfn == cell->crntTime.sfn) && (cell->crntTime.subframe >= 7)))
+ ((staRsp->u.timeToTx.sfn == cell->crntTime.sfn) && (cell->crntTime.slot >= 7)))
{
RETVALUE(ROK);
}
}
-
+/*
boRpt.cellSapId = cell->schInstMap.cellSapId;
boRpt.cellId = staRsp->cellId;
boRpt.u.timeToTx = staRsp->u.timeToTx;
boRpt.lcId = staRsp->lcId;
boRpt.lcType = staRsp->lcType;
- boRpt.bo = staRsp->bo;
+ boRpt.bo = staRsp->bo;*/
#ifdef EMTC_ENABLE
if(cell->emtcEnable)
{
if (ROK != rgTOMUtlProcDlSf (dlSf, cellCb, &err))
{
RLOG_ARG0(L_ERROR,DBG_CELLID,cellCb->cellId,
- "Unable to process downlink subframe for cell");
+ "Unable to process downlink slot for cell");
err.errType = RGERR_ROM_DEDDATREQ;
}