fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/30804 ) Change subject: rlcmac: rename s/SI_13_t/SI13_RestOctets_t/ ...................................................................... rlcmac: rename s/SI_13_t/SI13_RestOctets_t/ Change-Id: I74ed534b9b52b70cdf8e4e2d4d960bb1d9aaf27b --- M include/osmocom/gprs/rlcmac/gprs_rlcmac.h M src/rlcmac/ts_44_018.c M tests/rlcmac/ts_44_018_test.c 3 files changed, 20 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/04/30804/1 diff --git a/include/osmocom/gprs/rlcmac/gprs_rlcmac.h b/include/osmocom/gprs/rlcmac/gprs_rlcmac.h index b325f3e..2be01b2 100644 --- a/include/osmocom/gprs/rlcmac/gprs_rlcmac.h +++ b/include/osmocom/gprs/rlcmac/gprs_rlcmac.h @@ -3229,8 +3229,8 @@ PSI13_AdditionR99 AdditionsR99; } PSI13_t; -/* SI_13_t is combined in the PSI13 structure */ -typedef PSI13_t SI_13_t; +/* SI13_RestOctets_t is combined in the PSI13 structure */ +typedef PSI13_t SI13_RestOctets_t; /* < Packet PRACH Parameters message content > */ typedef struct @@ -5429,7 +5429,7 @@ int osmo_gprs_rlcmac_encode_ms_ra_cap(struct bitvec *vector, MS_Radio_Access_capability_t * data); int osmo_gprs_rlcmac_decode_egprs_pkt_ch_req(guint16 ra, EGPRS_PacketChannelRequest_t *data); -int osmo_gprs_rlcmac_decode_si13ro(SI_13_t *storage, +int osmo_gprs_rlcmac_decode_si13ro(SI13_RestOctets_t *storage, const uint8_t *data, size_t data_len); int osmo_gprs_rlcmac_decode_imm_ass_ro(IA_RestOctets_t *storage, const uint8_t *data, size_t data_len); diff --git a/src/rlcmac/ts_44_018.c b/src/rlcmac/ts_44_018.c index 68be92e..48ab5ea 100644 --- a/src/rlcmac/ts_44_018.c +++ b/src/rlcmac/ts_44_018.c @@ -439,24 +439,24 @@ CSN_DESCR_END (SI13_AdditionR99) static const -CSN_DESCR_BEGIN (SI_13_t) - M_THIS_EXIST_LH (SI_13_t), +CSN_DESCR_BEGIN (SI13_RestOctets_t) + M_THIS_EXIST_LH (SI13_RestOctets_t), - M_UINT (SI_13_t, BCCH_CHANGE_MARK, 3), - M_UINT (SI_13_t, SI_CHANGE_FIELD, 4), + M_UINT (SI13_RestOctets_t, BCCH_CHANGE_MARK, 3), + M_UINT (SI13_RestOctets_t, SI_CHANGE_FIELD, 4), - M_NEXT_EXIST (SI_13_t, Exist_MA, 2), - M_UINT (SI_13_t, SI13_CHANGE_MARK, 2), - M_TYPE (SI_13_t, GPRS_Mobile_Allocation, GPRS_Mobile_Allocation_t), + M_NEXT_EXIST (SI13_RestOctets_t, Exist_MA, 2), + M_UINT (SI13_RestOctets_t, SI13_CHANGE_MARK, 2), + M_TYPE (SI13_RestOctets_t, GPRS_Mobile_Allocation, GPRS_Mobile_Allocation_t), - M_UNION (SI_13_t, 2), - M_TYPE (SI_13_t, u.PBCCH_Not_present, PBCCH_Not_present_t), - M_TYPE (SI_13_t, u.PBCCH_present, PBCCH_present_t), + M_UNION (SI13_RestOctets_t, 2), + M_TYPE (SI13_RestOctets_t, u.PBCCH_Not_present, PBCCH_Not_present_t), + M_TYPE (SI13_RestOctets_t, u.PBCCH_present, PBCCH_present_t), - M_NEXT_EXIST_OR_NULL_LH(SI_13_t, Exist_AdditionsR99, 1), - M_TYPE (SI_13_t, AdditionsR99, SI13_AdditionR99), - M_PADDING_BITS (SI_13_t), -CSN_DESCR_END (SI_13_t) + M_NEXT_EXIST_OR_NULL_LH(SI13_RestOctets_t, Exist_AdditionsR99, 1), + M_TYPE (SI13_RestOctets_t, AdditionsR99, SI13_AdditionR99), + M_PADDING_BITS (SI13_RestOctets_t), +CSN_DESCR_END (SI13_RestOctets_t) /* Enhanced Measurement Report */ #if 0 @@ -657,11 +657,11 @@ return ret; } -int osmo_gprs_rlcmac_decode_si13ro(SI_13_t *storage, +int osmo_gprs_rlcmac_decode_si13ro(SI13_RestOctets_t *storage, const uint8_t *data, size_t data_len) { return _osmo_gprs_rlcmac_decode(storage, - CSNDESCR(SI_13_t), + CSNDESCR(SI13_RestOctets_t), "SI13 Rest Octets", data, data_len); } diff --git a/tests/rlcmac/ts_44_018_test.c b/tests/rlcmac/ts_44_018_test.c index 05d5aab..cff153e 100644 --- a/tests/rlcmac/ts_44_018_test.c +++ b/tests/rlcmac/ts_44_018_test.c @@ -41,7 +41,7 @@ for (unsigned int i = 0; i < ARRAY_SIZE(testData); i++) { uint8_t buf[20]; /* GSM_MACBLOCK_LEN - 3 */ - SI_13_t si13ro = { 0 }; + SI13_RestOctets_t si13ro = { 0 }; int rc; printf("testData[%d] = %s\n", i, testData[i]); -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/30804 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I74ed534b9b52b70cdf8e4e2d4d960bb1d9aaf27b Gerrit-Change-Number: 30804 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria &lt;vyanitskiy(a)sysmocom.de&gt; Gerrit-MessageType: newchange