<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/19502">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">i460: pass more context to call-back functions<br><br>When calling a user-provided call-back function for the i460 mux<br>or demux, always pass a pointer to the osmo_i460_subchan the callback<br>relates to. This way, the user can walk the i460 data structures<br>to obtain information about which mux/demux instances is calling.<br><br>Change-Id: Id842c72ce371a67fe5df6694e195c281aaf607ab<br>---<br>M include/osmocom/gsm/i460_mux.h<br>M src/gsm/i460_mux.c<br>M tests/i460_mux/i460_mux_test.c<br>3 files changed, 14 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/gsm/i460_mux.h b/include/osmocom/gsm/i460_mux.h</span><br><span>index e7ea9bd..8e39243 100644</span><br><span>--- a/include/osmocom/gsm/i460_mux.h</span><br><span>+++ b/include/osmocom/gsm/i460_mux.h</span><br><span>@@ -36,8 +36,12 @@</span><br><span> OSMO_I460_RATE_8k,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-typedef void (*out_cb_bits_t)(void *user_data, const ubit_t *bits, unsigned int num_bits);</span><br><span style="color: hsl(0, 100%, 40%);">-typedef void (*out_cb_bytes_t)(void *user_data, const uint8_t *bytes, unsigned int num_bytes);</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_i460_subchan;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+typedef void (*out_cb_bits_t)(struct osmo_i460_subchan *schan, void *user_data,</span><br><span style="color: hsl(120, 100%, 40%);">+ const ubit_t *bits, unsigned int num_bits);</span><br><span style="color: hsl(120, 100%, 40%);">+typedef void (*out_cb_bytes_t)(struct osmo_i460_subchan *schan, void *user_data,</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t *bytes, unsigned int num_bytes);</span><br><span> </span><br><span> struct osmo_i460_subchan_demux {</span><br><span> /*! bit-buffer for output bits */</span><br><span>@@ -52,7 +56,7 @@</span><br><span> void *user_data;</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-typedef void (*in_cb_queue_empty_t)(void *user_data);</span><br><span style="color: hsl(120, 100%, 40%);">+typedef void (*in_cb_queue_empty_t)(struct osmo_i460_subchan *schan, void *user_data);</span><br><span> </span><br><span> struct osmo_i460_subchan_mux {</span><br><span> /*! list of to-be-transmitted message buffers */</span><br><span>diff --git a/src/gsm/i460_mux.c b/src/gsm/i460_mux.c</span><br><span>index 3b2a589..320e781 100644</span><br><span>--- a/src/gsm/i460_mux.c</span><br><span>+++ b/src/gsm/i460_mux.c</span><br><span>@@ -69,14 +69,14 @@</span><br><span> </span><br><span> if (demux->out_idx >= demux->out_bitbuf_size) {</span><br><span> if (demux->out_cb_bits)</span><br><span style="color: hsl(0, 100%, 40%);">- demux->out_cb_bits(demux->user_data, demux->out_bitbuf, demux->out_idx);</span><br><span style="color: hsl(120, 100%, 40%);">+ demux->out_cb_bits(schan, demux->user_data, demux->out_bitbuf, demux->out_idx);</span><br><span> else {</span><br><span> /* pack bits into bytes */</span><br><span> OSMO_ASSERT((demux->out_idx % 8) == 0);</span><br><span> unsigned int num_bytes = demux->out_idx / 8;</span><br><span> uint8_t bytes[num_bytes];</span><br><span> osmo_ubit2pbit(bytes, demux->out_bitbuf, demux->out_idx);</span><br><span style="color: hsl(0, 100%, 40%);">- demux->out_cb_bytes(demux->user_data, bytes, num_bytes);</span><br><span style="color: hsl(120, 100%, 40%);">+ demux->out_cb_bytes(schan, demux->user_data, bytes, num_bytes);</span><br><span> }</span><br><span> demux->out_idx = 0;</span><br><span> }</span><br><span>@@ -137,11 +137,11 @@</span><br><span> schan = &ts->schan[0];</span><br><span> demux = &schan->demux;</span><br><span> if (demux->out_cb_bytes)</span><br><span style="color: hsl(0, 100%, 40%);">- demux->out_cb_bytes(demux->user_data, data, data_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ demux->out_cb_bytes(schan, demux->user_data, data, data_len);</span><br><span> else {</span><br><span> ubit_t bits[data_len*8];</span><br><span> osmo_pbit2ubit(bits, data, data_len*8);</span><br><span style="color: hsl(0, 100%, 40%);">- demux->out_cb_bits(demux->user_data, bits, data_len*8);</span><br><span style="color: hsl(120, 100%, 40%);">+ demux->out_cb_bits(schan, demux->user_data, bits, data_len*8);</span><br><span> }</span><br><span> return;</span><br><span> }</span><br><span>@@ -178,7 +178,7 @@</span><br><span> if (llist_empty(&mux->tx_queue)) {</span><br><span> /* User code now has a last chance to put something into the queue. */</span><br><span> if (mux->in_cb_queue_empty)</span><br><span style="color: hsl(0, 100%, 40%);">- mux->in_cb_queue_empty(mux->user_data);</span><br><span style="color: hsl(120, 100%, 40%);">+ mux->in_cb_queue_empty(schan, mux->user_data);</span><br><span> </span><br><span> /* If the queue is still empty, return idle bits */</span><br><span> if (llist_empty(&mux->tx_queue))</span><br><span>diff --git a/tests/i460_mux/i460_mux_test.c b/tests/i460_mux/i460_mux_test.c</span><br><span>index 53144fd..d63b2ae 100644</span><br><span>--- a/tests/i460_mux/i460_mux_test.c</span><br><span>+++ b/tests/i460_mux/i460_mux_test.c</span><br><span>@@ -3,7 +3,8 @@</span><br><span> </span><br><span> #include <osmocom/gsm/i460_mux.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void bits_cb(void *user_data, const ubit_t *bits, unsigned int num_bits)</span><br><span style="color: hsl(120, 100%, 40%);">+static void bits_cb(struct osmo_i460_subchan *schan, void *user_data,</span><br><span style="color: hsl(120, 100%, 40%);">+ const ubit_t *bits, unsigned int num_bits)</span><br><span> {</span><br><span> char *str = user_data;</span><br><span> printf("demux_bits_cb '%s': %s\n", str, osmo_ubit_dump(bits, num_bits));</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/19502">change 19502</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/libosmocore/+/19502"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Id842c72ce371a67fe5df6694e195c281aaf607ab </div>
<div style="display:none"> Gerrit-Change-Number: 19502 </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-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>