F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add default cases in serializating RlcConfig.choice and SoundingRsUlConfigCommon.type

Browse Source
This commit is contained in:
Lluis Parcerisa
2012-12-12 17:24:54 +01:00
parent b0e4d03781
commit 29af8761f1
1 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/lte/model/lte-rrc-header.cc
View File

@@ -74,23 +74,6 @@ RrcAsn1Header::SerializeDrbToAddModList (std::list<LteRrcSap::DrbToAddMod> drbTo
switch (it->rlcConfig.choice)
{
case LteRrcSap::RlcConfig::AM:
// Serialize rlc-Config choice
SerializeChoice (4,0);
// Serialize UL-AM-RLC
SerializeSequence<0> (std::bitset<0> (),false);
SerializeEnum (64,0); // t-PollRetransmit
SerializeEnum (8,0); // pollPDU
SerializeEnum (16,0); // pollByte
SerializeEnum (8,0); // maxRetxThreshold
// Serialize DL-AM-RLC
SerializeSequence<0> (std::bitset<0> (),false);
SerializeEnum (32,0); // t-Reordering
SerializeEnum (64,0); // t-StatusProhibit
break;
case LteRrcSap::RlcConfig::UM_BI_DIRECTIONAL:
// Serialize rlc-Config choice
SerializeChoice (4,1);
@@ -123,6 +106,24 @@ RrcAsn1Header::SerializeDrbToAddModList (std::list<LteRrcSap::DrbToAddMod> drbTo
SerializeEnum (2,0); // sn-FieldLength
SerializeEnum (32,0); // t-Reordering
break;
case LteRrcSap::RlcConfig::AM:
default:
// Serialize rlc-Config choice
SerializeChoice (4,0);
// Serialize UL-AM-RLC
SerializeSequence<0> (std::bitset<0> (),false);
SerializeEnum (64,0); // t-PollRetransmit
SerializeEnum (8,0); // pollPDU
SerializeEnum (16,0); // pollByte
SerializeEnum (8,0); // maxRetxThreshold
// Serialize DL-AM-RLC
SerializeSequence<0> (std::bitset<0> (),false);
SerializeEnum (32,0); // t-Reordering
SerializeEnum (64,0); // t-StatusProhibit
break;
}
// Serialize logicalChannelIdentity ::=INTEGER (3..10)
@@ -263,7 +264,9 @@ RrcAsn1Header::SerializePhysicalConfigDedicated (LteRrcSap::PhysicalConfigDedica
SerializeChoice (2,0);
SerializeNull ();
break;
case LteRrcSap::SoundingRsUlConfigDedicated::SETUP:
default:
// 2 options, selected: 1 (setup)
SerializeChoice (2,1);