[S] Change in osmo-bsc[master]: rsl_rx_pchan_rqd(): Clean up code path

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/38075?usp=email ) Change subject: rsl_rx_pchan_rqd(): Clean up code path ...................................................................... rsl_rx_pchan_rqd(): Clean up code path * Use early return to simplify code indentation * use LOG_BTS macro Change-Id: I052600d8c7b1e948947a9cd989c8ae80f3c23259 --- M src/osmo-bsc/abis_rsl.c 1 file changed, 15 insertions(+), 14 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 9d922d0..42a164a 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -1946,26 +1946,27 @@ uint8_t is_11bit; struct gsm_time gsm_time; - /* Process rach request and forward contained information to PCU */ - if (rqd->ref.ra == 0x7F) { + /* Process rach request and forward contained information to PCU: */ + + if (rqd->ref.ra == 0x7F) { /* 11bit RACH */ is_11bit = 1; /* FIXME: Also handle 11 bit rach requests */ - LOGP(DRSL, LOGL_ERROR, "BTS %d eleven bit access burst not supported yet!\n", rqd->bts->nr); + LOG_BTS(rqd->bts, DRSL, LOGL_ERROR, "CHAN RQD 11bit access burst not supported yet!\n"); return -EINVAL; - } else { - is_11bit = 0; - rqd_ta = rqd->ta; - - gsm_time.t1 = rqd->ref.t1; - gsm_time.t2 = rqd->ref.t2; - gsm_time.t3 = rqd->ref.t3_low | (rqd->ref.t3_high << 3); - fn = gsm_gsmtime2fn(&gsm_time); - - LOG_BTS(rqd->bts, DRSL, LOGL_INFO, "CHAN RQD: fn(t1=%u,t3=%u,t2=%u) = %u\n", - gsm_time.t1, gsm_time.t3, gsm_time.t2, fn); } + is_11bit = 0; + rqd_ta = rqd->ta; + + gsm_time.t1 = rqd->ref.t1; + gsm_time.t2 = rqd->ref.t2; + gsm_time.t3 = rqd->ref.t3_low | (rqd->ref.t3_high << 3); + fn = gsm_gsmtime2fn(&gsm_time); + + LOG_BTS(rqd->bts, DRSL, LOGL_INFO, "CHAN RQD: fn(t1=%u,t3=%u,t2=%u) = %u\n", + gsm_time.t1, gsm_time.t3, gsm_time.t2, fn); + return pcu_tx_rach_ind(rqd->bts, rqd_ta, rqd->ref.ra, fn, is_11bit, GSM_L1_BURST_TYPE_ACCESS_0); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/38075?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I052600d8c7b1e948947a9cd989c8ae80f3c23259 Gerrit-Change-Number: 38075 Gerrit-PatchSet: 1 Gerrit-Owner: pespin &lt;pespin(a)sysmocom.de&gt; Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter &lt;pmaier(a)sysmocom.de&gt; Gerrit-Reviewer: fixeria &lt;vyanitskiy(a)sysmocom.de&gt; Gerrit-Reviewer: laforge &lt;laforge(a)osmocom.org&gt;