Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/15918 )
Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH
..
l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH
The MPH INFO MEAS IND indication, which contains the uplink measurement
data is sent in parallel to the PH DATA and TCH indications as a
separate indications. This makes the overall uplink measurement data
processing unnecessarly complex. So lets put the data that is relevant
for measurement into the PH DATA and TCH indications directly.
This change only affects osmo-bts-trx at the moment. In order to keep
the upper layers (l1sap.c) compatible we add an autodection to switch
between separate measurement indications and included measurement data.
Related: OS#2977
Depends: libosmocore I2c34b02d329f9df190c5035c396403ca0a4f9c42
Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84
---
M include/osmo-bts/gsm_data_shared.h
M include/osmo-bts/scheduler_backend.h
M src/common/gsm_data_shared.c
M src/common/l1sap.c
M src/common/scheduler.c
M src/osmo-bts-trx/l1_if.c
M src/osmo-bts-trx/l1_if.h
M src/osmo-bts-trx/main.c
M src/osmo-bts-trx/scheduler_trx.c
9 files changed, 128 insertions(+), 99 deletions(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/include/osmo-bts/gsm_data_shared.h
b/include/osmo-bts/gsm_data_shared.h
index 41998ad..e0d70b0 100644
--- a/include/osmo-bts/gsm_data_shared.h
+++ b/include/osmo-bts/gsm_data_shared.h
@@ -479,6 +479,11 @@
BTS_FEAT_SPEECH_H_AMR,
BTS_FEAT_ETWS_PN,
BTS_FEAT_MS_PWR_CTRL_DSP,
+ /* When the feature is set then the measurement data is included in
+* (PRIM_PH_DATA) and struct ph_tch_param (PRIM_TCH). Otherwise the
+* measurement data is passed using a separate MPH INFO MEAS IND.
+* (See also ticket: OS#2977) */
+ BTS_FEAT_MEAS_PAYLOAD_COMB,
_NUM_BTS_FEAT
};
diff --git a/include/osmo-bts/scheduler_backend.h
b/include/osmo-bts/scheduler_backend.h
index 51c957c..aa2d6e9 100644
--- a/include/osmo-bts/scheduler_backend.h
+++ b/include/osmo-bts/scheduler_backend.h
@@ -54,7 +54,8 @@
enum osmo_ph_pres_info_type presence_info);
int _sched_compose_tch_ind(struct l1sched_trx *l1t, uint8_t tn, uint32_t fn,
- enum trx_chan_type chan, uint8_t *tch, uint8_t tch_len);
+ enum trx_chan_type chan, uint8_t *tch, uint8_t
tch_len,
+ int16_t ta_offs_256bits, uint16_t ber10k, float
rssi);
ubit_t *tx_idle_fn(struct l1sched_trx *l1t, uint8_t tn, uint32_t fn,
enum trx_chan_type chan, uint8_t bid, uint16_t *nbits);
diff --git a/src/common/gsm_data_shared.c b/src/common/gsm_data_shared.c
index b31d458..c4a60b5 100644
--- a/src/common/gsm_data_shared.c
+++ b/src/common/gsm_data_shared.c
@@ -109,6 +109,7 @@
{ BTS_FEAT_SPEECH_H_AMR,"Halfrate speech AMR" },
{ BTS_FEAT_ETWS_PN, "ETWS Primary Notification on PCH" },
{ BTS_FEAT_MS_PWR_CTRL_DSP, "DSP/HW based MS Power Control Loop" },
+ { BTS_FEAT_MEAS_PAYLOAD_COMB, "Measurement and Payload data
combined"},
{ 0, NULL }
};
diff --git a/src/common/l1sap.c b/src/common/l1sap.c
index 889f7f6..21f3a8a 100644
--- a/src/common/l1sap.c
+++ b/src/common/l1sap.c
@@ -629,42 +629,93 @@
}
/* measurement information received from bts model */
-static int l1sap_info_meas_ind(struct gsm_bts_trx *trx,
- struct osmo_phsap_prim *l1sap,
- struct info_meas_ind_param *info_meas_ind)
+static void process_l1sap_meas_data(struct gsm_bts_trx *trx,
+ struct osmo_phsap_prim *l1sap,
+ enum osmo_ph_prim ind_type)
{
struct bts_ul_meas ulm;
struct gsm_lchan *lchan;
+ struct info_meas_ind_param *info_meas_ind;
+ struct ph_data_param *ph_data_ind;
+ struct ph_tch_param *ph_tch_ind;
+ uint8_t chan_nr;
+ uint32_t fn;
+ uint8_t inv_rssi;
+ uint8_t is_sub;
+ int16_t ta_offs_256bits;
+ uint16_t ber10k;
+ const char *ind_name;
- lchan = get_active_lchan_by_chan_nr(trx, info_meas_ind->chan_nr);
- if (!lchan) {
- LOGPFN(DL1P, LOGL_ERROR, info_meas_ind->fn,
- "No lchan for MPH INFO MEAS IND (chan_nr=%s)\n",
rsl_chan_nr_str(info_meas_ind->chan_nr));
- return 0;
+ switch (ind_type) {
+ case PRIM_MPH_INFO:
+ /* (legacy way, see also OS#2977) */
+ info_meas_ind = &l1sap->u.info.u.meas_ind;
+ chan_nr = info_meas_ind->chan_nr;
+ fn = info_meas_ind->fn;
+ inv_rssi = info_meas_ind->inv_rssi;
+ is_sub = info_meas_ind->is_sub;
+ ta_offs_256bits = info_meas_ind->ta_
Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15918 ) Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH .. Patch Set 13: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 13 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 20 Jan 2020 14:35:18 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15918 ) Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH .. Patch Set 13: Code-Review+1 My comments regarding unnecessary pointers still apply. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 13 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 20 Jan 2020 12:19:46 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH
Hello pespin, fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 to look at the new patch set (#13). Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH .. l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH The MPH INFO MEAS IND indication, which contains the uplink measurement data is sent in parallel to the PH DATA and TCH indications as a separate indications. This makes the overall uplink measurement data processing unnecessarly complex. So lets put the data that is relevant for measurement into the PH DATA and TCH indications directly. This change only affects osmo-bts-trx at the moment. In order to keep the upper layers (l1sap.c) compatible we add an autodection to switch between separate measurement indications and included measurement data. Related: OS#2977 Depends: libosmocore I2c34b02d329f9df190c5035c396403ca0a4f9c42 Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 --- M include/osmo-bts/gsm_data_shared.h M include/osmo-bts/scheduler_backend.h M src/common/gsm_data_shared.c M src/common/l1sap.c M src/common/scheduler.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/main.c M src/osmo-bts-trx/scheduler_trx.c 9 files changed, 128 insertions(+), 99 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/18/15918/13 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 13 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15918 ) Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH .. Patch Set 12: (2 comments) https://gerrit.osmocom.org/c/osmo-bts/+/15918/12/include/osmo-bts/gsm_data_shared.h File include/osmo-bts/gsm_data_shared.h: https://gerrit.osmocom.org/c/osmo-bts/+/15918/12/include/osmo-bts/gsm_data_shared.h@482 PS12, Line 482: /* We are capable to use two different sources to receive measurement data It's not clear in here which method is available if the feature is set... I'm sure this text can be shrunk a lot too. https://gerrit.osmocom.org/c/osmo-bts/+/15918/12/src/osmo-bts-trx/scheduler_trx.c File src/osmo-bts-trx/scheduler_trx.c: https://gerrit.osmocom.org/c/osmo-bts/+/15918/12/src/osmo-bts-trx/scheduler_trx.c@346 PS12, Line 346: int32_t *toa256_sum = &chan_state->toa256_sum; IMHO these pointers are not needed and make code more complex with no good reason. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 12 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 16 Jan 2020 12:25:21 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH
Hello fixeria, pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 to look at the new patch set (#12). Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH .. l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH The MPH INFO MEAS IND indication, which contains the uplink measurement data is sent in parallel to the PH DATA and TCH indications as a separate indications. This makes the overall uplink measurement data processing unnecessarly complex. So lets put the data that is relevant for measurement into the PH DATA and TCH indications directly. This change only affects osmo-bts-trx at the moment. In order to keep the upper layers (l1sap.c) compatible we add an autodection to switch between separate measurement indications and included measurement data. Related: OS#2977 Depends: libosmocore I2c34b02d329f9df190c5035c396403ca0a4f9c42 Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 --- M include/osmo-bts/gsm_data_shared.h M include/osmo-bts/scheduler_backend.h M src/common/gsm_data_shared.c M src/common/l1sap.c M src/common/scheduler.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/main.c M src/osmo-bts-trx/scheduler_trx.c 9 files changed, 133 insertions(+), 99 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/18/15918/12 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 12 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH
Hello fixeria, pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 to look at the new patch set (#11). Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH .. l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH The MPH INFO MEAS IND indication, which contains the uplink measurement data is sent in parallel to the PH DATA and TCH indications as a separate indications. This makes the overall uplink measurement data processing unnecessarly complex. So lets put the data that is relevant for measurement into the PH DATA and TCH indications directly. This change only affects osmo-bts-trx at the moment. In order to keep the upper layers (l1sap.c) compatible we add an autodection to switch between separate measurement indications and included measurement data. Related: OS#2977 Depends: libosmocore I2c34b02d329f9df190c5035c396403ca0a4f9c42 Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 --- M include/osmo-bts/gsm_data_shared.h M include/osmo-bts/scheduler_backend.h M src/common/gsm_data_shared.c M src/common/l1sap.c M src/common/scheduler.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/main.c M src/osmo-bts-trx/scheduler_trx.c 9 files changed, 136 insertions(+), 99 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/18/15918/11 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 11 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15918 ) Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH .. Patch Set 10: (2 comments) https://gerrit.osmocom.org/c/osmo-bts/+/15918/10/src/common/l1sap.c File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/15918/10/src/common/l1sap.c@647 PS10, Line 647: char cosmetic: const char ... https://gerrit.osmocom.org/c/osmo-bts/+/15918/10/src/common/l1sap.c@742 PS10, Line 742: true false? does not make sense otherwise... -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 10 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 15 Jan 2020 16:35:45 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH
Hello fixeria, pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 to look at the new patch set (#10). Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH .. l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH The MPH INFO MEAS IND indication, which contains the uplink measurement data is sent in parallel to the PH DATA and TCH indications as a separate indications. This makes the overall uplink measurement data processing unnecessarly complex. So lets put the data that is relevant for measurement into the PH DATA and TCH indications directly. This change only affects osmo-bts-trx at the moment. In order to keep the upper layers (l1sap.c) compatible we add an autodection to switch between separate measurement indications and included measurement data. Related: OS#2977 Depends: libosmocore I2c34b02d329f9df190c5035c396403ca0a4f9c42 Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 --- M include/osmo-bts/gsm_data_shared.h M include/osmo-bts/scheduler_backend.h M src/common/gsm_data_shared.c M src/common/l1sap.c M src/common/scheduler.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/main.c M src/osmo-bts-trx/scheduler_trx.c 9 files changed, 136 insertions(+), 99 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/18/15918/10 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 10 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15918 ) Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH .. Patch Set 9: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/15918/9/src/osmo-bts-trx/scheduler_trx.c File src/osmo-bts-trx/scheduler_trx.c: https://gerrit.osmocom.org/c/osmo-bts/+/15918/9/src/osmo-bts-trx/scheduler_trx.c@401 PS9, Line 401: toa_num > Its probably the wrong approach to calculate those values from the > chan_state. […] In general we should not do loss detection of Rx/Uplink SACCH/TCH frames in Tx/Downlink burst handlers. Since we have NOPE indications, we can move this code to the proper place. This is not related to this change and should be done separately. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jan 2020 15:45:19 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: dexter Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15918 ) Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH .. Patch Set 9: (3 comments) https://gerrit.osmocom.org/c/osmo-bts/+/15918/9/src/osmo-bts-trx/scheduler_trx.c File src/osmo-bts-trx/scheduler_trx.c: https://gerrit.osmocom.org/c/osmo-bts/+/15918/9/src/osmo-bts-trx/scheduler_trx.c@156 PS9, Line 156: uint8_t _sched_compose_ph_data_ind() accepts float AFAIR. https://gerrit.osmocom.org/c/osmo-bts/+/15918/9/src/osmo-bts-trx/scheduler_trx.c@201 PS9, Line 201: 110 ... but shouldn't it be -110? https://gerrit.osmocom.org/c/osmo-bts/+/15918/9/src/osmo-bts-trx/scheduler_trx.c@405 PS9, Line 405: 127 Also must be negative? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jan 2020 15:37:39 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15918 ) Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH .. Patch Set 9: -Code-Review (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/15918/9/src/osmo-bts-trx/scheduler_trx.c File src/osmo-bts-trx/scheduler_trx.c: https://gerrit.osmocom.org/c/osmo-bts/+/15918/9/src/osmo-bts-trx/scheduler_trx.c@198 PS9, Line 198: rssi_num > Again, it's always 0 here, and the positive branch will never be taken. […] Or wait... I am sorry. I forgot that both Uplink and Downlink handlers share the same state. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jan 2020 15:31:42 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15918 ) Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH .. Patch Set 9: (5 comments) https://gerrit.osmocom.org/c/osmo-bts/+/15918/7/src/common/l1sap.c File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/15918/7/src/common/l1sap.c@735 PS7, Line 735: if (!gsm_bts_has_feature(trx->bts, BTS_FEAT_MEAS_PAYLOAD_COMB)) : process_l1sap_meas_data(trx, l1sap, PRIM_MPH_INFO); > we sould probably print an error message here (once? rate-limited)? Or even > have an OSMO_ASSERT()? […] Done https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/common/scheduler.c File src/common/scheduler.c: https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/common/scheduler.c@760 PS1, Line 760: l1sap->u.tch. > I believe I explained this elsewhere here in gerrit or in redmine. […] The is_sub flag is, as far as I know only set by the higher layers. From what I can see the higher layers are not setting it, at least not in l1sap.c. However when we the data ind and the measurement report are one indication the decision would be easy to make in l1sap.c https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/osmo-bts-trx/scheduler_trx.c File src/osmo-bts-trx/scheduler_trx.c: https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/osmo-bts-trx/scheduler_trx.c@a205 PS1, Line 205: /* FIXME: use actual values for BER etc */ > the best would be if those values simply wouldn't count. […] We could use rssi_sum rssi_num from the chan_state struct to do that. I see it in other places too so I use this method now. However, I am still not sure if this is right. The value is now averaged so when the signal fades it should be realistic, but what if there is a sudden signal drop then the lost SACCH frames we compensate here would reflect better signal conditions as they actually are. All in all it might not matter much as the measurement results are averaged anyway in the higher layers. https://gerrit.osmocom.org/c/osmo-bts/+/15918/8/src/osmo-bts-trx/scheduler_trx.c File src/osmo-bts-trx/scheduler_trx.c: https://gerrit.osmocom.org/c/osmo-bts/+/15918/8/src/osmo-bts-trx/scheduler_trx.c@198 PS8, Line 198: *rssi_sum / *rssi_num > This is a TX burst handler, so there can be no RSSI measurements. […] Yes, in TX the division by zero case is very likely. However, I see the division with rssi and toa in many other places. Do you think it makes sense to protect those as well? https://gerrit.osmocom.org/c/osmo-bts/+/15918/9/src/osmo-bts-trx/scheduler_trx.c File src/osmo-bts-trx/scheduler_trx.c: https://gerrit.osmocom.org/c/osmo-bts/+/15918/9/src/osmo-bts-trx/scheduler_trx.c@401 PS9, Line 401: toa_num > Same here. Its probably the wrong approach to calculate those values from the chan_state. Instead I suggest to remember the last good toa256 and the last good rssi and use those instead. However I still do not understand why there aren't any toa256_sum values in the chan state. During the channel establishment phase, before the MS transmitting I see that there can not be any values but what happens when a TCH gets lost while the channel is up? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jan 2020 14:54:41 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: dexter Comment-In-Reply-To: fixeria Comment-In-Reply-To: laforge Gerrit-MessageType: comment
Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15918 ) Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH .. Patch Set 9: Code-Review-1 (2 comments) https://gerrit.osmocom.org/c/osmo-bts/+/15918/9/src/osmo-bts-trx/scheduler_trx.c File src/osmo-bts-trx/scheduler_trx.c: https://gerrit.osmocom.org/c/osmo-bts/+/15918/9/src/osmo-bts-trx/scheduler_trx.c@198 PS9, Line 198: rssi_num Again, it's always 0 here, and the positive branch will never be taken. In general this part of the code is a hack, and we have to use hard-coded -110 here. https://gerrit.osmocom.org/c/osmo-bts/+/15918/9/src/osmo-bts-trx/scheduler_trx.c@401 PS9, Line 401: toa_num Same here. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 09 Jan 2020 14:21:40 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH
Hello fixeria, pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 to look at the new patch set (#9). Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH .. l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH The MPH INFO MEAS IND indication, which contains the uplink measurement data is sent in parallel to the PH DATA and TCH indications as a separate indications. This makes the overall uplink measurement data processing unnecessarly complex. So lets put the data that is relevant for measurement into the PH DATA and TCH indications directly. This change only affects osmo-bts-trx at the moment. In order to keep the upper layers (l1sap.c) compatible we add an autodection to switch between separate measurement indications and included measurement data. Related: OS#2977 Depends: libosmocore I2c34b02d329f9df190c5035c396403ca0a4f9c42 Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 --- M include/osmo-bts/gsm_data_shared.h M include/osmo-bts/scheduler_backend.h M src/common/gsm_data_shared.c M src/common/l1sap.c M src/common/scheduler.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/main.c M src/osmo-bts-trx/scheduler_trx.c 9 files changed, 131 insertions(+), 99 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/18/15918/9 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15918 ) Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH .. Patch Set 8: Code-Review-1 (2 comments) https://gerrit.osmocom.org/c/osmo-bts/+/15918/8/src/osmo-bts-trx/scheduler_trx.c File src/osmo-bts-trx/scheduler_trx.c: https://gerrit.osmocom.org/c/osmo-bts/+/15918/8/src/osmo-bts-trx/scheduler_trx.c@198 PS8, Line 198: *rssi_sum / *rssi_num This is a TX burst handler, so there can be no RSSI measurements. Most likely you would get division by zero. https://gerrit.osmocom.org/c/osmo-bts/+/15918/8/src/osmo-bts-trx/scheduler_trx.c@398 PS8, Line 398: toa256 = *toa256_sum / *toa_num; Same here, it's a TX handler and it has no Uplink measurements in its state. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 8 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jan 2020 13:16:16 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH
Hello pespin, fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 to look at the new patch set (#8). Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH .. l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH The MPH INFO MEAS IND indication, which contains the uplink measurement data is sent in parallel to the PH DATA and TCH indications as a separate indications. This makes the overall uplink measurement data processing unnecessarly complex. So lets put the data that is relevant for measurement into the PH DATA and TCH indications directly. This change only affects osmo-bts-trx at the moment. In order to keep the upper layers (l1sap.c) compatible we add an autodection to switch between separate measurement indications and included measurement data. Related: OS#2977 Depends: libosmocore I2c34b02d329f9df190c5035c396403ca0a4f9c42 Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 --- M include/osmo-bts/gsm_data_shared.h M include/osmo-bts/scheduler_backend.h M src/common/gsm_data_shared.c M src/common/l1sap.c M src/common/scheduler.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/main.c M src/osmo-bts-trx/scheduler_trx.c 9 files changed, 126 insertions(+), 100 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/18/15918/8 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 8 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15918 ) Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH .. Patch Set 7: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/15918/7/src/common/l1sap.c File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/15918/7/src/common/l1sap.c@735 PS7, Line 735: if (!gsm_bts_has_feature(trx->bts, BTS_FEAT_MEAS_PAYLOAD_COMB)) : process_l1sap_meas_data(trx, l1sap, PRIM_MPH_INFO); we sould probably print an error message here (once? rate-limited)? Or even have an OSMO_ASSERT()? It's a claar programming bug: Either you have FEAT_MEAS_PAYLOAD_COMB *or* you send PRIM_INFO_MEAS up the stack... -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 08 Jan 2020 11:17:56 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH
Hello pespin, fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 to look at the new patch set (#7). Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH .. l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH The MPH INFO MEAS IND indication, which contains the uplink measurement data is sent in parallel to the PH DATA and TCH indications as a separate indications. This makes the overall uplink measurement data processing unnecessarly complex. So lets put the data that is relevant for measurement into the PH DATA and TCH indications directly. This change only affects osmo-bts-trx at the moment. In order to keep the upper layers (l1sap.c) compatible we add an autodection to switch between separate measurement indications and included measurement data. Related: OS#2977 Depends: libosmocore I2c34b02d329f9df190c5035c396403ca0a4f9c42 Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 --- M include/osmo-bts/gsm_data_shared.h M include/osmo-bts/scheduler_backend.h M src/common/gsm_data_shared.c M src/common/l1sap.c M src/common/scheduler.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/main.c M src/osmo-bts-trx/scheduler_trx.c 9 files changed, 122 insertions(+), 100 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/18/15918/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset
Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH
Hello pespin, fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 to look at the new patch set (#6). Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH .. l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH The MPH INFO MEAS IND indication, which contains the uplink measurement data is sent in parallel to the PH DATA and TCH indications as a separate indications. This makes the overall uplink measurement data processing unnecessarly complex. So lets put the data that is relevant for measurement into the PH DATA and TCH indications directly. This change only affects osmo-bts-trx at the moment. In order to keep the upper layers (l1sap.c) compatible we add an autodection to switch between separate measurement indications and included measurement data. Related: OS#2977 Depends: libosmocore I2c34b02d329f9df190c5035c396403ca0a4f9c42 Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 --- M include/osmo-bts/gsm_data_shared.h M include/osmo-bts/scheduler_backend.h M src/common/gsm_data_shared.c M src/common/l1sap.c M src/common/scheduler.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/main.c M src/osmo-bts-trx/scheduler_trx.c 9 files changed, 119 insertions(+), 99 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/18/15918/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset
Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH
Hello pespin, fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 to look at the new patch set (#5). Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH .. l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH The MPH INFO MEAS IND indication, which contains the uplink measurement data is sent in parallel to the PH DATA and TCH indications as a separate indications. This makes the overall uplink measurement data processing unnecessarly complex. So lets put the data that is relevant for measurement into the PH DATA and TCH indications directly. This change only affects osmo-bts-trx at the moment. In order to keep the upper layers (l1sap.c) compatible we add an autodection to switch between separate measurement indications and included measurement data. Related: OS#2977 Depends: libosmocore I2c34b02d329f9df190c5035c396403ca0a4f9c42 Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 --- M include/osmo-bts/gsm_data_shared.h M include/osmo-bts/scheduler_backend.h M src/common/bts.c M src/common/l1sap.c M src/common/scheduler.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/main.c M src/osmo-bts-trx/scheduler_trx.c 9 files changed, 121 insertions(+), 99 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/18/15918/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset
Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15918 ) Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH .. Patch Set 1: (3 comments) https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/common/l1sap.c File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/common/l1sap.c@74 PS1, Line 74: static bool tch_data_meas_present = true; > AFAIU You don't need to do any switching, simply have an API bool > bts_model_tch_data_meas_present() […] we do already have the BTS_FEAT_* constants and the gsm_bts_set_feature() API. That would be the most logical way for me to deal with this. Adding a single call to gsm_bts_set_feature() in all existing backends is also certainly not requiring a full re-test with all hardware. https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/common/scheduler.c File src/common/scheduler.c: https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/common/scheduler.c@760 PS1, Line 760: l1sap->u.tch. > I am also a bit confused about the is_sub struct member. […] I believe I explained this elsewhere here in gerrit or in redmine. is_sub must at the very least be set for all SACCH frames, and is set on other frames depending on the codec that's being used. It controls which frames count into RXLEV/QUAL "SUB". https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/osmo-bts-trx/scheduler_trx.c File src/osmo-bts-trx/scheduler_trx.c: https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/osmo-bts-trx/scheduler_trx.c@a205 PS1, Line 205: /* FIXME: use actual values for BER etc */ > The problem here is that we can not use actual values for BER. […] the best would be if those values simply wouldn't count. Let's say you normally expect 23 values every measurement interval. Then you compute the average by dividing by 23. But if only 20 valid measurements were received and 3 were in bad frames, then the average should simply be computed by dividing by 20, and not by 23. At this point you don't need to "invent" any values. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 18 Dec 2019 12:12:21 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: dexter Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/15918 )
Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH
..
Patch Set 4: Code-Review-1
(1 comment)
https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/common/l1sap.c
File src/common/l1sap.c:
https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/common/l1sap.c@74
PS1, Line 74: static bool tch_data_meas_present = true;
> I wonder if there is a failsafe way to do this. We could have a function in
> l1sap. […]
AFAIU You don't need to do any switching, simply have an API bool
bts_model_tch_data_meas_present() { return true; (or false) }
Make it return true or false depending on the BTS being compiled (so the API is
in bts specific code).
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84
Gerrit-Change-Number: 15918
Gerrit-PatchSet: 4
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-Comment-Date: Tue, 12 Nov 2019 10:24:04 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: dexter
Comment-In-Reply-To: fixeria
Comment-In-Reply-To: pespin
Gerrit-MessageType: comment
Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15918 ) Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH .. Patch Set 4: (ensure draft replies are sent) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 11 Nov 2019 13:08:45 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15918 ) Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH .. Patch Set 4: (9 comments) (ensure draft replies are sent) https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/common/l1sap.c File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/common/l1sap.c@67 PS1, Line 67: * indication for itsself that is passed up in parallel to the payload data > itself Done https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/common/l1sap.c@74 PS1, Line 74: static bool tch_data_meas_present = true; > ACK. I wonder if there is a failsafe way to do this. We could have a function in l1sap.c that is called by the bts model and then does the switching. A per-bts-model API is usually a very difficult thing as in theory it would require a test with each model and I do not even have the hardware for each and every BTS, so its always blind flying. https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/common/l1sap.c@646 PS1, Line 646: struct info_meas_ind_param *info_meas_ind = &l1sap->u.info.u.meas_ind; > Let's rather move these assignments under each switch case. Done https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/common/l1sap.c@695 PS1, Line 695: "%s MPH_INFO meas ind, ta_offs_256bits=%d, ber10k=%d, inv_rssi=%u\n", > MPH_INFO only on some case right? maybe add a string pointing to the name in > the switch case. Done https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/common/l1sap.c@740 PS1, Line 740: rc = 0; > rc is already zero here, it can be dropped. Done https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/common/scheduler.c File src/common/scheduler.c: https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/common/scheduler.c@760 PS1, Line 760: l1sap->u.tch. > How about 'is_sub'? (still not aware of its meaning) I am also a bit confused about the is_sub struct member. As far as I know it is used for DTX to mark special frames which must not be removed by DTX. I think this is to distinguish between real bad frames and those what are just not sent. My guess is that osmo-bts-trx seems not to support this for some reason, but phy based BTS might support it and set the flag then? I am not sure. https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/osmo-bts-trx/scheduler_trx.c File src/osmo-bts-trx/scheduler_trx.c: https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/osmo-bts-trx/scheduler_trx.c@a205 PS1, Line 205: /* FIXME: use actual values for BER etc */ > Not sure why you're removing this comment... The problem here is that we can not use actual values for BER. This part of the code generates an artificial frame to satisfy the higher layers. We can only use artificial values. A BER value of 1 is basically 100% Error, which matches the reality here. The rssi of -110 is fake, but realistic. I wonder about the ta_offs_256bits, maybe we should try to find some better approximation than 0 here... https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/osmo-bts-trx/scheduler_trx.c@a991 PS1, Line 991: /* Send uplink measurement information to L2 */ > This comment does not make sense anymore. Done https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/osmo-bts-trx/scheduler_trx.c@a1105 PS1, Line 1105: /* Send uplink measurement information to L2 */ > Same. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 11 Nov 2019 13:08:22 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH
Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 to look at the new patch set (#4). Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH .. l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH The MPH INFO MEAS IND indication, which contains the uplink measurement data is sent in parallel to the PH DATA and TCH indications as a separate indications. This makes the overall uplink measurement data processing unnecessarly complex. So lets put the data that is relevant for measurement into the PH DATA and TCH indications directly. This change only affects osmo-bts-trx at the moment. In order to keep the upper layers (l1sap.c) compatible we add an autodection to switch between separate measurement indications and included measurement data. Related: OS#2977 Depends: libosmocore I2c34b02d329f9df190c5035c396403ca0a4f9c42 Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 --- M include/osmo-bts/scheduler_backend.h M src/common/l1sap.c M src/common/scheduler.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/scheduler_trx.c 6 files changed, 121 insertions(+), 99 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/18/15918/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-MessageType: newpatchset
Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH
Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 to look at the new patch set (#3). Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH .. l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH The MPH INFO MEAS IND indication, which contains the uplink measurement data is sent in parallel to the PH DATA and TCH indications as a separate indications. This makes the overall uplink measurement data processing unnecessarly complex. So lets put the data that is relevant for measurement into the PH DATA and TCH indications directly. This change only affects osmo-bts-trx at the moment. In order to keep the upper layers (l1sap.c) compatible we add an autodection to switch between separate measurement indications and included measurement data. Related: OS#2977 Depends: libosmocore I2c34b02d329f9df190c5035c396403ca0a4f9c42 Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 --- M include/osmo-bts/scheduler_backend.h M src/common/l1sap.c M src/common/scheduler.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/scheduler_trx.c 6 files changed, 114 insertions(+), 99 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/18/15918/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-MessageType: newpatchset
Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH
Hello fixeria, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 to look at the new patch set (#2). Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH .. l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH The MPH INFO MEAS IND indication, which contains the uplink measurement data is sent in parallel to the PH DATA and TCH indications as a separate indications. This makes the overall uplink measurement data processing unnecessarly complex. So lets put the data that is relevant for measurement into the PH DATA and TCH indications directly. This change only affects osmo-bts-trx at the moment. In order to keep the upper layers (l1sap.c) compatible we add an autodection to switch between separate measurement indications and included measurement data. Related: OS#2977 Depends: libosmocore I2c34b02d329f9df190c5035c396403ca0a4f9c42 Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 --- M include/osmo-bts/scheduler_backend.h M src/common/l1sap.c M src/common/scheduler.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/l1_if.h M src/osmo-bts-trx/scheduler_trx.c 6 files changed, 114 insertions(+), 99 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/18/15918/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-MessageType: newpatchset
Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15918 ) Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH .. Patch Set 1: Code-Review-1 (5 comments) https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/common/l1sap.c File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/common/l1sap.c@74 PS1, Line 74: static bool tch_data_meas_present = true; > I'm not liking that much the idea behind this variable. […] ACK. https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/common/scheduler.c File src/common/scheduler.c: https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/common/scheduler.c@760 PS1, Line 760: l1sap->u.tch. How about 'is_sub'? (still not aware of its meaning) https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/osmo-bts-trx/scheduler_trx.c File src/osmo-bts-trx/scheduler_trx.c: https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/osmo-bts-trx/scheduler_trx.c@a205 PS1, Line 205: /* FIXME: use actual values for BER etc */ Not sure why you're removing this comment... https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/osmo-bts-trx/scheduler_trx.c@a991 PS1, Line 991: /* Send uplink measurement information to L2 */ This comment does not make sense anymore. https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/osmo-bts-trx/scheduler_trx.c@a1105 PS1, Line 1105: /* Send uplink measurement information to L2 */ Same. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 31 Oct 2019 18:05:44 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/15918 ) Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH .. Patch Set 1: (5 comments) https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/common/l1sap.c File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/common/l1sap.c@67 PS1, Line 67: * indication for itsself that is passed up in parallel to the payload data itself https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/common/l1sap.c@74 PS1, Line 74: static bool tch_data_meas_present = true; I'm not liking that much the idea behind this variable. IIUC, some BTS models send this while some other don't. Let's then better please add a per-bts-model API which tells us whether the BTS being used is expected to receive it or not instead of detecting it at runtime. https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/common/l1sap.c@646 PS1, Line 646: struct info_meas_ind_param *info_meas_ind = &l1sap->u.info.u.meas_ind; Let's rather move these assignments under each switch case. https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/common/l1sap.c@695 PS1, Line 695: "%s MPH_INFO meas ind, ta_offs_256bits=%d, ber10k=%d, inv_rssi=%u\n", MPH_INFO only on some case right? maybe add a string pointing to the name in the switch case. https://gerrit.osmocom.org/c/osmo-bts/+/15918/1/src/common/l1sap.c@740 PS1, Line 740: rc = 0; rc is already zero here, it can be dropped. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/15918 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84 Gerrit-Change-Number: 15918 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 31 Oct 2019 11:47:30 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bts[master]: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH
dexter has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/15918 )
Change subject: l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH
..
l1sap: merge MEAS IND into PRIM PH DATA / PRIM TCH
The MPH INFO MEAS IND indication, which contains the uplink measurement
data is sent in parallel to the PH DATA and TCH indications as a
separate indications. This makes the overall uplink measurement data
processing unnecessarly complex. So lets put the data that is relevant
for measurement into the PH DATA and TCH indications directly.
This change only affects osmo-bts-trx at the moment. In order to keep
the upper layers (l1sap.c) compatible we add an autodection to switch
between separate measurement indications and included measurement data.
Related: OS#2977
Depends: libosmocore I2c34b02d329f9df190c5035c396403ca0a4f9c42
Change-Id: I710d0b7cf193afa8515807836ee69b8b7db84a84
---
M include/osmo-bts/scheduler_backend.h
M src/common/l1sap.c
M src/common/scheduler.c
M src/osmo-bts-trx/l1_if.c
M src/osmo-bts-trx/l1_if.h
M src/osmo-bts-trx/scheduler_trx.c
6 files changed, 114 insertions(+), 96 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/18/15918/1
diff --git a/include/osmo-bts/scheduler_backend.h
b/include/osmo-bts/scheduler_backend.h
index d713900..4959853 100644
--- a/include/osmo-bts/scheduler_backend.h
+++ b/include/osmo-bts/scheduler_backend.h
@@ -52,7 +52,8 @@
enum osmo_ph_pres_info_type presence_info);
int _sched_compose_tch_ind(struct l1sched_trx *l1t, uint8_t tn, uint32_t fn,
- enum trx_chan_type chan, uint8_t *tch, uint8_t tch_len);
+ enum trx_chan_type chan, uint8_t *tch, uint8_t
tch_len,
+ int16_t ta_offs_256bits, uint16_t ber10k, float
rssi);
ubit_t *tx_idle_fn(struct l1sched_trx *l1t, uint8_t tn, uint32_t fn,
enum trx_chan_type chan, uint8_t bid, uint16_t *nbits);
diff --git a/src/common/l1sap.c b/src/common/l1sap.c
index 7bf0b09..ec6f287 100644
--- a/src/common/l1sap.c
+++ b/src/common/l1sap.c
@@ -62,6 +62,17 @@
#define CB_BCCH-3
#define CB_IDLE-4
+/* We are capable to use two different sources to receive measurement data from
+ * lower layers. The first source is the MPH INFO MEAS IND, which is an
+ * indication for itsself that is passed up in parallel to the payload data
+ * (see also PRIM_PH_DATA, PRIM_TCH). This idea is obsolete, however it is
+ * still used with some BTS implementations). The second source is to use the
+ * measurement data that is contained inside struct ph_data_param
+ * (PRIM_PH_DATA) and struct ph_tch_param (PRIM_TCH). Which source is used is
+ * determined automatically. Once we receive an MPH INFO MEAS IND, we fall back
+ * to the old (first) source. (See also ticket: OS#2977) */
+static bool tch_data_meas_present = true;
+
/* according to TS 05.02 Clause 7 Table 3 of 9 an Figure 8a */
static const int ccch_block_table[51] = {
CB_FCCH, CB_SCH,/* 0..1 */
@@ -626,42 +637,81 @@
}
/* measurement information received from bts model */
-static int l1sap_info_meas_ind(struct gsm_bts_trx *trx,
- struct osmo_phsap_prim *l1sap,
- struct info_meas_ind_param *info_meas_ind)
+static void process_l1sap_meas_data(struct gsm_bts_trx *trx,
+ struct osmo_phsap_prim *l1sap,
+ enum osmo_ph_prim ind_type)
{
struct bts_ul_meas ulm;
struct gsm_lchan *lchan;
+ struct info_meas_ind_param *info_meas_ind = &l1sap->u.info.u.meas_ind;
+ struct ph_data_param *ph_data_ind = &l1sap->u.data;
+ struct ph_tch_param *ph_tch_ind = &l1sap->u.tch;
+ uint8_t chan_nr;
+ uint32_t fn;
+ uint8_t inv_rssi;
+ uint8_t is_sub;
+ int16_t ta_offs_256bits;
+ uint16_t ber10k;
- lchan = get_active_lchan_by_chan_nr(trx, info_meas_ind->chan_nr);
- if (!lchan) {
- LOGPFN(DL1P, LOGL_ERROR, info_meas_ind->fn,
- "No lchan for MPH INFO MEAS IND (chan_nr=%s)\n",
rsl_chan_nr_str(info_meas_ind->chan_nr));
- return 0;
+ switch (ind_type) {
+ case PRIM_MPH_INFO:
+ /* (legacy way, see also OS#2977) */
+ chan_nr = info_meas_ind->chan_nr;
+ fn = info_meas_ind->fn;
+ inv_rssi = info_meas_ind->inv_rssi;
+ is_sub = info_meas_ind->is_sub;
+ ta_offs_256bits = info_meas_ind->ta_offs_256bits;
+ ber10k = info_meas_ind->ber10k;
+ break;
+ case PRIM_TCH:
+ chan_nr = ph_tch_ind->chan_nr;
+ fn = ph_tch_ind->fn;
+ inv_rssi = abs(ph_tch_ind->rssi);
+ is_sub = ph_tch_ind->is_sub;
+ ta_offs_256bits = ph_tch_ind->ta_offs_256bits;
+ ber10k = ph_tch_ind
