<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/14274">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trxcon/l1ctl.c: properly handle handover RACH request<br><br>During the handover the MS needs to release the existing dedicated<br>channel(s), establish the new one(s) as indicated by the network,<br>and then, depending on the synchronisation state, send one or more<br>HANDOVER ACCESS messages carried by Access Bursts.<br><br>In order to implement this, trxcon needs to be able to transmit<br>Access Bursts on any TDMA timeslot regardless of the logical<br>channel type and the associated handler, i.e. != TRXC_RACH.<br><br>The controlling side on L1CTL (layer23 or TTCN-3) needs to send<br>one or more L1CTL_RESET_REQ message(s) with properly populated<br>UL info header. Otherwise a regular RACH on TS0 is assumed.<br><br>Change-Id: Ia967820a536c99966ba2c60b63d2ea9edb093f46<br>---<br>M src/host/trxcon/l1ctl.c<br>M src/host/trxcon/sched_trx.c<br>2 files changed, 17 insertions(+), 13 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/74/14274/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c</span><br><span>index fff1c2b..ce83f95 100644</span><br><span>--- a/src/host/trxcon/l1ctl.c</span><br><span>+++ b/src/host/trxcon/l1ctl.c</span><br><span>@@ -509,7 +509,6 @@</span><br><span> struct l1ctl_rach_req *req;</span><br><span> struct l1ctl_info_ul *ul;</span><br><span> struct trx_ts_prim *prim;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t chan_nr, link_id;</span><br><span> size_t len;</span><br><span> int rc;</span><br><span> </span><br><span>@@ -534,25 +533,24 @@</span><br><span> "(offset=%u, ra=0x%02x)\n", req->offset, req->ra);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /**</span><br><span style="color: hsl(0, 100%, 40%);">- * FIXME: l1ctl_info_ul doesn't provide channel description</span><br><span style="color: hsl(0, 100%, 40%);">- * FIXME: Can we use other than TS0?</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">- chan_nr = RSL_CHAN_RACH;</span><br><span style="color: hsl(0, 100%, 40%);">- link_id = 0x00;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* The controlling L1CTL side always include the UL info header,</span><br><span style="color: hsl(120, 100%, 40%);">+ * but may leave it empty. We assume RACH is on TS0 in this case. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ul->chan_nr == 0x00) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DL1C, LOGL_NOTICE, "The UL info header is empty, "</span><br><span style="color: hsl(120, 100%, 40%);">+ "assuming RACH is on TS0\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ ul->chan_nr = RSL_CHAN_RACH;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> /* Init a new primitive */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = sched_prim_init(l1l->trx, &prim, len, chan_nr, link_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = sched_prim_init(l1l->trx, &prim, len, ul->chan_nr, ul->link_id);</span><br><span> if (rc)</span><br><span> goto exit;</span><br><span> </span><br><span> /**</span><br><span style="color: hsl(0, 100%, 40%);">- * Push this primitive to transmit queue</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * FIXME: what if requested TS is not configured?</span><br><span style="color: hsl(0, 100%, 40%);">- * Or what if one (such as TCH) has no TRXC_RACH slots?</span><br><span style="color: hsl(120, 100%, 40%);">+ * Push this primitive to the transmit queue.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Indicated timeslot needs to be configured.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = sched_prim_push(l1l->trx, prim, chan_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = sched_prim_push(l1l->trx, prim, ul->chan_nr);</span><br><span> if (rc) {</span><br><span> talloc_free(prim);</span><br><span> goto exit;</span><br><span>diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c</span><br><span>index 62fe870..37d1acf 100644</span><br><span>--- a/src/host/trxcon/sched_trx.c</span><br><span>+++ b/src/host/trxcon/sched_trx.c</span><br><span>@@ -35,6 +35,7 @@</span><br><span> #include <osmocom/core/logging.h></span><br><span> #include <osmocom/core/linuxlist.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include "l1ctl_proto.h"</span><br><span> #include "scheduler.h"</span><br><span> #include "sched_trx.h"</span><br><span> #include "trx_if.h"</span><br><span>@@ -116,6 +117,11 @@</span><br><span> if (lchan->prim == NULL)</span><br><span> continue;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Handover RACH needs to be handled regardless of the</span><br><span style="color: hsl(120, 100%, 40%);">+ * current channel type and the associated handler. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (PRIM_IS_RACH(lchan->prim) && lchan->prim->chan != TRXC_RACH)</span><br><span style="color: hsl(120, 100%, 40%);">+ handler = trx_lchan_desc[TRXC_RACH].tx_fn;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Poke lchan handler */</span><br><span> handler(trx, ts, lchan, fn, bid);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14274">change 14274</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/14274"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ia967820a536c99966ba2c60b63d2ea9edb093f46 </div>
<div style="display:none"> Gerrit-Change-Number: 14274 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>