<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9486">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">doc: tweak msc charts on Assignment/Handover: act_timer<br><br>Change-Id: I6205e43c227652432548c5c99bed5a197c095da2<br>---<br>M doc/assignment.msc<br>M doc/handover.msc<br>2 files changed, 17 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/doc/assignment.msc b/doc/assignment.msc</span><br><span>index e2bdf84..d470d01 100644</span><br><span>--- a/doc/assignment.msc</span><br><span>+++ b/doc/assignment.msc</span><br><span>@@ -54,14 +54,17 @@</span><br><span>        bsc_gscon abox bsc_gscon [label="ST_WAIT_ASS_COMPL (GSM0808_T10_VALUE=6s)"];</span><br><span>       ...;</span><br><span>         bts note bsc_gscon [linecolor="red",</span><br><span style="color: hsl(0, 100%, 40%);">-    label="There seems to be no timer watching over Chan Release nor dyn TS switchover!"];</span><br><span style="color: hsl(120, 100%, 40%);">+            label="Osmocom style dyn TS use lchan->act_timer to watch over RF Chan Release, but there</span><br><span style="color: hsl(120, 100%, 40%);">+             seems to be no timer watching over PDCH Deact!"];</span><br><span>       ...;</span><br><span>         bts => bsc [label="i) RSL RF Chan Release ACK (Osmocom dyn TS)"];</span><br><span>       bts => bsc [label="OR ii) RSL PDCH Deact ACK (ip.access dyn TS)"];</span><br><span>      bsc box bsc [label="rsl_chan_activate_lchan() re-invoked"];</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc box bsc [label="lchan->state = LCHAN_S_ACT_REQ"];</span><br><span>   bts <= bsc [label="RSL Chan Activ"];</span><br><span>    --- [label="else (no dyn TS switchover)"];</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+      bsc box bsc [label="lchan->state = LCHAN_S_ACT_REQ"];</span><br><span>   bts <= bsc [label="RSL Chan Activ"];</span><br><span>    bsc -> bsc_gscon [label="gsm0808_assign_req() returns"];</span><br><span>        bsc_gscon abox bsc_gscon [label="ST_WAIT_ASS_COMPL (GSM0808_T10_VALUE=6s)"];</span><br><span>@@ -79,6 +82,10 @@</span><br><span>  ...;</span><br><span> </span><br><span>     bts => bsc [label="RSL Chan Activ ACK"];</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc box bsc [label="rsl_rx_chan_act_ack()"];</span><br><span style="color: hsl(120, 100%, 40%);">+        bsc box bsc [label="Stop lchan->act_timer"];</span><br><span style="color: hsl(120, 100%, 40%);">+     bsc box bsc [label="lchan->state = LCHAN_S_ACTIVE"];</span><br><span style="color: hsl(120, 100%, 40%);">+     bsc -> bsc [label="S_LCHAN_ACTIVATE_ACK"];</span><br><span>      bsc box bsc [label="bsc_api.c handle_chan_ack()"];</span><br><span>         ms <= bsc [label="RR Assignment Command"];</span><br><span> </span><br><span>@@ -135,6 +142,8 @@</span><br><span>    --- [label="End: 'On timeout'"];</span><br><span>   ...;</span><br><span>         bts => bsc [label="RSL RF Channel Release Ack"];</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc box bsc [label="Stop lchan->act_timer"];</span><br><span style="color: hsl(120, 100%, 40%);">+     bsc box bsc [label="Stop lchan->T3111"];</span><br><span>        --- [label="End: 'Release old lchan'"];</span><br><span>    bsc box bsc [label="still in handle_ass_compl()"];</span><br><span>         bsc note bsc [label="officially take over new lchan: conn->lchan = conn->secondary_lchan"];</span><br><span>diff --git a/doc/handover.msc b/doc/handover.msc</span><br><span>index e5e787c..8862dd9 100644</span><br><span>--- a/doc/handover.msc</span><br><span>+++ b/doc/handover.msc</span><br><span>@@ -20,7 +20,8 @@</span><br><span>         bsc_gscon abox bsc_gscon [label="ST_WAIT_HO_COMPL (no timeout, relies on T3103 below)"];</span><br><span>   ...;</span><br><span>         bts note bsc_gscon [linecolor="red",</span><br><span style="color: hsl(0, 100%, 40%);">-    label="There seems to be no timer watching over Chan Release nor dyn TS switchover!"];</span><br><span style="color: hsl(120, 100%, 40%);">+            label="Osmocom style dyn TS use lchan->act_timer to watch over RF Chan Release, but there</span><br><span style="color: hsl(120, 100%, 40%);">+             seems to be no timer watching over PDCH Deact!"];</span><br><span>       ...;</span><br><span>         bts => bsc [label="i) RSL RF Chan Release ACK (Osmocom dyn TS)"];</span><br><span>       bts => bsc [label="OR ii) RSL PDCH Deact ACK (ip.access dyn TS)"];</span><br><span>@@ -38,6 +39,9 @@</span><br><span>    label="There seems to be no timer watching out for RSL Chan Activ ACK/NACK!"];</span><br><span>   ...;</span><br><span>         bts => bsc [label="RSL Chan Activ ACK"];</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc box bsc [label="rsl_rx_chan_act_ack()"];</span><br><span style="color: hsl(120, 100%, 40%);">+        bsc box bsc [label="Stop lchan->act_timer"];</span><br><span style="color: hsl(120, 100%, 40%);">+     bsc box bsc [label="lchan->state = LCHAN_S_ACTIVE"];</span><br><span>    bsc -> bsc [label="S_LCHAN_ACTIVATE_ACK"];</span><br><span>      bsc box bsc [label="handover_logic.c ho_logic_sig_cb()"];</span><br><span>  bsc box bsc [label="ho_chan_activ_ack()"];</span><br><span>@@ -132,6 +136,8 @@</span><br><span>   --- [label="End: 'On timeout'"];</span><br><span>   ...;</span><br><span>         bts => bsc [label="RSL RF Channel Release Ack"];</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc box bsc [label="Stop lchan->act_timer"];</span><br><span style="color: hsl(120, 100%, 40%);">+     bsc box bsc [label="Stop lchan->T3111"];</span><br><span>        ---;</span><br><span> </span><br><span>     bsc box bsc [label="still in ho_gsm48_ho_compl()"];</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9486">change 9486</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/9486"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I6205e43c227652432548c5c99bed5a197c095da2 </div>
<div style="display:none"> Gerrit-Change-Number: 9486 </div>
<div style="display:none"> Gerrit-PatchSet: 7 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>