bts: Allocate TRX for BTS dynamically, deprecate -t

No need to pass -t num_trx anymore to specify number of TRX to use. It
is calculated based on dynamic allocation from VTY config.
Using parameter -t is flagged as deprecated and is transformed into a
NOOP por backward compatibility.

As a result, TRX now are allocated after the BTS is allocated and
initial config (pre-VTY) is applied.
A new function bts_trx_init() is added, to set default config on each
TRX during allocation and before setting VTY config on it.
A new per BTS model function bts_model_trx_init() is added, to allow
per model specific default configuration of each TRX.

Change-Id: Iab1a754ab12a626759f9f90aa66f87bdce65ac9c

4 files changed, 26 insertions, 8 deletions

diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c
index c7bd8f8d..407ed95d 100644
--- a/tests/handover/handover_test.c
+++ b/tests/handover/handover_test.c
@@ -75,14 +75,18 @@ int main(int argc, char **argv)
 		fprintf(stderr, "Failed to create BTS structure\n");
 		exit(1);
 	}
+	if (bts_init(bts) < 0) {
+		fprintf(stderr, "unable to init BTS\n");
+		exit(1);
+	}
+
 	trx = gsm_bts_trx_alloc(bts);
 	if (!trx) {
-		fprintf(stderr, "Failed to TRX structure\n");
+		fprintf(stderr, "Failed to alloc TRX structure\n");
 		exit(1);
 	}
-
-	if (bts_init(bts) < 0) {
-		fprintf(stderr, "unable to to open bts\n");
+	if (bts_trx_init(trx) < 0) {
+		fprintf(stderr, "unable to init TRX\n");
 		exit(1);
 	}
 
@@ -268,6 +272,7 @@ int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg, struct tlv_parsed
 int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo, void *obj) { return 0; }
 int bts_model_chg_adm_state(struct gsm_bts *bts, struct gsm_abis_mo *mo, void *obj, uint8_t adm_state) { return 0; }
 int bts_model_init(struct gsm_bts *bts) { return 0; }
+int bts_model_trx_init(struct gsm_bts_trx *trx) { return 0; }
 int bts_model_trx_deact_rf(struct gsm_bts_trx *trx) { return 0; }
 int bts_model_trx_close(struct gsm_bts_trx *trx) { return 0; }
 void trx_get_hlayer1(void) {}
diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c
index d4f3fe68..f5803743 100644
--- a/tests/meas/meas_test.c
+++ b/tests/meas/meas_test.c
@@ -519,14 +519,18 @@ int main(int argc, char **argv)
 		fprintf(stderr, "Failed to create BTS structure\n");
 		exit(1);
 	}
+	if (bts_init(bts) < 0) {
+		fprintf(stderr, "unable to init BTS\n");
+		exit(1);
+	}
+
 	trx = gsm_bts_trx_alloc(bts);
 	if (!trx) {
-		fprintf(stderr, "Failed to TRX structure\n");
+		fprintf(stderr, "Failed to alloc TRX structure\n");
 		exit(1);
 	}
-
-	if (bts_init(bts) < 0) {
-		fprintf(stderr, "unable to to open bts\n");
+	if (bts_trx_init(trx) < 0) {
+		fprintf(stderr, "unable to init TRX\n");
 		exit(1);
 	}
 
@@ -626,6 +630,11 @@ int bts_model_init(struct gsm_bts *bts)
 	return 0;
 }
 
+int bts_model_trx_init(struct gsm_bts_trx *trx)
+{
+	return 0;
+}
+
 int bts_model_trx_deact_rf(struct gsm_bts_trx *trx)
 {
 	return 0;
diff --git a/tests/stubs.c b/tests/stubs.c
index f969cb3c..d6f4d3d8 100644
--- a/tests/stubs.c
+++ b/tests/stubs.c
@@ -13,6 +13,8 @@ int bts_model_chg_adm_state(struct gsm_bts *bts, struct gsm_abis_mo *mo,
 { return 0; }
 int bts_model_init(struct gsm_bts *bts)
 { return 0; }
+int bts_model_trx_init(struct gsm_bts_trx *trx)
+{ return 0; }
 int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg,
 			struct tlv_parsed *new_attr, int kind, void *obj)
 { return 0; }
diff --git a/tests/sysmobts/sysmobts_test.c b/tests/sysmobts/sysmobts_test.c
index 02490bef..4b01ed7a 100644
--- a/tests/sysmobts/sysmobts_test.c
+++ b/tests/sysmobts/sysmobts_test.c
@@ -198,6 +198,8 @@ void bts_update_status(enum bts_global_status which, int on)
 
 int bts_model_init(struct gsm_bts *bts)
 { return 0; }
+int bts_model_trx_init(struct gsm_bts_trx *trx)
+{ return 0; }
 int bts_model_oml_estab(struct gsm_bts *bts)
 { return 0; }
 void bts_model_abis_close(struct gsm_bts *bts)