<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/18488">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">WIP: bts-trx: Implement power ramping on power on<br><br>TODO: figure out wheter we send here makes sense, because i think<br>osmo-trx actually expectes "Power Attenuation".<br><br>TODO2: find some way to overwrite hardcoded nominal value for TRXs in<br>bts_model_init:<br>"""<br>/* FIXME: this needs to be overridden with the real hardrware<br> * value */<br>bts->c0->nominal_power = 23;<br>"""<br>Change-Id: Ia7c353e4c199e0fc3bcab55c45a4abda2c66d2c1<br>---<br>M src/osmo-bts-trx/l1_if.c<br>M src/osmo-bts-trx/main.c<br>M src/osmo-bts-trx/trx_if.c<br>M src/osmo-bts-trx/trx_if.h<br>4 files changed, 38 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/88/18488/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c</span><br><span>index b28c894..c4b0915 100644</span><br><span>--- a/src/osmo-bts-trx/l1_if.c</span><br><span>+++ b/src/osmo-bts-trx/l1_if.c</span><br><span>@@ -179,6 +179,8 @@</span><br><span> if (rc == 0 && pinst->phy_link->state != PHY_LINK_CONNECTED) {</span><br><span> trx_sched_clock_started(pinst->trx->bts);</span><br><span> phy_link_state_set(pinst->phy_link, PHY_LINK_CONNECTED);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Begin to ramp up the power */</span><br><span style="color: hsl(120, 100%, 40%);">+ power_ramp_start(pinst->trx, get_p_target_mdBm(pinst->trx, 0), 0);</span><br><span> } else if (rc != 0 && pinst->phy_link->state != PHY_LINK_SHUTDOWN) {</span><br><span> trx_sched_clock_stopped(pinst->trx->bts);</span><br><span> phy_link_state_set(pinst->phy_link, PHY_LINK_SHUTDOWN);</span><br><span>@@ -186,6 +188,16 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void l1if_setpower_cb(struct trx_l1h *l1h, int power_db, int rc)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct phy_instance *pinst = l1h->phy_inst;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPPHI(pinst, DL1C, LOGL_DEBUG, "l1if_setpower_cb(power_db=%d)", power_db);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ l1h->config.power_sent = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ power_trx_change_compl(pinst->trx, power_db * 1000);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*</span><br><span> * transceiver provisioning</span><br><span> */</span><br><span>@@ -252,7 +264,7 @@</span><br><span> l1h->config.rxgain_sent = 1;</span><br><span> }</span><br><span> if (l1h->config.power_valid && !l1h->config.power_sent) {</span><br><span style="color: hsl(0, 100%, 40%);">- trx_if_cmd_setpower(l1h, l1h->config.power);</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_if_cmd_setpower(l1h, l1h->config.power, l1if_setpower_cb);</span><br><span> l1h->config.power_sent = 1;</span><br><span> }</span><br><span> if (l1h->config.maxdly_valid && !l1h->config.maxdly_sent) {</span><br><span>@@ -420,7 +432,7 @@</span><br><span> }</span><br><span> </span><br><span> if (l1h->config.power_oml) {</span><br><span style="color: hsl(0, 100%, 40%);">- l1h->config.power = trx->max_power_red;</span><br><span style="color: hsl(120, 100%, 40%);">+ l1h->config.power = power_ramp_initial_power_mdBm(trx);</span><br><span> l1h->config.power_valid = 1;</span><br><span> l1h->config.power_sent = 0;</span><br><span> l1if_provision_transceiver_trx(l1h);</span><br><span>@@ -804,9 +816,9 @@</span><br><span> </span><br><span> int bts_model_change_power(struct gsm_bts_trx *trx, int p_trxout_mdBm)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-#warning "implement bts_model_change_power\n"</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DL1C, LOGL_NOTICE, "Setting TRX output power not supported!\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct phy_instance *pinst = trx_phy_instance(trx);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct trx_l1h *l1h = pinst->u.osmotrx.hdl;</span><br><span style="color: hsl(120, 100%, 40%);">+ return trx_if_cmd_setpower(l1h, p_trxout_mdBm / 1000, l1if_setpower_cb);</span><br><span> }</span><br><span> </span><br><span> int bts_model_ts_disconnect(struct gsm_bts_trx_ts *ts)</span><br><span>diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c</span><br><span>index ab0472e..8f89051 100644</span><br><span>--- a/src/osmo-bts-trx/main.c</span><br><span>+++ b/src/osmo-bts-trx/main.c</span><br><span>@@ -125,6 +125,7 @@</span><br><span> </span><br><span> int bts_model_trx_init(struct gsm_bts_trx *trx)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->power_params.trx_p_max_out_mdBm = to_mdB(trx->bts->c0->nominal_power);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c</span><br><span>index f717a0c..aee9e08 100644</span><br><span>--- a/src/osmo-bts-trx/trx_if.c</span><br><span>+++ b/src/osmo-bts-trx/trx_if.c</span><br><span>@@ -302,9 +302,9 @@</span><br><span> }</span><br><span> </span><br><span> /*! Send "SETPOWER" command to TRX */</span><br><span style="color: hsl(0, 100%, 40%);">-int trx_if_cmd_setpower(struct trx_l1h *l1h, int db)</span><br><span style="color: hsl(120, 100%, 40%);">+int trx_if_cmd_setpower(struct trx_l1h *l1h, int power_db, trx_if_cmd_setpower_cb *cb)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return trx_ctrl_cmd(l1h, 0, "SETPOWER", "%d", db);</span><br><span style="color: hsl(120, 100%, 40%);">+ return trx_ctrl_cmd(l1h, 0, "SETPOWER", "%d", power_db);</span><br><span> }</span><br><span> </span><br><span> /*! Send "SETMAXDLY" command to TRX, i.e. maximum delay for RACH bursts */</span><br><span>@@ -543,6 +543,20 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int trx_ctrl_rx_rsp_setpower(struct trx_l1h *l1h, struct trx_ctrl_rsp *rsp)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_if_cmd_setpower_cb *cb = (trx_if_cmd_setpower_cb*) rsp->cb;</span><br><span style="color: hsl(120, 100%, 40%);">+ int power;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!cb)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ sscanf(rsp->params, "%d", &power);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cb)</span><br><span style="color: hsl(120, 100%, 40%);">+ cb(l1h, power, rsp->status);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* -EINVAL: unrecoverable error, exit BTS</span><br><span> * N > 0: try sending originating command again after N seconds</span><br><span> * 0: Done with response, get originating command out from send queue</span><br><span>@@ -561,6 +575,8 @@</span><br><span> * so that's why we should use tcm instead of rsp. */</span><br><span> } else if (strcmp(tcm->cmd, "SETFORMAT") == 0) {</span><br><span> return trx_ctrl_rx_rsp_setformat(l1h, rsp);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (strcmp(tcm->cmd, "SETPOWER") == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return trx_ctrl_rx_rsp_setpower(l1h, rsp);</span><br><span> }</span><br><span> </span><br><span> if (rsp->status) {</span><br><span>diff --git a/src/osmo-bts-trx/trx_if.h b/src/osmo-bts-trx/trx_if.h</span><br><span>index fd0077d..44f73c4 100644</span><br><span>--- a/src/osmo-bts-trx/trx_if.h</span><br><span>+++ b/src/osmo-bts-trx/trx_if.h</span><br><span>@@ -15,6 +15,7 @@</span><br><span> </span><br><span> typedef void trx_if_cmd_poweronoff_cb(struct trx_l1h *l1h, bool poweronoff, int rc);</span><br><span> typedef void trx_if_cmd_setslot_cb(struct trx_l1h *l1h, uint8_t tn, uint8_t type, int rc);</span><br><span style="color: hsl(120, 100%, 40%);">+typedef void trx_if_cmd_setpower_cb(struct trx_l1h *l1h, int power_db, int rc);</span><br><span> </span><br><span> void trx_if_init(struct trx_l1h *l1h);</span><br><span> int trx_if_cmd_poweroff(struct trx_l1h *l1h, trx_if_cmd_poweronoff_cb *cb);</span><br><span>@@ -22,7 +23,7 @@</span><br><span> int trx_if_cmd_settsc(struct trx_l1h *l1h, uint8_t tsc);</span><br><span> int trx_if_cmd_setbsic(struct trx_l1h *l1h, uint8_t bsic);</span><br><span> int trx_if_cmd_setrxgain(struct trx_l1h *l1h, int db);</span><br><span style="color: hsl(0, 100%, 40%);">-int trx_if_cmd_setpower(struct trx_l1h *l1h, int db);</span><br><span style="color: hsl(120, 100%, 40%);">+int trx_if_cmd_setpower(struct trx_l1h *l1h, int power_db, trx_if_cmd_setpower_cb *cb);</span><br><span> int trx_if_cmd_setmaxdly(struct trx_l1h *l1h, int dly);</span><br><span> int trx_if_cmd_setmaxdlynb(struct trx_l1h *l1h, int dly);</span><br><span> int trx_if_cmd_setslot(struct trx_l1h *l1h, uint8_t tn, uint8_t type, trx_if_cmd_setslot_cb *cb);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/18488">change 18488</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/+/18488"/><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: Ia7c353e4c199e0fc3bcab55c45a4abda2c66d2c1 </div>
<div style="display:none"> Gerrit-Change-Number: 18488 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>