<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/23864">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-bts-trx: pass 'struct phy_instance' to TRXD dissectors<br><br>All these functions need the PHY instance pointer for logging,<br>they don't really need a pointer to 'struct trx_l1h'.<br><br>Change-Id: I626b4392a8bc57a3fe5e8c931aa1ce9dd505676c<br>Related: SYS#4895, OS#4941, OS#4006<br>---<br>M src/osmo-bts-trx/trx_if.c<br>1 file changed, 15 insertions(+), 15 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/64/23864/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c</span><br><span>index 28b5f2e..d2ad877 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,7 +730,7 @@</span><br><span> };</span><br><span> </span><br><span> /* TRXD header dissector for version 0 */</span><br><span style="color: hsl(0, 100%, 40%);">-static int trx_data_handle_hdr_v0(struct trx_l1h *l1h,</span><br><span style="color: hsl(120, 100%, 40%);">+static int trx_data_handle_hdr_v0(struct phy_instance *phy_inst,</span><br><span> struct trx_ul_burst_ind *bi,</span><br><span> const uint8_t *buf, size_t buf_len)</span><br><span> {</span><br><span>@@ -743,7 +743,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Parser for MTS (Modulation and Training Sequence) */</span><br><span style="color: hsl(0, 100%, 40%);">-static inline int trx_data_parse_mts(struct trx_l1h *l1h,</span><br><span style="color: hsl(120, 100%, 40%);">+static inline int trx_data_parse_mts(struct phy_instance *phy_inst,</span><br><span> struct trx_ul_burst_ind *bi,</span><br><span> const uint8_t mts)</span><br><span> {</span><br><span>@@ -762,7 +762,7 @@</span><br><span> bi->mod = TRX_MOD_T_8PSK;</span><br><span> bi->tsc_set = (mts >> 3) & 0x01;</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPPHI(l1h->phy_inst, DTRX, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPPHI(phy_inst, DTRX, LOGL_ERROR,</span><br><span> "Rx TRXD PDU with unknown or not supported "</span><br><span> "modulation (MTS=0x%02x)\n", mts);</span><br><span> return -ENOTSUP;</span><br><span>@@ -777,14 +777,14 @@</span><br><span> }</span><br><span> </span><br><span> /* TRXD header dissector for version 0x01 */</span><br><span style="color: hsl(0, 100%, 40%);">-static int trx_data_handle_hdr_v1(struct trx_l1h *l1h,</span><br><span style="color: hsl(120, 100%, 40%);">+static int trx_data_handle_hdr_v1(struct phy_instance *phy_inst,</span><br><span> struct trx_ul_burst_ind *bi,</span><br><span> const uint8_t *buf, size_t buf_len)</span><br><span> {</span><br><span> int rc;</span><br><span> </span><br><span> /* Parse v0 specific part */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = trx_data_handle_hdr_v0(l1h, bi, buf, buf_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = trx_data_handle_hdr_v0(phy_inst, bi, buf, buf_len);</span><br><span> if (rc < 0)</span><br><span> return rc;</span><br><span> </span><br><span>@@ -793,7 +793,7 @@</span><br><span> buf += rc;</span><br><span> </span><br><span> /* MTS (Modulation and Training Sequence) */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = trx_data_parse_mts(l1h, bi, buf[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = trx_data_parse_mts(phy_inst, bi, buf[0]);</span><br><span> if (rc < 0)</span><br><span> return rc;</span><br><span> </span><br><span>@@ -805,7 +805,7 @@</span><br><span> }</span><br><span> </span><br><span> /* TRXD burst handler for PDU version 0 */</span><br><span style="color: hsl(0, 100%, 40%);">-static int trx_data_handle_burst_v0(struct trx_l1h *l1h,</span><br><span style="color: hsl(120, 100%, 40%);">+static int trx_data_handle_burst_v0(struct phy_instance *phy_inst,</span><br><span> struct trx_ul_burst_ind *bi,</span><br><span> const uint8_t *buf, size_t buf_len)</span><br><span> {</span><br><span>@@ -824,7 +824,7 @@</span><br><span> break;</span><br><span> </span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPPHI(l1h->phy_inst, DTRX, LOGL_NOTICE,</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPPHI(phy_inst, DTRX, LOGL_NOTICE,</span><br><span> "Rx TRXD message with odd burst length %zu\n", buf_len);</span><br><span> return -EINVAL;</span><br><span> }</span><br><span>@@ -841,7 +841,7 @@</span><br><span> }</span><br><span> </span><br><span> /* TRXD burst handler for PDU version 1 */</span><br><span style="color: hsl(0, 100%, 40%);">-static int trx_data_handle_burst_v1(struct trx_l1h *l1h,</span><br><span style="color: hsl(120, 100%, 40%);">+static int trx_data_handle_burst_v1(struct phy_instance *phy_inst,</span><br><span> struct trx_ul_burst_ind *bi,</span><br><span> const uint8_t *buf, size_t buf_len)</span><br><span> {</span><br><span>@@ -853,7 +853,7 @@</span><br><span> </span><br><span> /* Verify burst length */</span><br><span> if (bl[bi->mod] != buf_len) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPPHI(l1h->phy_inst, DTRX, LOGL_NOTICE,</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPPHI(phy_inst, DTRX, LOGL_NOTICE,</span><br><span> "Rx TRXD message with odd burst length %zu, "</span><br><span> "expected %zu\n", buf_len, bl[bi->mod]);</span><br><span> return -EINVAL;</span><br><span>@@ -861,7 +861,7 @@</span><br><span> </span><br><span> /* The PDU format is the same as for version 0.</span><br><span> * NOTE: other modulation types to be handled separately. */</span><br><span style="color: hsl(0, 100%, 40%);">- return trx_data_handle_burst_v0(l1h, bi, buf, buf_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ return trx_data_handle_burst_v0(phy_inst, bi, buf, buf_len);</span><br><span> }</span><br><span> </span><br><span> static const char *trx_data_desc_msg(const struct trx_ul_burst_ind *bi)</span><br><span>@@ -950,10 +950,10 @@</span><br><span> switch (pdu_ver) {</span><br><span> case 0:</span><br><span> /* Legacy protocol has no version indicator */</span><br><span style="color: hsl(0, 100%, 40%);">- hdr_len = trx_data_handle_hdr_v0(l1h, &bi, buf, buf_len);</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> break;</span><br><span> case 1:</span><br><span style="color: hsl(0, 100%, 40%);">- hdr_len = trx_data_handle_hdr_v1(l1h, &bi, buf, buf_len);</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> break;</span><br><span> default:</span><br><span> /* Shall not happen */</span><br><span>@@ -982,10 +982,10 @@</span><br><span> /* Handle burst bits */</span><br><span> switch (pdu_ver) {</span><br><span> case 0:</span><br><span style="color: hsl(0, 100%, 40%);">- rc = trx_data_handle_burst_v0(l1h, &bi, buf + hdr_len, buf_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = trx_data_handle_burst_v0(l1h->phy_inst, &bi, buf + hdr_len, buf_len);</span><br><span> break;</span><br><span> case 1:</span><br><span style="color: hsl(0, 100%, 40%);">- rc = trx_data_handle_burst_v1(l1h, &bi, buf + hdr_len, buf_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = trx_data_handle_burst_v1(l1h->phy_inst, &bi, buf + hdr_len, buf_len);</span><br><span> break;</span><br><span> default:</span><br><span> /* Shall not happen, just to make GCC happy */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/23864">change 23864</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/+/23864"/><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: I626b4392a8bc57a3fe5e8c931aa1ce9dd505676c </div>
<div style="display:none"> Gerrit-Change-Number: 23864 </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>