pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/39778?usp=email ) Change subject: csn1: Use enum to select enc/dec direction ...................................................................... csn1: Use enum to select enc/dec direction Change-Id: I845bcab61e354436bff1c3a0f2b6f49de9705716 --- M src/csn1.c M src/csn1.h M src/csn1_dec.c M src/csn1_enc.c M src/gsm_rlcmac.c 5 files changed, 12 insertions(+), 9 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/csn1.c b/src/csn1.c index a9b1343..7148e8c 100644 --- a/src/csn1.c +++ b/src/csn1.c @@ -73,7 +73,7 @@ { ar->remaining_bits_len = remaining_bits_len; ar->bit_offset = bit_offset; - ar->direction = 0; + ar->direction = CSN_DIRECTION_ENC; } static const struct value_string csn1_error_names[] = { diff --git a/src/csn1.h b/src/csn1.h index 47956c3..6607b02 100644 --- a/src/csn1.h +++ b/src/csn1.h @@ -51,7 +51,10 @@ #define CSNCBS_REVISION_LIMIT_STOP -20 /* Stop packing/unpacking - revision limit */ #define CSNCBS_NOT_SUPPORTED_IE -21 /* Handling of the unpacked IE is not supported by MS-software */ - +enum CSN_Direction { + CSN_DIRECTION_ENC = 0, + CSN_DIRECTION_DEC = 1, +}; #ifndef ElementsOf #define ElementsOf(array) (sizeof(array) / sizeof(array[0])) @@ -63,7 +66,7 @@ { gint remaining_bits_len; /* IN to an csn stream operation */ gint bit_offset; /* IN/OUT to an csn stream operation */ - gint direction; /* 0 - decode; 1 - encode */ + enum CSN_Direction direction; /* encode vs decode */ } csnStream_t; typedef gint16 (*StreamSerializeFcn_t)(csnStream_t* ar, struct bitvec *vector, unsigned *readIndex, void* data); diff --git a/src/csn1_dec.c b/src/csn1_dec.c index f0d07ac..c6ea12b 100644 --- a/src/csn1_dec.c +++ b/src/csn1_dec.c @@ -483,7 +483,7 @@ remaining_bits_len -= length_len; csnStreamInit(&arT, bit_offset, length > 0 ? length : remaining_bits_len); - arT.direction = 1; + arT.direction = CSN_DIRECTION_DEC; LOGPC(DCSN1, LOGL_DEBUG, "offset = %u | ", pDescr->offset); Status = serialize(&arT, vector, readIndex, pvDATA(data, pDescr->offset)); diff --git a/src/csn1_enc.c b/src/csn1_enc.c index e4e5e09..b6ed6c4 100644 --- a/src/csn1_enc.c +++ b/src/csn1_enc.c @@ -433,7 +433,7 @@ *writeIndex += length_len; bit_offset += length_len; remaining_bits_len -= length_len; - arT.direction = 0; + arT.direction = CSN_DIRECTION_ENC; csnStreamInit(&arT, bit_offset, remaining_bits_len); Status = serialize(&arT, vector, writeIndex, pvDATA(data, pDescr->offset)); diff --git a/src/gsm_rlcmac.c b/src/gsm_rlcmac.c index 79fda90..ecb1e44 100644 --- a/src/gsm_rlcmac.c +++ b/src/gsm_rlcmac.c @@ -178,7 +178,7 @@ /*< EGPRS Ack/Nack Description IE >*/ gint16 Egprs_Ack_Nack_Desc_w_len_Dissector(csnStream_t* ar, struct bitvec *vector, unsigned *readIndex, void* data) { - if (ar->direction == 0) + if (ar->direction == CSN_DIRECTION_ENC) { return csnStreamEncoder(ar, CSNDESCR(EGPRS_AckNack_Desc_t), vector, readIndex, data); } @@ -798,7 +798,7 @@ #if 0 gint16 Receive_N_PDU_Number_list_Dissector(csnStream_t* ar, struct bitvec *vector, unsigned *readIndex, void* data) { - if (ar->direction == 0) + if (ar->direction == CSN_DIRECTION_ENC) { return csnStreamEncoder(ar, CSNDESCR(Receive_N_PDU_Number_t), vector, readIndex, data); } @@ -937,7 +937,7 @@ gint16 Content_Dissector(csnStream_t* ar, struct bitvec *vector, unsigned *readIndex, void* data) { - if (ar->direction == 0) + if (ar->direction == CSN_DIRECTION_ENC) { return csnStreamEncoder(ar, CSNDESCR(Content_t), vector, readIndex, data); } @@ -961,7 +961,7 @@ static gint16 Additional_access_technologies_Dissector(csnStream_t* ar, struct bitvec *vector, unsigned *readIndex, void* data) { - if (ar->direction == 0) + if (ar->direction == CSN_DIRECTION_ENC) { return csnStreamEncoder(ar, CSNDESCR(Additional_access_technologies_t), vector, readIndex, data); } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/39778?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I845bcab61e354436bff1c3a0f2b6f49de9705716 Gerrit-Change-Number: 39778 Gerrit-PatchSet: 2 Gerrit-Owner: pespin &lt;pespin(a)sysmocom.de&gt; Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria &lt;vyanitskiy(a)sysmocom.de&gt; Gerrit-Reviewer: laforge &lt;laforge(a)osmocom.org&gt; Gerrit-Reviewer: pespin &lt;pespin(a)sysmocom.de&gt;