merge
Nicola Baldo
|
Before Width: | Height: | Size: 56 KiB After Width: | Height: | Size: 69 KiB |
|
Before Width: | Height: | Size: 56 KiB After Width: | Height: | Size: 67 KiB |
|
Before Width: | Height: | Size: 72 KiB After Width: | Height: | Size: 100 KiB |
|
Before Width: | Height: | Size: 53 KiB After Width: | Height: | Size: 68 KiB |
|
Before Width: | Height: | Size: 45 KiB After Width: | Height: | Size: 61 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 839 KiB After Width: | Height: | Size: 85 KiB |
|
Before Width: | Height: | Size: 62 KiB After Width: | Height: | Size: 72 KiB |
@@ -1114,6 +1114,7 @@ RrFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sched
|
||||
NS_LOG_INFO ("\t " << rbgAllocated);
|
||||
i++;
|
||||
rbgMap.at (rbgAllocated) = true;
|
||||
rbgAllocatedNum++;
|
||||
}
|
||||
rbgAllocated++;
|
||||
}
|
||||
@@ -1146,7 +1147,7 @@ RrFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sched
|
||||
// ...more parameters -> ignored in this version
|
||||
|
||||
ret.m_buildDataList.push_back (newEl);
|
||||
if (rbgAllocated == rbgNum)
|
||||
if (rbgAllocatedNum == rbgNum)
|
||||
{
|
||||
m_nextRntiDl = (*it).m_rnti; // store last RNTI served
|
||||
break; // no more RGB to be allocated
|
||||
|
||||