From df69809b82c28d1d75d98b4fc8bfecd25b046768 Mon Sep 17 00:00:00 2001
From: Tom Tsou <tom.tsou@ettus.com>
Date: Mon, 11 Jul 2016 17:05:19 -0700
Subject: egprs: Use RLC/MAC headers from libosmocore

EGPRS Type 1, 2, and 3 headers are used by OsmoPCU and OsmoBTS.
Move the header definitions to libosmocore to be shared by both
packages.

Modify the struct variable naming to use *_hi/*_lo instead of
*_a/*_b in order to be consistent with existing naming used in
libosmocore.

Change-Id: I98687ad981d27502aec42729611937ba1caf207c
---
 src/rlc.h | 99 ---------------------------------------------------------------
 1 file changed, 99 deletions(-)

(limited to 'src/rlc.h')

diff --git a/src/rlc.h b/src/rlc.h
index 082db898..057e838b 100644
--- a/src/rlc.h
+++ b/src/rlc.h
@@ -324,105 +324,6 @@ struct rlc_li_field_egprs {
 	uint8_t	e:1,
 		 li:7;
 } __attribute__ ((packed));
-
-/* TS 44.060  10.3a.4.1.1 */
-struct gprs_rlc_ul_header_egprs_1 {
-	uint8_t r:1,
-		si:1,
-		cv:4,
-		tfi_a:2;
-	uint8_t tfi_b:3,
-		bsn1_a:5;
-	uint8_t bsn1_b:6,
-		bsn2_a:2;
-	uint8_t bsn2_b;
-	uint8_t cps:5,
-		rsb:1,
-		pi:1,
-		spare_a:1;
-	uint8_t spare_b:6,
-		dummy:2;
-} __attribute__ ((packed));
-
-/* TS 44.060  10.3a.4.2.1 */
-struct gprs_rlc_ul_header_egprs_2 {
-	uint8_t r:1,
-		si:1,
-		cv:4,
-		tfi_a:2;
-	uint8_t tfi_b:3,
-		bsn1_a:5;
-	uint8_t bsn1_b:6,
-		cps_a:2;
-	uint8_t cps_b:1,
-		rsb:1,
-		pi:1,
-		spare_a:5;
-	uint8_t spare_b:5,
-		dummy:3;
-} __attribute__ ((packed));
-
-/* TS 44.060  10.3a.4.3.1 */
-struct gprs_rlc_ul_header_egprs_3 {
-	uint8_t r:1,
-		si:1,
-		cv:4,
-		tfi_a:2;
-	uint8_t tfi_b:3,
-		bsn1_a:5;
-	uint8_t bsn1_b:6,
-		cps_a:2;
-	uint8_t cps_b:2,
-		spb:2,
-		rsb:1,
-		pi:1,
-		spare:1,
-		dummy:1;
-} __attribute__ ((packed));
-
-struct gprs_rlc_dl_header_egprs_1 {
-	uint8_t usf:3,
-		es_p:2,
-		rrbp:2,
-		tfi_a:1;
-	uint8_t tfi_b:4,
-		pr:2,
-		bsn1_a:2;
-	uint8_t bsn1_b:8;
-	uint8_t bsn1_c:1,
-		bsn2_a:7;
-	uint8_t bsn2_b:3,
-		cps:5;
-} __attribute__ ((packed));
-
-struct gprs_rlc_dl_header_egprs_2 {
-	uint8_t usf:3,
-		es_p:2,
-		rrbp:2,
-		tfi_a:1;
-	uint8_t tfi_b:4,
-		pr:2,
-		bsn1_a:2;
-	uint8_t bsn1_b:8;
-	uint8_t bsn1_c:1,
-		cps:3,
-		dummy:4;
-} __attribute__ ((packed));
-
-struct gprs_rlc_dl_header_egprs_3 {
-	uint8_t usf:3,
-		es_p:2,
-		rrbp:2,
-		tfi_a:1;
-	uint8_t tfi_b:4,
-		pr:2,
-		bsn1_a:2;
-	uint8_t bsn1_b:8;
-	uint8_t bsn1_c:1,
-		cps:4,
-		spb:2,
-		dummy:1;
-} __attribute__ ((packed));
 #else
 #  error "Only little endian headers are supported yet. TODO: add missing structs"
 #endif
-- 
cgit v1.2.3