<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/23826">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
pespin: 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: define TRXC/TRXD message buffer size<br><br>Change-Id: I4cb05600fa8af33e1c92e93cc1a86c14f21b9fb2<br>Related: SYS#4895, OS#4941, OS#4006<br>---<br>M src/osmo-bts-trx/trx_if.c<br>M src/osmo-bts-trx/trx_if.h<br>2 files changed, 10 insertions(+), 8 deletions(-)<br><br></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 495de92..905d3da 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>@@ -95,7 +95,7 @@</span><br><span> {</span><br><span> struct phy_link *plink = ofd->data;</span><br><span> struct phy_instance *pinst = phy_instance_by_num(plink, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- char buf[1500];</span><br><span style="color: hsl(120, 100%, 40%);">+ char buf[TRXC_MSG_BUF_SIZE];</span><br><span> ssize_t len;</span><br><span> uint32_t fn;</span><br><span> </span><br><span>@@ -148,7 +148,7 @@</span><br><span> static void trx_ctrl_send(struct trx_l1h *l1h)</span><br><span> {</span><br><span> struct trx_ctrl_msg *tcm;</span><br><span style="color: hsl(0, 100%, 40%);">- char buf[1500];</span><br><span style="color: hsl(120, 100%, 40%);">+ char buf[TRXC_MSG_BUF_SIZE];</span><br><span> int len;</span><br><span> ssize_t snd_len;</span><br><span> </span><br><span>@@ -634,7 +634,7 @@</span><br><span> {</span><br><span> struct trx_l1h *l1h = ofd->data;</span><br><span> struct phy_instance *pinst = l1h->phy_inst;</span><br><span style="color: hsl(0, 100%, 40%);">- char buf[1500];</span><br><span style="color: hsl(120, 100%, 40%);">+ char buf[TRXC_MSG_BUF_SIZE];</span><br><span> struct trx_ctrl_rsp rsp;</span><br><span> int len, rc;</span><br><span> struct trx_ctrl_msg *tcm;</span><br><span>@@ -718,9 +718,6 @@</span><br><span> * TRX burst data socket</span><br><span> */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* Maximum DATA message length (header + burst) */</span><br><span style="color: hsl(0, 100%, 40%);">-#define TRX_DATA_MSG_MAX_LEN 512</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* Common header length: 1/2 VER + 1/2 TDMA TN + 4 TDMA FN */</span><br><span> #define TRX_CHDR_LEN (1 + 4)</span><br><span> /* Uplink v0 header length: 1 RSSI + 2 ToA256 */</span><br><span>@@ -920,7 +917,7 @@</span><br><span> static int trx_data_read_cb(struct osmo_fd *ofd, unsigned int what)</span><br><span> {</span><br><span> struct trx_l1h *l1h = ofd->data;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t buf[TRX_DATA_MSG_MAX_LEN];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t buf[TRXD_MSG_BUF_SIZE];</span><br><span> struct trx_ul_burst_ind bi;</span><br><span> ssize_t hdr_len, buf_len;</span><br><span> uint8_t pdu_ver;</span><br><span>@@ -1002,7 +999,7 @@</span><br><span> {</span><br><span> 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_MSG_MAX_LEN];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t buf[TRXD_MSG_BUF_SIZE];</span><br><span> </span><br><span> if ((br->burst_len != GSM_BURST_LEN) && (br->burst_len != EGPRS_BURST_LEN)) {</span><br><span> LOGPPHI(l1h->phy_inst, DTRX, LOGL_ERROR, "Tx burst length %zu invalid\n",</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 18ba74f..ca3d51b 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>@@ -1,5 +1,10 @@</span><br><span> #pragma once</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* TRXC read/send buffer size */</span><br><span style="color: hsl(120, 100%, 40%);">+#define TRXC_MSG_BUF_SIZE 1500</span><br><span style="color: hsl(120, 100%, 40%);">+/* TRXD read/send buffer size */</span><br><span style="color: hsl(120, 100%, 40%);">+#define TRXD_MSG_BUF_SIZE 512</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct trx_dl_burst_req;</span><br><span> struct trx_l1h;</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/23826">change 23826</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/+/23826"/><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: I4cb05600fa8af33e1c92e93cc1a86c14f21b9fb2 </div>
<div style="display:none"> Gerrit-Change-Number: 23826 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </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>