From f48fcb1ec12746cde56ba9e17653818d20a3bc2c Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Tue, 6 Nov 2018 21:39:15 +0100 Subject: cosmetic: lchan: introduce sub-struct lchan->release.* Put all lchan release related flags and settings in a sub-struct named 'release' to better indicate what those fields are for. There is no functional change. Change-Id: Icfddc6010e5d7c309f1a7ed3526b5b635ffeaf11 --- include/osmocom/bsc/gsm_data.h | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) (limited to 'include/osmocom/bsc/gsm_data.h') diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 3712b9778..94af535ac 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -492,6 +492,8 @@ struct gsm_lchan { uint8_t nr; char *name; + char *last_error; + struct osmo_fsm_inst *fi; struct osmo_fsm_inst *fi_rtp; struct mgwep_ci *mgw_endpoint_ci_bts; @@ -510,21 +512,21 @@ struct gsm_lchan { struct gsm_lchan *re_use_mgw_endpoint_from_lchan; } activate; - /* If an event to release the lchan comes in while still waiting for responses, just mark this - * flag, so that the lchan will gracefully release at the next sensible junction. */ - bool release_requested; - bool do_rr_release; - - char *last_error; - - /* There is an RSL error cause of value 0, so we need a separate flag. */ - bool release_in_error; - /* RSL error code, RSL_ERR_* */ - uint8_t rsl_error_cause; - - /* If a release event is being handled, ignore other ricocheting release events until that - * release handling has concluded. */ - bool in_release_handler; + struct { + /* If an event to release the lchan comes in while still waiting for responses, just mark this + * flag, so that the lchan will gracefully release at the next sensible junction. */ + bool release_requested; + bool do_rr_release; + + /* There is an RSL error cause of value 0, so we need a separate flag. */ + bool release_in_error; + /* RSL error code, RSL_ERR_* */ + uint8_t rsl_error_cause; + + /* If a release event is being handled, ignore other ricocheting release events until that + * release handling has concluded. */ + bool in_release_handler; + } release; /* The logical channel type */ enum gsm_chan_t type; -- cgit v1.2.3