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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use #define RSL_CHAN_RACH for RSL Channel Number of RACH<br><br>Change-Id: I7f54fccdae6799e5f4d956a101e11c2d6f998546<br>---<br>M src/common/rsl.c<br>M src/osmo-bts-litecell15/l1_if.c<br>M src/osmo-bts-oc2g/l1_if.c<br>M src/osmo-bts-octphy/l1_if.c<br>M src/osmo-bts-sysmo/l1_if.c<br>5 files changed, 5 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/rsl.c b/src/common/rsl.c</span><br><span>index 410b38a..7630a8c 100644</span><br><span>--- a/src/common/rsl.c</span><br><span>+++ b/src/common/rsl.c</span><br><span>@@ -883,7 +883,7 @@</span><br><span>         /* 9.3.17 Access Delay */</span><br><span>    msgb_tv_put(nmsg, RSL_IE_ACCESS_DELAY, acc_delay);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  rsl_cch_push_hdr(nmsg, RSL_MT_CHAN_RQD, 0x88); // FIXME</span><br><span style="color: hsl(120, 100%, 40%);">+       rsl_cch_push_hdr(nmsg, RSL_MT_CHAN_RQD, RSL_CHAN_RACH); // FIXME</span><br><span>     nmsg->trx = trx;</span><br><span> </span><br><span>      return abis_bts_rsl_sendmsg(nmsg);</span><br><span>diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c</span><br><span>index 99852e3..3710fa8 100644</span><br><span>--- a/src/osmo-bts-litecell15/l1_if.c</span><br><span>+++ b/src/osmo-bts-litecell15/l1_if.c</span><br><span>@@ -1035,7 +1035,7 @@</span><br><span>  if (!lchan || lchan->ts->pchan == GSM_PCHAN_CCCH ||</span><br><span>        lchan->ts->pchan == GSM_PCHAN_CCCH_SDCCH4 ||</span><br><span>           lchan->ts->pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH)</span><br><span style="color: hsl(0, 100%, 40%);">-               rach_ind_param.chan_nr = 0x88;</span><br><span style="color: hsl(120, 100%, 40%);">+                rach_ind_param.chan_nr = RSL_CHAN_RACH;</span><br><span>      else</span><br><span>                 rach_ind_param.chan_nr = gsm_lchan2chan_nr(lchan);</span><br><span> </span><br><span>diff --git a/src/osmo-bts-oc2g/l1_if.c b/src/osmo-bts-oc2g/l1_if.c</span><br><span>index 87c7cf7..d9c8da0 100644</span><br><span>--- a/src/osmo-bts-oc2g/l1_if.c</span><br><span>+++ b/src/osmo-bts-oc2g/l1_if.c</span><br><span>@@ -1091,7 +1091,7 @@</span><br><span>      if (!lchan || lchan->ts->pchan == GSM_PCHAN_CCCH ||</span><br><span>        lchan->ts->pchan == GSM_PCHAN_CCCH_SDCCH4 ||</span><br><span>           lchan->ts->pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH)</span><br><span style="color: hsl(0, 100%, 40%);">-               rach_ind_param.chan_nr = 0x88;</span><br><span style="color: hsl(120, 100%, 40%);">+                rach_ind_param.chan_nr = RSL_CHAN_RACH;</span><br><span>      else</span><br><span>                 rach_ind_param.chan_nr = gsm_lchan2chan_nr(lchan);</span><br><span> </span><br><span>diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c</span><br><span>index f149c04..32e738f 100644</span><br><span>--- a/src/osmo-bts-octphy/l1_if.c</span><br><span>+++ b/src/osmo-bts-octphy/l1_if.c</span><br><span>@@ -1195,7 +1195,7 @@</span><br><span> </span><br><span>  if (ra_ind->LchId.bySubChannelNb == cOCTVC1_GSM_ID_SUB_CHANNEL_NB_ENUM_ALL &&</span><br><span>         ra_ind->LchId.bySAPI == cOCTVC1_GSM_SAPI_ENUM_RACH) {</span><br><span style="color: hsl(0, 100%, 40%);">-            rach_ind_param.chan_nr = 0x88;</span><br><span style="color: hsl(120, 100%, 40%);">+                rach_ind_param.chan_nr = RSL_CHAN_RACH;</span><br><span>      } else {</span><br><span>             struct gsm_lchan *lchan = get_lchan_by_lchid(trx, &ra_ind->LchId);</span><br><span>            rach_ind_param.chan_nr = gsm_lchan2chan_nr(lchan);</span><br><span>diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c</span><br><span>index 6f61c67..0777d0e 100644</span><br><span>--- a/src/osmo-bts-sysmo/l1_if.c</span><br><span>+++ b/src/osmo-bts-sysmo/l1_if.c</span><br><span>@@ -1030,7 +1030,7 @@</span><br><span>      if (!lchan || lchan->ts->pchan == GSM_PCHAN_CCCH ||</span><br><span>        lchan->ts->pchan == GSM_PCHAN_CCCH_SDCCH4 ||</span><br><span>           lchan->ts->pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH)</span><br><span style="color: hsl(0, 100%, 40%);">-               rach_ind_param.chan_nr = 0x88;</span><br><span style="color: hsl(120, 100%, 40%);">+                rach_ind_param.chan_nr = RSL_CHAN_RACH;</span><br><span>      else</span><br><span>                 rach_ind_param.chan_nr = gsm_lchan2chan_nr(lchan);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/14381">change 14381</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/+/14381"/><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: I7f54fccdae6799e5f4d956a101e11c2d6f998546 </div>
<div style="display:none"> Gerrit-Change-Number: 14381 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-MessageType: merged </div>