*
* This function handles common scheduling for DL
*
- * @param[in] schCellCb *cell, cell cb
- * @param[in] DlBrdcstAlloc *dlBrdcstAlloc, DL brdcst allocation
+ * @param[in] uint8_t scs, uint8_t *ssbStartSym
* @return void
**/
void ssbDlTdAlloc(uint8_t scs, uint8_t *ssbStartSymb)
*
* @details
*
- * Function : schCmnDlAlloc
+ * Function : schBroadcastAlloc
*
* This function handles common scheduling for DL
*
* @param[in] DlBrdcstAlloc *dlBrdcstAlloc, DL brdcst allocation
* @return void
**/
-uint8_t schCmnDlAlloc(SchCellCb *cell, DlBrdcstAlloc *dlBrdcstAlloc)
+uint8_t schBroadcastAlloc(SchCellCb *cell, DlBrdcstAlloc *dlBrdcstAlloc,
+ uint16_t slot)
{
/* schedule SSB */
uint8_t scs, ssbStartPrb, ssbStartSymb, idx;
SchDlAlloc *dlAlloc;
SsbInfo ssbInfo;
- dlAlloc = cell->dlAlloc[cell->slotInfo.slot];
+ dlAlloc = cell->dlAlloc[slot];
if(dlBrdcstAlloc->ssbTrans)
{
scs = cell->cellCfg.ssbSchCfg.scsCommon;
- ssbStartPrb = \
- (cell->cellCfg.ssbSchCfg.ssbOffsetPointA)/SCH_NUM_SC_PRB;
+ ssbStartPrb = cell->cellCfg.ssbSchCfg.ssbOffsetPointA;
memset(ssbStartSymbArr, 0, SCH_MAX_SSB_BEAM);
ssbDlTdAlloc(scs, ssbStartSymbArr);
dlAlloc->ssbIdxSupported = dlBrdcstAlloc->ssbIdxSupported;
for(idx=ssbStartSymb; idx<ssbStartSymb+SCH_SSB_SYMB_DURATION; idx++)
{
- dlAlloc->assignedPrb[idx] = SCH_SSB_PRB_DURATION + 1; /* +1 for kSsb */
+ dlAlloc->assignedPrb[idx] = ssbStartPrb + SCH_SSB_PRB_DURATION + 1; /* +1 for kSsb */
}
}
/* SIB1 allocation */
if(dlBrdcstAlloc->sib1Trans)
{
- memcpy(&dlBrdcstAlloc->sib1Alloc.sib1PdcchCfg, &cell->cellCfg.sib1SchCfg.sib1PdcchCfg, sizeof(Sib1PdcchCfg));
- memcpy(&dlBrdcstAlloc->sib1Alloc.sib1PdschCfg, &cell->cellCfg.sib1SchCfg.sib1PdschCfg, sizeof(Sib1PdschCfg));
+ dlAlloc->sib1Pres = true;
+ for(idx=0; idx<SCH_SYMBOL_PER_SLOT; idx++)
+ {
+ dlAlloc->assignedPrb[idx] = ssbStartPrb + SCH_SSB_PRB_DURATION + 1 + 10; /* 10 PRBs for sib1 */
+ }
+ memcpy(&dlBrdcstAlloc->sib1Alloc.sib1PdcchCfg, &cell->cellCfg.sib1SchCfg.sib1PdcchCfg, sizeof(PdcchCfg));
+ memcpy(&dlBrdcstAlloc->sib1Alloc.sib1PdschCfg, &cell->cellCfg.sib1SchCfg.sib1PdschCfg, sizeof(PdschCfg));
}
return ROK;
}
uint8_t prachFormat = 0;
uint8_t x = 0;
uint8_t y = 0;
- uint8_t prachSubframe = 0;
+ uint16_t prachSubframe = 0;
uint8_t prachStartSymbol = 0;
uint8_t prachOcas = 0;
uint8_t dataType = 0;
* @param[in] SchCellCb *cell, cellCb
* @return void
**/
-int schUlResAlloc(SchCellCb *cell, Inst schInst)
+uint8_t schUlResAlloc(SchCellCb *cell, Inst schInst)
{
int ret = ROK;
UlSchInfo ulSchInfo;