diff options
| author | Harald Welte <laforge@gnumonks.org> | 2018-03-17 12:22:40 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2018-03-17 13:40:03 +0100 |
| commit | d8cd756da48bcff9f9caf9e64fc0af047a165b60 (patch) | |
| tree | 136d09901ae8420803500d92646944376ae21f59 /src/osmo-bts-octphy/l1_if.c | |
| parent | 7c4a22dbc48f51eb199766bf1b29e061bf765cbd (diff) | |
Get rid of 'struct gsm_bts_role_bts'
gsm_bts_role_bts was introduced at a time when we still shared
gsm_data_shared.[ch] between BSC and BTS, and where we then subsequently
needed a BTS-private structure. Since that sharing was abandoned quite
some time ago, we can merge gsm_bts_role_bts into gsm_bts and do away
with the bts/btsb dualism in a lot of the code.
Change-Id: I4fdd601ea873d9697f89a748cc77bcf7c978fa3e
Diffstat (limited to 'src/osmo-bts-octphy/l1_if.c')
| -rw-r--r-- | src/osmo-bts-octphy/l1_if.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c index 32b86a0a..0d63d517 100644 --- a/src/osmo-bts-octphy/l1_if.c +++ b/src/osmo-bts-octphy/l1_if.c @@ -767,13 +767,10 @@ int bts_model_phy_link_open(struct phy_link *plink) int bts_model_init(struct gsm_bts *bts) { - struct gsm_bts_role_bts *btsb; - LOGP(DL1C, LOGL_NOTICE, "model_init()\n"); bts->variant = BTS_OSMO_OCTPHY; - btsb = bts_role_bts(bts); - btsb->support.ciphers = CIPHER_A5(1) | CIPHER_A5(2) | CIPHER_A5(3); + bts->support.ciphers = CIPHER_A5(1) | CIPHER_A5(2) | CIPHER_A5(3); /* FIXME: what is the nominal transmit power of the PHY/board? */ bts->c0->nominal_power = 15; @@ -1166,7 +1163,6 @@ static int handle_ph_rach_ind(struct octphy_hdl *fl1, { struct gsm_bts_trx *trx = trx_by_l1h(fl1, ra_ind->TrxId.byTrxId); struct gsm_bts *bts = trx->bts; - struct gsm_bts_role_bts *btsb = bts_role_bts(bts); struct osmo_phsap_prim *l1sap; int rc; struct ph_rach_ind_param rach_ind_param; |