From 2dec9fff1cc78dd70e23a752acb9e9d002527be7 Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Wed, 5 Jun 2019 21:06:10 +0700 Subject: Use #define RSL_CHAN_RACH for RSL Channel Number of RACH Change-Id: I7f54fccdae6799e5f4d956a101e11c2d6f998546 --- src/common/rsl.c | 2 +- src/osmo-bts-litecell15/l1_if.c | 2 +- src/osmo-bts-oc2g/l1_if.c | 2 +- src/osmo-bts-octphy/l1_if.c | 2 +- src/osmo-bts-sysmo/l1_if.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/rsl.c b/src/common/rsl.c index 410b38a7..7630a8cc 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -883,7 +883,7 @@ int rsl_tx_chan_rqd(struct gsm_bts_trx *trx, struct gsm_time *gtime, /* 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 99852e39..3710fa80 100644 --- a/src/osmo-bts-litecell15/l1_if.c +++ b/src/osmo-bts-litecell15/l1_if.c @@ -1035,7 +1035,7 @@ static int handle_ph_ra_ind(struct lc15l1_hdl *fl1, GsmL1_PhRaInd_t *ra_ind, 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 87c7cf7a..d9c8da0d 100644 --- a/src/osmo-bts-oc2g/l1_if.c +++ b/src/osmo-bts-oc2g/l1_if.c @@ -1091,7 +1091,7 @@ static int handle_ph_ra_ind(struct oc2gl1_hdl *fl1, GsmL1_PhRaInd_t *ra_ind, 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 f149c048..32e738f2 100644 --- a/src/osmo-bts-octphy/l1_if.c +++ b/src/osmo-bts-octphy/l1_if.c @@ -1195,7 +1195,7 @@ static int handle_ph_rach_ind(struct octphy_hdl *fl1, 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 6f61c67b..0777d0e8 100644 --- a/src/osmo-bts-sysmo/l1_if.c +++ b/src/osmo-bts-sysmo/l1_if.c @@ -1030,7 +1030,7 @@ static int handle_ph_ra_ind(struct femtol1_hdl *fl1, GsmL1_PhRaInd_t *ra_ind, 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); -- cgit v1.2.3