diff options
| author | Philipp Maier <pmaier@sysmocom.de> | 2019-10-31 09:36:17 +0100 |
|---|---|---|
| committer | laforge <laforge@osmocom.org> | 2020-01-20 14:35:19 +0000 |
| commit | d4f67591c77dd011bb4886d92565fb5014437330 (patch) | |
| tree | effe95a8b5b46716fe6aff5448e217e6df9c4894 /include/osmo-bts | |
| parent | 8969adc5d940e32031ade68e4eb2fdf7ac4e17d0 (diff) | |
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
Diffstat (limited to 'include/osmo-bts')
| -rw-r--r-- | include/osmo-bts/gsm_data_shared.h | 5 | ||||
| -rw-r--r-- | include/osmo-bts/scheduler_backend.h | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h index 41998ad8..e0d70b0b 100644 --- a/include/osmo-bts/gsm_data_shared.h +++ b/include/osmo-bts/gsm_data_shared.h @@ -479,6 +479,11 @@ enum gsm_bts_features { 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 51c957cc..aa2d6e9e 100644 --- a/include/osmo-bts/scheduler_backend.h +++ b/include/osmo-bts/scheduler_backend.h @@ -54,7 +54,8 @@ int _sched_compose_ph_data_ind(struct l1sched_trx *l1t, uint8_t tn, uint32_t fn, 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); |