[MERGED] osmo-bts[master]: osmo-bts-virtual: Generate PRIM_INFO_MEAS (with bogus values)
Harald Welte has submitted this change and it was merged. Change subject: osmo-bts-virtual: Generate PRIM_INFO_MEAS (with bogus values) .. osmo-bts-virtual: Generate PRIM_INFO_MEAS (with bogus values) The problem is that measurement processing above L1SAP requires/expects those PRIM_INFO_MEAS indications from the bts specific parts. Otherwise it will never generate even uplink-only measurement reports to the BSC, which is a violation of Abis protocol specs. Change-Id: I48f73293cb4f0ab4c657dfd00e7ddd032a3c030f --- M src/osmo-bts-virtual/l1_if.c 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-virtual/l1_if.c b/src/osmo-bts-virtual/l1_if.c index 290e097..55c7ee4 100644 --- a/src/osmo-bts-virtual/l1_if.c +++ b/src/osmo-bts-virtual/l1_if.c @@ -58,6 +58,8 @@ return NULL; } +static int l1if_process_meas_res(struct gsm_bts_trx *trx, uint8_t tn, uint32_t fn, uint8_t chan_nr, +int n_errors, int n_bits_total, float rssi, float toa); /** * Callback to handle incoming messages from the MS. * The incoming message should be GSM_TAP encapsulated. @@ -146,6 +148,7 @@ l1sap.u.data.ta_offs_qbits = 0; /* Burst time of arrival in quarter bits. Probably used for Timing Advance calc. Best -> 0 */ l1sap.u.data.lqual_cb = 10 * signal_dbm; /* Link quality in centiBel = 10 * dB. */ l1sap.u.data.pdch_presence_info = PRES_INFO_BOTH; + l1if_process_meas_res(pinst->trx, timeslot, fn, chan_nr, 0, 0, 0, 0); break; case GSMTAP_CHANNEL_AGCH: case GSMTAP_CHANNEL_PCH: @@ -305,8 +308,8 @@ l1sap->u.info.u.meas_ind.inv_rssi = (uint8_t) (rssi * -1); } -int l1if_process_meas_res(struct gsm_bts_trx *trx, uint8_t tn, uint32_t fn, uint8_t chan_nr, - int n_errors, int n_bits_total, float rssi, float toa) +static int l1if_process_meas_res(struct gsm_bts_trx *trx, uint8_t tn, uint32_t fn, uint8_t chan_nr, +int n_errors, int n_bits_total, float rssi, float toa) { struct gsm_lchan *lchan = &trx->ts[tn].lchan[l1sap_chan2ss(chan_nr)]; struct osmo_phsap_prim l1sap; -- To view, visit https://gerrit.osmocom.org/6675 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I48f73293cb4f0ab4c657dfd00e7ddd032a3c030f Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
osmo-bts[master]: osmo-bts-virtual: Generate PRIM_INFO_MEAS (with bogus values)
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/6675 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I48f73293cb4f0ab4c657dfd00e7ddd032a3c030f Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
[PATCH] osmo-bts[master]: osmo-bts-virtual: Generate PRIM_INFO_MEAS (with bogus values)
Review at https://gerrit.osmocom.org/6675 osmo-bts-virtual: Generate PRIM_INFO_MEAS (with bogus values) The problem is that measurement processing above L1SAP requires/expects those PRIM_INFO_MEAS indications from the bts specific parts. Otherwise it will never generate even uplink-only measurement reports to the BSC, which is a violation of Abis protocol specs. Change-Id: I48f73293cb4f0ab4c657dfd00e7ddd032a3c030f --- M src/osmo-bts-virtual/l1_if.c 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/75/6675/1 diff --git a/src/osmo-bts-virtual/l1_if.c b/src/osmo-bts-virtual/l1_if.c index 290e097..55c7ee4 100644 --- a/src/osmo-bts-virtual/l1_if.c +++ b/src/osmo-bts-virtual/l1_if.c @@ -58,6 +58,8 @@ return NULL; } +static int l1if_process_meas_res(struct gsm_bts_trx *trx, uint8_t tn, uint32_t fn, uint8_t chan_nr, +int n_errors, int n_bits_total, float rssi, float toa); /** * Callback to handle incoming messages from the MS. * The incoming message should be GSM_TAP encapsulated. @@ -146,6 +148,7 @@ l1sap.u.data.ta_offs_qbits = 0; /* Burst time of arrival in quarter bits. Probably used for Timing Advance calc. Best -> 0 */ l1sap.u.data.lqual_cb = 10 * signal_dbm; /* Link quality in centiBel = 10 * dB. */ l1sap.u.data.pdch_presence_info = PRES_INFO_BOTH; + l1if_process_meas_res(pinst->trx, timeslot, fn, chan_nr, 0, 0, 0, 0); break; case GSMTAP_CHANNEL_AGCH: case GSMTAP_CHANNEL_PCH: @@ -305,8 +308,8 @@ l1sap->u.info.u.meas_ind.inv_rssi = (uint8_t) (rssi * -1); } -int l1if_process_meas_res(struct gsm_bts_trx *trx, uint8_t tn, uint32_t fn, uint8_t chan_nr, - int n_errors, int n_bits_total, float rssi, float toa) +static int l1if_process_meas_res(struct gsm_bts_trx *trx, uint8_t tn, uint32_t fn, uint8_t chan_nr, +int n_errors, int n_bits_total, float rssi, float toa) { struct gsm_lchan *lchan = &trx->ts[tn].lchan[l1sap_chan2ss(chan_nr)]; struct osmo_phsap_prim l1sap; -- To view, visit https://gerrit.osmocom.org/6675 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I48f73293cb4f0ab4c657dfd00e7ddd032a3c030f Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Harald Welte