<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13265">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">oc2g: generate failure event report in case of bad calibration<br><br>When the TX/RX calibration files can not be loaded a failure event<br>report should be sent to the BSC. Lets send a failure event report when<br>calbration data is either bad or can not be loaded (see also remvoed TODOs).<br><br>Change-Id: I3318470518b34807a443f7cb78c7091b4a3d4481<br>Related OS#3823<br>---<br>M src/osmo-bts-oc2g/calib_file.c<br>1 file changed, 7 insertions(+), 30 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-oc2g/calib_file.c b/src/osmo-bts-oc2g/calib_file.c</span><br><span>index 4976848..ed7aa16 100644</span><br><span>--- a/src/osmo-bts-oc2g/calib_file.c</span><br><span>+++ b/src/osmo-bts-oc2g/calib_file.c</span><br><span>@@ -34,6 +34,7 @@</span><br><span> </span><br><span> #include <osmo-bts/gsm_data.h></span><br><span> #include <osmo-bts/logging.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmo-bts/bts.h></span><br><span> </span><br><span> #include <nrw/oc2g/oc2g.h></span><br><span> #include <nrw/oc2g/gsml1const.h></span><br><span>@@ -133,16 +134,8 @@</span><br><span> st->fp = fopen(fname, "rb");</span><br><span> if (!st->fp) {</span><br><span> LOGP(DL1C, LOGL_NOTICE, "Failed to open '%s' for calibration data.\n", fname);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* TODO (oramadan): Fix OML alarms</span><br><span style="color: hsl(0, 100%, 40%);">- if( fl1h->phy_inst->trx ){</span><br><span style="color: hsl(0, 100%, 40%);">- fl1h->phy_inst->trx->mo.obj_inst.trx_nr = fl1h->phy_inst->trx->nr;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- alarm_sig_data.mo = &fl1h->phy_inst->trx->mo;</span><br><span style="color: hsl(0, 100%, 40%);">- alarm_sig_data.add_text = (char*)&fname[0];</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_signal_dispatch(SS_NM, S_NM_OML_BTS_FAIL_OPEN_CALIB_ALARM, &alarm_sig_data);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(120, 100%, 40%);">+ oml_tx_failure_event_rep(&fl1h->phy_inst->trx->mo, OSMO_EVT_WARN_SW_WARN,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Failed to open '%s' for calibration data", fname);</span><br><span> return -1;</span><br><span> }</span><br><span> return 0;</span><br><span>@@ -228,17 +221,8 @@</span><br><span> rc = calib_verify(fl1h, desc);</span><br><span> if (rc < 0) {</span><br><span> LOGP(DL1C, LOGL_NOTICE,"Verify L1 calibration table %s -> failed (%d)\n", desc->fname, rc);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* TODO (oramadan): Fix OML alarms</span><br><span style="color: hsl(0, 100%, 40%);">- if (fl1h->phy_inst->trx) {</span><br><span style="color: hsl(0, 100%, 40%);">- fl1h->phy_inst->trx->mo.obj_inst.trx_nr = fl1h->phy_inst->trx->nr;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- alarm_sig_data.mo = &fl1h->phy_inst->trx->mo;</span><br><span style="color: hsl(0, 100%, 40%);">- alarm_sig_data.add_text = (char*)&desc->fname[0];</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(alarm_sig_data.spare, &rc, sizeof(int));</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_signal_dispatch(SS_NM, S_NM_OML_BTS_FAIL_VERIFY_CALIB_ALARM, &alarm_sig_data);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(120, 100%, 40%);">+ oml_tx_failure_event_rep(&fl1h->phy_inst->trx->mo, OSMO_EVT_WARN_SW_WARN,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Verify L1 calibration table %s -> failed (%d)", desc->fname, rc);</span><br><span> </span><br><span> st->last_file_idx = get_next_calib_file_idx(fl1h, st->last_file_idx);</span><br><span> </span><br><span>@@ -294,15 +278,8 @@</span><br><span> </span><br><span> if (!calib_path) {</span><br><span> LOGP(DL1C, LOGL_NOTICE, "Calibration file path not specified\n");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* TODO (oramadan): Fix OML alarms</span><br><span style="color: hsl(0, 100%, 40%);">- if( fl1h->phy_inst->trx ){</span><br><span style="color: hsl(0, 100%, 40%);">- fl1h->phy_inst->trx->mo.obj_inst.trx_nr = fl1h->phy_inst->trx->nr;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- alarm_sig_data.mo = &fl1h->phy_inst->trx->mo;</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_signal_dispatch(SS_NM, S_NM_OML_BTS_NO_CALIB_PATH_ALARM, &alarm_sig_data);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(120, 100%, 40%);">+ oml_tx_failure_event_rep(&fl1h->phy_inst->trx->mo, OSMO_EVT_WARN_SW_WARN,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Calibration file path not specified");</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13265">change 13265</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/13265"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I3318470518b34807a443f7cb78c7091b4a3d4481 </div>
<div style="display:none"> Gerrit-Change-Number: 13265 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>