From db9c064dd4d0bd9da907db75d4a598dd0a5a8c75 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Mon, 22 Feb 2016 12:16:55 +0100 Subject: osmo-bsc: half-fix tz override to allow compilation As described in a comment, for MSCSPLIT the tz data has been moved to network level. To allow compiling osmo-bsc on the sysmocom-iu branch, move tz up to network level in osmo-bsc as well. This could be done better for osmo-bsc, rather easily too, still allowing per-BTS timezone settings. But I'm trying to focus on IuCS and would like to come back to this later. --- openbsc/include/openbsc/gsm_data.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'openbsc/include') diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h index a1085f6c7..74f91b164 100644 --- a/openbsc/include/openbsc/gsm_data.h +++ b/openbsc/include/openbsc/gsm_data.h @@ -235,6 +235,13 @@ enum gsm_auth_policy { #define GSM_T3113_DEFAULT 60 #define GSM_T3122_DEFAULT 10 +struct gsm_tz { + int override; /* if 0, use system's time zone instead. */ + int hr; /* hour */ + int mn; /* minute */ + int dst; /* daylight savings */ +}; + struct gsm_network { /* global parameters */ uint16_t country_code; @@ -327,12 +334,7 @@ struct gsm_network { /* TODO: in OsmoNITB, tz-override used to be BTS-specific. To enable * BTS|RNC specific timezone overrides for multi-tz networks in * OsmoCSCN, this should be tied to the location area code (LAC). */ - struct { - int override; /* if 0, use system's time zone instead. */ - int hr; /* hour */ - int mn; /* minute */ - int dst; /* daylight savings */ - } tz; + struct gsm_tz tz; /* Periodic location update default value */ uint8_t t3212; -- cgit v1.2.3