Serialization of MeasConfig IE, tiny modification in ThresholdEutra SAP.

This commit is contained in:
lluis
2013-02-19 14:13:39 +01:00
parent 99861b69c9
commit cbbeb1f8af
3 changed files with 883 additions and 112 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -61,7 +61,10 @@ protected:
void SerializeMeasResults (LteRrcSap::MeasResults measResults) const;
void SerializePlmnIdentity (uint32_t plmnId) const;
void SerializeRachConfigCommon (LteRrcSap::RachConfigCommon rachConfigCommon) const;
void SerializeMeasConfig (LteRrcSap::MeasConfig measConfig) const;
void SerializeQoffsetRange (int8_t qOffsetRange) const;
void SerializeThresholdEutra (LteRrcSap::ThresholdEutra thresholdEutra) const;
// Deserialization functions
Buffer::Iterator DeserializeDrbToAddModList (std::list<LteRrcSap::DrbToAddMod> *drbToAddModLis, Buffer::Iterator bIterator);
Buffer::Iterator DeserializeSrbToAddModList (std::list<LteRrcSap::SrbToAddMod> *srbToAddModList, Buffer::Iterator bIterator);
@@ -75,6 +78,9 @@ protected:
Buffer::Iterator DeserializeMeasResults (LteRrcSap::MeasResults *measResults, Buffer::Iterator bIterator);
Buffer::Iterator DeserializePlmnIdentity (uint32_t *plmnId, Buffer::Iterator bIterator);
Buffer::Iterator DeserializeRachConfigCommon (LteRrcSap::RachConfigCommon * rachConfigCommon, Buffer::Iterator bIterator);
Buffer::Iterator DeserializeMeasConfig (LteRrcSap::MeasConfig * measConfig, Buffer::Iterator bIterator);
Buffer::Iterator DeserializeQoffsetRange (int8_t * qOffsetRange, Buffer::Iterator bIterator);
Buffer::Iterator DeserializeThresholdEutra (LteRrcSap::ThresholdEutra * thresholdEutra, Buffer::Iterator bIterator);
/**
* This function prints RadioResourceConfigDedicated IE, for debugging purposes.

View File

@@ -218,12 +218,13 @@ public:
struct ThresholdEutra
{
uint8_t thresholdRsrp;
uint8_t thresholdRsrq;
enum {thresholdRsrp, thresholdRsrq} choice;
uint8_t range;
};
struct ReportConfigEutra
{
enum {event,periodical} triggerType;
enum {eventA1,eventA2,eventA3,eventA4,eventA5} eventId;
ThresholdEutra threshold1; // used for A1, A2, A4, A5
ThresholdEutra threshold2; // used for A5