<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/17964">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gsm_04_06.h: Remove repeated egprs header struct definitions<br><br>Each struct already contains different definition based on endianess, so<br>there's no reason to re-define all of them again based on endianess.<br>Probably at some point somebody run the script<br>./contrib/struct_endianess.py on those structures but forgot to remove<br>the old way of supporting differnet endianess.<br><br>Change-Id: Ibd002e52979950e09013767fa643b2a3c52dfea9<br>---<br>M include/osmocom/gprs/protocol/gsm_04_60.h<br>1 file changed, 0 insertions(+), 153 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/64/17964/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/gprs/protocol/gsm_04_60.h b/include/osmocom/gprs/protocol/gsm_04_60.h</span><br><span>index f592b14..05728f4 100644</span><br><span>--- a/include/osmocom/gprs/protocol/gsm_04_60.h</span><br><span>+++ b/include/osmocom/gprs/protocol/gsm_04_60.h</span><br><span>@@ -9,7 +9,6 @@</span><br><span> #include <stdint.h></span><br><span> #include <osmocom/core/endian.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#if OSMO_IS_LITTLE_ENDIAN == 1</span><br><span> /* TS 04.60 10.3a.4.1.1 */</span><br><span> struct gprs_rlc_ul_header_egprs_1 {</span><br><span> #if OSMO_IS_LITTLE_ENDIAN</span><br><span>@@ -160,158 +159,6 @@</span><br><span> uint8_t dummy:1, spb:2, cps:4, bsn1_lo:1;</span><br><span> #endif</span><br><span> } __attribute__ ((packed));</span><br><span style="color: hsl(0, 100%, 40%);">-#else</span><br><span style="color: hsl(0, 100%, 40%);">-/* TS 04.60 10.3a.4.1.1 */</span><br><span style="color: hsl(0, 100%, 40%);">-struct gprs_rlc_ul_header_egprs_1 {</span><br><span style="color: hsl(0, 100%, 40%);">-#if OSMO_IS_LITTLE_ENDIAN</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t tfi_hi:2,</span><br><span style="color: hsl(0, 100%, 40%);">- cv:4,</span><br><span style="color: hsl(0, 100%, 40%);">- si:1,</span><br><span style="color: hsl(0, 100%, 40%);">- r:1;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t bsn1_hi:5,</span><br><span style="color: hsl(0, 100%, 40%);">- tfi_lo:3;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t bsn2_hi:2,</span><br><span style="color: hsl(0, 100%, 40%);">- bsn1_lo:6;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t bsn2_lo:8;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t spare_hi:1,</span><br><span style="color: hsl(0, 100%, 40%);">- pi:1,</span><br><span style="color: hsl(0, 100%, 40%);">- rsb:1,</span><br><span style="color: hsl(0, 100%, 40%);">- cps:5;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t dummy:2,</span><br><span style="color: hsl(0, 100%, 40%);">- spare_lo:6;</span><br><span style="color: hsl(0, 100%, 40%);">-#elif OSMO_IS_BIG_ENDIAN</span><br><span style="color: hsl(0, 100%, 40%);">-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t r:1, si:1, cv:4, tfi_hi:2;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t tfi_lo:3, bsn1_hi:5;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t bsn1_lo:6, bsn2_hi:2;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t bsn2_lo:8;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t cps:5, rsb:1, pi:1, spare_hi:1;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t spare_lo:6, dummy:2;</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span style="color: hsl(0, 100%, 40%);">-} __attribute__ ((packed));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* TS 04.60 10.3a.4.2.1 */</span><br><span style="color: hsl(0, 100%, 40%);">-struct gprs_rlc_ul_header_egprs_2 {</span><br><span style="color: hsl(0, 100%, 40%);">-#if OSMO_IS_LITTLE_ENDIAN</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t tfi_hi:2,</span><br><span style="color: hsl(0, 100%, 40%);">- cv:4,</span><br><span style="color: hsl(0, 100%, 40%);">- si:1,</span><br><span style="color: hsl(0, 100%, 40%);">- r:1;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t bsn1_hi:5,</span><br><span style="color: hsl(0, 100%, 40%);">- tfi_lo:3;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t cps_hi:2,</span><br><span style="color: hsl(0, 100%, 40%);">- bsn1_lo:6;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t spare_hi:5,</span><br><span style="color: hsl(0, 100%, 40%);">- pi:1,</span><br><span style="color: hsl(0, 100%, 40%);">- rsb:1,</span><br><span style="color: hsl(0, 100%, 40%);">- cps_lo:1;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t dummy:3,</span><br><span style="color: hsl(0, 100%, 40%);">- spare_lo:5;</span><br><span style="color: hsl(0, 100%, 40%);">-#elif OSMO_IS_BIG_ENDIAN</span><br><span style="color: hsl(0, 100%, 40%);">-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t r:1, si:1, cv:4, tfi_hi:2;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t tfi_lo:3, bsn1_hi:5;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t bsn1_lo:6, cps_hi:2;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t cps_lo:1, rsb:1, pi:1, spare_hi:5;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t spare_lo:5, dummy:3;</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span style="color: hsl(0, 100%, 40%);">-} __attribute__ ((packed));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* TS 04.60 10.3a.4.3.1 */</span><br><span style="color: hsl(0, 100%, 40%);">-struct gprs_rlc_ul_header_egprs_3 {</span><br><span style="color: hsl(0, 100%, 40%);">-#if OSMO_IS_LITTLE_ENDIAN</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t tfi_hi:2,</span><br><span style="color: hsl(0, 100%, 40%);">- cv:4,</span><br><span style="color: hsl(0, 100%, 40%);">- si:1,</span><br><span style="color: hsl(0, 100%, 40%);">- r:1;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t bsn1_hi:5,</span><br><span style="color: hsl(0, 100%, 40%);">- tfi_lo:3;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t cps_hi:2,</span><br><span style="color: hsl(0, 100%, 40%);">- bsn1_lo:6;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t dummy:1,</span><br><span style="color: hsl(0, 100%, 40%);">- spare:1,</span><br><span style="color: hsl(0, 100%, 40%);">- pi:1,</span><br><span style="color: hsl(0, 100%, 40%);">- rsb:1,</span><br><span style="color: hsl(0, 100%, 40%);">- spb:2,</span><br><span style="color: hsl(0, 100%, 40%);">- cps_lo:2;</span><br><span style="color: hsl(0, 100%, 40%);">-#elif OSMO_IS_BIG_ENDIAN</span><br><span style="color: hsl(0, 100%, 40%);">-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t r:1, si:1, cv:4, tfi_hi:2;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t tfi_lo:3, bsn1_hi:5;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t bsn1_lo:6, cps_hi:2;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t cps_lo:2, spb:2, rsb:1, pi:1, spare:1, dummy:1;</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span style="color: hsl(0, 100%, 40%);">-} __attribute__ ((packed));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct gprs_rlc_dl_header_egprs_1 {</span><br><span style="color: hsl(0, 100%, 40%);">-#if OSMO_IS_LITTLE_ENDIAN</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t tfi_hi:1,</span><br><span style="color: hsl(0, 100%, 40%);">- rrbp:2,</span><br><span style="color: hsl(0, 100%, 40%);">- es_p:2,</span><br><span style="color: hsl(0, 100%, 40%);">- usf:3;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t bsn1_hi:2,</span><br><span style="color: hsl(0, 100%, 40%);">- pr:2,</span><br><span style="color: hsl(0, 100%, 40%);">- tfi_lo:4;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t bsn1_mid:8;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t bsn2_hi:7,</span><br><span style="color: hsl(0, 100%, 40%);">- bsn1_lo:1;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t cps:5,</span><br><span style="color: hsl(0, 100%, 40%);">- bsn2_lo:3;</span><br><span style="color: hsl(0, 100%, 40%);">-#elif OSMO_IS_BIG_ENDIAN</span><br><span style="color: hsl(0, 100%, 40%);">-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t usf:3, es_p:2, rrbp:2, tfi_hi:1;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t tfi_lo:4, pr:2, bsn1_hi:2;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t bsn1_mid:8;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t bsn1_lo:1, bsn2_hi:7;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t bsn2_lo:3, cps:5;</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span style="color: hsl(0, 100%, 40%);">-} __attribute__ ((packed));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct gprs_rlc_dl_header_egprs_2 {</span><br><span style="color: hsl(0, 100%, 40%);">-#if OSMO_IS_LITTLE_ENDIAN</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t tfi_hi:1,</span><br><span style="color: hsl(0, 100%, 40%);">- rrbp:2,</span><br><span style="color: hsl(0, 100%, 40%);">- es_p:2,</span><br><span style="color: hsl(0, 100%, 40%);">- usf:3;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t bsn1_hi:2,</span><br><span style="color: hsl(0, 100%, 40%);">- pr:2,</span><br><span style="color: hsl(0, 100%, 40%);">- tfi_lo:4;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t bsn1_mid:8;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t dummy:4,</span><br><span style="color: hsl(0, 100%, 40%);">- cps:3,</span><br><span style="color: hsl(0, 100%, 40%);">- bsn1_lo:1;</span><br><span style="color: hsl(0, 100%, 40%);">-#elif OSMO_IS_BIG_ENDIAN</span><br><span style="color: hsl(0, 100%, 40%);">-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t usf:3, es_p:2, rrbp:2, tfi_hi:1;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t tfi_lo:4, pr:2, bsn1_hi:2;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t bsn1_mid:8;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t bsn1_lo:1, cps:3, dummy:4;</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span style="color: hsl(0, 100%, 40%);">-} __attribute__ ((packed));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct gprs_rlc_dl_header_egprs_3 {</span><br><span style="color: hsl(0, 100%, 40%);">-#if OSMO_IS_LITTLE_ENDIAN</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t tfi_hi:1,</span><br><span style="color: hsl(0, 100%, 40%);">- rrbp:2,</span><br><span style="color: hsl(0, 100%, 40%);">- es_p:2,</span><br><span style="color: hsl(0, 100%, 40%);">- usf:3;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t bsn1_hi:2,</span><br><span style="color: hsl(0, 100%, 40%);">- pr:2,</span><br><span style="color: hsl(0, 100%, 40%);">- tfi_lo:4;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t bsn1_mid:8;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t dummy:1,</span><br><span style="color: hsl(0, 100%, 40%);">- spb:2,</span><br><span style="color: hsl(0, 100%, 40%);">- cps:4,</span><br><span style="color: hsl(0, 100%, 40%);">- bsn1_lo:1;</span><br><span style="color: hsl(0, 100%, 40%);">-#elif OSMO_IS_BIG_ENDIAN</span><br><span style="color: hsl(0, 100%, 40%);">-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t usf:3, es_p:2, rrbp:2, tfi_hi:1;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t tfi_lo:4, pr:2, bsn1_hi:2;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t bsn1_mid:8;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t bsn1_lo:1, cps:4, spb:2, dummy:1;</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span style="color: hsl(0, 100%, 40%);">-} __attribute__ ((packed));</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span> </span><br><span> /* TS 03.60 Chapter 6.3.3.1: Network Mode of Operation */</span><br><span> enum osmo_gprs_nmo {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/17964">change 17964</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/+/17964"/><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: Ibd002e52979950e09013767fa643b2a3c52dfea9 </div>
<div style="display:none"> Gerrit-Change-Number: 17964 </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-MessageType: newchange </div>