<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11735">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Vadim Yanitskiy: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bts: Allocate TRX for BTS dynamically, deprecate -t<br><br>No need to pass -t num_trx anymore to specify number of TRX to use. It<br>is calculated based on dynamic allocation from VTY config.<br>Using parameter -t is flagged as deprecated and is transformed into a<br>NOOP por backward compatibility.<br><br>As a result, TRX now are allocated after the BTS is allocated and<br>initial config (pre-VTY) is applied.<br>A new function bts_trx_init() is added, to set default config on each<br>TRX during allocation and before setting VTY config on it.<br>A new per BTS model function bts_model_trx_init() is added, to allow<br>per model specific default configuration of each TRX.<br><br>Change-Id: Iab1a754ab12a626759f9f90aa66f87bdce65ac9c<br>---<br>M include/osmo-bts/bts.h<br>M include/osmo-bts/bts_model.h<br>M src/common/bts.c<br>M src/common/main.c<br>M src/common/vty.c<br>M src/osmo-bts-litecell15/main.c<br>M src/osmo-bts-oc2g/main.c<br>M src/osmo-bts-octphy/l1_if.c<br>M src/osmo-bts-omldummy/bts_model.c<br>M src/osmo-bts-sysmo/main.c<br>M src/osmo-bts-trx/main.c<br>M src/osmo-bts-virtual/main.c<br>M tests/handover/handover_test.c<br>M tests/meas/meas_test.c<br>M tests/stubs.c<br>M tests/sysmobts/sysmobts_test.c<br>16 files changed, 119 insertions(+), 61 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h</span><br><span>index 34ba956..d7c4bbf 100644</span><br><span>--- a/include/osmo-bts/bts.h</span><br><span>+++ b/include/osmo-bts/bts.h</span><br><span>@@ -27,6 +27,7 @@</span><br><span> extern void *tall_bts_ctx;</span><br><span> </span><br><span> int bts_init(struct gsm_bts *bts);</span><br><span style="color: hsl(120, 100%, 40%);">+int bts_trx_init(struct gsm_bts_trx *trx);</span><br><span> void bts_shutdown(struct gsm_bts *bts, const char *reason);</span><br><span> </span><br><span> struct gsm_bts *create_bts(uint8_t num_trx, char *id);</span><br><span>diff --git a/include/osmo-bts/bts_model.h b/include/osmo-bts/bts_model.h</span><br><span>index 7a87d78..f1f6830 100644</span><br><span>--- a/include/osmo-bts/bts_model.h</span><br><span>+++ b/include/osmo-bts/bts_model.h</span><br><span>@@ -14,6 +14,7 @@</span><br><span> /* BTS model specific functions needed by the common code */</span><br><span> </span><br><span> int bts_model_init(struct gsm_bts *bts);</span><br><span style="color: hsl(120, 100%, 40%);">+int bts_model_trx_init(struct gsm_bts_trx *trx);</span><br><span> </span><br><span> int bts_model_check_oml(struct gsm_bts *bts, uint8_t msg_type,</span><br><span> struct tlv_parsed *old_attr, struct tlv_parsed *new_attr,</span><br><span>diff --git a/src/common/bts.c b/src/common/bts.c</span><br><span>index c251fdd..68cb167 100644</span><br><span>--- a/src/common/bts.c</span><br><span>+++ b/src/common/bts.c</span><br><span>@@ -105,11 +105,10 @@</span><br><span> bts_ctr_desc</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* Initialize the BTS (and TRX) data structures, called before config</span><br><span style="color: hsl(120, 100%, 40%);">+/* Initialize the BTS data structures, called before config</span><br><span> * file reading */</span><br><span> int bts_init(struct gsm_bts *bts)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts_trx *trx;</span><br><span> int rc, i;</span><br><span> static int initialized = 0;</span><br><span> void *tall_rtp_ctx;</span><br><span>@@ -167,26 +166,6 @@</span><br><span> oml_mo_state_init(&bts->gprs.nsvc[0].mo, -1, NM_AVSTATE_DEPENDENCY);</span><br><span> oml_mo_state_init(&bts->gprs.nsvc[1].mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* initialize bts data structure */</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(trx, &bts->trx_list, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct trx_power_params *tpp = &trx->power_params;</span><br><span style="color: hsl(0, 100%, 40%);">- int i;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < ARRAY_SIZE(trx->ts); i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts_trx_ts *ts = &trx->ts[i];</span><br><span style="color: hsl(0, 100%, 40%);">- int k;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (k = 0; k < ARRAY_SIZE(ts->lchan); k++) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_lchan *lchan = &ts->lchan[k];</span><br><span style="color: hsl(0, 100%, 40%);">- INIT_LLIST_HEAD(&lchan->dl_tch_queue);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- /* Default values for the power adjustments */</span><br><span style="color: hsl(0, 100%, 40%);">- tpp->ramp.max_initial_pout_mdBm = to_mdB(0);</span><br><span style="color: hsl(0, 100%, 40%);">- tpp->ramp.step_size_mdB = to_mdB(2);</span><br><span style="color: hsl(0, 100%, 40%);">- tpp->ramp.step_interval_sec = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* allocate a talloc pool for ORTP to ensure it doesn't have to go back</span><br><span> * to the libc malloc all the time */</span><br><span> tall_rtp_ctx = talloc_pool(tall_bts_ctx, 262144);</span><br><span>@@ -215,6 +194,36 @@</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Initialize the TRX data structures, called before config</span><br><span style="color: hsl(120, 100%, 40%);">+ * file reading */</span><br><span style="color: hsl(120, 100%, 40%);">+int bts_trx_init(struct gsm_bts_trx *trx)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ /* initialize bts data structure */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct trx_power_params *tpp = &trx->power_params;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc, i;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < ARRAY_SIZE(trx->ts); i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx_ts *ts = &trx->ts[i];</span><br><span style="color: hsl(120, 100%, 40%);">+ int k;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (k = 0; k < ARRAY_SIZE(ts->lchan); k++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_lchan *lchan = &ts->lchan[k];</span><br><span style="color: hsl(120, 100%, 40%);">+ INIT_LLIST_HEAD(&lchan->dl_tch_queue);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Default values for the power adjustments */</span><br><span style="color: hsl(120, 100%, 40%);">+ tpp->ramp.max_initial_pout_mdBm = to_mdB(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ tpp->ramp.step_size_mdB = to_mdB(2);</span><br><span style="color: hsl(120, 100%, 40%);">+ tpp->ramp.step_interval_sec = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = bts_model_trx_init(trx);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_del(&trx->list);</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</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> static void shutdown_timer_cb(void *data)</span><br><span> {</span><br><span> fprintf(stderr, "Shutdown timer expired\n");</span><br><span>diff --git a/src/common/main.c b/src/common/main.c</span><br><span>index 9121a2a..f90a4d4 100644</span><br><span>--- a/src/common/main.c</span><br><span>+++ b/src/common/main.c</span><br><span>@@ -59,7 +59,6 @@</span><br><span> static const char *config_file = "osmo-bts.cfg";</span><br><span> static int daemonize = 0;</span><br><span> static int rt_prio = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-static int trx_num = 1;</span><br><span> static char *gsmtap_ip = 0;</span><br><span> extern int g_vty_port_num;</span><br><span> </span><br><span>@@ -76,8 +75,6 @@</span><br><span> " -e --log-level Set a global log-level\n"</span><br><span> " -r --realtime PRIO Use SCHED_RR with the specified priority\n"</span><br><span> " -i --gsmtap-ip The destination IP used for GSMTAP.\n"</span><br><span style="color: hsl(0, 100%, 40%);">- " -t --trx-num Set number of TRX (default=%d)\n",</span><br><span style="color: hsl(0, 100%, 40%);">- trx_num</span><br><span> );</span><br><span> bts_model_print_help();</span><br><span> }</span><br><span>@@ -152,9 +149,8 @@</span><br><span> gsmtap_ip = optarg;</span><br><span> break;</span><br><span> case 't':</span><br><span style="color: hsl(0, 100%, 40%);">- trx_num = atoi(optarg);</span><br><span style="color: hsl(0, 100%, 40%);">- if (trx_num < 1)</span><br><span style="color: hsl(0, 100%, 40%);">- trx_num = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "Parameter -t is deprecated and does nothing, "</span><br><span style="color: hsl(120, 100%, 40%);">+ "TRX num is calculated from VTY\n");</span><br><span> break;</span><br><span> case '?':</span><br><span> case 1:</span><br><span>@@ -228,7 +224,7 @@</span><br><span> {</span><br><span> struct gsm_bts_trx *trx;</span><br><span> struct e1inp_line *line;</span><br><span style="color: hsl(0, 100%, 40%);">- int rc, i;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span> </span><br><span> printf("((*))\n |\n / \\ OsmoBTS\n");</span><br><span> </span><br><span>@@ -251,13 +247,7 @@</span><br><span> fprintf(stderr, "Failed to create BTS structure\n");</span><br><span> exit(1);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 1; i < trx_num; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- trx = gsm_bts_trx_alloc(bts);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!trx) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "Failed to create TRX structure\n");</span><br><span style="color: hsl(0, 100%, 40%);">- exit(1);</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%);">+</span><br><span> e1inp_vty_init();</span><br><span> bts_vty_init(bts, &bts_log_info);</span><br><span> </span><br><span>diff --git a/src/common/vty.c b/src/common/vty.c</span><br><span>index f918f57..f305413 100644</span><br><span>--- a/src/common/vty.c</span><br><span>+++ b/src/common/vty.c</span><br><span>@@ -227,12 +227,22 @@</span><br><span> struct gsm_bts *bts = vty->index;</span><br><span> struct gsm_bts_trx *trx;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- trx = gsm_bts_trx_num(bts, trx_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trx_nr > bts->num_trx) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% The next unused TRX number is %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->num_trx, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (trx_nr == bts->num_trx) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* allocate a new one */</span><br><span style="color: hsl(120, 100%, 40%);">+ trx = gsm_bts_trx_alloc(bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trx)</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_trx_init(trx);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else</span><br><span style="color: hsl(120, 100%, 40%);">+ trx = gsm_bts_trx_num(bts, trx_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (!trx) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Unknown TRX %u. Available TRX are: 0..%u%s",</span><br><span style="color: hsl(0, 100%, 40%);">- trx_nr, bts->num_trx - 1, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Hint: Check if commandline option -t matches the"</span><br><span style="color: hsl(0, 100%, 40%);">- "number of available transceivers!%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Unable to allocate TRX %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_nr, VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bts-litecell15/main.c b/src/osmo-bts-litecell15/main.c</span><br><span>index de175e3..e4f9a56 100644</span><br><span>--- a/src/osmo-bts-litecell15/main.c</span><br><span>+++ b/src/osmo-bts-litecell15/main.c</span><br><span>@@ -79,11 +79,6 @@</span><br><span> exit(1);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(trx, &bts->trx_list, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- trx->nominal_power = 40;</span><br><span style="color: hsl(0, 100%, 40%);">- trx->power_params.trx_p_max_out_mdBm = to_mdB(bts->c0->nominal_power);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> if (stat(LC15BTS_RF_LOCK_PATH, &st) == 0) {</span><br><span> LOGP(DL1C, LOGL_NOTICE, "Not starting BTS due to RF_LOCK file present\n");</span><br><span> exit(23);</span><br><span>@@ -104,6 +99,13 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+int bts_model_trx_init(struct gsm_bts_trx *trx)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->nominal_power = 40;</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 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> void bts_model_phy_link_set_defaults(struct phy_link *plink)</span><br><span> {</span><br><span> }</span><br><span>diff --git a/src/osmo-bts-oc2g/main.c b/src/osmo-bts-oc2g/main.c</span><br><span>index 9777c09..574bc72 100644</span><br><span>--- a/src/osmo-bts-oc2g/main.c</span><br><span>+++ b/src/osmo-bts-oc2g/main.c</span><br><span>@@ -105,11 +105,6 @@</span><br><span> exit(1);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(trx, &bts->trx_list, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- trx->nominal_power = 40;</span><br><span style="color: hsl(0, 100%, 40%);">- trx->power_params.trx_p_max_out_mdBm = to_mdB(bts->c0->nominal_power);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> if (stat(OC2GBTS_RF_LOCK_PATH, &st) == 0) {</span><br><span> LOGP(DL1C, LOGL_NOTICE, "Not starting BTS due to RF_LOCK file present\n");</span><br><span> exit(23);</span><br><span>@@ -130,6 +125,13 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+int bts_model_trx_init(struct gsm_bts_trx *trx)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->nominal_power = 40;</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 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> void bts_model_phy_link_set_defaults(struct phy_link *plink)</span><br><span> {</span><br><span> }</span><br><span>diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c</span><br><span>index 40d5300..f149c04 100644</span><br><span>--- a/src/osmo-bts-octphy/l1_if.c</span><br><span>+++ b/src/osmo-bts-octphy/l1_if.c</span><br><span>@@ -792,6 +792,11 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+int bts_model_trx_init(struct gsm_bts_trx *trx)</span><br><span style="color: hsl(120, 100%, 40%);">+{</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> /***********************************************************************</span><br><span> * handling of messages coming up from PHY</span><br><span> ***********************************************************************/</span><br><span>diff --git a/src/osmo-bts-omldummy/bts_model.c b/src/osmo-bts-omldummy/bts_model.c</span><br><span>index 9ade2c6..fa1aaf4 100644</span><br><span>--- a/src/osmo-bts-omldummy/bts_model.c</span><br><span>+++ b/src/osmo-bts-omldummy/bts_model.c</span><br><span>@@ -179,6 +179,11 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+int bts_model_trx_init(struct gsm_bts_trx *trx)</span><br><span style="color: hsl(120, 100%, 40%);">+{</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> void bts_model_print_help()</span><br><span> {</span><br><span> }</span><br><span>diff --git a/src/osmo-bts-sysmo/main.c b/src/osmo-bts-sysmo/main.c</span><br><span>index b63d07e..221e8e8 100644</span><br><span>--- a/src/osmo-bts-sysmo/main.c</span><br><span>+++ b/src/osmo-bts-sysmo/main.c</span><br><span>@@ -91,6 +91,11 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+int bts_model_trx_init(struct gsm_bts_trx *trx)</span><br><span style="color: hsl(120, 100%, 40%);">+{</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> int bts_model_oml_estab(struct gsm_bts *bts)</span><br><span> {</span><br><span> return 0;</span><br><span>diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c</span><br><span>index 61610f7..98f460e 100644</span><br><span>--- a/src/osmo-bts-trx/main.c</span><br><span>+++ b/src/osmo-bts-trx/main.c</span><br><span>@@ -118,6 +118,11 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+int bts_model_trx_init(struct gsm_bts_trx *trx)</span><br><span style="color: hsl(120, 100%, 40%);">+{</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> void bts_model_phy_link_set_defaults(struct phy_link *plink)</span><br><span> {</span><br><span> plink->u.osmotrx.local_ip = talloc_strdup(plink, "127.0.0.1");</span><br><span>diff --git a/src/osmo-bts-virtual/main.c b/src/osmo-bts-virtual/main.c</span><br><span>index b66a3ff..88041fd 100644</span><br><span>--- a/src/osmo-bts-virtual/main.c</span><br><span>+++ b/src/osmo-bts-virtual/main.c</span><br><span>@@ -72,6 +72,11 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+int bts_model_trx_init(struct gsm_bts_trx *trx)</span><br><span style="color: hsl(120, 100%, 40%);">+{</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> void bts_model_print_help()</span><br><span> {</span><br><span> LOGP(DSUM, LOGL_NOTICE, "Unimplemented %s\n", __func__);</span><br><span>diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c</span><br><span>index c7bd8f8..407ed95 100644</span><br><span>--- a/tests/handover/handover_test.c</span><br><span>+++ b/tests/handover/handover_test.c</span><br><span>@@ -75,14 +75,18 @@</span><br><span> fprintf(stderr, "Failed to create BTS structure\n");</span><br><span> exit(1);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- trx = gsm_bts_trx_alloc(bts);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!trx) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "Failed to TRX structure\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts_init(bts) < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "unable to init BTS\n");</span><br><span> exit(1);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (bts_init(bts) < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "unable to to open bts\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ trx = gsm_bts_trx_alloc(bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!trx) {</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "Failed to alloc TRX structure\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(1);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts_trx_init(trx) < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "unable to init TRX\n");</span><br><span> exit(1);</span><br><span> }</span><br><span> </span><br><span>@@ -268,6 +272,7 @@</span><br><span> int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo, void *obj) { return 0; }</span><br><span> int bts_model_chg_adm_state(struct gsm_bts *bts, struct gsm_abis_mo *mo, void *obj, uint8_t adm_state) { return 0; }</span><br><span> int bts_model_init(struct gsm_bts *bts) { return 0; }</span><br><span style="color: hsl(120, 100%, 40%);">+int bts_model_trx_init(struct gsm_bts_trx *trx) { return 0; }</span><br><span> int bts_model_trx_deact_rf(struct gsm_bts_trx *trx) { return 0; }</span><br><span> int bts_model_trx_close(struct gsm_bts_trx *trx) { return 0; }</span><br><span> void trx_get_hlayer1(void) {}</span><br><span>diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c</span><br><span>index d4f3fe6..f580374 100644</span><br><span>--- a/tests/meas/meas_test.c</span><br><span>+++ b/tests/meas/meas_test.c</span><br><span>@@ -519,14 +519,18 @@</span><br><span> fprintf(stderr, "Failed to create BTS structure\n");</span><br><span> exit(1);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- trx = gsm_bts_trx_alloc(bts);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!trx) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "Failed to TRX structure\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts_init(bts) < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "unable to init BTS\n");</span><br><span> exit(1);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (bts_init(bts) < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "unable to to open bts\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ trx = gsm_bts_trx_alloc(bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!trx) {</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "Failed to alloc TRX structure\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(1);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts_trx_init(trx) < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "unable to init TRX\n");</span><br><span> exit(1);</span><br><span> }</span><br><span> </span><br><span>@@ -626,6 +630,11 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+int bts_model_trx_init(struct gsm_bts_trx *trx)</span><br><span style="color: hsl(120, 100%, 40%);">+{</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> int bts_model_trx_deact_rf(struct gsm_bts_trx *trx)</span><br><span> {</span><br><span> return 0;</span><br><span>diff --git a/tests/stubs.c b/tests/stubs.c</span><br><span>index f969cb3..d6f4d3d 100644</span><br><span>--- a/tests/stubs.c</span><br><span>+++ b/tests/stubs.c</span><br><span>@@ -13,6 +13,8 @@</span><br><span> { return 0; }</span><br><span> int bts_model_init(struct gsm_bts *bts)</span><br><span> { return 0; }</span><br><span style="color: hsl(120, 100%, 40%);">+int bts_model_trx_init(struct gsm_bts_trx *trx)</span><br><span style="color: hsl(120, 100%, 40%);">+{ return 0; }</span><br><span> int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg,</span><br><span> struct tlv_parsed *new_attr, int kind, void *obj)</span><br><span> { return 0; }</span><br><span>diff --git a/tests/sysmobts/sysmobts_test.c b/tests/sysmobts/sysmobts_test.c</span><br><span>index 02490be..4b01ed7 100644</span><br><span>--- a/tests/sysmobts/sysmobts_test.c</span><br><span>+++ b/tests/sysmobts/sysmobts_test.c</span><br><span>@@ -198,6 +198,8 @@</span><br><span> </span><br><span> int bts_model_init(struct gsm_bts *bts)</span><br><span> { return 0; }</span><br><span style="color: hsl(120, 100%, 40%);">+int bts_model_trx_init(struct gsm_bts_trx *trx)</span><br><span style="color: hsl(120, 100%, 40%);">+{ return 0; }</span><br><span> int bts_model_oml_estab(struct gsm_bts *bts)</span><br><span> { return 0; }</span><br><span> void bts_model_abis_close(struct gsm_bts *bts)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11735">change 11735</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/11735"/><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: Iab1a754ab12a626759f9f90aa66f87bdce65ac9c </div>
<div style="display:none"> Gerrit-Change-Number: 11735 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@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>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>