Index: src/lte/model/tdmt-ff-mac-scheduler.cc |
=================================================================== |
--- a/src/lte/model/tdmt-ff-mac-scheduler.cc |
+++ b/src/lte/model/tdmt-ff-mac-scheduler.cc |
@@ -295,6 +295,18 @@ |
} |
void |
+TdMtFfMacScheduler::SetLteFfrSapProvider (LteFfrSapProvider* s) |
+{ |
+ m_ffrSapProvider = s; |
+} |
+ |
+LteFfrSapUser* |
+TdMtFfMacScheduler::GetLteFfrSapUser () |
+{ |
+ return m_ffrSapUser; |
+} |
+ |
+void |
TdMtFfMacScheduler::DoCschedCellConfigReq (const struct FfMacCschedSapProvider::CschedCellConfigReqParameters& params) |
{ |
NS_LOG_FUNCTION (this); |
@@ -870,7 +882,7 @@ |
dciRbg.at (j) = rbgId; |
j++; |
} |
- rbgId++; |
+ rbgId = (rbgId + 1) % rbgNum; |
} |
if (j == dciRbg.size ()) |
{ |
@@ -888,7 +900,7 @@ |
else |
{ |
// HARQ retx cannot be performed on this TTI -> store it |
- dlInfoListUntxed.push_back (params.m_dlInfoList.at (i)); |
+ dlInfoListUntxed.push_back (m_dlInfoListBuffered.at (i)); |
NS_LOG_INFO (this << " No resource for this retx -> buffer it"); |
} |
} |
@@ -1186,6 +1198,8 @@ |
newDci.m_rv.push_back (0); |
} |
+ newDci.m_tpc = 1; //1 is mapped to 0 in Accumulated Mode and to -1 in Absolute Mode |
+ |
newEl.m_dci = newDci; |
if (m_harqOn == true) |