pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmo-gprs/+/32999 )
Change subject: rlcmac: P1,P2 Rest Octets: Add missing final padding to
definitions
......................................................................
rlcmac: P1,P2 Rest Octets: Add missing final padding to definitions
Change-Id: I26f1405bd99a7c1aba0782a25e22a69943493a69
---
M src/rlcmac/csn1_ts_44_018.c
M tests/rlcmac/csn1_ts_44_018_test.err
M tests/rlcmac/rlcmac_prim_test.err
3 files changed, 14 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/99/32999/1
diff --git a/src/rlcmac/csn1_ts_44_018.c b/src/rlcmac/csn1_ts_44_018.c
index 40275f4..3606346 100644
--- a/src/rlcmac/csn1_ts_44_018.c
+++ b/src/rlcmac/csn1_ts_44_018.c
@@ -113,6 +113,8 @@
M_UINT_LH (P1_Rest_Octets_t, Packet_Page_Indication_1, 1),
M_UINT_LH (P1_Rest_Octets_t, Packet_Page_Indication_2, 1),
+ /* TODO: Additions for Rel-6,7,8,10,11,12,13,14,15 */
+ M_PADDING_BITS (IA_RestOctets_t),
CSN_DESCR_END (P1_Rest_Octets_t)
static const
@@ -134,6 +136,8 @@
M_UINT (P2_Rest_Octets_t, Priority3, 3),
M_UINT_LH (P2_Rest_Octets_t, Packet_Page_Indication_3, 1),
+ /* TODO: Additions for Rel-6,10,11,13,14,15 */
+ M_PADDING_BITS (IA_RestOctets_t),
CSN_DESCR_END (P2_Rest_Octets_t)
static const
diff --git a/tests/rlcmac/csn1_ts_44_018_test.err
b/tests/rlcmac/csn1_ts_44_018_test.err
index 0f3d92b..20ec5a8 100644
--- a/tests/rlcmac/csn1_ts_44_018_test.err
+++ b/tests/rlcmac/csn1_ts_44_018_test.err
@@ -8,5 +8,4 @@
DLCSN1 INFO osmo_csn1_stream_decode (IA Rest Octets): u.hh = 3 | : u.hh |
u.UplinkDownlinkAssignment = 0 | : u.UplinkDownlinkAssignment |
ul_dl.Packet_Downlink_ImmAssignment = 1 | :
ul_dl.Packet_Downlink_ImmAssignment | TLLI = 0xd6e1ae5a | Exist_TFI_to_TA_VALID
= 1 | TFI_ASSIGNMENT = 3 | RLC_MODE = 0 | Exist_ALPHA = 0 | GAMMA = 15 |
POLLING = 0 | TA_VALID = 0 | Exist_TIMING_ADVANCE_INDEX = 0 |
Exist_TBF_STARTING_TIME = 0 | Exist_P0_PR_MODE = 1 | P0 = 0 | BTS_PWR_CTRL_MODE
= 0 | PR_MODE = 1 | Exist_AdditionsR99 = 0 | : End
ul_dl.Packet_Downlink_ImmAssignment | : End u.UplinkDownlinkAssignment |
Exist_AdditionsR10 = 0 | Exist_AdditionsR13 = 0 | : End u.hh | Padding =
0|86|86|-22|
DLCSN1 INFO osmo_csn1_stream_decode (IA Rest Octets): u.lh = 1 | : u.lh |
lh0x = 0 | : lh0x | u.EGPRS_PktUlAss = 0 | : u.EGPRS_PktUlAss | ExtendedRA =
12 | AccessTechnologyType = Exist | AccessTechnologyType = 0 |
AccessTechnologyType = Exist | AccessTechnologyType = 3 | AccessTechnologyType
= 0 | Access.OnePhaseAccess = 1 | : Access.OnePhaseAccess | TFI_ASSIGNMENT = 7
| POLLING = 0 | Allocation.DynamicAllocation = 0 | :
Allocation.DynamicAllocation | USF = 3 | USF_GRANULARITY = 0 | Exist_P0_PR_MODE
= 0 | : End Allocation.DynamicAllocation | EGPRS_CHANNEL_CODING_COMMAND = 2 |
TLLI_BLOCK_CHANNEL_CODING = 1 | Exist_BEP_PERIOD2 = 1 | BEP_PERIOD2 = 5 |
RESEGMENT = 1 | EGPRS_WindowSize = 4 | Exist_ALPHA = 0 | GAMMA = 13 |
Exist_TIMING_ADVANCE_INDEX = 1 | TIMING_ADVANCE_INDEX = 0 |
Exist_TBF_STARTING_TIME = 0 | : End Access.OnePhaseAccess | : End
u.EGPRS_PktUlAss | : End lh0x | : AdditionsR13 | Exist_AdditionsR13 = 0 | :
End AdditionsR13 | : End u.lh | Padding = 0|172|172|-22|
DLCSN1 INFO osmo_csn1_stream_decode (IA Rest Octets): u.lh = 1 | : u.lh |
lh0x = 0 | : lh0x | u.EGPRS_PktUlAss = 0 | : u.EGPRS_PktUlAss | ExtendedRA =
8 | AccessTechnologyType = Exist | AccessTechnologyType = 0 |
AccessTechnologyType = Exist | AccessTechnologyType = 3 | AccessTechnologyType
= 0 | Access.TwoPhaseAccess = 0 | : Access.TwoPhaseAccess | Exist_ALPHA = 0 |
GAMMA = 13 | : TBF_STARTING_TIME | N32 = 20 | N51 = 45 | N26 = 0 | : End
TBF_STARTING_TIME | NR_OF_RADIO_BLOCKS_ALLOCATED = 1 |
Exist_P0_BTS_PWR_CTRL_PR_MODE = 0 | : End Access.TwoPhaseAccess | : End
u.EGPRS_PktUlAss | : End lh0x | : AdditionsR13 | Exist_AdditionsR13 = 0 | :
End AdditionsR13 | : End u.lh | Padding = 0|86|86|86|86|-22|
-DLCSN1 INFO osmo_csn1_stream_decode (P1 Rest Octets):
Exist_NLN_PCH_and_NLN_status = 0 | Exist_Priority1 = 0 | Exist_Priority2 = 0 |
Exist_Group_Call_information = 0 | Packet_Page_Indication_1 = 1 |
Packet_Page_Indication_2 = 1 |
-DLGLOBAL NOTICE P1 Rest Octets: 74 remaining bits unhandled by decoder
+DLCSN1 INFO osmo_csn1_stream_decode (P1 Rest Octets):
Exist_NLN_PCH_and_NLN_status = 0 | Exist_Priority1 = 0 | Exist_Priority2 = 0 |
Exist_Group_Call_information = 0 | Packet_Page_Indication_1 = 1 |
Packet_Page_Indication_2 = 1 | Padding = 0|172|172|172|172|172|172|172|172|-22|
diff --git a/tests/rlcmac/rlcmac_prim_test.err
b/tests/rlcmac/rlcmac_prim_test.err
index 12e64d4..a02739a 100644
--- a/tests/rlcmac/rlcmac_prim_test.err
+++ b/tests/rlcmac/rlcmac_prim_test.err
@@ -801,5 +801,4 @@
DLGLOBAL INFO DL_TBF_ASS{IDLE}: Allocated
DLGLOBAL DEBUG Rx from lower layers: L1CTL-CCCH_DATA.indication
DLGLOBAL INFO Rx Paging Request Type 1
-DLGLOBAL NOTICE P1 Rest Octets: 74 remaining bits unhandled by decoder
DLGLOBAL INFO DL_TBF_ASS{IDLE}: Deallocated
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32999
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: I26f1405bd99a7c1aba0782a25e22a69943493a69
Gerrit-Change-Number: 32999
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <[email protected]>
Gerrit-MessageType: newchange
