[MERGED] osmo-bts[master]: Fix build after recent gsm_bts_alloc() change

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Sun Aug 13 23:24:06 UTC 2017


Harald Welte has submitted this change and it was merged.

Change subject: Fix build after recent gsm_bts_alloc() change
......................................................................


Fix build after recent gsm_bts_alloc() change

In openbsc.git Change-Id I61c18a7f021fcb1ec00d34a745f4e3ab03416c2d
we changed the gsm_bts_alloc() function signature to include
a second argument (the BTS number).  This broke omso-bts, and this
commit is intended to make it build again.

Change-Id: I7ef7654d48c1cfc7e4ecb0b771553ec0740ce2bf
---
M src/common/main.c
M tests/agch/agch_test.c
M tests/cipher/cipher_test.c
M tests/handover/handover_test.c
M tests/meas/meas_test.c
M tests/paging/paging_test.c
M tests/tx_power/tx_power_test.c
7 files changed, 7 insertions(+), 7 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved; Verified



diff --git a/src/common/main.c b/src/common/main.c
index 4c51848..6c13663 100644
--- a/src/common/main.c
+++ b/src/common/main.c
@@ -241,7 +241,7 @@
 
 	handle_options(argc, argv);
 
-	bts = gsm_bts_alloc(tall_bts_ctx);
+	bts = gsm_bts_alloc(tall_bts_ctx, 0);
 	if (!bts) {
 		fprintf(stderr, "Failed to create BTS structure\n");
 		exit(1);
diff --git a/tests/agch/agch_test.c b/tests/agch/agch_test.c
index e275c64..7c4e6cd 100644
--- a/tests/agch/agch_test.c
+++ b/tests/agch/agch_test.c
@@ -229,7 +229,7 @@
 
 	bts_log_init(NULL);
 
-	bts = gsm_bts_alloc(tall_bts_ctx);
+	bts = gsm_bts_alloc(tall_bts_ctx, 0);
 	if (bts_init(bts) < 0) {
 		fprintf(stderr, "unable to open bts\n");
 		exit(1);
diff --git a/tests/cipher/cipher_test.c b/tests/cipher/cipher_test.c
index c913925..07d9fde 100644
--- a/tests/cipher/cipher_test.c
+++ b/tests/cipher/cipher_test.c
@@ -71,7 +71,7 @@
 
 	bts_log_init(NULL);
 
-	bts = gsm_bts_alloc(tall_bts_ctx);
+	bts = gsm_bts_alloc(tall_bts_ctx, 0);
 	if (bts_init(bts) < 0) {
 		fprintf(stderr, "unable to open bts\n");
 		exit(1);
diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c
index 611c441..adc4d65 100644
--- a/tests/handover/handover_test.c
+++ b/tests/handover/handover_test.c
@@ -71,7 +71,7 @@
 	bts_log_init(NULL);
 	osmo_stderr_target->categories[DHO].loglevel = LOGL_DEBUG;
 
-	bts = gsm_bts_alloc(tall_bts_ctx);
+	bts = gsm_bts_alloc(tall_bts_ctx, 0);
 	if (!bts) {
 		fprintf(stderr, "Failed to create BTS structure\n");
 		exit(1);
diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c
index c87350b..6c514ca 100644
--- a/tests/meas/meas_test.c
+++ b/tests/meas/meas_test.c
@@ -97,7 +97,7 @@
 	bts_log_init(NULL);
 	osmo_stderr_target->categories[DMEAS].loglevel = LOGL_DEBUG;
 
-	bts = gsm_bts_alloc(tall_bts_ctx);
+	bts = gsm_bts_alloc(tall_bts_ctx, 0);
 	if (!bts) {
 		fprintf(stderr, "Failed to create BTS structure\n");
 		exit(1);
diff --git a/tests/paging/paging_test.c b/tests/paging/paging_test.c
index 1d5f216..2573b3f 100644
--- a/tests/paging/paging_test.c
+++ b/tests/paging/paging_test.c
@@ -117,7 +117,7 @@
 
 	bts_log_init(NULL);
 
-	bts = gsm_bts_alloc(tall_bts_ctx);
+	bts = gsm_bts_alloc(tall_bts_ctx, 0);
 	if (bts_init(bts) < 0) {
 		fprintf(stderr, "unable to open bts\n");
 		exit(1);
diff --git a/tests/tx_power/tx_power_test.c b/tests/tx_power/tx_power_test.c
index fb23409..a47d186 100644
--- a/tests/tx_power/tx_power_test.c
+++ b/tests/tx_power/tx_power_test.c
@@ -215,7 +215,7 @@
 	osmo_stderr_target->categories[DL1C].loglevel = LOGL_DEBUG;
 	log_set_print_filename(osmo_stderr_target, 0);
 
-	bts = gsm_bts_alloc(tall_bts_ctx);
+	bts = gsm_bts_alloc(tall_bts_ctx, 0);
 	if (!bts) {
 		fprintf(stderr, "Failed to create BTS structure\n");
 		exit(1);

-- 
To view, visit https://gerrit.osmocom.org/3511
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7ef7654d48c1cfc7e4ecb0b771553ec0740ce2bf
Gerrit-PatchSet: 1
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder



More information about the gerrit-log mailing list