laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/39835?usp=email )

Change subject: cosmetic: Improve spec references of fields/structs related to SI3ro and SI4ro ......................................................................

cosmetic: Improve spec references of fields/structs related to SI3ro and SI4ro

Change-Id: I48ac83c5032f47fd9e39a00025b102fb83ced0ae --- M include/osmocom/gsm/gsm48_rest_octets.h M src/gsm/gsm48_rest_octets.c 2 files changed, 18 insertions(+), 14 deletions(-)

Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved

diff --git a/include/osmocom/gsm/gsm48_rest_octets.h b/include/osmocom/gsm/gsm48_rest_octets.h index cdb2e80..d8e52be 100644 --- a/include/osmocom/gsm/gsm48_rest_octets.h +++ b/include/osmocom/gsm/gsm48_rest_octets.h @@ -60,30 +60,34 @@

int osmo_gsm48_rest_octets_si6_encode(uint8_t *data, const struct osmo_gsm48_si6_ro_info *in);

+/* 3GPP TS 44.018 Table 10.5.2.34.1 (Optional) "Selection Parameters" */ struct osmo_gsm48_si_selection_params { - uint16_t penalty_time:5, - temp_offs:3, - cell_resel_off:6, - cbq:1, + uint16_t penalty_time:5, /* PENALTY_TIME */ + temp_offs:3, /* TEMPORARY_OFFSET */ + cell_resel_off:6, /* CELL_RESELECT_OFFSET */ + cbq:1, /* CELL_BAR_QUALIFY (CBQ) */ present:1; };

+/* 3GPP TS 44.018 Table 10.5.2.34.1 "Optional Power offset" */ struct osmo_gsm48_si_power_offset { - uint8_t power_offset:2, + uint8_t power_offset:2, /* POWER OFFSET */ present:1; };

+/* 3GPP TS 44.018 Table 10.5.2.34.1 "GPRS Indicator" */ struct osmo_gsm48_si3_gprs_ind { - uint8_t si13_position:1, - ra_colour:3, + uint8_t si13_position:1, /* SI13 POSITION */ + ra_colour:3, /* RA COLOUR */ present:1; };

+/* 3GPP TS 44.018 Table 10.5.2.35.1 "LSA Parameters" */ struct osmo_gsm48_lsa_params { - uint32_t prio_thr:3, - lsa_offset:3, - mcc:12, - mnc:12; + uint32_t prio_thr:3, /* PRIO_THR */ + lsa_offset:3, /* LSA_OFFSET */ + mcc:12, /* MCC */ + mnc:12; /* MNC */ unsigned int present; };

diff --git a/src/gsm/gsm48_rest_octets.c b/src/gsm/gsm48_rest_octets.c index 57c2c99..02469a7 100644 --- a/src/gsm/gsm48_rest_octets.c +++ b/src/gsm/gsm48_rest_octets.c @@ -605,7 +605,7 @@ return bv.data_len; }

-/* Append selection parameters to bitvec */ +/* 3GPP TS 44.018 Table 10.5.2.34.1 (Optional) "Selection Parameters", append to bitvec */ static void append_selection_params(struct bitvec *bv, const struct osmo_gsm48_si_selection_params *sp) { @@ -620,7 +620,7 @@ } }

-/* Append power offset to bitvec */ +/* 3GPP TS 44.018 Table 10.5.2.34.1 "Optional Power offset", append to bitvec */ static void append_power_offset(struct bitvec *bv, const struct osmo_gsm48_si_power_offset *po) { @@ -632,7 +632,7 @@ } }

-/* Append GPRS indicator to bitvec */ +/* 3GPP TS 44.018 Table 10.5.2.34.1 "GPRS Indicator", append bitvec */ static void append_gprs_ind(struct bitvec *bv, const struct osmo_gsm48_si3_gprs_ind *gi) {