--- a/src/lte/model/lte-common.cc Tue Jul 30 16:41:23 2013 +0300
+++ b/src/lte/model/lte-common.cc Wed Jul 31 13:50:46 2013 +0300
@@ -128,14 +128,14 @@
uint32_t BufferSizeLevelBsrTable[64] = {
-
+
0, 10, 12, 14, 17, 19, 22, 26, 31, 36, 42, 49, 57, 67, 78, 91,
107, 125, 146, 171, 200, 234, 274, 321, 376, 440, 515, 603,
706, 826, 967, 1132, 1326, 1552, 1817, 2127, 2490, 2915, 3413,
3995, 4677, 5476, 6411, 7505, 8787, 10287, 12043, 14099, 16507,
19325, 22624, 26487, 31009, 36304, 42502, 49759, 58255,
68201, 79846, 93749, 109439, 128125, 150000, 150000
-
+
};
uint32_t
@@ -161,7 +161,7 @@
index++;
}
}
-
+
return (index);
}
@@ -243,7 +243,7 @@
}
double
-EutranMeasurementMapping::GetActualHysteresis (uint8_t hysteresis)
+EutranMeasurementMapping::IeValue2ActualHysteresis (uint8_t hysteresis)
{
if (hysteresis > 30)
{
@@ -254,7 +254,7 @@
}
double
-EutranMeasurementMapping::GetActualA3Offset (int8_t a3Offset)
+EutranMeasurementMapping::IeValue2ActualA3Offset (int8_t a3Offset)
{
if ((a3Offset < -30) || (a3Offset > 30))
{
@@ -265,7 +265,7 @@
}
double
-EutranMeasurementMapping::GetActualQRxLevMin (int8_t qRxLevMin)
+EutranMeasurementMapping::IeValue2ActualQRxLevMin (int8_t qRxLevMin)
{
if ((qRxLevMin < -70) || (qRxLevMin > -22))
{
@@ -276,7 +276,7 @@
}
double
-EutranMeasurementMapping::GetActualQQualMin (int8_t qQualMin)
+EutranMeasurementMapping::IeValue2ActualQQualMin (int8_t qQualMin)
{
if ((qQualMin < -34) || (qQualMin > -3))
{
--- a/src/lte/model/lte-common.h Tue Jul 30 16:41:23 2013 +0300
+++ b/src/lte/model/lte-common.h Wed Jul 31 13:50:46 2013 +0300
@@ -76,12 +76,12 @@
* Srs Configuration index for UE specific SRS, see section 8.2 of TS 36.213
*/
uint16_t m_srsConfigurationIndex;
-
- public:
- LteUeConfig_t ();
-
- friend bool operator == (const LteUeConfig_t &a, const LteUeConfig_t &b);
- friend bool operator < (const LteUeConfig_t &a, const LteUeConfig_t &b);
+
+public:
+ LteUeConfig_t ();
+
+ friend bool operator == (const LteUeConfig_t &a, const LteUeConfig_t &b);
+ friend bool operator < (const LteUeConfig_t &a, const LteUeConfig_t &b);
};
@@ -95,24 +95,22 @@
//static const double MIN_FP_S11DOT3_VALUE = -4096;
-
};
class BufferSizeLevelBsr
{
-
- public:
- static uint32_t BsrId2BufferSize (uint8_t val);
- static uint8_t BufferSize2BsrId (uint32_t val);
-
- static int m_bufferSizeLevelBsr[64];
-
-
+
+public:
+ static uint32_t BsrId2BufferSize (uint8_t val);
+ static uint8_t BufferSize2BsrId (uint32_t val);
+
+ static int m_bufferSizeLevelBsr[64];
+
};
class TransmissionModesLayers
{
- public:
+public:
static uint8_t TxMode2LayerNum (uint8_t txMode);
};
@@ -216,25 +214,25 @@
/**
* \brief Returns the actual value of a hysteresis parameter.
- * \param IE value of hysteresis
- * \return hysteresis actual value in dB, which is IE value * 0.5 dB
+ * \param hysteresis IE value of hysteresis
+ * \return actual value in dB, which is IE value * 0.5 dB
*
* As per section 6.3.5 of 3GPP TS 36.331.
*
* \sa LteRrcSap::ReportConfigEutra
*/
- static double GetActualHysteresis (uint8_t hysteresis);
+ static double IeValue2ActualHysteresis (uint8_t hysteresis);
/**
* \brief Returns the actual value of an a3-Offset parameter.
- * \param IE value of a3-offset
- * \return a3-Offset actual value in dB, which is IE value * 0.5 dB
+ * \param a3-Offset IE value of a3-offset
+ * \return actual value in dB, which is IE value * 0.5 dB
*
* As per section 6.3.5 of 3GPP TS 36.331.
*
* \sa LteRrcSap::ReportConfigEutra
*/
- static double GetActualA3Offset (int8_t a3Offset);
+ static double IeValue2ActualA3Offset (int8_t a3Offset);
/**
* \brief Returns the actual value of an Q-RxLevMin parameter.
@@ -245,7 +243,7 @@
*
* \sa LteRrcSap::CellSelectionInfo
*/
- static double GetActualQRxLevMin (int8_t qRxLevMin);
+ static double IeValue2ActualQRxLevMin (int8_t qRxLevMin);
/**
* \brief Returns the actual value of an Q-QualMin parameter.
@@ -256,7 +254,7 @@
*
* \sa LteRrcSap::CellSelectionInfo
*/
- static double GetActualQQualMin (int8_t qQualMin);
+ static double IeValue2ActualQQualMin (int8_t qQualMin);
}; // end of class EutranMeasurementMapping
--- a/src/lte/model/lte-ue-rrc.cc Tue Jul 30 16:41:23 2013 +0300
+++ b/src/lte/model/lte-ue-rrc.cc Wed Jul 31 13:50:46 2013 +0300
@@ -382,7 +382,7 @@
rlc->SetRnti (m_rnti);
rlc->SetLcId (lcid);
- m_srb0 = CreateObject<LteSignalingRadioBearerInfo> ();
+ m_srb0 = CreateObject<LteSignalingRadioBearerInfo> ();
m_srb0->m_rlc = rlc;
m_srb0->m_srbIdentity = 0;
LteUeRrcSapUser::SetupParameters ueParams;
@@ -877,7 +877,7 @@
bool isAcceptableCell = false;
std::map<uint16_t, MeasValues>::iterator storedMeasIt = m_storedMeasValues.find (cellId);
double qRxLevMeas = storedMeasIt->second.rsrp;
- double qRxLevMin = EutranMeasurementMapping::GetActualQRxLevMin (m_lastSib1.cellSelectionInfo.qRxLevMin);
+ double qRxLevMin = EutranMeasurementMapping::IeValue2ActualQRxLevMin (m_lastSib1.cellSelectionInfo.qRxLevMin);
NS_LOG_LOGIC (this << " cell selection to cellId=" << cellId
<< " qrxlevmeas=" << qRxLevMeas << " dBm"
<< " qrxlevmin=" << qRxLevMin << " dBm");
@@ -1452,7 +1452,7 @@
double ms; // Ms, the measurement result of the serving cell
double thresh; // Thresh, the threshold parameter for this event
// Hys, the hysteresis parameter for this event.
- double hys = EutranMeasurementMapping::GetActualHysteresis (reportConfigEutra.hysteresis);
+ double hys = EutranMeasurementMapping::IeValue2ActualHysteresis (reportConfigEutra.hysteresis);
switch (reportConfigEutra.triggerQuantity)
{
@@ -1531,7 +1531,7 @@
double ms; // Ms, the measurement result of the serving cell
double thresh; // Thresh, the threshold parameter for this event
// Hys, the hysteresis parameter for this event.
- double hys = EutranMeasurementMapping::GetActualHysteresis (reportConfigEutra.hysteresis);
+ double hys = EutranMeasurementMapping::IeValue2ActualHysteresis (reportConfigEutra.hysteresis);
switch (reportConfigEutra.triggerQuantity)
{
@@ -1612,9 +1612,9 @@
double ofp = measObjectEutra.offsetFreq; // Ofp, the frequency specific offset of the primary frequency
double ocp = 0.0; // Ocp, the cell specific offset of the PCell
// Off, the offset parameter for this event.
- double off = EutranMeasurementMapping::GetActualA3Offset (reportConfigEutra.a3Offset);
+ double off = EutranMeasurementMapping::IeValue2ActualA3Offset (reportConfigEutra.a3Offset);
// Hys, the hysteresis parameter for this event.
- double hys = EutranMeasurementMapping::GetActualHysteresis (reportConfigEutra.hysteresis);
+ double hys = EutranMeasurementMapping::IeValue2ActualHysteresis (reportConfigEutra.hysteresis);
switch (reportConfigEutra.triggerQuantity)
{
@@ -1715,7 +1715,7 @@
double ocn = 0.0; // Ocn, the cell specific offset of the neighbour cell
double thresh; // Thresh, the threshold parameter for this event
// Hys, the hysteresis parameter for this event.
- double hys = EutranMeasurementMapping::GetActualHysteresis (reportConfigEutra.hysteresis);
+ double hys = EutranMeasurementMapping::IeValue2ActualHysteresis (reportConfigEutra.hysteresis);
switch (reportConfigEutra.triggerQuantity)
{
@@ -1819,7 +1819,7 @@
double thresh1; // Thresh1, the threshold parameter for this event
double thresh2; // Thresh2, the threshold parameter for this event
// Hys, the hysteresis parameter for this event.
- double hys = EutranMeasurementMapping::GetActualHysteresis (reportConfigEutra.hysteresis);
+ double hys = EutranMeasurementMapping::IeValue2ActualHysteresis (reportConfigEutra.hysteresis);
switch (reportConfigEutra.triggerQuantity)
{