Index: src/lte/model/lte-ue-mac.cc |
=================================================================== |
--- a/src/lte/model/lte-ue-mac.cc |
+++ b/src/lte/model/lte-ue-mac.cc |
@@ -398,7 +398,7 @@ |
// 3GPP 36.321 5.1.1 |
NS_ASSERT_MSG (m_rachConfigured, "RACH not configured"); |
// assume that there is no Random Access Preambles group B |
- m_raPreambleId = m_raPreambleUniformVariable->GetInteger (0, m_rachConfig.numberOfRaPreambles - 1); |
+ m_raPreambleId = static_cast<uint8_t> (m_raPreambleUniformVariable->GetInteger (0, m_rachConfig.numberOfRaPreambles - 1)); |
bool contention = true; |
SendRaPreamble (contention); |
} |
@@ -415,7 +415,7 @@ |
// the RACH preamble is sent on 6RB bandwidth so the uplink |
// bandwidth does not need to be configured. |
NS_ASSERT (m_subframeNo > 0); // sanity check for subframe starting at 1 |
- m_raRnti = m_subframeNo - 1; |
+ m_raRnti = static_cast<uint8_t> (m_subframeNo - 1); |
m_uePhySapProvider->SendRachPreamble (m_raPreambleId, m_raRnti); |
NS_LOG_INFO (this << " sent preamble id " << (uint32_t) m_raPreambleId << ", RA-RNTI " << (uint32_t) m_raRnti); |
// 3GPP 36.321 5.1.4 |
@@ -527,6 +527,7 @@ |
{ |
NS_LOG_FUNCTION (this << " rnti" << rnti); |
NS_ASSERT_MSG (prachMask == 0, "requested PRACH MASK = " << (uint32_t) prachMask << ", but only PRACH MASK = 0 is supported"); |
+ (void)prachMask; // make compiler happy |
Biljana Bojović
2018/08/22 11:35:29
Again, I would change this to NS_ABORT_MSG_UNLESS
|
m_rnti = rnti; |
m_raPreambleId = preambleId; |
bool contention = false; |