From da680071a62c903333b93913fb56907a338f98fa Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Sat, 21 Nov 2020 20:44:51 +0100 Subject: rename to release_sapi_ul_rach(), simplify The sapis_for_ho have only one member, so it's silly to iterate. A subsequent commit will drop sapis_for_ho. Change-Id: I896fbca9876fd274ff9c426250b18b50faebfa89 --- src/osmo-bts-sysmo/oml.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'src/osmo-bts-sysmo') diff --git a/src/osmo-bts-sysmo/oml.c b/src/osmo-bts-sysmo/oml.c index e8bfb2da..6121f76b 100644 --- a/src/osmo-bts-sysmo/oml.c +++ b/src/osmo-bts-sysmo/oml.c @@ -1651,17 +1651,9 @@ static int check_sapi_release(struct gsm_lchan *lchan, int sapi, int dir) return enqueue_sapi_deact_cmd(lchan, sapi, dir); } -static int release_sapis_for_ho(struct gsm_lchan *lchan) +static int release_sapi_ul_rach(struct gsm_lchan *lchan) { - int res = 0; - int i; - - const struct lchan_sapis *s4l = &sapis_for_ho; - - for (i = s4l->num_sapis-1; i >= 0; i--) - res |= check_sapi_release(lchan, - s4l->sapis[i].sapi, s4l->sapis[i].dir); - return res; + return check_sapi_release(lchan, GsmL1_Sapi_Rach, GsmL1_Dir_RxUplink); } static int lchan_deactivate_sapis(struct gsm_lchan *lchan) @@ -1683,7 +1675,7 @@ static int lchan_deactivate_sapis(struct gsm_lchan *lchan) } /* always attempt to disable the RACH burst */ - res |= release_sapis_for_ho(lchan); + res |= release_sapi_ul_rach(lchan); /* nothing was queued */ if (res == 0) { @@ -1886,7 +1878,7 @@ int l1if_rsl_chan_mod(struct gsm_lchan *lchan) gsm_lchan_name(lchan)); /* Give up listening to RACH bursts */ - release_sapis_for_ho(lchan); + release_sapi_ul_rach(lchan); /* Activate the normal SAPIs */ for (i = 0; i < s4l->num_sapis; i++) { -- cgit v1.2.3