cosmetic: bsc_network_init(): imply default 001-01 PLMN
All callers pass mcc=1, mnc=1, so just have it as default. (Prepare for net->country_code etc to be replaced by net->plmn) Change-Id: Ic16bc0bab3f2d4721e86a1a04f9d9f988d777df2
This commit is contained in:
parent
4d358c00e1
commit
f7a6329bbd
|
@ -2,6 +2,4 @@
|
|||
|
||||
#include <stdint.h>
|
||||
|
||||
struct gsm_network *bsc_network_init(void *ctx,
|
||||
uint16_t country_code,
|
||||
uint16_t network_code);
|
||||
struct gsm_network *bsc_network_init(void *ctx);
|
||||
|
|
|
@ -992,7 +992,7 @@ int main(int argc, char **argv)
|
|||
}
|
||||
libosmo_abis_init(tall_ctx_config);
|
||||
|
||||
bsc_gsmnet = bsc_network_init(tall_bsc_ctx, 1, 1);
|
||||
bsc_gsmnet = bsc_network_init(tall_bsc_ctx);
|
||||
if (!bsc_gsmnet)
|
||||
exit(1);
|
||||
|
||||
|
|
|
@ -547,7 +547,7 @@ static int bootstrap_bts(struct gsm_bts *bts)
|
|||
int bsc_network_alloc(void)
|
||||
{
|
||||
/* initialize our data structures */
|
||||
bsc_gsmnet = bsc_network_init(tall_bsc_ctx, 1, 1);
|
||||
bsc_gsmnet = bsc_network_init(tall_bsc_ctx);
|
||||
if (!bsc_gsmnet)
|
||||
return -ENOMEM;
|
||||
|
||||
|
|
|
@ -22,6 +22,7 @@
|
|||
#include <osmocom/bsc/gsm_04_08_utils.h>
|
||||
#include <osmocom/bsc/handover_cfg.h>
|
||||
#include <osmocom/bsc/chan_alloc.h>
|
||||
#include <osmocom/bsc/common_bsc.h>
|
||||
|
||||
/* XXX hard-coded for now */
|
||||
#define T3122_CHAN_LOAD_SAMPLE_INTERVAL 1 /* in seconds */
|
||||
|
@ -38,9 +39,7 @@ static void update_t3122_chan_load_timer(void *data)
|
|||
osmo_timer_schedule(&net->t3122_chan_load_timer, T3122_CHAN_LOAD_SAMPLE_INTERVAL, 0);
|
||||
}
|
||||
|
||||
struct gsm_network *bsc_network_init(void *ctx,
|
||||
uint16_t country_code,
|
||||
uint16_t network_code)
|
||||
struct gsm_network *bsc_network_init(void *ctx)
|
||||
{
|
||||
struct gsm_network *net;
|
||||
|
||||
|
@ -48,8 +47,9 @@ struct gsm_network *bsc_network_init(void *ctx,
|
|||
if (!net)
|
||||
return NULL;
|
||||
|
||||
net->country_code = country_code;
|
||||
net->network_code = network_code;
|
||||
net->country_code = 1;
|
||||
net->network_code = 1;
|
||||
|
||||
/* Permit a compile-time default of A5/3 and A5/1 */
|
||||
net->a5_encryption_mask = (1 << 3) | (1 << 1);
|
||||
|
||||
|
|
|
@ -915,7 +915,7 @@ int main(int argc, char **argv)
|
|||
handle_options(argc, argv);
|
||||
bts_model_bs11_init();
|
||||
|
||||
gsmnet = bsc_network_init(tall_bs11cfg_ctx, 1, 1);
|
||||
gsmnet = bsc_network_init(tall_bs11cfg_ctx);
|
||||
if (!gsmnet) {
|
||||
fprintf(stderr, "Unable to allocate gsm network\n");
|
||||
exit(1);
|
||||
|
|
|
@ -122,7 +122,7 @@ static void test_scan(void)
|
|||
{
|
||||
int i;
|
||||
|
||||
struct gsm_network *net = bsc_network_init(NULL, 1, 1);
|
||||
struct gsm_network *net = bsc_network_init(NULL);
|
||||
struct gsm_bts *bts = gsm_bts_alloc(net, 0);
|
||||
struct bsc_msc_data *msc;
|
||||
struct gsm_subscriber_connection *conn;
|
||||
|
|
|
@ -89,7 +89,7 @@ void test_cell_identifier()
|
|||
struct bsc_msc_data *msc;
|
||||
struct gsm_bts *bts;
|
||||
|
||||
bsc_gsmnet = bsc_network_init(NULL, 1, 1);
|
||||
bsc_gsmnet = bsc_network_init(NULL);
|
||||
bsc_gsmnet->bsc_data->rf_ctrl = talloc_zero(NULL, struct osmo_bsc_rf);
|
||||
bsc_gsmnet->bsc_data->rf_ctrl->policy = S_RF_ON;
|
||||
|
||||
|
|
|
@ -38,7 +38,7 @@ void test_bts_debug_print(void)
|
|||
printf("Testing the lchan printing:");
|
||||
|
||||
/* Create a dummy network */
|
||||
network = bsc_network_init(tall_bsc_ctx, 1, 1);
|
||||
network = bsc_network_init(tall_bsc_ctx);
|
||||
if (!network)
|
||||
exit(1);
|
||||
/* Add a BTS with some reasonanbly non-zero id */
|
||||
|
|
|
@ -834,7 +834,7 @@ int main(int argc, char **argv)
|
|||
osmo_init_logging(&log_info);
|
||||
log_set_log_level(osmo_stderr_target, LOGL_INFO);
|
||||
|
||||
net = bsc_network_init(tall_bsc_ctx, 1, 1);
|
||||
net = bsc_network_init(tall_bsc_ctx);
|
||||
if (!net) {
|
||||
printf("Network init failure.\n");
|
||||
return EXIT_FAILURE;
|
||||
|
|
|
@ -1293,7 +1293,7 @@ int main(int argc, char **argv)
|
|||
log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_BASENAME);
|
||||
|
||||
/* Create a dummy network */
|
||||
bsc_gsmnet = bsc_network_init(NULL, 1, 1);
|
||||
bsc_gsmnet = bsc_network_init(NULL);
|
||||
if (!bsc_gsmnet)
|
||||
exit(1);
|
||||
|
||||
|
|
Loading…
Reference in New Issue