<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/23833">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-bts-trx: implement TRXDv2 protocol support<br><br>Change-Id: I3532a6693bb335043ec390049138308991083e66<br>Related: SYS#4895, OS#4941, OS#4006<br>---<br>M include/osmo-bts/scheduler.h<br>M src/osmo-bts-trx/trx_if.c<br>2 files changed, 72 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/33/23833/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/scheduler.h b/include/osmo-bts/scheduler.h</span><br><span>index ad6e5c5..e990774 100644</span><br><span>--- a/include/osmo-bts/scheduler.h</span><br><span>+++ b/include/osmo-bts/scheduler.h</span><br><span>@@ -231,12 +231,17 @@</span><br><span> #define TRX_BI_F_MOD_TYPE (1 << 1)</span><br><span> #define TRX_BI_F_TS_INFO (1 << 2)</span><br><span> #define TRX_BI_F_CI_CB (1 << 3)</span><br><span style="color: hsl(120, 100%, 40%);">+#define TRX_BI_F_TRX_NUM (1 << 4)</span><br><span> </span><br><span> /*! UL burst indication with the corresponding meta info */</span><br><span> struct trx_ul_burst_ind {</span><br><span> /* Field presence bitmask (see TRX_BI_F_*) */</span><br><span> uint8_t flags;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Used internally by the PDU parser */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t pdu_num; /*!< Number of this PDU in the packet */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool more_pdus; /*!< Do we expect more PDUs? */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Mandatory fields */</span><br><span> uint32_t fn; /*!< TDMA frame number */</span><br><span> uint8_t tn; /*!< TDMA time-slot number */</span><br><span>@@ -248,6 +253,7 @@</span><br><span> uint8_t tsc_set; /*!< Training Sequence Set */</span><br><span> uint8_t tsc; /*!< Training Sequence Code */</span><br><span> int16_t ci_cb; /*!< Carrier-to-Interference ratio (in centiBels) */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t trx_num; /*!< TRX (RF channel) number */</span><br><span> </span><br><span> /*! Burst soft-bits buffer */</span><br><span> sbit_t burst[EGPRS_BURST_LEN];</span><br><span>diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c</span><br><span>index bd04f5c..61dc3e6 100644</span><br><span>--- a/src/osmo-bts-trx/trx_if.c</span><br><span>+++ b/src/osmo-bts-trx/trx_if.c</span><br><span>@@ -722,6 +722,8 @@</span><br><span> #define TRX_UL_V0HDR_LEN (1 + 4 + 1 + 2)</span><br><span> /* Uplink TRXDv1 header length: additional MTS + C/I */</span><br><span> #define TRX_UL_V1HDR_LEN (TRX_UL_V0HDR_LEN + 1 + 2)</span><br><span style="color: hsl(120, 100%, 40%);">+/* Uplink TRXDv2 header length: TDMA TN + TRXN + MTS + RSSI + ToA256 + C/I */</span><br><span style="color: hsl(120, 100%, 40%);">+#define TRX_UL_V2HDR_LEN 1 + 1 + 1 + 1 + 2 + 2</span><br><span> </span><br><span> /* Parser for TRXDv0 header (and part of TRXDv1) */</span><br><span> static inline void trx_data_parse_hdr_v0(struct trx_ul_burst_ind *bi,</span><br><span>@@ -822,6 +824,47 @@</span><br><span> return TRX_UL_V1HDR_LEN;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Parser for TRXDv2 PDU */</span><br><span style="color: hsl(120, 100%, 40%);">+static int trx_data_parse_pdu_v2(struct phy_instance *phy_inst,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct trx_ul_burst_ind *bi,</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t *buf, size_t buf_len)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TDMA timeslot number (other bits are RFU) */</span><br><span style="color: hsl(120, 100%, 40%);">+ bi->tn = buf[0] & 0x07;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TRX (RF channel) number and BATCH.ind */</span><br><span style="color: hsl(120, 100%, 40%);">+ bi->more_pdus = !!(buf[1] & (1 << 7));</span><br><span style="color: hsl(120, 100%, 40%);">+ bi->trx_num = buf[1] & 0x3f;</span><br><span style="color: hsl(120, 100%, 40%);">+ bi->flags |= TRX_BI_F_TRX_NUM;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* MTS (Modulation and Training Sequence) */</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = trx_data_parse_mts(phy_inst, bi, buf[2]);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bi->rssi = -(int8_t)buf[3];</span><br><span style="color: hsl(120, 100%, 40%);">+ bi->toa256 = (int16_t) osmo_load16be(buf + 6);</span><br><span style="color: hsl(120, 100%, 40%);">+ bi->ci_cb = (int16_t) osmo_load16be(buf + 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ bi->flags |= TRX_BI_F_CI_CB;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TDMA frame number is absent in batched PDUs */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bi->pdu_num == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (buf_len < sizeof(bi->fn) + TRX_UL_V2HDR_LEN) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPPHI(phy_inst, DTRX, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Rx malformed TRXDv2 PDU: not enough bytes "</span><br><span style="color: hsl(120, 100%, 40%);">+ "to parse TDMA frame number\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bi->fn = osmo_load32be(buf + TRX_UL_V2HDR_LEN);</span><br><span style="color: hsl(120, 100%, 40%);">+ return TRX_UL_V2HDR_LEN + sizeof(bi->fn);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return TRX_UL_V2HDR_LEN;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Parser for burst bits (version independent) */</span><br><span> static int trx_data_parse_burst(struct trx_ul_burst_ind *bi,</span><br><span> const uint8_t *buf, size_t buf_len)</span><br><span>@@ -872,6 +915,10 @@</span><br><span> /* Common TDMA parameters */</span><br><span> OSMO_STRBUF_PRINTF(sb, "tn=%u fn=%u", bi->tn, bi->fn);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* TRX (RF channel number) */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bi->flags & TRX_BI_F_TRX_NUM)</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRBUF_PRINTF(sb, " trx_num=%u", bi->trx_num);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* RSSI and ToA256 */</span><br><span> OSMO_STRBUF_PRINTF(sb, " rssi=%d toa256=%d", bi->rssi, bi->toa256);</span><br><span> </span><br><span>@@ -911,6 +958,10 @@</span><br><span> .hdr_len = TRX_UL_V1HDR_LEN,</span><br><span> .parse = &trx_data_parse_pdu_v1,</span><br><span> },</span><br><span style="color: hsl(120, 100%, 40%);">+ [2] = { /* TRXDv2 */</span><br><span style="color: hsl(120, 100%, 40%);">+ .hdr_len = TRX_UL_V2HDR_LEN,</span><br><span style="color: hsl(120, 100%, 40%);">+ .parse = &trx_data_parse_pdu_v2,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span> };</span><br><span> </span><br><span> /* Parse TRXD message from transceiver, compose an UL burst indication. */</span><br><span>@@ -931,9 +982,6 @@</span><br><span> return buf_len;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Pre-clean (initialize) the flags */</span><br><span style="color: hsl(0, 100%, 40%);">- bi.flags = 0x00;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* Parse PDU version first */</span><br><span> pdu_ver = buf[0] >> 4;</span><br><span> </span><br><span>@@ -947,6 +995,13 @@</span><br><span> </span><br><span> OSMO_ASSERT(trx_data_codec[pdu_ver].parse != NULL);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* We're about to parse the first PDU */</span><br><span style="color: hsl(120, 100%, 40%);">+ bi.pdu_num = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+loop:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Reset (initialize) the flags */</span><br><span style="color: hsl(120, 100%, 40%);">+ bi.flags = 0x00;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Make sure that we have enough bytes to parse the header */</span><br><span> if (buf_len < trx_data_codec[pdu_ver].hdr_len) {</span><br><span> LOGPPHI(l1h->phy_inst, DTRX, LOGL_ERROR,</span><br><span>@@ -987,6 +1042,14 @@</span><br><span> /* feed received burst into scheduler code */</span><br><span> trx_sched_route_burst_ind(&bi, &l1h->l1s);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Starting from TRXDv2, there can be batched PDUs */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bi.more_pdus) {</span><br><span style="color: hsl(120, 100%, 40%);">+ buf_len -= bi.burst_len;</span><br><span style="color: hsl(120, 100%, 40%);">+ ptr += bi.burst_len;</span><br><span style="color: hsl(120, 100%, 40%);">+ bi.pdu_num++;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto loop;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/23833">change 23833</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-bts/+/23833"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I3532a6693bb335043ec390049138308991083e66 </div>
<div style="display:none"> Gerrit-Change-Number: 23833 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>