From 29af8761f1994b62da3adddea25548ea66dc85d5 Mon Sep 17 00:00:00 2001
From: Lluis Parcerisa <parcerisa@gmail.com>
Date: Wed, 12 Dec 2012 17:24:54 +0100
Subject: [PATCH] Add default cases in serializating RlcConfig.choice and
 SoundingRsUlConfigCommon.type

---
 src/lte/model/lte-rrc-header.cc | 37 ++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/lte/model/lte-rrc-header.cc b/src/lte/model/lte-rrc-header.cc
index 8baa7bd7a..e366fe85b 100644
--- a/src/lte/model/lte-rrc-header.cc
+++ b/src/lte/model/lte-rrc-header.cc
@@ -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);