aboutsummaryrefslogtreecommitdiffstats
path: root/src/osmo-bts-sysmo/main.c
diff options
context:
space:
mode:
authorAndreas Eversberg <jolly@eversberg.eu>2012-07-24 09:33:35 +0200
committerHarald Welte <laforge@gnumonks.org>2012-07-26 21:14:02 +0200
commit7daa093df7f5f743e69d73778d695e2f31cec73e (patch)
treea9e4a324d74e626fa043ee273637de3fee273424 /src/osmo-bts-sysmo/main.c
parentb86bf060d334b33628e192218915526a526ebe46 (diff)
PCU: Removed -P option, so GPRS support is always enabled
Diffstat (limited to 'src/osmo-bts-sysmo/main.c')
-rw-r--r--src/osmo-bts-sysmo/main.c18
1 files changed, 7 insertions, 11 deletions
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);