<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/25988">View Change</a></p><div style="white-space:pre-wrap">Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">l1sap: use designated initializers in process_l1sap_meas_data()<br><br>Change-Id: I5169a6c5f6865655dbfebb6b68d5f67941d9cdb1<br>---<br>M src/common/l1sap.c<br>1 file changed, 24 insertions(+), 30 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/l1sap.c b/src/common/l1sap.c</span><br><span>index d9e27b2..d02676b 100644</span><br><span>--- a/src/common/l1sap.c</span><br><span>+++ b/src/common/l1sap.c</span><br><span>@@ -705,11 +705,6 @@</span><br><span> struct ph_tch_param *ph_tch_ind;</span><br><span> uint8_t chan_nr;</span><br><span> uint32_t fn;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t inv_rssi;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t is_sub;</span><br><span style="color: hsl(0, 100%, 40%);">- int16_t ta_offs_256bits;</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t ber10k;</span><br><span style="color: hsl(0, 100%, 40%);">- int16_t ci_cb;</span><br><span> const char *ind_name;</span><br><span> </span><br><span> switch (ind_type) {</span><br><span>@@ -718,12 +713,14 @@</span><br><span> info_meas_ind = &l1sap->u.info.u.meas_ind;</span><br><span> chan_nr = info_meas_ind->chan_nr;</span><br><span> fn = info_meas_ind->fn;</span><br><span style="color: hsl(0, 100%, 40%);">- inv_rssi = info_meas_ind->inv_rssi;</span><br><span style="color: hsl(0, 100%, 40%);">- is_sub = info_meas_ind->is_sub;</span><br><span style="color: hsl(0, 100%, 40%);">- ta_offs_256bits = info_meas_ind->ta_offs_256bits;</span><br><span style="color: hsl(0, 100%, 40%);">- ber10k = info_meas_ind->ber10k;</span><br><span style="color: hsl(0, 100%, 40%);">- ci_cb = info_meas_ind->c_i_cb;</span><br><span> ind_name = "MPH INFO";</span><br><span style="color: hsl(120, 100%, 40%);">+ ulm = (struct bts_ul_meas) {</span><br><span style="color: hsl(120, 100%, 40%);">+ .ta_offs_256bits = info_meas_ind->ta_offs_256bits,</span><br><span style="color: hsl(120, 100%, 40%);">+ .inv_rssi = info_meas_ind->inv_rssi,</span><br><span style="color: hsl(120, 100%, 40%);">+ .ber10k = info_meas_ind->ber10k,</span><br><span style="color: hsl(120, 100%, 40%);">+ .c_i = info_meas_ind->c_i_cb,</span><br><span style="color: hsl(120, 100%, 40%);">+ .is_sub = info_meas_ind->is_sub,</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span> break;</span><br><span> case PRIM_TCH:</span><br><span> ph_tch_ind = &l1sap->u.tch;</span><br><span>@@ -731,12 +728,14 @@</span><br><span> return;</span><br><span> chan_nr = ph_tch_ind->chan_nr;</span><br><span> fn = ph_tch_ind->fn;</span><br><span style="color: hsl(0, 100%, 40%);">- inv_rssi = abs(ph_tch_ind->rssi);</span><br><span style="color: hsl(0, 100%, 40%);">- is_sub = ph_tch_ind->is_sub;</span><br><span style="color: hsl(0, 100%, 40%);">- ta_offs_256bits = ph_tch_ind->ta_offs_256bits;</span><br><span style="color: hsl(0, 100%, 40%);">- ber10k = ph_tch_ind->ber10k;</span><br><span style="color: hsl(0, 100%, 40%);">- ci_cb = ph_tch_ind->lqual_cb;</span><br><span> ind_name = "TCH";</span><br><span style="color: hsl(120, 100%, 40%);">+ ulm = (struct bts_ul_meas) {</span><br><span style="color: hsl(120, 100%, 40%);">+ .ta_offs_256bits = ph_tch_ind->ta_offs_256bits,</span><br><span style="color: hsl(120, 100%, 40%);">+ .inv_rssi = abs(ph_tch_ind->rssi),</span><br><span style="color: hsl(120, 100%, 40%);">+ .ber10k = ph_tch_ind->ber10k,</span><br><span style="color: hsl(120, 100%, 40%);">+ .c_i = ph_tch_ind->lqual_cb,</span><br><span style="color: hsl(120, 100%, 40%);">+ .is_sub = ph_tch_ind->is_sub,</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span> break;</span><br><span> case PRIM_PH_DATA:</span><br><span> ph_data_ind = &l1sap->u.data;</span><br><span>@@ -744,12 +743,14 @@</span><br><span> return;</span><br><span> chan_nr = ph_data_ind->chan_nr;</span><br><span> fn = ph_data_ind->fn;</span><br><span style="color: hsl(0, 100%, 40%);">- inv_rssi = abs(ph_data_ind->rssi);</span><br><span style="color: hsl(0, 100%, 40%);">- is_sub = ph_data_ind->is_sub;</span><br><span style="color: hsl(0, 100%, 40%);">- ta_offs_256bits = ph_data_ind->ta_offs_256bits;</span><br><span style="color: hsl(0, 100%, 40%);">- ber10k = ph_data_ind->ber10k;</span><br><span style="color: hsl(0, 100%, 40%);">- ci_cb = ph_data_ind->lqual_cb;</span><br><span> ind_name = "DATA";</span><br><span style="color: hsl(120, 100%, 40%);">+ ulm = (struct bts_ul_meas) {</span><br><span style="color: hsl(120, 100%, 40%);">+ .ta_offs_256bits = ph_data_ind->ta_offs_256bits,</span><br><span style="color: hsl(120, 100%, 40%);">+ .inv_rssi = abs(ph_data_ind->rssi),</span><br><span style="color: hsl(120, 100%, 40%);">+ .ber10k = ph_data_ind->ber10k,</span><br><span style="color: hsl(120, 100%, 40%);">+ .c_i = ph_data_ind->lqual_cb,</span><br><span style="color: hsl(120, 100%, 40%);">+ .is_sub = ph_data_ind->is_sub,</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span> break;</span><br><span> default:</span><br><span> OSMO_ASSERT(false);</span><br><span>@@ -765,23 +766,16 @@</span><br><span> </span><br><span> DEBUGPFN(DL1P, fn,</span><br><span> "%s %s meas ind, ta_offs_256bits=%d, ber10k=%d, inv_rssi=%u, C/I=%d cB\n",</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_lchan_name(lchan), ind_name, ta_offs_256bits, ber10k,</span><br><span style="color: hsl(0, 100%, 40%);">- inv_rssi, ci_cb);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm_lchan_name(lchan), ind_name, ulm.ta_offs_256bits,</span><br><span style="color: hsl(120, 100%, 40%);">+ ulm.ber10k, ulm.inv_rssi, ulm.c_i);</span><br><span> </span><br><span> /* in the GPRS case we are not interested in measurement</span><br><span> * processing. The PCU will take care of it */</span><br><span> if (lchan->type == GSM_LCHAN_PDTCH)</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- memset(&ulm, 0, sizeof(ulm));</span><br><span style="color: hsl(0, 100%, 40%);">- ulm.ta_offs_256bits = ta_offs_256bits;</span><br><span style="color: hsl(0, 100%, 40%);">- ulm.ber10k = ber10k;</span><br><span style="color: hsl(0, 100%, 40%);">- ulm.c_i = ci_cb;</span><br><span style="color: hsl(0, 100%, 40%);">- ulm.inv_rssi = inv_rssi;</span><br><span style="color: hsl(0, 100%, 40%);">- ulm.is_sub = is_sub;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* we assume that symbol period is 1 bit: */</span><br><span style="color: hsl(0, 100%, 40%);">- set_ms_to_data(lchan, ta_offs_256bits / 256, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ set_ms_to_data(lchan, ulm.ta_offs_256bits / 256, true);</span><br><span> </span><br><span> lchan_meas_process_measurement(lchan, &ulm, fn);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/25988">change 25988</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-bts/+/25988"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I5169a6c5f6865655dbfebb6b68d5f67941d9cdb1 </div>
<div style="display:none"> Gerrit-Change-Number: 25988 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>