diff options
Diffstat (limited to 'src/pcu_main.cpp')
| -rw-r--r-- | src/pcu_main.cpp | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/src/pcu_main.cpp b/src/pcu_main.cpp index 4126d06..9f38742 100644 --- a/src/pcu_main.cpp +++ b/src/pcu_main.cpp @@ -33,8 +33,6 @@ extern "C" { #include <osmocom/vty/telnet_interface.h> #include <osmocom/vty/logging.h> #include <osmocom/core/stats.h> -#include <osmocom/core/gsmtap.h> -#include <osmocom/core/gsmtap_util.h> } extern struct gprs_nsvc *nsvc; @@ -46,7 +44,6 @@ void *tall_pcu_ctx; extern void *bv_tall_ctx; static int quit = 0; static int rt_prio = -1; -static char *gsmtap_addr = "localhost"; // FIXME: use gengetopt's default value instead static void print_help() { @@ -58,10 +55,8 @@ static void print_help() "provided by BTS\n" " -n --mnc MNC use given MNC instead of value " "provided by BTS\n" - " -V --version print version\n" " -r --realtime PRIO Use SCHED_RR with the specified " "priority\n" - " -i --gsmtap-ip The destination IP used for GSMTAP.\n" ); } @@ -78,11 +73,10 @@ static void handle_options(int argc, char **argv) { "version", 0, 0, 'V' }, { "realtime", 1, 0, 'r' }, { "exit", 0, 0, 'e' }, - { "gsmtap-ip", 1, 0, 'i' }, { 0, 0, 0, 0 } }; - c = getopt_long(argc, argv, "hc:m:n:Vr:e:i:", + c = getopt_long(argc, argv, "hc:m:n:Vr:e", long_options, &option_idx); if (c == -1) break; @@ -107,9 +101,6 @@ static void handle_options(int argc, char **argv) print_version(1); exit(0); break; - case 'i': - gsmtap_addr = optarg; - break; case 'r': rt_prio = atoi(optarg); break; @@ -172,7 +163,6 @@ int main(int argc, char *argv[]) bts = bts_main_data(); bts->fc_interval = 1; bts->initial_cs_dl = bts->initial_cs_ul = 1; - bts->initial_mcs_dl = bts->initial_mcs_ul = 1; bts->cs1 = 1; bts->t3142 = 20; bts->t3169 = 5; @@ -189,8 +179,10 @@ int main(int argc, char *argv[]) bts->cs_adj_lower_limit = 10; /* Increase CS if the error rate is below */ bts->max_cs_ul = 4; bts->max_cs_dl = 4; - bts->max_mcs_ul = 4; - bts->max_mcs_dl = 4; + bts->initial_mcs_dl = 1; + bts->initial_mcs_ul = 1; + bts->max_mcs_ul = 9; + bts->max_mcs_dl = 9; /* CS-1 to CS-4 */ bts->cs_lqual_ranges[0].low = -256; bts->cs_lqual_ranges[0].high = 6; @@ -202,10 +194,6 @@ int main(int argc, char *argv[]) bts->cs_lqual_ranges[3].high = 256; bts->cs_downgrade_threshold = 200; - /* TODO: increase them when CRBB decoding is implemented */ - bts->ws_base = 64; - bts->ws_pdch = 0; - bts->llc_codel_interval_msec = LLC_CODEL_USE_DEFAULT; bts->dl_tbf_idle_msec = 2000; bts->llc_idle_ack_csec = 10; @@ -227,13 +215,6 @@ int main(int argc, char *argv[]) exit(0); } - bts->gsmtap = gsmtap_source_init(gsmtap_addr, GSMTAP_UDP_PORT, 1); - - if (bts->gsmtap) - gsmtap_source_add_sink(bts->gsmtap); - else - fprintf(stderr, "Failed to initialize GSMTAP for %s\n", gsmtap_addr); - rc = vty_read_config_file(config_file, NULL); if (rc < 0 && config_given) { fprintf(stderr, "Failed to parse the config file: '%s'\n", |