<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/16761">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">add/clean big-endian packed structs (struct_endianess.py)<br><br>Change-Id: I04ad3795fbaf495cae168aed69124b1dc132a9bd<br>---<br>M include/osmocom/mtp/mtp_level3.h<br>M include/osmocom/sccp/sccp_types.h<br>2 files changed, 14 insertions(+), 18 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/61/16761/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/mtp/mtp_level3.h b/include/osmocom/mtp/mtp_level3.h</span><br><span>index d0d24a1..414b144 100644</span><br><span>--- a/include/osmocom/mtp/mtp_level3.h</span><br><span>+++ b/include/osmocom/mtp/mtp_level3.h</span><br><span>@@ -131,9 +131,8 @@</span><br><span>               spare : 2,</span><br><span>           ni : 2;</span><br><span> #elif OSMO_IS_BIG_ENDIAN</span><br><span style="color: hsl(0, 100%, 40%);">-    uint8_t ni : 2,</span><br><span style="color: hsl(0, 100%, 40%);">-          spare : 2,</span><br><span style="color: hsl(0, 100%, 40%);">-              ser_ind : 4;</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 ni:2, spare:2, ser_ind:4;</span><br><span> #endif</span><br><span>  uint32_t addr;</span><br><span>       uint8_t data[0];</span><br><span>@@ -144,8 +143,8 @@</span><br><span>       uint8_t h0 : 4,</span><br><span>               h1 : 4;</span><br><span> #elif OSMO_IS_BIG_ENDIAN</span><br><span style="color: hsl(0, 100%, 40%);">-    uint8_t h1 : 4,</span><br><span style="color: hsl(0, 100%, 40%);">-          h0 : 4;</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 h1:4, h0:4;</span><br><span> #endif</span><br><span> } __attribute__((packed));</span><br><span> </span><br><span>@@ -155,8 +154,8 @@</span><br><span>        uint8_t spare : 4,</span><br><span>            length : 4;</span><br><span> #elif OSMO_IS_BIG_ENDIAN</span><br><span style="color: hsl(0, 100%, 40%);">-        uint8_t length : 4,</span><br><span style="color: hsl(0, 100%, 40%);">-              spare : 4;</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 length:4, spare:4;</span><br><span> #endif</span><br><span>         uint8_t data[0];</span><br><span> } __attribute__((packed));</span><br><span>@@ -175,8 +174,8 @@</span><br><span>         uint8_t mul_ind : 2,</span><br><span>                  spare : 6;</span><br><span> #elif OSMO_IS_BIG_ENDIAN</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t spare : 6,</span><br><span style="color: hsl(0, 100%, 40%);">-               mul_ind : 2;</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 spare:6, mul_ind:2;</span><br><span> #endif</span><br><span> } __attribute__((packed));</span><br><span> </span><br><span>diff --git a/include/osmocom/sccp/sccp_types.h b/include/osmocom/sccp/sccp_types.h</span><br><span>index 18b54f4..17c60e4 100644</span><br><span>--- a/include/osmocom/sccp/sccp_types.h</span><br><span>+++ b/include/osmocom/sccp/sccp_types.h</span><br><span>@@ -97,11 +97,8 @@</span><br><span>                        routing_indicator    : 1,</span><br><span>                    reserved             : 1;</span><br><span> #elif 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%);">-                       routing_indicator    : 1,</span><br><span style="color: hsl(0, 100%, 40%);">-                       global_title_indicator : 4,</span><br><span style="color: hsl(0, 100%, 40%);">-                     ssn_indicator        : 1,</span><br><span style="color: hsl(0, 100%, 40%);">-                       point_code_indicator : 1;</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, routing_indicator:1, global_title_indicator:4, ssn_indicator:1, point_code_indicator:1;</span><br><span> #endif</span><br><span>        uint8_t data[0];</span><br><span> } __attribute__((packed));</span><br><span>@@ -115,8 +112,8 @@</span><br><span>         uint8_t msb : 6,</span><br><span>                     reserved : 2;</span><br><span> #elif OSMO_IS_BIG_ENDIAN</span><br><span style="color: hsl(0, 100%, 40%);">-       uint8_t reserved : 2,</span><br><span style="color: hsl(0, 100%, 40%);">-                   msb : 6;</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:2, msb:6;</span><br><span> #endif</span><br><span> } __attribute__((packed));</span><br><span> </span><br><span>@@ -157,8 +154,8 @@</span><br><span>         uint8_t nature_of_addr_ind : 7,</span><br><span>                      odd_even : 1;</span><br><span> #elif OSMO_IS_BIG_ENDIAN</span><br><span style="color: hsl(0, 100%, 40%);">-       uint8_t odd_even : 1,</span><br><span style="color: hsl(0, 100%, 40%);">-                   nature_of_addr_ind : 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 odd_even:1, nature_of_addr_ind:7;</span><br><span> #endif</span><br><span>  uint8_t data[0];</span><br><span> } __attribute__((packed));</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/16761">change 16761</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-sccp/+/16761"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmo-sccp </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I04ad3795fbaf495cae168aed69124b1dc132a9bd </div>
<div style="display:none"> Gerrit-Change-Number: 16761 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>