[PATCH 2/2] octphy: add support for multiple trx ids

[msuraev]

From: Max <msur...@sysmocom.de>

---
 src/osmo-bts-octphy/l1_if.c  | 1 +
 src/osmo-bts-octphy/l1_oml.c | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c
index 51a1c61..ec61d6b 100644
--- a/src/osmo-bts-octphy/l1_if.c
+++ b/src/osmo-bts-octphy/l1_if.c
@@ -1550,6 +1550,7 @@ void bts_model_phy_link_set_defaults(struct phy_link 
*plink)

 void bts_model_phy_instance_set_defaults(struct phy_instance *pinst)
 {
+       pinst->u.octphy.trx_id = pinst->num;
 }

 /***********************************************************************
diff --git a/src/osmo-bts-octphy/l1_oml.c b/src/osmo-bts-octphy/l1_oml.c
index 6870c52..bdf39bf 100644
--- a/src/osmo-bts-octphy/l1_oml.c
+++ b/src/osmo-bts-octphy/l1_oml.c
@@ -1304,6 +1304,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;
+       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;
@@ -1311,9 +1312,9 @@ int l1if_trx_open(struct gsm_bts_trx *trx)
        oc->RfConfig.ulTxAttndB = plink->u.octphy.tx_atten_db;

        LOGP(DL1C, LOGL_INFO, "Tx TRX-OPEN.req(trx=%u, rf_port=%u, arfcn=%u, "
-               "tsc=%u, rx_gain=%u, tx_atten=%u)\n",
+               "center=%u, tsc=%u, rx_gain=%u, tx_atten=%u)\n",
                oc->TrxId.byTrxId, oc->ulRfPortIndex, oc->Config.usArfcn,
-               oc->Config.usTsc, oc->RfConfig.ulRxGainDb,
+               oc->Config.usCentreArfcn, oc->Config.usTsc, 
oc->RfConfig.ulRxGainDb,
                oc->RfConfig.ulTxAttndB);

        mOCTVC1_GSM_MSG_TRX_OPEN_CMD_SWAP(oc);
-- 
2.7.4