diff options
| author | Harald Welte <laforge@gnumonks.org> | 2018-03-17 12:22:40 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2018-03-17 13:40:03 +0100 |
| commit | d8cd756da48bcff9f9caf9e64fc0af047a165b60 (patch) | |
| tree | 136d09901ae8420803500d92646944376ae21f59 /src/common/main.c | |
| parent | 7c4a22dbc48f51eb199766bf1b29e061bf765cbd (diff) | |
Get rid of 'struct gsm_bts_role_bts'
gsm_bts_role_bts was introduced at a time when we still shared
gsm_data_shared.[ch] between BSC and BTS, and where we then subsequently
needed a BTS-private structure. Since that sharing was abandoned quite
some time ago, we can merge gsm_bts_role_bts into gsm_bts and do away
with the bts/btsb dualism in a lot of the code.
Change-Id: I4fdd601ea873d9697f89a748cc77bcf7c978fa3e
Diffstat (limited to 'src/common/main.c')
| -rw-r--r-- | src/common/main.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/common/main.c b/src/common/main.c index d5dc4ea0..0f6f5295 100644 --- a/src/common/main.c +++ b/src/common/main.c @@ -226,7 +226,6 @@ static int write_pid_file(char *procname) int bts_main(int argc, char **argv) { - struct gsm_bts_role_bts *btsb; struct gsm_bts_trx *trx; struct e1inp_line *line; int rc, i; @@ -289,7 +288,6 @@ int bts_main(int argc, char **argv) fprintf(stderr, "unable to open bts\n"); exit(1); } - btsb = bts_role_bts(bts); abis_init(bts); @@ -324,7 +322,7 @@ int bts_main(int argc, char **argv) exit(1); } - if (pcu_sock_init(btsb->pcu.sock_path)) { + if (pcu_sock_init(bts->pcu.sock_path)) { fprintf(stderr, "PCU L1 socket failed\n"); exit(1); } @@ -336,12 +334,12 @@ int bts_main(int argc, char **argv) signal(SIGUSR2, &signal_handler); osmo_init_ignore_signals(); - if (!btsb->bsc_oml_host) { + if (!bts->bsc_oml_host) { fprintf(stderr, "Cannot start BTS without knowing BSC OML IP\n"); exit(1); } - line = abis_open(bts, btsb->bsc_oml_host, "sysmoBTS"); + line = abis_open(bts, bts->bsc_oml_host, "sysmoBTS"); if (!line) { fprintf(stderr, "unable to connect to BSC\n"); exit(2); |