LEFT | RIGHT |
1 /* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ | 1 /* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ |
2 /* | 2 /* |
3 * Copyright (c) 2015 Danilo Abrignani | 3 * Copyright (c) 2015 Danilo Abrignani |
4 * | 4 * |
5 * This program is free software; you can redistribute it and/or modify | 5 * This program is free software; you can redistribute it and/or modify |
6 * it under the terms of the GNU General Public License version 2 as | 6 * it under the terms of the GNU General Public License version 2 as |
7 * published by the Free Software Foundation; | 7 * published by the Free Software Foundation; |
8 * | 8 * |
9 * This program is distributed in the hope that it will be useful, | 9 * This program is distributed in the hope that it will be useful, |
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
320 SimpleUeComponentCarrierManager::DoNotifyConnectionReconfigurationMsg () | 320 SimpleUeComponentCarrierManager::DoNotifyConnectionReconfigurationMsg () |
321 { | 321 { |
322 NS_LOG_FUNCTION (this); | 322 NS_LOG_FUNCTION (this); |
323 // this method need to be extended, now support only up to 2 ComponentCarrier
Simulations | 323 // this method need to be extended, now support only up to 2 ComponentCarrier
Simulations |
324 | 324 |
325 if (m_noOfComponentCarriersEnabled < m_noOfComponentCarriers) | 325 if (m_noOfComponentCarriersEnabled < m_noOfComponentCarriers) |
326 { | 326 { |
327 // new ComponentCarrierConfiguration Requested | 327 // new ComponentCarrierConfiguration Requested |
328 m_noOfComponentCarriersEnabled++; | 328 m_noOfComponentCarriersEnabled++; |
329 std::vector<uint8_t> res; | 329 std::vector<uint8_t> res; |
330 res.insert (res.end (), (uint8_t)m_noOfComponentCarriersEnabled); | 330 res.insert (res.end (), static_cast<uint8_t>(m_noOfComponentCarriersEnabled
)); |
331 //here the code to update all the Lc, since now those should be mapped on
all ComponentCarriers | 331 //here the code to update all the Lc, since now those should be mapped on
all ComponentCarriers |
332 m_ccmRrcSapUser->ComponentCarrierEnabling (res); | 332 m_ccmRrcSapUser->ComponentCarrierEnabling (res); |
333 } | 333 } |
334 ·· | 334 ·· |
335 } | 335 } |
336 LteMacSapUser* | 336 LteMacSapUser* |
337 SimpleUeComponentCarrierManager::DoConfigureSignalBearer (uint8_t lcid, LteUeCm
acSapProvider::LogicalChannelConfig lcConfig, LteMacSapUser* msu) | 337 SimpleUeComponentCarrierManager::DoConfigureSignalBearer (uint8_t lcid, LteUeCm
acSapProvider::LogicalChannelConfig lcConfig, LteMacSapUser* msu) |
338 { | 338 { |
339 NS_LOG_FUNCTION (this); | 339 NS_LOG_FUNCTION (this); |
340 NS_UNUSED(lcConfig); | 340 NS_UNUSED(lcConfig); |
341 std::map<uint8_t, LteMacSapUser*>::iterator it = m_lcAttached.find (lcid); | 341 std::map<uint8_t, LteMacSapUser*>::iterator it = m_lcAttached.find (lcid); |
342 //NS_ASSERT_MSG (it == m_lcAttached.end (), "Warning, LCID " << (uint8_t) lcid
<< " already exist"); | 342 //NS_ASSERT_MSG (it == m_lcAttached.end (), "Warning, LCID " << (uint8_t) lcid
<< " already exist"); |
343 if (it != m_lcAttached.end ()) | 343 if (it != m_lcAttached.end ()) |
344 { | 344 { |
345 // This line will remove the former SignalBearer. It is needed in case of
handover | 345 // This line will remove the former SignalBearer. It is needed in case of
handover |
346 // since an update of the signal bearer performed. | 346 // since an update of the signal bearer performed. |
347 // Now it points on the right LteMacSapUser | 347 // Now it points on the right LteMacSapUser |
348 m_lcAttached.erase (it);· | 348 m_lcAttached.erase (it);· |
349 } | 349 } |
350 m_lcAttached.insert (std::pair<uint8_t, LteMacSapUser*> (lcid, msu)); | 350 m_lcAttached.insert (std::pair<uint8_t, LteMacSapUser*> (lcid, msu)); |
351 | 351 |
352 return m_ccmMacSapUser; | 352 return m_ccmMacSapUser; |
353 }· | 353 }· |
354 | 354 |
355 } // end of namespace ns3 | 355 } // end of namespace ns3 |
LEFT | RIGHT |