diff options
author | Tom Tsou <tom.tsou@ettus.com> | 2016-07-11 17:05:19 -0700 |
---|---|---|
committer | Holger Freyther <holger@freyther.de> | 2016-07-14 06:56:19 +0000 |
commit | df69809b82c28d1d75d98b4fc8bfecd25b046768 (patch) | |
tree | 0fada55c044594f37fe535453793d719f1a1ab18 /tests | |
parent | 5d94b5455f50f9e1d35a706ad5956332922f06d5 (diff) |
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
Diffstat (limited to 'tests')
-rw-r--r-- | tests/edge/EdgeTest.cpp | 73 |
1 files changed, 37 insertions, 36 deletions
diff --git a/tests/edge/EdgeTest.cpp b/tests/edge/EdgeTest.cpp index 8b5746aa..807102c9 100644 --- a/tests/edge/EdgeTest.cpp +++ b/tests/edge/EdgeTest.cpp @@ -35,6 +35,7 @@ extern "C" { #include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> #include <osmocom/vty/vty.h> +#include <osmocom/gprs/protocol/gsm_04_60.h> } #include <errno.h> @@ -1196,12 +1197,12 @@ static void uplink_header_type_2_parsing_test(BTS *the_bts, egprs2->r = 1; egprs2->si = 1; egprs2->cv = 7; - egprs2->tfi_a = tfi & 0x03; - egprs2->tfi_b = (tfi & 0x1c) >> 2; - egprs2->bsn1_a = 0; - egprs2->bsn1_b = 0; - egprs2->cps_a = 3; - egprs2->cps_b = 0; + egprs2->tfi_hi = tfi & 0x03; + egprs2->tfi_lo = (tfi & 0x1c) >> 2; + egprs2->bsn1_hi = 0; + egprs2->bsn1_lo = 0; + egprs2->cps_hi = 3; + egprs2->cps_lo = 0; egprs2->rsb = 0; egprs2->pi = 0; data[4] = 0x20; /* Setting E field */ @@ -1220,12 +1221,12 @@ static void uplink_header_type_2_parsing_test(BTS *the_bts, egprs2->r = 1; egprs2->si = 1; egprs2->cv = 7; - egprs2->tfi_a = tfi & 0x03; - egprs2->tfi_b = (tfi & 0x1c) >> 2; - egprs2->bsn1_a = 0; - egprs2->bsn1_b = 0; - egprs2->cps_a = 3; - egprs2->cps_b = 0; + egprs2->tfi_hi = tfi & 0x03; + egprs2->tfi_lo = (tfi & 0x1c) >> 2; + egprs2->bsn1_hi = 0; + egprs2->bsn1_lo = 0; + egprs2->cps_hi = 3; + egprs2->cps_lo = 0; egprs2->rsb = 0; egprs2->pi = 0; data[10] = 0x20; /* Setting E field */ @@ -1241,12 +1242,12 @@ static void uplink_header_type_2_parsing_test(BTS *the_bts, egprs2->r = 1; egprs2->si = 1; egprs2->cv = 7; - egprs2->tfi_a = tfi & 0x03; - egprs2->tfi_b = (tfi & 0x1c) >> 2; - egprs2->bsn1_a = 1; - egprs2->bsn1_b = 0; - egprs2->cps_a = 2; - egprs2->cps_b = 0; + egprs2->tfi_hi = tfi & 0x03; + egprs2->tfi_lo = (tfi & 0x1c) >> 2; + egprs2->bsn1_hi = 1; + egprs2->bsn1_lo = 0; + egprs2->cps_hi = 2; + egprs2->cps_lo = 0; egprs2->rsb = 0; egprs2->pi = 0; data[10] = 0x20; /* Setting E field */ @@ -1305,12 +1306,12 @@ static void uplink_header_type_1_parsing_test(BTS *the_bts, egprs1->si = 1; egprs1->r = 1; egprs1->cv = 7; - egprs1->tfi_a = tfi & 0x03; - egprs1->tfi_b = (tfi & 0x1c) >> 2; - egprs1->bsn1_a = 0; - egprs1->bsn1_b = 0; - egprs1->bsn2_a = 1; - egprs1->bsn2_b = 0; + egprs1->tfi_hi = tfi & 0x03; + egprs1->tfi_lo = (tfi & 0x1c) >> 2; + egprs1->bsn1_hi = 0; + egprs1->bsn1_lo = 0; + egprs1->bsn2_hi = 1; + egprs1->bsn2_lo = 0; egprs1->cps = 15; egprs1->rsb = 0; egprs1->pi = 0; @@ -1332,12 +1333,12 @@ static void uplink_header_type_1_parsing_test(BTS *the_bts, egprs1->si = 1; egprs1->r = 1; egprs1->cv = 7; - egprs1->tfi_a = tfi & 0x03; - egprs1->tfi_b = (tfi & 0x1c) >> 2; - egprs1->bsn1_a = 0; - egprs1->bsn1_b = 0; - egprs1->bsn2_a = 1; - egprs1->bsn2_b = 0; + egprs1->tfi_hi = tfi & 0x03; + egprs1->tfi_lo = (tfi & 0x1c) >> 2; + egprs1->bsn1_hi = 0; + egprs1->bsn1_lo = 0; + egprs1->bsn2_hi = 1; + egprs1->bsn2_lo = 0; egprs1->cps = 15; egprs1->rsb = 0; egprs1->pi = 0; @@ -1359,12 +1360,12 @@ static void uplink_header_type_1_parsing_test(BTS *the_bts, egprs1->si = 1; egprs1->r = 1; egprs1->cv = 7; - egprs1->tfi_a = tfi & 0x03; - egprs1->tfi_b = (tfi & 0x1c) >> 2; - egprs1->bsn1_a = 0; - egprs1->bsn1_b = 0; - egprs1->bsn2_a = 1; - egprs1->bsn2_b = 0; + egprs1->tfi_hi = tfi & 0x03; + egprs1->tfi_lo = (tfi & 0x1c) >> 2; + egprs1->bsn1_hi = 0; + egprs1->bsn1_lo = 0; + egprs1->bsn2_hi = 1; + egprs1->bsn2_lo = 0; egprs1->cps = 15; egprs1->rsb = 0; egprs1->pi = 0; |