From 972c24314694396c9b66fd8175cdcd40f01bdd39 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Fri, 27 Sep 2019 15:55:45 +0200 Subject: struct gsm_bts: Add model_priv pointer handing bts_model specific data Currently there's bts-virtual specific fields in gsm_bts which is not used by other models and are always allocated. An alternative would be having a union with different structs inside, one per model, but since we already have the bts_model abstraction, in this case it makes more sense to use that abstraction instead of filling code with preprocessor ifdefs to guard against non-defined types, etc. Existing model specific data is moved there. This new infra will be user further in forthcoming commits. Related: OS#4215 Change-Id: Ib17a752cdbaa7d5eb8c5dfa0b197f80a4f38b38e --- include/osmo-bts/gsm_data_shared.h | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'include') diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h index cf7b7157..5d8bc76e 100644 --- a/include/osmo-bts/gsm_data_shared.h +++ b/include/osmo-bts/gsm_data_shared.h @@ -775,19 +775,7 @@ struct gsm_bts { char *sock_path; } pcu; - struct { - uint32_t last_fn; - struct timeval tv_clock; - struct osmo_timer_list fn_timer; - } vbts; -#ifdef ENABLE_OC2GBTS - /* specific to Open Cellular 2G BTS */ - struct { - uint8_t led_ctrl_mode; /* 0: control by BTS, 1: not control by BTS */ - struct llist_head ceased_alarm_list; /* ceased alarm list*/ - unsigned int rtp_drift_thres_ms; /* RTP timestamp drift detection threshold */ - } oc2g; -#endif + void *model_priv; /* Allocated by bts_model, contains model specific data pointer */ }; -- cgit v1.2.3