diff options
| -rw-r--r-- | src/common/bts.c | 11 | ||||
| -rw-r--r-- | src/osmo-bts-sysmo/main.c | 18 | ||||
| -rw-r--r-- | tests/paging/paging_test.c | 1 |
3 files changed, 11 insertions, 19 deletions
diff --git a/src/common/bts.c b/src/common/bts.c index 4be901bb..208e1c60 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -50,7 +50,6 @@ struct gsm_network bts_gsmnet = { }; void *tall_bts_ctx; -extern int gprs_enabled; int bts_init(struct gsm_bts *bts) { @@ -146,12 +145,10 @@ int bts_link_estab(struct gsm_bts *bts) oml_tx_state_changed(&bts->mo); /* those should all be in DEPENDENCY */ - if (gprs_enabled) { - oml_tx_state_changed(&bts->gprs.nse.mo); - oml_tx_state_changed(&bts->gprs.cell.mo); - oml_tx_state_changed(&bts->gprs.nsvc[0].mo); - oml_tx_state_changed(&bts->gprs.nsvc[1].mo); - } + oml_tx_state_changed(&bts->gprs.nse.mo); + oml_tx_state_changed(&bts->gprs.cell.mo); + oml_tx_state_changed(&bts->gprs.nsvc[0].mo); + oml_tx_state_changed(&bts->gprs.nsvc[1].mo); /* All other objects start off-line until the BTS Model code says otherwise */ for (i = 0; i < bts->num_trx; i++) { diff --git a/src/osmo-bts-sysmo/main.c b/src/osmo-bts-sysmo/main.c index 84a02745..137a0b16 100644 --- a/src/osmo-bts-sysmo/main.c +++ b/src/osmo-bts-sysmo/main.c @@ -51,7 +51,7 @@ /* FIXME: read from real hardware */ const uint8_t abis_mac[6] = { 0,1,2,3,4,5 }; -int gprs_enabled = 0, pcu_direct = 0; +int pcu_direct = 0; static const char *config_file = "osmo-bts.cfg"; static int daemonize = 0; @@ -109,7 +109,6 @@ static void print_help() " -e --log-level Set a global log-level\n" " -p --dsp-trace Set DSP trace flags\n" " -w --hw-version Print the targeted HW Version\n" - " -P --pcu Enable PCU L1 socket interface\n" " -M --pcu-direct Force PCU to access message queue for " "PDCH dchannel directly\n" ); @@ -141,12 +140,11 @@ static void handle_options(int argc, char **argv) { "log-level", 1, 0, 'e' }, { "dsp-trace", 1, 0, 'p' }, { "hw-version", 0, 0, 'w' }, - { "pcu", 0, 0, 'P' }, { "pcu-direct", 0, 0, 'M' }, { 0, 0, 0, 0 } }; - c = getopt_long(argc, argv, "hc:d:Dc:sTVe:p:w:PM", + c = getopt_long(argc, argv, "hc:d:Dc:sTVe:p:w:M", long_options, &option_idx); if (c == -1) break; @@ -171,13 +169,6 @@ static void handle_options(int argc, char **argv) case 'T': log_set_print_timestamp(osmo_stderr_target, 1); break; - case 'P': - if (pcu_sock_init()) { - fprintf(stderr, "PCU L1 socket failed\n"); - exit(-1); - } - gprs_enabled = 1; - break; case 'M': pcu_direct = 1; break; @@ -287,6 +278,11 @@ int main(int argc, char **argv) exit(1); } + if (pcu_sock_init()) { + fprintf(stderr, "PCU L1 socket failed\n"); + exit(-1); + } + signal(SIGINT, &signal_handler); //signal(SIGABRT, &signal_handler); signal(SIGUSR1, &signal_handler); diff --git a/tests/paging/paging_test.c b/tests/paging/paging_test.c index 1468735b..a0a39355 100644 --- a/tests/paging/paging_test.c +++ b/tests/paging/paging_test.c @@ -29,7 +29,6 @@ static struct gsm_bts *bts; static struct gsm_bts_role_bts *btsb; -int gprs_enabled = 0; int pcu_direct = 0; static const uint8_t static_ilv[] = { |