<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-netif/+/16759">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  laforge: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">add/clean big-endian packed structs (struct_endianess.py)<br><br>Change-Id: If408153af472a41dcea8d6f6aedd22adb16963d5<br>---<br>M include/osmocom/netif/amr.h<br>M include/osmocom/netif/osmux.h<br>M include/osmocom/netif/rtp.h<br>3 files changed, 16 insertions(+), 27 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/netif/amr.h b/include/osmocom/netif/amr.h</span><br><span>index 729d0ae..6e37c99 100644</span><br><span>--- a/include/osmocom/netif/amr.h</span><br><span>+++ b/include/osmocom/netif/amr.h</span><br><span>@@ -43,16 +43,7 @@</span><br><span>  */</span><br><span> </span><br><span> struct amr_hdr {</span><br><span style="color: hsl(0, 100%, 40%);">-#if OSMO_IS_BIG_ENDIAN</span><br><span style="color: hsl(0, 100%, 40%);">-   /* Payload Header */</span><br><span style="color: hsl(0, 100%, 40%);">-    uint8_t cmr:4,  /* Codec Mode Request */</span><br><span style="color: hsl(0, 100%, 40%);">-                pad1:4;</span><br><span style="color: hsl(0, 100%, 40%);">- /* Table of Contents */</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t f:1,    /* followed by another speech frame? */</span><br><span style="color: hsl(0, 100%, 40%);">-         ft:4,   /* coding mode */</span><br><span style="color: hsl(0, 100%, 40%);">-               q:1,    /* OK (not damaged) at origin? */</span><br><span style="color: hsl(0, 100%, 40%);">-               pad2:2;</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>        /* Payload Header */</span><br><span>         uint8_t pad1:4,</span><br><span>              cmr:4;  /* Codec Mode Request */</span><br><span>@@ -61,6 +52,10 @@</span><br><span>                q:1,    /* OK (not damaged) at origin? */</span><br><span>            ft:4,   /* coding mode */</span><br><span>            f:1;    /* followed by another speech frame? */</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 cmr:4, pad1:4;</span><br><span style="color: hsl(120, 100%, 40%);">+        uint8_t f:1, ft:4, q:1, pad2:2;</span><br><span> #endif</span><br><span> } __attribute__((packed));</span><br><span> </span><br><span>diff --git a/include/osmocom/netif/osmux.h b/include/osmocom/netif/osmux.h</span><br><span>index 7dee438..6305dc8 100644</span><br><span>--- a/include/osmocom/netif/osmux.h</span><br><span>+++ b/include/osmocom/netif/osmux.h</span><br><span>@@ -30,28 +30,25 @@</span><br><span> #define OSMUX_FT_DUMMY            2</span><br><span> </span><br><span> struct osmux_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 rtp_m:1,</span><br><span style="color: hsl(0, 100%, 40%);">-                ft:2,</span><br><span style="color: hsl(0, 100%, 40%);">-           ctr:3,</span><br><span style="color: hsl(0, 100%, 40%);">-          amr_f:1,</span><br><span style="color: hsl(0, 100%, 40%);">-                amr_q: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 amr_q:1,</span><br><span>             amr_f:1,</span><br><span>             ctr:3,</span><br><span>               ft:2,</span><br><span>                rtp_m: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 rtp_m:1, ft:2, ctr:3, amr_f:1, amr_q:1;</span><br><span> #endif</span><br><span>    uint8_t seq;</span><br><span> #define OSMUX_CID_MAX           255     /* determined by circuit_id */</span><br><span>       uint8_t circuit_id;</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 amr_ft:4,</span><br><span style="color: hsl(0, 100%, 40%);">-               amr_cmr:4;</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 amr_cmr:4,</span><br><span>           amr_ft: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 amr_ft:4, amr_cmr:4;</span><br><span> #endif</span><br><span> } __attribute__((packed));</span><br><span> </span><br><span>diff --git a/include/osmocom/netif/rtp.h b/include/osmocom/netif/rtp.h</span><br><span>index c01df41..4e40745 100644</span><br><span>--- a/include/osmocom/netif/rtp.h</span><br><span>+++ b/include/osmocom/netif/rtp.h</span><br><span>@@ -13,12 +13,9 @@</span><br><span>       uint8_t  payload_type:7,</span><br><span>              marker:1;</span><br><span> #elif OSMO_IS_BIG_ENDIAN</span><br><span style="color: hsl(0, 100%, 40%);">-  uint8_t  version:2,</span><br><span style="color: hsl(0, 100%, 40%);">-              padding:1,</span><br><span style="color: hsl(0, 100%, 40%);">-              extension:1,</span><br><span style="color: hsl(0, 100%, 40%);">-            csrc_count:4;</span><br><span style="color: hsl(0, 100%, 40%);">-  uint8_t  marker:1,</span><br><span style="color: hsl(0, 100%, 40%);">-               payload_type:7;</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  version:2, padding:1, extension:1, csrc_count:4;</span><br><span style="color: hsl(120, 100%, 40%);">+     uint8_t  marker:1, payload_type:7;</span><br><span> #endif</span><br><span>         uint16_t sequence;</span><br><span>   uint32_t timestamp;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-netif/+/16759">change 16759</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/libosmo-netif/+/16759"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmo-netif </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: If408153af472a41dcea8d6f6aedd22adb16963d5 </div>
<div style="display:none"> Gerrit-Change-Number: 16759 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>