fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/28081 ) Change subject: struct bts_ul_meas: reflect C/I units in field name s/c_i/ci_cb/ ...................................................................... struct bts_ul_meas: reflect C/I units in field name s/c_i/ci_cb/ Change-Id: If07f7f2a3ea996cbfc6a9087fa34402e38a7fd9f Related: SYS#5853 --- M include/osmo-bts/lchan.h M src/common/l1sap.c M src/common/measurement.c M tests/meas/meas_test.c M tests/meas/meas_testcases.h 5 files changed, 11 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/81/28081/1 diff --git a/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h index 9cdc6f7..90c28d9 100644 --- a/include/osmo-bts/lchan.h +++ b/include/osmo-bts/lchan.h @@ -52,7 +52,7 @@ /* timing advance offset (in 1/256 bits) */ int16_t ta_offs_256bits; /* C/I ratio in cB */ - int16_t c_i; + int16_t ci_cb; /* flags */ uint8_t is_sub:1; /* RSSI in dBm * -1 */ diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 53a083d..8e71cd4 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -719,7 +719,7 @@ .ta_offs_256bits = info_meas_ind->ta_offs_256bits, .inv_rssi = info_meas_ind->inv_rssi, .ber10k = info_meas_ind->ber10k, - .c_i = info_meas_ind->c_i_cb, + .ci_cb = info_meas_ind->c_i_cb, .is_sub = info_meas_ind->is_sub, }; break; @@ -733,7 +733,7 @@ .ta_offs_256bits = ph_tch_ind->ta_offs_256bits, .inv_rssi = abs(ph_tch_ind->rssi), .ber10k = ph_tch_ind->ber10k, - .c_i = ph_tch_ind->lqual_cb, + .ci_cb = ph_tch_ind->lqual_cb, .is_sub = ph_tch_ind->is_sub, }; break; @@ -747,7 +747,7 @@ .ta_offs_256bits = ph_data_ind->ta_offs_256bits, .inv_rssi = abs(ph_data_ind->rssi), .ber10k = ph_data_ind->ber10k, - .c_i = ph_data_ind->lqual_cb, + .ci_cb = ph_data_ind->lqual_cb, .is_sub = ph_data_ind->is_sub, }; break; @@ -758,7 +758,7 @@ DEBUGPFN(DL1P, fn, "%s %s meas ind, ta_offs_256bits=%d, ber10k=%d, inv_rssi=%u, C/I=%d cB\n", gsm_lchan_name(lchan), ind_name, ulm.ta_offs_256bits, - ulm.ber10k, ulm.inv_rssi, ulm.c_i); + ulm.ber10k, ulm.inv_rssi, ulm.ci_cb); /* we assume that symbol period is 1 bit: */ set_ms_to_data(lchan, ulm.ta_offs_256bits / 256, true); diff --git a/src/common/measurement.c b/src/common/measurement.c index 1a5992b..1251b48 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -31,7 +31,7 @@ static const struct bts_ul_meas measurement_dummy = { .ber10k = MEASUREMENT_DUMMY_BER, .ta_offs_256bits = 0, - .c_i = 0, + .ci_cb = 0, .is_sub = 0, .inv_rssi = MEASUREMENT_DUMMY_IRSSI }; @@ -348,7 +348,7 @@ DEBUGPFN(DMEAS, fn, "%s adding measurement (ber10k=%u, ta_offs=%d, ci_cB=%d, is_sub=%u, rssi=-%u), num_ul_meas=%d, fn_mod=%u\n", gsm_lchan_name(lchan), ulm->ber10k, ulm->ta_offs_256bits, - ulm->c_i, dest->is_sub, ulm->inv_rssi, lchan->meas.num_ul_meas, + ulm->ci_cb, dest->is_sub, ulm->inv_rssi, lchan->meas.num_ul_meas, fn_mod); lchan->meas.last_fn = fn; @@ -631,13 +631,13 @@ m = &lchan->meas.uplink[i + num_ul_meas_excess]; if (m->is_sub) { irssi_sub_sum += m->inv_rssi; - ci_sub_sum += m->c_i; + ci_sub_sum += m->ci_cb; num_meas_sub_actual++; is_sub = true; } irssi_full_sum += m->inv_rssi; ta256b_sum += m->ta_offs_256bits; - ci_full_sum += m->c_i; + ci_full_sum += m->ci_cb; num_ul_meas_actual++; } else { diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c index ab8ae28..9494495 100644 --- a/tests/meas/meas_test.c +++ b/tests/meas/meas_test.c @@ -329,7 +329,7 @@ ulm.ber10k = 0; ulm.ta_offs_256bits = 256; - ulm.c_i = 0; + ulm.ci_cb = 0; ulm.is_sub = 0; ulm.inv_rssi = 90; diff --git a/tests/meas/meas_testcases.h b/tests/meas/meas_testcases.h index 90f0f85..1263ac3 100644 --- a/tests/meas/meas_testcases.h +++ b/tests/meas/meas_testcases.h @@ -1,5 +1,5 @@ #define ULM(ber, ta, sub, neg_rssi) \ - { .ber10k = (ber), .ta_offs_256bits = (ta), .c_i = 10, .is_sub = sub, .inv_rssi = (neg_rssi) } + { .ber10k = (ber), .ta_offs_256bits = (ta), .ci_cb = 10, .is_sub = sub, .inv_rssi = (neg_rssi) } struct meas_testcase { const char *name; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/28081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If07f7f2a3ea996cbfc6a9087fa34402e38a7fd9f Gerrit-Change-Number: 28081 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange