Change sequence number type
authorManuel Requena <manuel.requena@cttc.es>
Tue, 31 Jan 2012 11:12:37 +0100
changeset 8616 aa7407ece96e
parent 8615 d942059f6651
child 8617 fd58bf72304c
Change sequence number type
src/lte/model/lte-rlc-am-header.cc
--- a/src/lte/model/lte-rlc-am-header.cc	Tue Jan 31 11:11:37 2012 +0100
+++ b/src/lte/model/lte-rlc-am-header.cc	Tue Jan 31 11:12:37 2012 +0100
@@ -89,9 +89,9 @@
 }
 
 void
-LteRlcAmHeader::SetSequenceNumber (uint16_t sequenceNumber)
+LteRlcAmHeader::SetSequenceNumber (SequenceNumber10 sequenceNumber)
 {
-  m_sequenceNumber = sequenceNumber & 0x03FF;
+  m_sequenceNumber = sequenceNumber;
 }
 
 uint8_t
@@ -100,7 +100,7 @@
   return m_framingInfo;
 }
 
-uint16_t
+SequenceNumber10
 LteRlcAmHeader::GetSequenceNumber () const
 {
   return m_sequenceNumber;
@@ -209,12 +209,12 @@
 
 
 void
-LteRlcAmHeader::SetAckSn (uint16_t ackSn)
+LteRlcAmHeader::SetAckSn (SequenceNumber10 ackSn)
 {
-  m_ackSn = ackSn & 0x03FF;
+  m_ackSn = ackSn;
 }
 
-uint16_t
+SequenceNumber10
 LteRlcAmHeader::GetAckSn (void) const
 {
   return m_ackSn;
@@ -303,8 +303,8 @@
                   ((m_pollingBit << 5) & 0x20) |
                   ((m_framingInfo << 3) & 0x18) |
                   (((*it1) << 2) & 0x04) |
-                  ((m_sequenceNumber >> 8) & 0x0003) );
-      i.WriteU8 ( m_sequenceNumber & 0x00FF );
+                  ((m_sequenceNumber.GetValue () >> 8) & 0x0003) );
+      i.WriteU8 ( m_sequenceNumber.GetValue () & 0x00FF );
       i.WriteU8 ( ((m_lastSegmentFlag << 7) & 0x80) |
                   ((m_segmentOffset >> 8) & 0x007F) );
       i.WriteU8 ( m_segmentOffset & 0x00FF );
@@ -346,8 +346,8 @@
     {
       i.WriteU8 ( ((CONTROL_PDU << 7) & 0x80) |
                   ((m_controlPduType << 4) & 0x70) |
-                  ((m_ackSn >> 6) & 0x0F) );
-      i.WriteU8 ( ((m_ackSn << 2) & 0xC0) );
+                  ((m_ackSn.GetValue () >> 6) & 0x0F) );
+      i.WriteU8 ( ((m_ackSn.GetValue () << 2) & 0xC0) );
     }
 }
 
@@ -378,7 +378,7 @@
 
       m_lastSegmentFlag    = (byte_3 & 0x80) >> 7;
       m_segmentOffset      = (byte_3 & 0x7F) | byte_4;
-           
+
       extensionBit = (byte_1 & 0x04) >> 2;
       m_extensionBits.push_back (extensionBit);