<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/26670">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">include/: Adapt some headers to match contrib/struct_endianess.py format<br><br>This way the related files are not changed when running the script to<br>generate struct fields for big endian systems.<br><br>Change-Id: I830e0961331a73f8dceb1a5a1c879798541752fd<br>---<br>M include/osmocom/gprs/protocol/gsm_08_18.h<br>M include/osmocom/gsm/protocol/gsm_08_58.h<br>M include/osmocom/gsm/protocol/gsm_44_004.h<br>3 files changed, 27 insertions(+), 36 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/gprs/protocol/gsm_08_18.h b/include/osmocom/gprs/protocol/gsm_08_18.h</span><br><span>index 0d002b5..d6f0fe6 100644</span><br><span>--- a/include/osmocom/gprs/protocol/gsm_08_18.h</span><br><span>+++ b/include/osmocom/gprs/protocol/gsm_08_18.h</span><br><span>@@ -362,13 +362,12 @@</span><br><span> /* RIM PDU Indications</span><br><span> * 3GPP TS 48.018, section 11.3.65.0 */</span><br><span> struct bssgp_rim_pdu_ind {</span><br><span style="color: hsl(0, 100%, 40%);">-#if OSMO_IS_BIG_ENDIAN</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t reserved:4,</span><br><span style="color: hsl(0, 100%, 40%);">- pdu_type_ext:3,</span><br><span style="color: hsl(0, 100%, 40%);">- ack_requested:1;</span><br><span style="color: hsl(0, 100%, 40%);">-#elif OSMO_IS_LITTLE_ENDIAN</span><br><span style="color: hsl(120, 100%, 40%);">+#if OSMO_IS_LITTLE_ENDIAN</span><br><span> uint8_t ack_requested:1,</span><br><span> pdu_type_ext:3,</span><br><span> reserved:4;</span><br><span style="color: hsl(120, 100%, 40%);">+#elif OSMO_IS_BIG_ENDIAN</span><br><span style="color: hsl(120, 100%, 40%);">+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t reserved:4, pdu_type_ext:3, ack_requested:1;</span><br><span> #endif</span><br><span> } __attribute__ ((packed));</span><br><span>diff --git a/include/osmocom/gsm/protocol/gsm_08_58.h b/include/osmocom/gsm/protocol/gsm_08_58.h</span><br><span>index 4937f08..7a527ff 100644</span><br><span>--- a/include/osmocom/gsm/protocol/gsm_08_58.h</span><br><span>+++ b/include/osmocom/gsm/protocol/gsm_08_58.h</span><br><span>@@ -118,35 +118,29 @@</span><br><span> </span><br><span> /* Osmocom specific IE to negotiate repeated ACCH capabilities */</span><br><span> struct abis_rsl_osmo_rep_acch_cap {</span><br><span style="color: hsl(0, 100%, 40%);">-#if OSMO_IS_BIG_ENDIAN</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t reserved:1,</span><br><span style="color: hsl(0, 100%, 40%);">- rxqual:3,</span><br><span style="color: hsl(0, 100%, 40%);">- ul_sacch:1,</span><br><span style="color: hsl(0, 100%, 40%);">- dl_sacch:1,</span><br><span style="color: hsl(0, 100%, 40%);">- dl_facch_all:1,</span><br><span style="color: hsl(0, 100%, 40%);">- dl_facch_cmd:1;</span><br><span style="color: hsl(0, 100%, 40%);">-#elif OSMO_IS_LITTLE_ENDIAN</span><br><span style="color: hsl(120, 100%, 40%);">+#if OSMO_IS_LITTLE_ENDIAN</span><br><span> uint8_t dl_facch_cmd:1,</span><br><span> dl_facch_all:1,</span><br><span> dl_sacch:1,</span><br><span> ul_sacch:1,</span><br><span> rxqual:3,</span><br><span> reserved:1;</span><br><span style="color: hsl(120, 100%, 40%);">+#elif OSMO_IS_BIG_ENDIAN</span><br><span style="color: hsl(120, 100%, 40%);">+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t reserved:1, rxqual:3, ul_sacch:1, dl_sacch:1, dl_facch_all:1, dl_facch_cmd:1;</span><br><span> #endif</span><br><span> } __attribute__ ((packed));</span><br><span> </span><br><span> /* Osmocom specific IE to negotiate temporary overpower of ACCH channels */</span><br><span> struct abis_rsl_osmo_temp_ovp_acch_cap {</span><br><span style="color: hsl(0, 100%, 40%);">-#if OSMO_IS_BIG_ENDIAN</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t sacch_enable:1,</span><br><span style="color: hsl(0, 100%, 40%);">- facch_enable:1,</span><br><span style="color: hsl(0, 100%, 40%);">- rxqual:3,</span><br><span style="color: hsl(0, 100%, 40%);">- overpower_db:3;</span><br><span style="color: hsl(0, 100%, 40%);">-#elif OSMO_IS_LITTLE_ENDIAN</span><br><span style="color: hsl(120, 100%, 40%);">+#if OSMO_IS_LITTLE_ENDIAN</span><br><span> uint8_t overpower_db:3,</span><br><span> rxqual:3,</span><br><span> facch_enable:1,</span><br><span> sacch_enable:1;</span><br><span style="color: hsl(120, 100%, 40%);">+#elif OSMO_IS_BIG_ENDIAN</span><br><span style="color: hsl(120, 100%, 40%);">+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t sacch_enable:1, facch_enable:1, rxqual:3, overpower_db:3;</span><br><span> #endif</span><br><span> } __attribute__ ((packed));</span><br><span> </span><br><span>@@ -862,10 +856,10 @@</span><br><span> uint8_t u_rxqual:3, reserved_u_rxqual:1,</span><br><span> l_rxqual:3, reserved_l_rxqual:1;</span><br><span> #elif OSMO_IS_BIG_ENDIAN</span><br><span style="color: hsl(120, 100%, 40%);">+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */</span><br><span> uint8_t reserved_l_rxlev:2, l_rxlev:6;</span><br><span> uint8_t reserved_u_rxlev:2, u_rxlev:6;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t reserved_l_rxqual:1, l_rxqual:3,</span><br><span style="color: hsl(0, 100%, 40%);">- reserved_u_rxqual:1, u_rxqual:3;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t reserved_l_rxqual:1, l_rxqual:3, reserved_u_rxqual:1, u_rxqual:3;</span><br><span> #endif</span><br><span> }__attribute__ ((packed));</span><br><span> </span><br><span>@@ -922,6 +916,7 @@</span><br><span> uint8_t pc_interval:5, reserved_pc:3;</span><br><span> uint8_t red_step_size:4, inc_step_size:4;</span><br><span> #elif OSMO_IS_BIG_ENDIAN</span><br><span style="color: hsl(120, 100%, 40%);">+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */</span><br><span> uint8_t reserved_p1:3, p1:5;</span><br><span> uint8_t reserved_n1:3, n1:5;</span><br><span> uint8_t reserved_p2:3, p2:5;</span><br><span>@@ -943,11 +938,12 @@</span><br><span> uint8_t upper_p:5, reserved_upper_p:3;</span><br><span> uint8_t upper_n:5, reserved_upper_n:3;</span><br><span> #elif OSMO_IS_BIG_ENDIAN</span><br><span style="color: hsl(120, 100%, 40%);">+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */</span><br><span> uint8_t reserved_lower_p:3, lower_p:5;</span><br><span> uint8_t reserved_lower_n:3, lower_n:5;</span><br><span> uint8_t reserved_upper_p:3, upper_p:5;</span><br><span> uint8_t reserved_upper_n:3, upper_n:5;</span><br><span style="color: hsl(0, 100%, 40%);">- #endif</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> }__attribute__ ((packed));</span><br><span> struct osmo_preproc_pc_comp {</span><br><span> /* Used for Carrier-to-Interference (C/I), in dB: */</span><br><span>@@ -1051,18 +1047,16 @@</span><br><span> };</span><br><span> </span><br><span> struct rsl_l1_info {</span><br><span style="color: hsl(0, 100%, 40%);">-#if OSMO_IS_BIG_ENDIAN</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t ms_pwr:5,</span><br><span style="color: hsl(0, 100%, 40%);">- fpc_epc:1,</span><br><span style="color: hsl(0, 100%, 40%);">- srr_sro:1,</span><br><span style="color: hsl(0, 100%, 40%);">- reserved:1;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t ta;</span><br><span style="color: hsl(0, 100%, 40%);">-#elif OSMO_IS_LITTLE_ENDIAN</span><br><span style="color: hsl(120, 100%, 40%);">+#if OSMO_IS_LITTLE_ENDIAN</span><br><span> uint8_t reserved:1,</span><br><span> srr_sro:1,</span><br><span> fpc_epc:1,</span><br><span> ms_pwr:5;</span><br><span> uint8_t ta;</span><br><span style="color: hsl(120, 100%, 40%);">+#elif OSMO_IS_BIG_ENDIAN</span><br><span style="color: hsl(120, 100%, 40%);">+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t ms_pwr:5, fpc_epc:1, srr_sro:1, reserved:1;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t ta;</span><br><span> #endif</span><br><span> } __attribute__ ((packed));</span><br><span> </span><br><span>diff --git a/include/osmocom/gsm/protocol/gsm_44_004.h b/include/osmocom/gsm/protocol/gsm_44_004.h</span><br><span>index 32ef24e..616e436 100644</span><br><span>--- a/include/osmocom/gsm/protocol/gsm_44_004.h</span><br><span>+++ b/include/osmocom/gsm/protocol/gsm_44_004.h</span><br><span>@@ -5,17 +5,15 @@</span><br><span> /* TS 44.004 Section 7.1 */</span><br><span> </span><br><span> struct gsm_sacch_l1_hdr {</span><br><span style="color: hsl(0, 100%, 40%);">-#if OSMO_IS_BIG_ENDIAN</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t reserved:1,</span><br><span style="color: hsl(0, 100%, 40%);">- srr_sro:1,</span><br><span style="color: hsl(0, 100%, 40%);">- fpc_epc:1,</span><br><span style="color: hsl(0, 100%, 40%);">- ms_pwr:5;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t ta;</span><br><span style="color: hsl(0, 100%, 40%);">-#elif OSMO_IS_LITTLE_ENDIAN</span><br><span style="color: hsl(120, 100%, 40%);">+#if OSMO_IS_LITTLE_ENDIAN</span><br><span> uint8_t ms_pwr:5,</span><br><span> fpc_epc:1,</span><br><span> srr_sro:1,</span><br><span> reserved:1;</span><br><span> uint8_t ta;</span><br><span style="color: hsl(120, 100%, 40%);">+#elif OSMO_IS_BIG_ENDIAN</span><br><span style="color: hsl(120, 100%, 40%);">+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t reserved:1, srr_sro:1, fpc_epc:1, ms_pwr:5;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t ta;</span><br><span> #endif</span><br><span> } __attribute__ ((packed));</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/26670">change 26670</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/libosmocore/+/26670"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I830e0961331a73f8dceb1a5a1c879798541752fd </div>
<div style="display:none"> Gerrit-Change-Number: 26670 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>