<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-abis/+/18177">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">subchan_demux: Use 'ubit_t' for unpacked bit buffer; use const<br><br>Change-Id: Ia082b9fddf03d02afd007825a1588a3ef0dbedae<br>---<br>M include/osmocom/abis/e1_input.h<br>M include/osmocom/abis/subchan_demux.h<br>M src/e1_input.c<br>M src/subchan_demux.c<br>M src/trau_frame.c<br>5 files changed, 7 insertions(+), 6 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/77/18177/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/abis/e1_input.h b/include/osmocom/abis/e1_input.h</span><br><span>index 4362f50..a38bab8 100644</span><br><span>--- a/include/osmocom/abis/e1_input.h</span><br><span>+++ b/include/osmocom/abis/e1_input.h</span><br><span>@@ -273,7 +273,7 @@</span><br><span> /* configure and initialize one timeslot dedicated to TRAU frames. */</span><br><span> int e1inp_ts_config_trau(struct e1inp_ts *ts, struct e1inp_line *line,</span><br><span>                          int (*trau_rcv_cb)(struct subch_demux *dmx, int ch,</span><br><span style="color: hsl(0, 100%, 40%);">-                                      uint8_t *data, int len, void *_priv));</span><br><span style="color: hsl(120, 100%, 40%);">+                                            const ubit_t *data, int len, void *_priv));</span><br><span> </span><br><span> /* configure and initialize one timeslot dedicated to RAW frames */</span><br><span> int e1inp_ts_config_raw(struct e1inp_ts *ts, struct e1inp_line *line,</span><br><span>diff --git a/include/osmocom/abis/subchan_demux.h b/include/osmocom/abis/subchan_demux.h</span><br><span>index 4e2f464..3978d73 100644</span><br><span>--- a/include/osmocom/abis/subchan_demux.h</span><br><span>+++ b/include/osmocom/abis/subchan_demux.h</span><br><span>@@ -22,6 +22,7 @@</span><br><span> </span><br><span> #include <stdint.h></span><br><span> #include <osmocom/core/linuxlist.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/bits.h></span><br><span> </span><br><span> /*! \defgroup subchan_demux</span><br><span>  *  \brief E1 sub-channel multiplexer/demultiplexer</span><br><span>@@ -44,7 +45,7 @@</span><br><span> /*! \brief one subchannel inside the demultplexer */</span><br><span> struct demux_subch {</span><br><span>       /*! \brief bit-buffer for output bits */</span><br><span style="color: hsl(0, 100%, 40%);">-        uint8_t out_bitbuf[TRAU_FRAME_BITS];</span><br><span style="color: hsl(120, 100%, 40%);">+  ubit_t out_bitbuf[TRAU_FRAME_BITS];</span><br><span>  /*! \brief next bit to be written in out_bitbuf */</span><br><span>   uint16_t out_idx;</span><br><span>    /*! \brief number of consecutive zeros that we have received (for sync) */</span><br><span>@@ -61,7 +62,7 @@</span><br><span>       struct demux_subch subch[NR_SUBCH];</span><br><span>  /*! \brief callback to be called once we have received a</span><br><span>      *  complete frame on a given subchannel */</span><br><span style="color: hsl(0, 100%, 40%);">-     int (*out_cb)(struct subch_demux *dmx, int ch, uint8_t *data, int len,</span><br><span style="color: hsl(120, 100%, 40%);">+        int (*out_cb)(struct subch_demux *dmx, int ch, const ubit_t *data, int len,</span><br><span>                void *);</span><br><span>       /*! \brief user-provided data, transparently passed to out_cb() */</span><br><span>   void *data;</span><br><span>diff --git a/src/e1_input.c b/src/e1_input.c</span><br><span>index 379cc53..b3341e7 100644</span><br><span>--- a/src/e1_input.c</span><br><span>+++ b/src/e1_input.c</span><br><span>@@ -297,7 +297,7 @@</span><br><span> /* Timeslot */</span><br><span> int e1inp_ts_config_trau(struct e1inp_ts *ts, struct e1inp_line *line,</span><br><span>                    int (*trau_rcv_cb)(struct subch_demux *dmx, int ch,</span><br><span style="color: hsl(0, 100%, 40%);">-                                    uint8_t *data, int len, void *_priv))</span><br><span style="color: hsl(120, 100%, 40%);">+                                 const ubit_t *data, int len, void *_priv))</span><br><span> {</span><br><span>      if (ts->type == E1INP_TS_TYPE_TRAU && ts->line && line)</span><br><span>                return 0;</span><br><span>diff --git a/src/subchan_demux.c b/src/subchan_demux.c</span><br><span>index d15c4b8..9275fda 100644</span><br><span>--- a/src/subchan_demux.c</span><br><span>+++ b/src/subchan_demux.c</span><br><span>@@ -40,7 +40,7 @@</span><br><span> </span><br><span> void *tall_tqe_ctx;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static inline void append_bit(struct demux_subch *sch, uint8_t bit)</span><br><span style="color: hsl(120, 100%, 40%);">+static inline void append_bit(struct demux_subch *sch, ubit_t bit)</span><br><span> {</span><br><span>    sch->out_bitbuf[sch->out_idx++] = bit;</span><br><span> }</span><br><span>diff --git a/src/trau_frame.c b/src/trau_frame.c</span><br><span>index 717bc32..eaced3d 100644</span><br><span>--- a/src/trau_frame.c</span><br><span>+++ b/src/trau_frame.c</span><br><span>@@ -37,7 +37,7 @@</span><br><span>  *  \file trau_frame.c</span><br><span>  */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static uint32_t get_bits(const uint8_t *bitbuf, int offset, int num)</span><br><span style="color: hsl(120, 100%, 40%);">+static uint32_t get_bits(const ubit_t *bitbuf, int offset, int num)</span><br><span> {</span><br><span>        int i;</span><br><span>       uint32_t ret = 0;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-abis/+/18177">change 18177</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/+/18177"/><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: Ia082b9fddf03d02afd007825a1588a3ef0dbedae </div>
<div style="display:none"> Gerrit-Change-Number: 18177 </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>