<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/17415">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">virt_phy: implement GSMTAP_CHANNEL_VOICE<br><br>Change-Id: Id72cf23b7c6587efae4cdaa7b50ab4d85b8c8d22<br>---<br>M src/host/virt_phy/configure.ac<br>M src/host/virt_phy/src/gsmtapl1_if.c<br>2 files changed, 17 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/15/17415/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/virt_phy/configure.ac b/src/host/virt_phy/configure.ac</span><br><span>index a2c2bf6..fbff2c1 100644</span><br><span>--- a/src/host/virt_phy/configure.ac</span><br><span>+++ b/src/host/virt_phy/configure.ac</span><br><span>@@ -12,6 +12,8 @@</span><br><span> AC_PROG_INSTALL</span><br><span> </span><br><span> dnl checks for libraries</span><br><span style="color: hsl(120, 100%, 40%);">+dnl TODO: insert libosmocore version with GSMTAP_CHANNEL_VOICE: PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.4.0)</span><br><span style="color: hsl(120, 100%, 40%);">+dnl (at time of writing not released yet)</span><br><span> PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore)</span><br><span> PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm)</span><br><span> </span><br><span>diff --git a/src/host/virt_phy/src/gsmtapl1_if.c b/src/host/virt_phy/src/gsmtapl1_if.c</span><br><span>index 30f88ff..e91af8e 100644</span><br><span>--- a/src/host/virt_phy/src/gsmtapl1_if.c</span><br><span>+++ b/src/host/virt_phy/src/gsmtapl1_if.c</span><br><span>@@ -76,6 +76,11 @@</span><br><span> subslot = 0;</span><br><span> gsmtap_chan = chantype_rsl2gsmtap(rsl_chantype, 0);</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case L1CTL_TRAFFIC_REQ:</span><br><span style="color: hsl(120, 100%, 40%);">+ ul = (struct l1ctl_info_ul *)l1h->data;</span><br><span style="color: hsl(120, 100%, 40%);">+ rsl_dec_chan_nr(ul->chan_nr, &rsl_chantype, &subslot, ×lot);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap_chan = GSMTAP_CHANNEL_VOICE;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> default:</span><br><span> ul = (struct l1ctl_info_ul *)l1h->data;</span><br><span> rsl_dec_chan_nr(ul->chan_nr, &rsl_chantype, &subslot, ×lot);</span><br><span>@@ -219,13 +224,7 @@</span><br><span> switch (gsmtap_chantype & ~GSMTAP_CHANNEL_ACCH & 0xff) {</span><br><span> case GSMTAP_CHANNEL_TCH_H:</span><br><span> case GSMTAP_CHANNEL_TCH_F:</span><br><span style="color: hsl(0, 100%, 40%);">-#if 0</span><br><span style="color: hsl(0, 100%, 40%);">- /* TODO: handle voice */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!facch && !tch_acch) {</span><br><span style="color: hsl(0, 100%, 40%);">- l1ctl_tx_traffic_ind(msg, arfcn, link_id, chan_nr, fn,</span><br><span style="color: hsl(0, 100%, 40%);">- snr, signal_dbm, 0, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span style="color: hsl(120, 100%, 40%);">+ /* This is TCH signalling, for voice frames see GSMTAP_CHANNEL_VOICE */</span><br><span> case GSMTAP_CHANNEL_SDCCH4:</span><br><span> case GSMTAP_CHANNEL_SDCCH8:</span><br><span> /* only forward messages on dedicated channels to l2, if</span><br><span>@@ -235,6 +234,15 @@</span><br><span> l1ctl_tx_data_ind(ms, msg, arfcn, link_id, chan_nr, fn, snr_db, signal_dbm, 0, 0);</span><br><span> }</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSMTAP_CHANNEL_VOICE:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* only forward messages on dedicated channels to l2, if</span><br><span style="color: hsl(120, 100%, 40%);">+ * the timeslot and subslot is fitting */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ms->state.dedicated.tn == timeslot</span><br><span style="color: hsl(120, 100%, 40%);">+ && ms->state.dedicated.subslot == subslot) {</span><br><span style="color: hsl(120, 100%, 40%);">+ l1ctl_tx_traffic_ind(ms, msg, arfcn, link_id, chan_nr, fn,</span><br><span style="color: hsl(120, 100%, 40%);">+ snr_db, signal_dbm, 0, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> case GSMTAP_CHANNEL_CBCH51:</span><br><span> /* only pass CBCH data if the user application actually indicated that a CBCH</span><br><span> * is present */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmocom-bb/+/17415">change 17415</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/osmocom-bb/+/17415"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Id72cf23b7c6587efae4cdaa7b50ab4d85b8c8d22 </div>
<div style="display:none"> Gerrit-Change-Number: 17415 </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>