View | Details | Raw Unified | Return to bug 2536
Collapse All | Expand All

(-)a/src/wimax/model/bs-uplink-scheduler-mbqos.cc (-3 / +2 lines)
225
  uint32_t symbolsToAllocation = 0;
225
  uint32_t symbolsToAllocation = 0;
226
  uint32_t allocationSize = 0; // size in symbols
226
  uint32_t allocationSize = 0; // size in symbols
227
  uint32_t availableSymbols = GetBs ()->GetNrUlSymbols ();
227
  uint32_t availableSymbols = GetBs ()->GetNrUlSymbols ();
228
  uint32_t availableSymbolsAux = GetBs ()->GetNrUlSymbols ();
229
228
230
  AllocateInitialRangingInterval (symbolsToAllocation, availableSymbols);
229
  AllocateInitialRangingInterval (symbolsToAllocation, availableSymbols);
231
230
357
    }
356
    }
358
  NS_LOG_DEBUG ("At " << Simulator::Now ().GetSeconds ()<< " high queue has " << m_uplinkJobs_high.size ()<< " jobs - after sched");
357
  NS_LOG_DEBUG ("At " << Simulator::Now ().GetSeconds ()<< " high queue has " << m_uplinkJobs_high.size ()<< " jobs - after sched");
359
358
360
  availableSymbolsAux = availableSymbols;
359
  uint32_t availableSymbolsAux = availableSymbols;
361
  uint32_t symbolsUsed = 0;
360
  uint32_t symbolsUsed = 0;
362
361
363
  symbolsUsed += CountSymbolsQueue (m_uplinkJobs_high);
362
  symbolsUsed += CountSymbolsQueue (m_uplinkJobs_high);
482
    }
481
    }
483
482
484
  OfdmUlMapIe ulMapIeEnd;
483
  OfdmUlMapIe ulMapIeEnd;
485
  ulMapIeEnd.SetCid (*(new Cid (0)));
484
  ulMapIeEnd.SetCid (Cid (0));
486
  ulMapIeEnd.SetStartTime (symbolsToAllocation);
485
  ulMapIeEnd.SetStartTime (symbolsToAllocation);
487
  ulMapIeEnd.SetUiuc (OfdmUlBurstProfile::UIUC_END_OF_MAP);
486
  ulMapIeEnd.SetUiuc (OfdmUlBurstProfile::UIUC_END_OF_MAP);
488
  ulMapIeEnd.SetDuration (0);
487
  ulMapIeEnd.SetDuration (0);
(-)a/src/wimax/model/ul-mac-messages.cc (-1 / +1 lines)
 Lines 472-478   OfdmUlMapIe::~OfdmUlMapIe (void) Link Here 
472
}
472
}
473
473
474
void
474
void
475
OfdmUlMapIe::SetCid (Cid cid)
475
OfdmUlMapIe::SetCid (const Cid &cid)
476
{
476
{
477
  m_cid = cid;
477
  m_cid = cid;
478
}
478
}
(-)a/src/wimax/model/ul-mac-messages.h (-1 / +1 lines)
 Lines 264-270   public: Link Here 
264
  OfdmUlMapIe (void);
264
  OfdmUlMapIe (void);
265
  ~OfdmUlMapIe (void);
265
  ~OfdmUlMapIe (void);
266
266
267
  void SetCid (Cid cid);
267
  void SetCid (const Cid &cid);
268
  void SetStartTime (uint16_t startTime);
268
  void SetStartTime (uint16_t startTime);
269
  void SetSubchannelIndex (uint8_t subchannelIndex);
269
  void SetSubchannelIndex (uint8_t subchannelIndex);
270
  void SetUiuc (uint8_t uiuc);
270
  void SetUiuc (uint8_t uiuc);

Return to bug 2536