Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-bts/+/14381 )
Change subject: Use #define RSL_CHAN_RACH for RSL Channel Number of RACH
......................................................................
Use #define RSL_CHAN_RACH for RSL Channel Number of RACH
Change-Id: I7f54fccdae6799e5f4d956a101e11c2d6f998546
---
M src/common/rsl.c
M src/osmo-bts-litecell15/l1_if.c
M src/osmo-bts-oc2g/l1_if.c
M src/osmo-bts-octphy/l1_if.c
M src/osmo-bts-sysmo/l1_if.c
5 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
diff --git a/src/common/rsl.c b/src/common/rsl.c
index 410b38a..7630a8c 100644
--- a/src/common/rsl.c
+++ b/src/common/rsl.c
@@ -883,7 +883,7 @@
/* 9.3.17 Access Delay */
msgb_tv_put(nmsg, RSL_IE_ACCESS_DELAY, acc_delay);
- rsl_cch_push_hdr(nmsg, RSL_MT_CHAN_RQD, 0x88); // FIXME
+ rsl_cch_push_hdr(nmsg, RSL_MT_CHAN_RQD, RSL_CHAN_RACH); // FIXME
nmsg->trx = trx;
return abis_bts_rsl_sendmsg(nmsg);
diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c
index 99852e3..3710fa8 100644
--- a/src/osmo-bts-litecell15/l1_if.c
+++ b/src/osmo-bts-litecell15/l1_if.c
@@ -1035,7 +1035,7 @@
if (!lchan || lchan->ts->pchan == GSM_PCHAN_CCCH ||
lchan->ts->pchan == GSM_PCHAN_CCCH_SDCCH4 ||
lchan->ts->pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH)
- rach_ind_param.chan_nr = 0x88;
+ rach_ind_param.chan_nr = RSL_CHAN_RACH;
else
rach_ind_param.chan_nr = gsm_lchan2chan_nr(lchan);
diff --git a/src/osmo-bts-oc2g/l1_if.c b/src/osmo-bts-oc2g/l1_if.c
index 87c7cf7..d9c8da0 100644
--- a/src/osmo-bts-oc2g/l1_if.c
+++ b/src/osmo-bts-oc2g/l1_if.c
@@ -1091,7 +1091,7 @@
if (!lchan || lchan->ts->pchan == GSM_PCHAN_CCCH ||
lchan->ts->pchan == GSM_PCHAN_CCCH_SDCCH4 ||
lchan->ts->pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH)
- rach_ind_param.chan_nr = 0x88;
+ rach_ind_param.chan_nr = RSL_CHAN_RACH;
else
rach_ind_param.chan_nr = gsm_lchan2chan_nr(lchan);
diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c
index f149c04..32e738f 100644
--- a/src/osmo-bts-octphy/l1_if.c
+++ b/src/osmo-bts-octphy/l1_if.c
@@ -1195,7 +1195,7 @@
if (ra_ind->LchId.bySubChannelNb ==
cOCTVC1_GSM_ID_SUB_CHANNEL_NB_ENUM_ALL &&
ra_ind->LchId.bySAPI == cOCTVC1_GSM_SAPI_ENUM_RACH) {
- rach_ind_param.chan_nr = 0x88;
+ rach_ind_param.chan_nr = RSL_CHAN_RACH;
} else {
struct gsm_lchan *lchan = get_lchan_by_lchid(trx,
&ra_ind->LchId);
rach_ind_param.chan_nr = gsm_lchan2chan_nr(lchan);
diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c
index 6f61c67..0777d0e 100644
--- a/src/osmo-bts-sysmo/l1_if.c
+++ b/src/osmo-bts-sysmo/l1_if.c
@@ -1030,7 +1030,7 @@
if (!lchan || lchan->ts->pchan == GSM_PCHAN_CCCH ||
lchan->ts->pchan == GSM_PCHAN_CCCH_SDCCH4 ||
lchan->ts->pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH)
- rach_ind_param.chan_nr = 0x88;
+ rach_ind_param.chan_nr = RSL_CHAN_RACH;
else
rach_ind_param.chan_nr = gsm_lchan2chan_nr(lchan);
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/14381
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I7f54fccdae6799e5f4d956a101e11c2d6f998546
Gerrit-Change-Number: 14381
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <axilira...@gmail.com>
Gerrit-Reviewer: Harald Welte <lafo...@gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-MessageType: merged
