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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trxcon/l1ctl.c: pass band_arfcn to l1ctl_tx_rach_conf()<br><br>This would allow to abstract both L1CTL and TRX interfaces<br>from each other in the upcoming refactoring.<br><br>Change-Id: I74a23c73b03bad822272b9cfe76c2501666912b7<br>---<br>M src/host/trxcon/l1ctl.c<br>M src/host/trxcon/l1ctl.h<br>M src/host/trxcon/sched_lchan_rach.c<br>3 files changed, 6 insertions(+), 5 deletions(-)<br><br></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 653ddf3..9cd5fe6 100644</span><br><span>--- a/src/host/trxcon/l1ctl.c</span><br><span>+++ b/src/host/trxcon/l1ctl.c</span><br><span>@@ -233,7 +233,8 @@</span><br><span>       return l1ctl_link_send(l1l, msg);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int l1ctl_tx_rach_conf(struct l1ctl_link *l1l, uint32_t fn)</span><br><span style="color: hsl(120, 100%, 40%);">+int l1ctl_tx_rach_conf(struct l1ctl_link *l1l,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t band_arfcn, uint32_t fn)</span><br><span> {</span><br><span>       struct l1ctl_info_dl *dl;</span><br><span>    struct msgb *msg;</span><br><span>@@ -243,8 +244,7 @@</span><br><span>              return -ENOMEM;</span><br><span> </span><br><span>  dl = put_dl_info_hdr(msg, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-        dl->band_arfcn = htons(l1l->trx->band_arfcn);</span><br><span style="color: hsl(120, 100%, 40%);">+        dl->band_arfcn = htons(band_arfcn);</span><br><span>       dl->frame_nr = htonl(fn);</span><br><span> </span><br><span>     return l1ctl_link_send(l1l, msg);</span><br><span>diff --git a/src/host/trxcon/l1ctl.h b/src/host/trxcon/l1ctl.h</span><br><span>index ca8c0be..48bbe09 100644</span><br><span>--- a/src/host/trxcon/l1ctl.h</span><br><span>+++ b/src/host/trxcon/l1ctl.h</span><br><span>@@ -22,4 +22,5 @@</span><br><span>       uint8_t *l2, size_t l2_len, bool traffic);</span><br><span> int l1ctl_tx_dt_conf(struct l1ctl_link *l1l,</span><br><span>   struct l1ctl_info_dl *data, bool traffic);</span><br><span style="color: hsl(0, 100%, 40%);">-int l1ctl_tx_rach_conf(struct l1ctl_link *l1l, uint32_t fn);</span><br><span style="color: hsl(120, 100%, 40%);">+int l1ctl_tx_rach_conf(struct l1ctl_link *l1l,</span><br><span style="color: hsl(120, 100%, 40%);">+        uint16_t band_arfcn, uint32_t fn);</span><br><span>diff --git a/src/host/trxcon/sched_lchan_rach.c b/src/host/trxcon/sched_lchan_rach.c</span><br><span>index 58e86ae..565d693 100644</span><br><span>--- a/src/host/trxcon/sched_lchan_rach.c</span><br><span>+++ b/src/host/trxcon/sched_lchan_rach.c</span><br><span>@@ -175,7 +175,7 @@</span><br><span>        }</span><br><span> </span><br><span>        /* Confirm RACH request */</span><br><span style="color: hsl(0, 100%, 40%);">-      l1ctl_tx_rach_conf(trx->l1l, fn);</span><br><span style="color: hsl(120, 100%, 40%);">+  l1ctl_tx_rach_conf(trx->l1l, trx->band_arfcn, fn);</span><br><span> </span><br><span>         /* Forget processed primitive */</span><br><span>     sched_prim_drop(lchan);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12613">change 12613</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/12613"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: I74a23c73b03bad822272b9cfe76c2501666912b7 </div>
<div style="display:none"> Gerrit-Change-Number: 12613 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>