diff options
| -rw-r--r-- | include/osmo-bts/phy_link.h | 3 | ||||
| -rw-r--r-- | src/osmo-bts-octphy/l1_oml.c | 9 |
2 files changed, 2 insertions, 10 deletions
diff --git a/include/osmo-bts/phy_link.h b/include/osmo-bts/phy_link.h index 82e73c8c..ea0fb336 100644 --- a/include/osmo-bts/phy_link.h +++ b/include/osmo-bts/phy_link.h @@ -63,8 +63,7 @@ struct phy_link { uint32_t rf_port_index; uint32_t rx_gain_db; uint32_t tx_atten_db; - /* arfcn used by TRX with id 0 */ - uint16_t center_arfcn; + struct octphy_hdl *hdl; } octphy; } u; diff --git a/src/osmo-bts-octphy/l1_oml.c b/src/osmo-bts-octphy/l1_oml.c index c893b044..660fe1c7 100644 --- a/src/osmo-bts-octphy/l1_oml.c +++ b/src/osmo-bts-octphy/l1_oml.c @@ -1345,14 +1345,7 @@ int l1if_trx_open(struct gsm_bts_trx *trx) oc->TrxId.byTrxId = pinst->u.octphy.trx_id; oc->Config.ulBand = osmocom_to_octphy_band(trx->bts->band, trx->arfcn); oc->Config.usArfcn = trx->arfcn; - - if (pinst->u.octphy.trx_id) - oc->Config.usCentreArfcn = plink->u.octphy.center_arfcn; - else { - oc->Config.usCentreArfcn = trx->arfcn; - plink->u.octphy.center_arfcn = trx->arfcn; - } - + oc->Config.usCentreArfcn = trx->bts->c0->arfcn; oc->Config.usTsc = trx->bts->bsic & 0x7; oc->Config.usBcchArfcn = trx->bts->c0->arfcn; oc->RfConfig.ulRxGainDb = plink->u.octphy.rx_gain_db; |