18 Mar
2016
18 Mar
'16
3:31 p.m.
From: Max <msuraev(a)sysmocom.de>
---
src/osmo-bts-octphy/l1_if.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c
index 3f6cfa9..51a1c61 100644
--- a/src/osmo-bts-octphy/l1_if.c
+++ b/src/osmo-bts-octphy/l1_if.c
@@ -53,6 +53,8 @@
#include <octphy/octpkt/octpkt_hdr.h>
#define OCTVC1_RC2STRING_DECLARE
#include <octphy/octvc1/octvc1_rc2string.h>
+#define OCTVC1_ID2STRING_DECLARE
+#include <octphy/octvc1/octvc1_id2string.h>
#include <octphy/octvc1/gsm/octvc1_gsm_evt_swap.h>
#define OCTVC1_OPT_DECLARE_DEFAULTS
#include <octphy/octvc1/gsm/octvc1_gsm_default.h>
@@ -258,7 +260,7 @@ int l1if_req_compl(struct octphy_hdl *fl1h, struct msgb *msg,
uint32_t cmd_id = (type_r_cmdid >> cOCTVC1_MSG_ID_BIT_OFFSET) &
cOCTVC1_MSG_ID_BIT_MASK;
LOGP(DL1C, LOGL_DEBUG, "l1if_req_compl(msg_len=%u, cmd_id=%s,
trans_id=%u)\n",
- msgb_length(msg), get_value_string(octphy_cid_vals, cmd_id),
+ msgb_length(msg), octvc1_id2string(cmd_id),
ntohl(msg_hdr->ulTransactionId));
/* push the two common headers in front */
@@ -1171,7 +1173,7 @@ static int rx_octvc1_resp(struct msgb *msg, uint32_t msg_id,
uint32_t trans_id)
int rc;
LOGP(DL1C, LOGL_DEBUG, "rx_octvc1_resp(msg_id=%s, trans_id=%u)\n",
- get_value_string(octphy_cid_vals, msg_id), trans_id);
+ octvc1_rc2string(msg_id), trans_id);
/* check if the response is for the oldest (first) entry in wlc_list */
first = llist_first(&fl1h->wlc_list);
--
2.7.4
18 Mar
18 Mar
3:31 p.m.
New subject: [PATCH 2/2] octphy: add support for multiple trx ids
From: Max <msuraev(a)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
7:45 p.m.
On 18 Mar 2016, at 15:31, msuraev(a)sysmocom.de wrote:
From: Max <msuraev(a)sysmocom.de>
- msgb_length(msg), get_value_string(octphy_cid_vals, cmd_id),
+ msgb_length(msg), octvc1_id2string(cmd_id),
so what happens if you remove octphy_cid_vals fields? Is it used somewhere else?
2967
days inactive
2967
days old
2 comments
2 participants
participants (2)
-
Holger Freyther -
msuraev＠sysmocom.de