<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/26140">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">tx_power: send CTRL TRAP when power ramping is completed<br><br>Change-Id: I747e1715e316999a6fb0c25275d9a86f42b5858d<br>---<br>M include/osmo-bts/gsm_data.h<br>M src/common/Makefile.am<br>M src/common/main.c<br>M src/common/tx_power.c<br>M tests/stubs.c<br>5 files changed, 29 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/40/26140/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h</span><br><span>index dcb357f..6660060 100644</span><br><span>--- a/include/osmo-bts/gsm_data.h</span><br><span>+++ b/include/osmo-bts/gsm_data.h</span><br><span>@@ -46,6 +46,7 @@</span><br><span> unsigned int num_bts;</span><br><span> struct osmo_plmn_id plmn;</span><br><span> struct pcu_sock_state *pcu_state;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ctrl_handle *ctrl;</span><br><span> };</span><br><span> </span><br><span> /* 16 is the max. number of SI2quater messages according to 3GPP TS 44.018 Table 10.5.2.33b.1:</span><br><span>diff --git a/src/common/Makefile.am b/src/common/Makefile.am</span><br><span>index 35df73e..f0c6ebb 100644</span><br><span>--- a/src/common/Makefile.am</span><br><span>+++ b/src/common/Makefile.am</span><br><span>@@ -7,12 +7,14 @@</span><br><span> AM_CFLAGS = \</span><br><span> -Wall \</span><br><span> $(LIBOSMOCORE_CFLAGS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOCTRL_CFLAGS) \</span><br><span> $(LIBOSMOTRAU_CFLAGS) \</span><br><span> $(LIBOSMOCODEC_CFLAGS) \</span><br><span> $(NULL)</span><br><span> </span><br><span> LDADD = \</span><br><span> $(LIBOSMOCORE_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOCTRL_LIBS) \</span><br><span> $(LIBOSMOTRAU_LIBS) \</span><br><span> $(LIBOSMOCODEC_LIBS) \</span><br><span> $(NULL)</span><br><span>diff --git a/src/common/main.c b/src/common/main.c</span><br><span>index b5ba21b..b47dc0a 100644</span><br><span>--- a/src/common/main.c</span><br><span>+++ b/src/common/main.c</span><br><span>@@ -59,6 +59,8 @@</span><br><span> #include <osmocom/ctrl/control_vty.h></span><br><span> #include <osmo-bts/oml.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+extern struct gsm_network bts_gsmnet;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static int quit = 0;</span><br><span> static const char *config_file = "osmo-bts.cfg";</span><br><span> static int daemonize = 0;</span><br><span>@@ -384,7 +386,12 @@</span><br><span> gsmtap_source_add_sink(g_bts->gsmtap.inst);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bts_controlif_setup(g_bts, ctrl_vty_get_bind_addr(), OSMO_CTRL_PORT_BTS);</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_gsmnet.ctrl = bts_controlif_setup(g_bts, ctrl_vty_get_bind_addr(),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_CTRL_PORT_BTS);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts_gsmnet.ctrl == NULL) {</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "Error initializing the control interface\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(1);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> rc = telnet_init_dynif(tall_bts_ctx, NULL, vty_get_bind_addr(),</span><br><span> g_vty_port_num);</span><br><span>diff --git a/src/common/tx_power.c b/src/common/tx_power.c</span><br><span>index 0307422..5e86af0 100644</span><br><span>--- a/src/common/tx_power.c</span><br><span>+++ b/src/common/tx_power.c</span><br><span>@@ -24,12 +24,16 @@</span><br><span> #include <errno.h></span><br><span> </span><br><span> #include <osmocom/core/utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/ctrl/control_if.h></span><br><span> </span><br><span> #include <osmo-bts/logging.h></span><br><span> #include <osmo-bts/gsm_data.h></span><br><span> #include <osmo-bts/bts_model.h></span><br><span> #include <osmo-bts/tx_power.h></span><br><span> #include <osmo-bts/bts_trx.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmo-bts/bts.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+extern struct gsm_network bts_gsmnet;</span><br><span> </span><br><span> static int get_pa_drive_level_mdBm(const struct power_amp *pa,</span><br><span> int desired_p_out_mdBm, unsigned int arfcn)</span><br><span>@@ -212,6 +216,16 @@</span><br><span> </span><br><span> /* we had finished in last loop iteration */</span><br><span> if (!first && tpp->ramp.attenuation_mdB == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ char *name = talloc_asprintf(trx, "bts.%u.trx.%u.power-ramping-completed",</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->bts->nr, trx->nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* FIXME: we always get "down" here */</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *dir = we_are_ramping_up(trx) ? "up" : "down";</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPTRX(trx, DL1C, LOGL_INFO, "Power ramping (%s) completed\n", dir);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ctrl_cmd_send_trap(bts_gsmnet.ctrl, name, (char *)dir);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(name);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (tpp->ramp.compl_cb)</span><br><span> tpp->ramp.compl_cb(trx);</span><br><span> return;</span><br><span>diff --git a/tests/stubs.c b/tests/stubs.c</span><br><span>index b24dfc9..a8c4f6c 100644</span><br><span>--- a/tests/stubs.c</span><br><span>+++ b/tests/stubs.c</span><br><span>@@ -72,3 +72,7 @@</span><br><span> </span><br><span> int bts_model_phy_link_open(struct phy_link *plink)</span><br><span> { return 0; }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct ctrl_handle;</span><br><span style="color: hsl(120, 100%, 40%);">+int ctrl_cmd_send_trap(struct ctrl_handle *ctrl, const char *name, char *value)</span><br><span style="color: hsl(120, 100%, 40%);">+{ return 0; }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/26140">change 26140</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/+/26140"/><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: I747e1715e316999a6fb0c25275d9a86f42b5858d </div>
<div style="display:none"> Gerrit-Change-Number: 26140 </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-MessageType: newchange </div>