<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-abis/+/18178">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;">trau_frame: use 'ubit_t' for unpacked bits<br><br>Change-Id: I497dbb7e9e199c6276e585b977bd941a2b442b3b<br>---<br>M include/osmocom/abis/trau_frame.h<br>M src/trau_frame.c<br>2 files changed, 21 insertions(+), 20 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/abis/trau_frame.h b/include/osmocom/abis/trau_frame.h</span><br><span>index f2a7015..63882d7 100644</span><br><span>--- a/include/osmocom/abis/trau_frame.h</span><br><span>+++ b/include/osmocom/abis/trau_frame.h</span><br><span>@@ -21,6 +21,7 @@</span><br><span>  */</span><br><span> </span><br><span> #include <stdint.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/bits.h></span><br><span> </span><br><span> /*! \defgroup trau_frame TRAU frame handling</span><br><span>  *  @{</span><br><span>@@ -43,11 +44,11 @@</span><br><span> </span><br><span> /*! \brief a decoded TRAU frame, extracted C/D/T/S/M bits */</span><br><span> struct decoded_trau_frame {</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t c_bits[MAX_C_BITS];</span><br><span style="color: hsl(0, 100%, 40%);">-     uint8_t d_bits[MAX_D_BITS];</span><br><span style="color: hsl(0, 100%, 40%);">-     uint8_t t_bits[MAX_T_BITS];</span><br><span style="color: hsl(0, 100%, 40%);">-     uint8_t s_bits[MAX_S_BITS];</span><br><span style="color: hsl(0, 100%, 40%);">-     uint8_t m_bits[MAX_M_BITS];</span><br><span style="color: hsl(120, 100%, 40%);">+   ubit_t c_bits[MAX_C_BITS];</span><br><span style="color: hsl(120, 100%, 40%);">+    ubit_t d_bits[MAX_D_BITS];</span><br><span style="color: hsl(120, 100%, 40%);">+    ubit_t t_bits[MAX_T_BITS];</span><br><span style="color: hsl(120, 100%, 40%);">+    ubit_t s_bits[MAX_S_BITS];</span><br><span style="color: hsl(120, 100%, 40%);">+    ubit_t m_bits[MAX_M_BITS];</span><br><span> };</span><br><span> </span><br><span> #define TRAU_FT_FR_UP           0x02    /* 0 0 0 1 0 - 3.5.1.1.1 */</span><br><span>@@ -64,11 +65,11 @@</span><br><span> #define TRAU_FT_IDLE_DOWN  0x0e    /* 0 1 1 1 0 - 3.5.5 */</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int decode_trau_frame(struct decoded_trau_frame *fr, const uint8_t *trau_bits);</span><br><span style="color: hsl(0, 100%, 40%);">-int encode_trau_frame(uint8_t *trau_bits, const struct decoded_trau_frame *fr);</span><br><span style="color: hsl(120, 100%, 40%);">+int decode_trau_frame(struct decoded_trau_frame *fr, const ubit_t *trau_bits);</span><br><span style="color: hsl(120, 100%, 40%);">+int encode_trau_frame(ubit_t *trau_bits, const struct decoded_trau_frame *fr);</span><br><span> int trau_frame_up2down(struct decoded_trau_frame *fr);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-uint8_t *trau_idle_frame(void);</span><br><span style="color: hsl(120, 100%, 40%);">+ubit_t *trau_idle_frame(void);</span><br><span> </span><br><span> /* }@ */</span><br><span> </span><br><span>diff --git a/src/trau_frame.c b/src/trau_frame.c</span><br><span>index eaced3d..9558b3f 100644</span><br><span>--- a/src/trau_frame.c</span><br><span>+++ b/src/trau_frame.c</span><br><span>@@ -51,7 +51,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Decode according to 3.1.1 */</span><br><span style="color: hsl(0, 100%, 40%);">-static void decode_fr(struct decoded_trau_frame *fr, const uint8_t *trau_bits)</span><br><span style="color: hsl(120, 100%, 40%);">+static void decode_fr(struct decoded_trau_frame *fr, const ubit_t *trau_bits)</span><br><span> {</span><br><span>        int i;</span><br><span>       int d_idx = 0;</span><br><span>@@ -72,7 +72,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Decode according to 3.1.2 */</span><br><span style="color: hsl(0, 100%, 40%);">-static void decode_amr(struct decoded_trau_frame *fr, const uint8_t *trau_bits)</span><br><span style="color: hsl(120, 100%, 40%);">+static void decode_amr(struct decoded_trau_frame *fr, const ubit_t *trau_bits)</span><br><span> {</span><br><span>   int i;</span><br><span>       int d_idx = 0;</span><br><span>@@ -94,7 +94,7 @@</span><br><span>   memcpy(fr->d_bits + d_idx, trau_bits + 305, 11);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void decode_data(struct decoded_trau_frame *fr, const uint8_t *trau_bits)</span><br><span style="color: hsl(120, 100%, 40%);">+static void decode_data(struct decoded_trau_frame *fr, const ubit_t *trau_bits)</span><br><span> {</span><br><span>   /* C1 .. C15 */</span><br><span>      memcpy(fr->c_bits+0, trau_bits+17, 15);</span><br><span>@@ -102,7 +102,7 @@</span><br><span>     memcpy(fr->d_bits, trau_bits+32, 288);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int decode_trau_frame(struct decoded_trau_frame *fr, const uint8_t *trau_bits)</span><br><span style="color: hsl(120, 100%, 40%);">+int decode_trau_frame(struct decoded_trau_frame *fr, const ubit_t *trau_bits)</span><br><span> {</span><br><span>         uint8_t cbits5 = get_bits(trau_bits, 17, 5);</span><br><span> </span><br><span>@@ -139,9 +139,9 @@</span><br><span>       return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const uint8_t ft_fr_down_bits[] = { 1, 1, 1, 0, 0 };</span><br><span style="color: hsl(0, 100%, 40%);">-const uint8_t ft_idle_down_bits[] = { 0, 1, 1, 1, 0 };</span><br><span style="color: hsl(0, 100%, 40%);">-const uint8_t ft_data_down_bits[] = { 1, 0, 1, 1, 0 };</span><br><span style="color: hsl(120, 100%, 40%);">+const ubit_t ft_fr_down_bits[] = { 1, 1, 1, 0, 0 };</span><br><span style="color: hsl(120, 100%, 40%);">+const ubit_t ft_idle_down_bits[] = { 0, 1, 1, 1, 0 };</span><br><span style="color: hsl(120, 100%, 40%);">+const ubit_t ft_data_down_bits[] = { 1, 0, 1, 1, 0 };</span><br><span> </span><br><span> /*! \brief modify an uplink TRAU frame so we can send it downlink</span><br><span>  *  \param[in,out] fr the uplink TRAU frame that is to be converted</span><br><span>@@ -209,7 +209,7 @@</span><br><span> </span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void encode_fr(uint8_t *trau_bits, const struct decoded_trau_frame *fr)</span><br><span style="color: hsl(120, 100%, 40%);">+static void encode_fr(ubit_t *trau_bits, const struct decoded_trau_frame *fr)</span><br><span> {</span><br><span>   int i;</span><br><span>       int d_idx = 0;</span><br><span>@@ -235,7 +235,7 @@</span><br><span>         memcpy(trau_bits+316, fr->t_bits+0, 4);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void encode_data(uint8_t *trau_bits, const struct decoded_trau_frame *fr)</span><br><span style="color: hsl(120, 100%, 40%);">+static void encode_data(ubit_t *trau_bits, const struct decoded_trau_frame *fr)</span><br><span> {</span><br><span>    trau_bits[16] = 1;</span><br><span>   /* C1 .. C15 */</span><br><span>@@ -249,7 +249,7 @@</span><br><span>  *  \param[in] fr decoded trau frame structure</span><br><span>  *  \returns 0 in case of success, < 0 in case of error</span><br><span>  */</span><br><span style="color: hsl(0, 100%, 40%);">-int encode_trau_frame(uint8_t *trau_bits, const struct decoded_trau_frame *fr)</span><br><span style="color: hsl(120, 100%, 40%);">+int encode_trau_frame(ubit_t *trau_bits, const struct decoded_trau_frame *fr)</span><br><span> {</span><br><span>       uint8_t cbits5 = get_bits(fr->c_bits, 0, 5);</span><br><span> </span><br><span>@@ -291,12 +291,12 @@</span><br><span>  .c_bits = { 0, 1, 1, 1, 0 },    /* IDLE DOWNLINK 3.5.5 */</span><br><span>    .t_bits = { 1, 1, 1, 1 },</span><br><span> };</span><br><span style="color: hsl(0, 100%, 40%);">-static uint8_t encoded_idle_frame[TRAU_FRAME_BITS];</span><br><span style="color: hsl(120, 100%, 40%);">+static ubit_t encoded_idle_frame[TRAU_FRAME_BITS];</span><br><span> static int dbits_initted = 0;</span><br><span> </span><br><span> /*! \brief return pointer to global buffer containing a TRAU idle frame</span><br><span>  */</span><br><span style="color: hsl(0, 100%, 40%);">-uint8_t *trau_idle_frame(void)</span><br><span style="color: hsl(120, 100%, 40%);">+ubit_t *trau_idle_frame(void)</span><br><span> {</span><br><span>      /* only initialize during the first call */</span><br><span>  if (!dbits_initted) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-abis/+/18178">change 18178</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-abis/+/18178"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmo-abis </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I497dbb7e9e199c6276e585b977bd941a2b442b3b </div>
<div style="display:none"> Gerrit-Change-Number: 18178 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </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>