diff options
| author | Harald Welte <laforge@gnumonks.org> | 2015-09-22 16:39:55 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2015-09-22 16:39:55 +0200 |
| commit | 329085a8ff2c1162a32eb617068fa5614efcde06 (patch) | |
| tree | 290806d3a1bc7f64a0e7a8e1cc5b48bfd6578164 /include/osmo-bts/gsm_data.h | |
| parent | 1eaa3d72eaa10bb854b2adff48d3f7f3e06dcb8c (diff) | |
| parent | 819b50e1a7b506a0a394cc71a795f0a9ce4083c1 (diff) | |
Merge branch '201509-l1sap'
Diffstat (limited to 'include/osmo-bts/gsm_data.h')
| -rw-r--r-- | include/osmo-bts/gsm_data.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h index 0562ecaf..bfa5285b 100644 --- a/include/osmo-bts/gsm_data.h +++ b/include/osmo-bts/gsm_data.h @@ -81,8 +81,11 @@ struct gsm_bts_role_bts { struct { uint8_t tc4_ctr; } si; + struct gsm_time gsm_time; uint8_t radio_link_timeout; + int ul_power_target; /* Uplink Rx power target */ + /* used by the sysmoBTS to adjust band */ uint8_t auto_band; @@ -96,8 +99,9 @@ enum lchan_ciph_state { LCHAN_CIPH_NONE, LCHAN_CIPH_RX_REQ, LCHAN_CIPH_RX_CONF, - LCHAN_CIPH_TXRX_REQ, - LCHAN_CIPH_TXRX_CONF, + LCHAN_CIPH_RXTX_REQ, + LCHAN_CIPH_RX_CONF_TX_REQ, + LCHAN_CIPH_RXTX_CONF, }; #define bts_role_bts(x) ((struct gsm_bts_role_bts *)(x)->role) |