pespin has uploaded this change for review.

View Change

encoding: Use defines to set PAYLOAD_TYPE

Change-Id: I3d663cb91672fb383aeb72b223490fa615bdcdf0
---
M src/encoding.cpp
M src/gsm_rlcmac.c
M src/gsm_rlcmac.h
3 files changed, 10 insertions(+), 10 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/77/39777/1

diff --git a/src/encoding.cpp b/src/encoding.cpp
index 75b9a30..b10b9a3 100644
--- a/src/encoding.cpp
+++ b/src/encoding.cpp
@@ -602,7 +602,7 @@
 	Dynamic_Allocation_t *da;
 
 	/* RLC/MAC control block without the optional RLC/MAC control header */
-	block->PAYLOAD_TYPE = 0x01;  // Payload Type
+	block->PAYLOAD_TYPE = PAYLOAD_TYPE_CTRL_NO_OPT_OCTET;  // Payload Type
 	block->RRBP         = rrbp;  // RRBP (e.g. N+13)
 	block->SP           = poll;  // RRBP field is valid
 	block->USF          = 0x00;  // Uplink state flag
@@ -720,7 +720,7 @@
 
 	uint8_t tn;
 
-	block->PAYLOAD_TYPE = 0x1;  // RLC/MAC control block that does not include the optional octets of the RLC/MAC control header
+	block->PAYLOAD_TYPE = PAYLOAD_TYPE_CTRL_NO_OPT_OCTET;  // RLC/MAC control block that does not include the optional octets of the RLC/MAC control header
 	block->RRBP         = rrbp;  // 0: N+13
 	block->SP           = poll; // RRBP field is valid
 	block->USF          = 0x0;  // Uplink state flag
@@ -1759,7 +1759,7 @@
 		uint8_t container_idx, PNCDContainer_t *container)
 {
 
-	block->PAYLOAD_TYPE = 0x1;  // RLC/MAC control block that does not include the optional octets of the RLC/MAC control header
+	block->PAYLOAD_TYPE = PAYLOAD_TYPE_CTRL_NO_OPT_OCTET;  // RLC/MAC control block that does not include the optional octets of the RLC/MAC control header
 	block->RRBP         = 0;  // 0: N+13
 	block->SP           = 0; // RRBP field is not valid
 	block->USF          = 0x0;  // Uplink state flag
@@ -1784,7 +1784,7 @@
 				       uint16_t arfcn, uint8_t bsic, uint8_t container_id)
 {
 
-	block->PAYLOAD_TYPE = 0x1;  // RLC/MAC control block that does not include the optional octets of the RLC/MAC control header
+	block->PAYLOAD_TYPE = PAYLOAD_TYPE_CTRL_NO_OPT_OCTET;  // RLC/MAC control block that does not include the optional octets of the RLC/MAC control header
 	block->RRBP         = rrbp;  // RRBP (e.g. N+13)
 	block->SP           = poll;  // RRBP field is valid?
 	block->USF          = 0x0;  // Uplink state flag
diff --git a/src/gsm_rlcmac.c b/src/gsm_rlcmac.c
index 931c85c..79fda90 100644
--- a/src/gsm_rlcmac.c
+++ b/src/gsm_rlcmac.c
@@ -36,12 +36,6 @@
 #include <arpa/inet.h>
 #include <gprs_debug.h>
 
-/* Payload type as defined in TS 44.060 / 10.4.7 */
-#define PAYLOAD_TYPE_DATA              0
-#define PAYLOAD_TYPE_CTRL_NO_OPT_OCTET 1
-#define PAYLOAD_TYPE_CTRL_OPT_OCTET    2
-#define PAYLOAD_TYPE_RESERVED          3
-
 /* CSN1 structures */
 /*(not all parts of CSN_DESCR structure are always initialized.)*/
 static const
diff --git a/src/gsm_rlcmac.h b/src/gsm_rlcmac.h
index c43d418..d34024a 100644
--- a/src/gsm_rlcmac.h
+++ b/src/gsm_rlcmac.h
@@ -48,6 +48,12 @@
 typedef guint8 N51_t;
 typedef guint8 N26_t;
 
+/* Payload type as defined in TS 44.060 / 10.4.7 */
+#define PAYLOAD_TYPE_DATA              0
+#define PAYLOAD_TYPE_CTRL_NO_OPT_OCTET 1
+#define PAYLOAD_TYPE_CTRL_OPT_OCTET    2
+#define PAYLOAD_TYPE_RESERVED          3
+
 /*  Starting Time IE as specified in 04.08 */
 typedef struct
 {

To view, visit change 39777. To unsubscribe, or for help writing mail filters, visit settings.