<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11006">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;">CBCH: Some more scheduler_mframe cleanup<br><br>As the CBCH replaces SDCCH sub-slot-2 in downlink, we should mark<br>the uplink as IDLE, just as the associated SACCH in uplink and downlink.<br><br>Also, there are no burst_numbers in IDLE slots.<br><br>Change-Id: Ib8565d1d0080bfce5d2aec77609709a445a2171c<br>---<br>M src/common/scheduler_mframe.c<br>1 file changed, 14 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/scheduler_mframe.c b/src/common/scheduler_mframe.c</span><br><span>index b78ffa8..b969407 100644</span><br><span>--- a/src/common/scheduler_mframe.c</span><br><span>+++ b/src/common/scheduler_mframe.c</span><br><span>@@ -179,9 +179,9 @@</span><br><span> { TRXC_BCCH, 2, TRXC_RACH, 0 },</span><br><span> { TRXC_BCCH, 3, TRXC_RACH, 0 },</span><br><span> { TRXC_CCCH, 0, TRXC_IDLE, 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { TRXC_CCCH, 1, TRXC_IDLE, 1 },</span><br><span style="color: hsl(0, 100%, 40%);">- { TRXC_CCCH, 2, TRXC_IDLE, 2 },</span><br><span style="color: hsl(0, 100%, 40%);">- { TRXC_CCCH, 3, TRXC_IDLE, 3 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { TRXC_CCCH, 1, TRXC_IDLE, 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { TRXC_CCCH, 2, TRXC_IDLE, 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { TRXC_CCCH, 3, TRXC_IDLE, 0 },</span><br><span> { TRXC_FCCH, 0, TRXC_SACCH4_3, 0 },</span><br><span> { TRXC_SCH, 0, TRXC_SACCH4_3, 1 },</span><br><span> { TRXC_CCCH, 0, TRXC_SACCH4_3, 2 },</span><br><span>@@ -219,10 +219,10 @@</span><br><span> { TRXC_SACCH4_0, 2, TRXC_SDCCH4_1, 3 },</span><br><span> { TRXC_SACCH4_0, 3, TRXC_RACH, 0 },</span><br><span> { TRXC_SACCH4_1, 0, TRXC_RACH, 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { TRXC_SACCH4_1, 1, TRXC_RACH, 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { TRXC_SACCH4_1, 2, TRXC_RACH, 1 },</span><br><span style="color: hsl(0, 100%, 40%);">- { TRXC_SACCH4_1, 3, TRXC_RACH, 2 },</span><br><span style="color: hsl(0, 100%, 40%);">- { TRXC_IDLE, 0, TRXC_RACH, 3 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { TRXC_SACCH4_1, 1, TRXC_IDLE, 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { TRXC_SACCH4_1, 2, TRXC_IDLE, 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { TRXC_SACCH4_1, 3, TRXC_IDLE, 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { TRXC_IDLE, 0, TRXC_IDLE, 0 },</span><br><span> </span><br><span> { TRXC_FCCH, 0, TRXC_SDCCH4_3, 0 },</span><br><span> { TRXC_SCH, 0, TRXC_SDCCH4_3, 1 },</span><br><span>@@ -267,14 +267,14 @@</span><br><span> { TRXC_FCCH, 0, TRXC_SDCCH4_0, 3 },</span><br><span> { TRXC_SCH, 0, TRXC_SDCCH4_1, 0 },</span><br><span> { TRXC_IDLE, 0, TRXC_SDCCH4_1, 1 },</span><br><span style="color: hsl(0, 100%, 40%);">- { TRXC_IDLE, 1, TRXC_SDCCH4_1, 2 },</span><br><span style="color: hsl(0, 100%, 40%);">- { TRXC_IDLE, 2, TRXC_SDCCH4_1, 3 },</span><br><span style="color: hsl(0, 100%, 40%);">- { TRXC_IDLE, 3, TRXC_RACH, 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { TRXC_IDLE, 0, TRXC_SDCCH4_1, 2 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { TRXC_IDLE, 0, TRXC_SDCCH4_1, 3 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { TRXC_IDLE, 0, TRXC_RACH, 0 },</span><br><span> { TRXC_SACCH4_3, 0, TRXC_RACH, 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { TRXC_SACCH4_3, 1, TRXC_RACH, 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- { TRXC_SACCH4_3, 2, TRXC_RACH, 1 },</span><br><span style="color: hsl(0, 100%, 40%);">- { TRXC_SACCH4_3, 3, TRXC_RACH, 2 },</span><br><span style="color: hsl(0, 100%, 40%);">- { TRXC_IDLE, 0, TRXC_SDCCH4_2, 3 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { TRXC_SACCH4_3, 1, TRXC_IDLE, 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { TRXC_SACCH4_3, 2, TRXC_IDLE, 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { TRXC_SACCH4_3, 3, TRXC_IDLE, 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { TRXC_IDLE, 0, TRXC_IDLE, 0 },</span><br><span> };</span><br><span> </span><br><span> static const struct trx_sched_frame frame_sdcch8[102] = {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11006">change 11006</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/11006"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ib8565d1d0080bfce5d2aec77609709a445a2171c </div>
<div style="display:none"> Gerrit-Change-Number: 11006 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>