<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-abis/+/18179">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">subchan_demux: Use ubit_t where appropriate<br><br>the subchan_demux code predates ubit_t; let's use it to clarify<br>certain pointers refer to arrays of unpacked bits.<br><br>Change-Id: I944f05473954920d57e12d5514cf928fc78f2ea4<br>---<br>M include/osmocom/abis/subchan_demux.h<br>M src/subchan_demux.c<br>2 files changed, 7 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/79/18179/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/abis/subchan_demux.h b/include/osmocom/abis/subchan_demux.h</span><br><span>index 3978d73..dac072c 100644</span><br><span>--- a/include/osmocom/abis/subchan_demux.h</span><br><span>+++ b/include/osmocom/abis/subchan_demux.h</span><br><span>@@ -85,7 +85,7 @@</span><br><span>     unsigned int bit_len;   /*!< \brief total number of bits in 'bits' */</span><br><span>     unsigned int next_bit;  /*!< \brief next bit to be transmitted */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        uint8_t bits[0];        /*!< \brief one bit per byte */</span><br><span style="color: hsl(120, 100%, 40%);">+    ubit_t bits[0];         /*!< \brief one bit per byte */</span><br><span> };</span><br><span> </span><br><span> /*! \brief one sub-channel inside a multiplexer */</span><br><span>@@ -102,7 +102,7 @@</span><br><span> </span><br><span> int subchan_mux_init(struct subch_mux *mx);</span><br><span> int subchan_mux_out(struct subch_mux *mx, uint8_t *data, int len);</span><br><span style="color: hsl(0, 100%, 40%);">-int subchan_mux_enqueue(struct subch_mux *mx, int s_nr, const uint8_t *data,</span><br><span style="color: hsl(120, 100%, 40%);">+int subchan_mux_enqueue(struct subch_mux *mx, int s_nr, const ubit_t *data,</span><br><span>                   int len);</span><br><span> </span><br><span> /* }@ */</span><br><span>diff --git a/src/subchan_demux.c b/src/subchan_demux.c</span><br><span>index 9275fda..55503db 100644</span><br><span>--- a/src/subchan_demux.c</span><br><span>+++ b/src/subchan_demux.c</span><br><span>@@ -200,7 +200,7 @@</span><br><span> </span><br><span> /* return the requested number of bits from the specified subchannel */</span><br><span> static int get_subch_bits(struct subch_mux *mx, int subch,</span><br><span style="color: hsl(0, 100%, 40%);">-                     uint8_t *bits, int num_requested)</span><br><span style="color: hsl(120, 100%, 40%);">+                     ubit_t *bits, int num_requested)</span><br><span> {</span><br><span>      struct mux_subch *sch = &mx->subch[subch];</span><br><span>    int num_bits = 0;</span><br><span>@@ -258,7 +258,7 @@</span><br><span> /* obtain a single output byte from the subchannel muxer */</span><br><span> static int mux_output_byte(struct subch_mux *mx, uint8_t *byte)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-  uint8_t bits[8];</span><br><span style="color: hsl(120, 100%, 40%);">+      ubit_t bits[8];</span><br><span>      int rc;</span><br><span> </span><br><span>  /* combine two bits of every subchan */</span><br><span>@@ -310,11 +310,11 @@</span><br><span> /*! \brief enqueue some data into the tx_queue of a given subchannel</span><br><span>  *  \param[in] mx subchannel muxer instance</span><br><span>  *  \param[in] s_nr subchannel number</span><br><span style="color: hsl(0, 100%, 40%);">- *  \param[in] data pointer to buffer with data</span><br><span style="color: hsl(0, 100%, 40%);">- *  \param[in] len length of \a data</span><br><span style="color: hsl(120, 100%, 40%);">+ *  \param[in] data pointer to buffer with data (unpacked bits)</span><br><span style="color: hsl(120, 100%, 40%);">+ *  \param[in] len length of data (in unpacked bits)</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 subchan_mux_enqueue(struct subch_mux *mx, int s_nr, const uint8_t *data,</span><br><span style="color: hsl(120, 100%, 40%);">+int subchan_mux_enqueue(struct subch_mux *mx, int s_nr, const ubit_t *data,</span><br><span>                       int len)</span><br><span> {</span><br><span>        struct mux_subch *sch = &mx->subch[s_nr];</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-abis/+/18179">change 18179</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/+/18179"/><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: I944f05473954920d57e12d5514cf928fc78f2ea4 </div>
<div style="display:none"> Gerrit-Change-Number: 18179 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>