<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/24326">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  laforge: Looks good to me, approved
  pespin: Looks good to me, but someone else must approve
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">[VAMOS] common/scheduler: unify symbol names for training sequences<br><br>Change-Id: Ice464e5b02b11b0f13df247fe6a01420a29bf1c5<br>Related: SYS#4895, OS#4941<br>---<br>M include/osmo-bts/scheduler_backend.h<br>M src/common/scheduler.c<br>M src/osmo-bts-trx/sched_lchan_fcch_sch.c<br>M src/osmo-bts-trx/sched_lchan_pdtch.c<br>M src/osmo-bts-trx/sched_lchan_tchf.c<br>M src/osmo-bts-trx/sched_lchan_tchh.c<br>M src/osmo-bts-trx/sched_lchan_xcch.c<br>7 files changed, 12 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/scheduler_backend.h b/include/osmo-bts/scheduler_backend.h</span><br><span>index 2a0dd11..d5ce5bf 100644</span><br><span>--- a/include/osmo-bts/scheduler_backend.h</span><br><span>+++ b/include/osmo-bts/scheduler_backend.h</span><br><span>@@ -35,9 +35,9 @@</span><br><span> extern const struct trx_chan_desc trx_chan_desc[_TRX_CHAN_MAX];</span><br><span> </span><br><span> extern const ubit_t _sched_dummy_burst[];</span><br><span style="color: hsl(0, 100%, 40%);">-extern const ubit_t _sched_tsc[8][26];</span><br><span style="color: hsl(0, 100%, 40%);">-extern const ubit_t _sched_egprs_tsc[8][78];</span><br><span style="color: hsl(0, 100%, 40%);">-extern const ubit_t _sched_sch_train[64];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const ubit_t _sched_train_seq_gmsk_nb[8][26];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const ubit_t _sched_train_seq_8psk_nb[8][78];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const ubit_t _sched_train_seq_gmsk_sb[64];</span><br><span> </span><br><span> struct msgb *_sched_dequeue_prim(struct l1sched_ts *l1ts, const struct trx_dl_burst_req *br);</span><br><span> </span><br><span>diff --git a/src/common/scheduler.c b/src/common/scheduler.c</span><br><span>index 90b9479..a3647a9 100644</span><br><span>--- a/src/common/scheduler.c</span><br><span>+++ b/src/common/scheduler.c</span><br><span>@@ -63,7 +63,7 @@</span><br><span> };</span><br><span> </span><br><span> /*! \brief Training Sequences (TS 05.02 Chapter 5.2.3) */</span><br><span style="color: hsl(0, 100%, 40%);">-const ubit_t _sched_tsc[8][26] = {</span><br><span style="color: hsl(120, 100%, 40%);">+const ubit_t _sched_train_seq_gmsk_nb[8][26] = {</span><br><span>      { 0,0,1,0,0,1,0,1,1,1,0,0,0,0,1,0,0,0,1,0,0,1,0,1,1,1, },</span><br><span>    { 0,0,1,0,1,1,0,1,1,1,0,1,1,1,1,0,0,0,1,0,1,1,0,1,1,1, },</span><br><span>    { 0,1,0,0,0,0,1,1,1,0,1,1,1,0,1,0,0,1,0,0,0,0,1,1,1,0, },</span><br><span>@@ -74,7 +74,7 @@</span><br><span>        { 1,1,1,0,1,1,1,1,0,0,0,1,0,0,1,0,1,1,1,0,1,1,1,1,0,0, },</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const ubit_t _sched_egprs_tsc[8][78] = {</span><br><span style="color: hsl(120, 100%, 40%);">+const ubit_t _sched_train_seq_8psk_nb[8][78] = {</span><br><span>        { 1,1,1,1,1,1,0,0,1,1,1,1,1,1,1,0,0,1,1,1,1,0,0,1,0,0,</span><br><span>         1,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,1,1,1,1,1,1,1,1,</span><br><span>         1,1,0,0,1,1,1,1,1,1,1,0,0,1,1,1,1,0,0,1,0,0,1,0,0,1, },</span><br><span>@@ -102,7 +102,7 @@</span><br><span> };</span><br><span> </span><br><span> /*! \brief SCH training sequence (TS 05.02 Chapter 5.2.5) */</span><br><span style="color: hsl(0, 100%, 40%);">-const ubit_t _sched_sch_train[64] = {</span><br><span style="color: hsl(120, 100%, 40%);">+const ubit_t _sched_train_seq_gmsk_sb[64] = {</span><br><span>        1,0,1,1,1,0,0,1,0,1,1,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,1,1,1,1,</span><br><span>     0,0,1,0,1,1,0,1,0,1,0,0,0,1,0,1,0,1,1,1,0,1,1,0,0,0,0,1,1,0,1,1,</span><br><span> };</span><br><span>diff --git a/src/osmo-bts-trx/sched_lchan_fcch_sch.c b/src/osmo-bts-trx/sched_lchan_fcch_sch.c</span><br><span>index 44da04c..993cb63 100644</span><br><span>--- a/src/osmo-bts-trx/sched_lchan_fcch_sch.c</span><br><span>+++ b/src/osmo-bts-trx/sched_lchan_fcch_sch.c</span><br><span>@@ -80,7 +80,7 @@</span><br><span> </span><br><span>      /* compose burst */</span><br><span>  memcpy(br->burst + 3, burst, 39);</span><br><span style="color: hsl(0, 100%, 40%);">-    memcpy(br->burst + 42, _sched_sch_train, 64);</span><br><span style="color: hsl(120, 100%, 40%);">+      memcpy(br->burst + 42, _sched_train_seq_gmsk_sb, 64);</span><br><span>     memcpy(br->burst + 106, burst + 39, 39);</span><br><span> </span><br><span>      br->burst_len = GSM_BURST_LEN;</span><br><span>diff --git a/src/osmo-bts-trx/sched_lchan_pdtch.c b/src/osmo-bts-trx/sched_lchan_pdtch.c</span><br><span>index 8648cb8..dede371 100644</span><br><span>--- a/src/osmo-bts-trx/sched_lchan_pdtch.c</span><br><span>+++ b/src/osmo-bts-trx/sched_lchan_pdtch.c</span><br><span>@@ -212,7 +212,7 @@</span><br><span>                 burst = *bursts_p + br->bid * 348;</span><br><span>                memset(br->burst, 1, 9);</span><br><span>          memcpy(br->burst + 9, burst, 174);</span><br><span style="color: hsl(0, 100%, 40%);">-           memcpy(br->burst + 183, _sched_egprs_tsc[gsm_ts_tsc(l1ts->ts)], 78);</span><br><span style="color: hsl(120, 100%, 40%);">+            memcpy(br->burst + 183, _sched_train_seq_8psk_nb[gsm_ts_tsc(l1ts->ts)], 78);</span><br><span>           memcpy(br->burst + 261, burst + 174, 174);</span><br><span>                memset(br->burst + 435, 1, 9);</span><br><span> </span><br><span>@@ -220,7 +220,7 @@</span><br><span>  } else {</span><br><span>             burst = *bursts_p + br->bid * 116;</span><br><span>                memcpy(br->burst + 3, burst, 58);</span><br><span style="color: hsl(0, 100%, 40%);">-            memcpy(br->burst + 61, _sched_tsc[gsm_ts_tsc(l1ts->ts)], 26);</span><br><span style="color: hsl(120, 100%, 40%);">+           memcpy(br->burst + 61, _sched_train_seq_gmsk_nb[gsm_ts_tsc(l1ts->ts)], 26);</span><br><span>            memcpy(br->burst + 87, burst + 58, 58);</span><br><span> </span><br><span>               br->burst_len = GSM_BURST_LEN;</span><br><span>diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c</span><br><span>index 0961758..5605969 100644</span><br><span>--- a/src/osmo-bts-trx/sched_lchan_tchf.c</span><br><span>+++ b/src/osmo-bts-trx/sched_lchan_tchf.c</span><br><span>@@ -562,7 +562,7 @@</span><br><span>     /* compose burst */</span><br><span>  burst = *bursts_p + br->bid * 116;</span><br><span>        memcpy(br->burst + 3, burst, 58);</span><br><span style="color: hsl(0, 100%, 40%);">-    memcpy(br->burst + 61, _sched_tsc[gsm_ts_tsc(l1ts->ts)], 26);</span><br><span style="color: hsl(120, 100%, 40%);">+   memcpy(br->burst + 61, _sched_train_seq_gmsk_nb[gsm_ts_tsc(l1ts->ts)], 26);</span><br><span>    memcpy(br->burst + 87, burst + 58, 58);</span><br><span> </span><br><span>       br->burst_len = GSM_BURST_LEN;</span><br><span>diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c</span><br><span>index e526e48..91ce02f 100644</span><br><span>--- a/src/osmo-bts-trx/sched_lchan_tchh.c</span><br><span>+++ b/src/osmo-bts-trx/sched_lchan_tchh.c</span><br><span>@@ -451,7 +451,7 @@</span><br><span>     /* compose burst */</span><br><span>  burst = *bursts_p + br->bid * 116;</span><br><span>        memcpy(br->burst + 3, burst, 58);</span><br><span style="color: hsl(0, 100%, 40%);">-    memcpy(br->burst + 61, _sched_tsc[gsm_ts_tsc(l1ts->ts)], 26);</span><br><span style="color: hsl(120, 100%, 40%);">+   memcpy(br->burst + 61, _sched_train_seq_gmsk_nb[gsm_ts_tsc(l1ts->ts)], 26);</span><br><span>    memcpy(br->burst + 87, burst + 58, 58);</span><br><span> </span><br><span>       br->burst_len = GSM_BURST_LEN;</span><br><span>diff --git a/src/osmo-bts-trx/sched_lchan_xcch.c b/src/osmo-bts-trx/sched_lchan_xcch.c</span><br><span>index 62b511c..b31175e 100644</span><br><span>--- a/src/osmo-bts-trx/sched_lchan_xcch.c</span><br><span>+++ b/src/osmo-bts-trx/sched_lchan_xcch.c</span><br><span>@@ -239,7 +239,7 @@</span><br><span>     /* compose burst */</span><br><span>  burst = *bursts_p + br->bid * 116;</span><br><span>        memcpy(br->burst + 3, burst, 58);</span><br><span style="color: hsl(0, 100%, 40%);">-    memcpy(br->burst + 61, _sched_tsc[gsm_ts_tsc(l1ts->ts)], 26);</span><br><span style="color: hsl(120, 100%, 40%);">+   memcpy(br->burst + 61, _sched_train_seq_gmsk_nb[gsm_ts_tsc(l1ts->ts)], 26);</span><br><span>    memcpy(br->burst + 87, burst + 58, 58);</span><br><span> </span><br><span>       br->burst_len = GSM_BURST_LEN;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/24326">change 24326</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/osmo-bts/+/24326"/><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-Change-Id: Ice464e5b02b11b0f13df247fe6a01420a29bf1c5 </div>
<div style="display:none"> Gerrit-Change-Number: 24326 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>