<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/22688">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">rlc.h: Fix struct bit fields on big endian systems<br><br>Related: OS#5003<br>Change-Id: I534539cdf197ce5c038752a177aff7efeefc9883<br>---<br>M src/rlc.h<br>1 file changed, 24 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/rlc.h b/src/rlc.h</span><br><span>index bcc738c..45cbb95 100644</span><br><span>--- a/src/rlc.h</span><br><span>+++ b/src/rlc.h</span><br><span>@@ -377,8 +377,8 @@</span><br><span> </span><br><span> extern "C" {</span><br><span> /* TS 44.060 10.2.2 */</span><br><span style="color: hsl(0, 100%, 40%);">-#if OSMO_IS_LITTLE_ENDIAN</span><br><span> struct rlc_ul_header {</span><br><span style="color: hsl(120, 100%, 40%);">+#if OSMO_IS_LITTLE_ENDIAN</span><br><span> uint8_t r:1,</span><br><span> si:1,</span><br><span> cv:4,</span><br><span>@@ -389,9 +389,16 @@</span><br><span> spare:1;</span><br><span> uint8_t e:1,</span><br><span> bsn:7;</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 pt:2, cv:4, si:1, r:1;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t spare:1, pi:1, tfi:5, ti:1;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t bsn:7, e:1;</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> } __attribute__ ((packed));</span><br><span> </span><br><span> struct rlc_dl_header {</span><br><span style="color: hsl(120, 100%, 40%);">+#if OSMO_IS_LITTLE_ENDIAN</span><br><span> uint8_t usf:3,</span><br><span> s_p:1,</span><br><span> rrbp:2,</span><br><span>@@ -401,21 +408,34 @@</span><br><span> pr:2;</span><br><span> uint8_t e:1,</span><br><span> bsn:7;</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 pt:2, rrbp:2, s_p:1, usf:3;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t pr:2, tfi:5, fbi:1;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t bsn:7, e:1;</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> } __attribute__ ((packed));</span><br><span> </span><br><span> struct rlc_li_field {</span><br><span style="color: hsl(120, 100%, 40%);">+#if OSMO_IS_LITTLE_ENDIAN</span><br><span> uint8_t e:1,</span><br><span> m:1,</span><br><span> li:6;</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 li:6, m:1, e:1;</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> } __attribute__ ((packed));</span><br><span> </span><br><span> struct rlc_li_field_egprs {</span><br><span style="color: hsl(120, 100%, 40%);">+#if OSMO_IS_LITTLE_ENDIAN</span><br><span> uint8_t e:1,</span><br><span> li:7;</span><br><span style="color: hsl(0, 100%, 40%);">-} __attribute__ ((packed));</span><br><span style="color: hsl(0, 100%, 40%);">-#else</span><br><span style="color: hsl(0, 100%, 40%);">-# error "Only little endian headers are supported yet. TODO: add missing structs"</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 li:7, e:1;</span><br><span> #endif</span><br><span style="color: hsl(120, 100%, 40%);">+} __attribute__ ((packed));</span><br><span> }</span><br><span> </span><br><span> inline bool gprs_rlc_v_b::is_state(int bsn, const gprs_rlc_dl_bsn_state type) const</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/22688">change 22688</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/osmo-pcu/+/22688"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I534539cdf197ce5c038752a177aff7efeefc9883 </div>
<div style="display:none"> Gerrit-Change-Number: 22688 </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: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>