aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVadim Yanitskiy <axilirator@gmail.com>2020-03-30 16:14:07 +0700
committerlaforge <laforge@osmocom.org>2020-08-12 18:20:33 +0000
commit811c90c5fd4413f9ab36773120beab3cde5d47ab (patch)
treef584f12f229b07552a18adba1cd23e3d89982e70
parent9d5a115ee20bc6e446e57d3efb9ca955a751de10 (diff)
direct-phy: fix handle_ph_ra_ind(): handle PH-RA.ind on PRACH SAPI
In [1] I restricted L1 SAPI of PH-RA.ind to PDTCH and PTCCH, and this seems to have caused a regression reported in [2]: DL1IF ERROR sysmo_l1_if.c:251 Rx PH-RA.ind for unknown L1 SAPI PRACH I assumed that PH-RA.ind belonging to a Control Acknowledgement message (in format of 4 Access Bursts) would have PDTCH SAPI, while apparently it's actually arriving on PRACH. [1] I482d60a46b9d253dfe0b16140eac9fea6420b30c [2] https://osmocom.org/issues/1526#note-39 Change-Id: Ib0a6da37de7a1db4cad2b96293b31b9f32e7d9eb Related: OS#1526
-rw-r--r--src/osmo-bts-litecell15/lc15_l1_if.c1
-rw-r--r--src/osmo-bts-oc2g/oc2g_l1_if.c1
-rw-r--r--src/osmo-bts-sysmo/sysmo_l1_if.c1
3 files changed, 3 insertions, 0 deletions
diff --git a/src/osmo-bts-litecell15/lc15_l1_if.c b/src/osmo-bts-litecell15/lc15_l1_if.c
index 0fcd7cf0..bf2ecec8 100644
--- a/src/osmo-bts-litecell15/lc15_l1_if.c
+++ b/src/osmo-bts-litecell15/lc15_l1_if.c
@@ -250,6 +250,7 @@ static int handle_ph_ra_ind(struct lc15l1_hdl *fl1h, GsmL1_PhRaInd_t *ra_ind)
switch (ra_ind->sapi) {
case GsmL1_Sapi_Pdtch:
+ case GsmL1_Sapi_Prach:
bts_update_tbf_ta("PH-RA", ra_ind->u32Fn, fl1h->trx_no, ra_ind->u8Tn,
qta2ta(ra_ind->measParam.i16BurstTiming), true);
break;
diff --git a/src/osmo-bts-oc2g/oc2g_l1_if.c b/src/osmo-bts-oc2g/oc2g_l1_if.c
index 6c1e0f8c..0bfe0b93 100644
--- a/src/osmo-bts-oc2g/oc2g_l1_if.c
+++ b/src/osmo-bts-oc2g/oc2g_l1_if.c
@@ -249,6 +249,7 @@ static int handle_ph_ra_ind(struct oc2gl1_hdl *fl1h, GsmL1_PhRaInd_t *ra_ind)
switch (ra_ind->sapi) {
case GsmL1_Sapi_Pdtch:
+ case GsmL1_Sapi_Prach:
bts_update_tbf_ta("PH-RA", ra_ind->u32Fn, fl1h->trx_no, ra_ind->u8Tn,
qta2ta(ra_ind->measParam.i16BurstTiming), true);
break;
diff --git a/src/osmo-bts-sysmo/sysmo_l1_if.c b/src/osmo-bts-sysmo/sysmo_l1_if.c
index 5e743db7..7406bbf3 100644
--- a/src/osmo-bts-sysmo/sysmo_l1_if.c
+++ b/src/osmo-bts-sysmo/sysmo_l1_if.c
@@ -239,6 +239,7 @@ static int handle_ph_ra_ind(struct femtol1_hdl *fl1h, GsmL1_PhRaInd_t *ra_ind)
switch (ra_ind->sapi) {
case GsmL1_Sapi_Pdtch:
+ case GsmL1_Sapi_Prach:
bts_update_tbf_ta("PH-RA", ra_ind->u32Fn, fl1h->trx_no, ra_ind->u8Tn,
qta2ta(ra_ind->measParam.i16BurstTiming), true);
break;