<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/23833">View Change</a></p><div style="white-space:pre-wrap">Approvals:
fixeria: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Hoernchen: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><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>M src/osmo-bts-trx/trx_if.h<br>3 files changed, 170 insertions(+), 69 deletions(-)<br><br></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 2d613e7..10359f1 100644</span><br><span>--- a/include/osmo-bts/scheduler.h</span><br><span>+++ b/include/osmo-bts/scheduler.h</span><br><span>@@ -231,6 +231,8 @@</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 style="color: hsl(120, 100%, 40%);">+#define TRX_BI_F_BATCH_IND (1 << 5)</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>@@ -248,6 +250,10 @@</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 style="color: hsl(120, 100%, 40%);">+</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 _num_pdus; /*!< Number of processed PDUs */</span><br><span> </span><br><span> /* Internally used by the scheduler */</span><br><span> enum trx_chan_type chan;</span><br><span>@@ -258,11 +264,19 @@</span><br><span> size_t burst_len;</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define TRX_BR_F_MORE_PDUS (1 << 0)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! DL burst request with the corresponding meta info */</span><br><span> struct trx_dl_burst_req {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t flags; /*!< see TRX_BR_F_* */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Mandatory fields */</span><br><span> uint32_t fn; /*!< TDMA frame number */</span><br><span> uint8_t tn; /*!< TDMA timeslot number */</span><br><span> uint8_t att; /*!< Tx power attenuation */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t mts; /*!< MTS (Modulation and Training Sequence) */</span><br><span style="color: hsl(120, 100%, 40%);">+ int8_t scpir; /*!< SCPIR (for AQPSK only) */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t trx_num; /*!< TRX (RF channel) number */</span><br><span> </span><br><span> /* Internally used by the scheduler */</span><br><span> enum trx_chan_type chan;</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 ff63187..93bbf19 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>@@ -730,11 +730,14 @@</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> /* Minimum Uplink TRXD header length for all PDU versions */</span><br><span> static const uint8_t trx_data_rx_hdr_len[] = {</span><br><span> TRX_UL_V0HDR_LEN, /* TRXDv0 */</span><br><span> TRX_UL_V1HDR_LEN, /* TRXDv1 */</span><br><span style="color: hsl(120, 100%, 40%);">+ TRX_UL_V2HDR_LEN, /* TRXDv2 */</span><br><span> };</span><br><span> </span><br><span> /* Header dissector for TRXDv0 (and part of TRXDv1) */</span><br><span>@@ -833,6 +836,48 @@</span><br><span> return TRX_UL_V1HDR_LEN;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* TRXD header dissector for version 0x01 */</span><br><span style="color: hsl(120, 100%, 40%);">+static int trx_data_handle_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%);">+ if (buf[1] & (1 << 7))</span><br><span style="color: hsl(120, 100%, 40%);">+ bi->flags |= TRX_BI_F_BATCH_IND;</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[4]);</span><br><span style="color: hsl(120, 100%, 40%);">+ bi->ci_cb = (int16_t) osmo_load16be(&buf[6]);</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->_num_pdus == 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> /* TRXD burst handler (version independent) */</span><br><span> static int trx_data_handle_burst(struct trx_ul_burst_ind *bi,</span><br><span> const uint8_t *buf, size_t buf_len)</span><br><span>@@ -883,6 +928,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>@@ -929,9 +978,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>@@ -943,56 +989,76 @@</span><br><span> return -EIO;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Make sure that we have enough bytes to parse the header */</span><br><span style="color: hsl(0, 100%, 40%);">- if (buf_len < trx_data_rx_hdr_len[pdu_ver]) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPPHI(l1h->phy_inst, DTRX, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "Rx malformed TRXDv%u PDU: len=%zd < expected %u\n",</span><br><span style="color: hsl(0, 100%, 40%);">- pdu_ver, buf_len, trx_data_rx_hdr_len[pdu_ver]);</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</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._num_pdus = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Parse header depending on the PDU version */</span><br><span style="color: hsl(0, 100%, 40%);">- switch (pdu_ver) {</span><br><span style="color: hsl(0, 100%, 40%);">- case 0: /* TRXDv0 */</span><br><span style="color: hsl(0, 100%, 40%);">- hdr_len = trx_data_handle_hdr_v0(l1h->phy_inst, &bi, buf, buf_len);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case 1: /* TRXDv1 */</span><br><span style="color: hsl(0, 100%, 40%);">- hdr_len = trx_data_handle_hdr_v1(l1h->phy_inst, &bi, buf, buf_len);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- /* Shall not happen */</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(0);</span><br><span style="color: hsl(0, 100%, 40%);">- }</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%);">+ do {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* (Re)initialize the flags */</span><br><span style="color: hsl(120, 100%, 40%);">+ bi.flags = 0x00;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Header parsing error */</span><br><span style="color: hsl(0, 100%, 40%);">- if (hdr_len < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- return hdr_len;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Make sure that we have enough bytes to parse the header */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (buf_len < trx_data_rx_hdr_len[pdu_ver]) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPPHI(l1h->phy_inst, DTRX, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Rx malformed TRXDv%u PDU: len=%zd < expected %u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ pdu_ver, buf_len, trx_data_rx_hdr_len[pdu_ver]);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (bi.fn >= GSM_TDMA_HYPERFRAME) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPPHI(l1h->phy_inst, DTRX, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "Rx malformed TRXDv%u PDU: illegal TDMA fn=%u\n",</span><br><span style="color: hsl(0, 100%, 40%);">- pdu_ver, bi.fn);</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Parse header depending on the PDU version */</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (pdu_ver) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case 0: /* TRXDv0 */</span><br><span style="color: hsl(120, 100%, 40%);">+ hdr_len = trx_data_handle_hdr_v0(l1h->phy_inst, &bi, buf, buf_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 1: /* TRXDv1 */</span><br><span style="color: hsl(120, 100%, 40%);">+ hdr_len = trx_data_handle_hdr_v1(l1h->phy_inst, &bi, buf, buf_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 2: /* TRXDv2 */</span><br><span style="color: hsl(120, 100%, 40%);">+ hdr_len = trx_data_handle_pdu_v2(l1h->phy_inst, &bi, buf, buf_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Shall not happen */</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* We're done with the header now */</span><br><span style="color: hsl(0, 100%, 40%);">- buf_len -= hdr_len;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Header parsing error */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (hdr_len < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return hdr_len;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Calculate burst length and parse it (if present) */</span><br><span style="color: hsl(0, 100%, 40%);">- if (trx_data_handle_burst(&bi, buf + hdr_len, buf_len) != 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPPHI(l1h->phy_inst, DTRX, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "Rx malformed TRXDv%u PDU: odd burst length=%zd\n",</span><br><span style="color: hsl(0, 100%, 40%);">- pdu_ver, buf_len);</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bi.fn >= GSM_TDMA_HYPERFRAME) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPPHI(l1h->phy_inst, DTRX, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Rx malformed TRXDv%u PDU: illegal TDMA fn=%u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ pdu_ver, bi.fn);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Print header & burst info */</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPPHI(l1h->phy_inst, DTRX, LOGL_DEBUG, "Rx %s (pdu_ver=%u): %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- (bi.flags & TRX_BI_F_NOPE_IND) ? "NOPE.ind" : "UL burst",</span><br><span style="color: hsl(0, 100%, 40%);">- pdu_ver, trx_data_desc_msg(&bi));</span><br><span style="color: hsl(120, 100%, 40%);">+ /* We're done with the header now */</span><br><span style="color: hsl(120, 100%, 40%);">+ buf_len -= hdr_len;</span><br><span style="color: hsl(120, 100%, 40%);">+ buf += hdr_len;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* feed received burst into scheduler code */</span><br><span style="color: hsl(0, 100%, 40%);">- trx_sched_route_burst_ind(&bi, &l1h->l1s);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Calculate burst length and parse it (if present) */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trx_data_handle_burst(&bi, buf, buf_len) != 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPPHI(l1h->phy_inst, DTRX, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Rx malformed TRXDv%u PDU: odd burst length=%zd\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ pdu_ver, buf_len);</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%);">+ /* We're done with the burst bits now */</span><br><span style="color: hsl(120, 100%, 40%);">+ buf_len -= bi.burst_len;</span><br><span style="color: hsl(120, 100%, 40%);">+ buf += bi.burst_len;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Print header & burst info */</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPPHI(l1h->phy_inst, DTRX, LOGL_DEBUG, "Rx %s (pdu_ver=%u): %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ (bi.flags & TRX_BI_F_NOPE_IND) ? "NOPE.ind" : "UL burst",</span><br><span style="color: hsl(120, 100%, 40%);">+ pdu_ver, trx_data_desc_msg(&bi));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Number of processed PDUs */</span><br><span style="color: hsl(120, 100%, 40%);">+ bi._num_pdus++;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* feed received burst into scheduler code */</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_sched_route_burst_ind(&bi, &l1h->l1s);</span><br><span style="color: hsl(120, 100%, 40%);">+ } while (bi.flags & TRX_BI_F_BATCH_IND);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>@@ -1003,9 +1069,10 @@</span><br><span> * \returns 0 on success; negative on error */</span><br><span> int trx_if_send_burst(struct trx_l1h *l1h, const struct trx_dl_burst_req *br)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- ssize_t snd_len;</span><br><span> uint8_t pdu_ver = l1h->config.trxd_pdu_ver_use;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t *buf = &trx_data_buf[0];</span><br><span style="color: hsl(120, 100%, 40%);">+ static uint8_t *buf = &trx_data_buf[0];</span><br><span style="color: hsl(120, 100%, 40%);">+ static unsigned int pdu_num = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ ssize_t snd_len, buf_len;</span><br><span> </span><br><span> /* Make sure that the PHY is powered on */</span><br><span> if (!trx_if_powered(l1h)) {</span><br><span>@@ -1014,35 +1081,55 @@</span><br><span> return -ENODEV;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if ((br->burst_len != GSM_BURST_LEN) && (br->burst_len != EGPRS_BURST_LEN)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPPHI(l1h->phy_inst, DTRX, LOGL_ERROR, "Tx burst length %zu invalid\n",</span><br><span style="color: hsl(0, 100%, 40%);">- br->burst_len);</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPPHI(l1h->phy_inst, DTRX, LOGL_DEBUG,</span><br><span style="color: hsl(0, 100%, 40%);">- "Tx burst (pdu_ver=%u): tn=%u fn=%u att=%u\n",</span><br><span style="color: hsl(0, 100%, 40%);">- pdu_ver, br->tn, br->fn, br->att);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> switch (pdu_ver) {</span><br><span style="color: hsl(0, 100%, 40%);">- case 0:</span><br><span style="color: hsl(0, 100%, 40%);">- case 1:</span><br><span style="color: hsl(0, 100%, 40%);">- /* Both versions have the same PDU format */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Both versions have the same PDU format */</span><br><span style="color: hsl(120, 100%, 40%);">+ case 0: /* TRXDv0 */</span><br><span style="color: hsl(120, 100%, 40%);">+ case 1: /* TRXDv1 */</span><br><span style="color: hsl(120, 100%, 40%);">+ buf[0] = ((pdu_ver & 0x0f) << 4) | br->tn;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_store32be(br->fn, buf + 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ buf[5] = br->att;</span><br><span style="color: hsl(120, 100%, 40%);">+ buf += 6;</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ case 2: /* TRXDv2 */</span><br><span style="color: hsl(120, 100%, 40%);">+ buf[0] = br->tn;</span><br><span style="color: hsl(120, 100%, 40%);">+ buf[1] = (br->trx_num & 0x3f) | (br->flags << 7);</span><br><span style="color: hsl(120, 100%, 40%);">+ buf[2] = br->mts;</span><br><span style="color: hsl(120, 100%, 40%);">+ buf[3] = br->att;</span><br><span style="color: hsl(120, 100%, 40%);">+ buf[4] = (uint8_t) br->scpir;</span><br><span style="color: hsl(120, 100%, 40%);">+ buf[5] = buf[6] = buf[7] = 0x00; /* Spare */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Some fields are not present in batched PDUs */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pdu_num == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ buf[0] |= (pdu_ver & 0x0f) << 4;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_store32be(br->fn, buf + 8);</span><br><span style="color: hsl(120, 100%, 40%);">+ buf += 4;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ buf += 8;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> default:</span><br><span> /* Shall not happen */</span><br><span> OSMO_ASSERT(0);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- buf[0] = ((pdu_ver & 0x0f) << 4) | br->tn;</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_store32be(br->fn, buf + 1);</span><br><span style="color: hsl(0, 100%, 40%);">- buf[5] = br->att;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* copy ubits {0,1} */</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(buf + 6, br->burst, br->burst_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(buf, br->burst, br->burst_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ buf += br->burst_len;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- snd_len = send(l1h->trx_ofd_data.fd, trx_data_buf, br->burst_len + 6, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* One more PDU in the buffer */</span><br><span style="color: hsl(120, 100%, 40%);">+ pdu_num++;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* More PDUs to send? Batch them! */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pdu_ver >= 2 && br->flags & TRX_BR_F_MORE_PDUS)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPPHI(l1h->phy_inst, DTRX, LOGL_DEBUG,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Tx TRXDv%u datagram with %u PDU(s): fn=%u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ pdu_ver, pdu_num, br->fn);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ buf_len = buf - &trx_data_buf[0];</span><br><span style="color: hsl(120, 100%, 40%);">+ buf = &trx_data_buf[0];</span><br><span style="color: hsl(120, 100%, 40%);">+ pdu_num = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ snd_len = send(l1h->trx_ofd_data.fd, trx_data_buf, buf_len, 0);</span><br><span> if (snd_len <= 0) {</span><br><span> strerror_r(errno, (char *) trx_data_buf, sizeof(trx_data_buf));</span><br><span> LOGPPHI(l1h->phy_inst, DTRX, LOGL_ERROR,</span><br><span>diff --git a/src/osmo-bts-trx/trx_if.h b/src/osmo-bts-trx/trx_if.h</span><br><span>index f40dbb5..e131d56 100644</span><br><span>--- a/src/osmo-bts-trx/trx_if.h</span><br><span>+++ b/src/osmo-bts-trx/trx_if.h</span><br><span>@@ -44,7 +44,7 @@</span><br><span> int trx_if_powered(struct trx_l1h *l1h);</span><br><span> </span><br><span> /* The latest supported TRXD PDU version */</span><br><span style="color: hsl(0, 100%, 40%);">-#define TRX_DATA_PDU_VER 1</span><br><span style="color: hsl(120, 100%, 40%);">+#define TRX_DATA_PDU_VER 2</span><br><span> </span><br><span> /* Format negotiation command */</span><br><span> int trx_if_cmd_setformat(struct trx_l1h *l1h, uint8_t ver, trx_if_cmd_generic_cb *cb);</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: 9 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Hoernchen <ewild@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>