Attachment #977 for bug #995

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

(-)a/src/devices/wimax/bs-scheduler-rtps.cc (-1 / +1 lines)

Lines 494-500	Link Here

494

  ServiceFlowRecord *serviceFlowRecord;

494

  ServiceFlowRecord *serviceFlowRecord;

495

  std::vector<ServiceFlow*> serviceFlows;

495

  std::vector<ServiceFlow*> serviceFlows;

496

497

  std::deque<WimaxMacQueue::QueueElement>::const_iterator iter3;

497

///  std::deque<WimaxMacQueue::QueueElement>::const_iterator iter3;

498

  uint32_t symbolsRequired[100];

498

  uint32_t symbolsRequired[100];

499

  WimaxPhy::ModulationType modulationType_[100];

499

  WimaxPhy::ModulationType modulationType_[100];

500

  uint8_t diuc_[100];

500

  uint8_t diuc_[100];




            {
              uint32_t BurstSizeSymbols =  GetBs ()->GetPhy ()->GetNrSymbols (burst->GetSize (), modulationType);
              AddDownlinkBurst (connection, diuc, modulationType, burst);

              if (availableSymbols <= BurstSizeSymbols)
                {
                  availableSymbols -= BurstSizeSymbols; // XXX: Overflows but don't know how to fix
                  break;
                }
            }
        }
      else
        {
          burst = Create<PacketBurst> ();
          while (connection->HasPackets () == true)
            {
              uint32_t FirstPacketSize = connection->GetQueue ()->GetFirstPacketRequiredByte (MacHeaderType::HEADER_TYPE_GENERIC);
              nrSymbolsRequired = GetBs ()->GetPhy ()->GetNrSymbols (FirstPacketSize, modulationType);

            }
          AddDownlinkBurst (connection, diuc, modulationType, burst);
        }
      if (availableSymbols == 0)
        {
          break;
        }

(-)a/src/devices/wimax/simple-ofdm-wimax-phy.cc (-1 / +1 lines)

Lines 797-803	Link Here

797

  m_nrBlocks = GetNrBlocks (burstSize, modulationType);

797

  m_nrBlocks = GetNrBlocks (burstSize, modulationType);

798

  m_paddingBits = (m_nrBlocks * m_blockSize) - (burstSize * 8);

798

  m_paddingBits = (m_nrBlocks * m_blockSize) - (burstSize * 8);

799

  m_nrRemainingBlocksToSend = m_nrBlocks;

799

  m_nrRemainingBlocksToSend = m_nrBlocks;

800

  NS_ASSERT_MSG (m_paddingBits >= 0, "Size of padding bytes < 0");

800

  NS_ASSERT_MSG ((m_nrBlocks * m_blockSize) >= (burstSize * 8), "Size of padding bytes < 0");

801

802

803

uint16_t

803

uint16_t

(-)a/src/devices/wimax/wimax-mac-queue.cc (-4 / +4 lines)

Lines 171-186	Link Here

171

      if (element.m_hdrType.GetType () == MacHeaderType::HEADER_TYPE_GENERIC)

171

      if (element.m_hdrType.GetType () == MacHeaderType::HEADER_TYPE_GENERIC)

172

173

          NS_LOG_INFO ("Enqueued Packet IS A data packet");

173

          NS_LOG_INFO ("Enqueued Packet IS A data packet");

174

          NS_ASSERT_MSG (m_nrDataPackets >= 1,

175

                         "Can not enqueue more packets: no space left in the queue");

174

          m_nrDataPackets--;

176

          m_nrDataPackets--;

175

          NS_ASSERT_MSG (m_nrDataPackets >= 0,

176

                         "Can not enqueue more packets: no space left in the queue");

177

178

      else

178

      else

179

180

          NS_LOG_INFO ("Enqueued Packet IS A Request BW packet");

180

          NS_LOG_INFO ("Enqueued Packet IS A Request BW packet");

181

          NS_ASSERT_MSG (m_nrRequestPackets >= 1,

182

                         "Can not enqueue more packets: no space left in the queue");

181

          m_nrRequestPackets--;

183

          m_nrRequestPackets--;

182

          NS_ASSERT_MSG (m_nrRequestPackets >= 0,

183

                         "Can not enqueue more packets: no space left in the queue");

184

185

186

      Ptr<Packet> packet = element.m_packet;

186

      Ptr<Packet> packet = element.m_packet;

Return to bug 995