<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/16083">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">PTCCH: properly handle RTS.req for PCU_IF_SAPI_PTCCH<br><br>Change-Id: Ib204acce1a7e33f6651b9da2a7b4a9b9ae461093<br>Related: OS#1545<br>---<br>M src/osmo-bts-litecell15/lc15_l1_if.c<br>M src/osmo-bts-oc2g/oc2g_l1_if.c<br>M src/osmo-bts-sysmo/sysmo_l1_if.c<br>M src/pcu_l1_if.cpp<br>M src/pcu_l1_if.h<br>5 files changed, 44 insertions(+), 21 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-litecell15/lc15_l1_if.c b/src/osmo-bts-litecell15/lc15_l1_if.c</span><br><span>index 1df7941..670263f 100644</span><br><span>--- a/src/osmo-bts-litecell15/lc15_l1_if.c</span><br><span>+++ b/src/osmo-bts-litecell15/lc15_l1_if.c</span><br><span>@@ -161,8 +161,11 @@</span><br><span> case GsmL1_Sapi_Pacch:</span><br><span> rc = pcu_rx_rts_req_pdtch(fl1h->trx_no, rts_ind->u8Tn,</span><br><span> rts_ind->u32Fn, rts_ind->u8BlockNbr);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> case GsmL1_Sapi_Ptcch:</span><br><span style="color: hsl(0, 100%, 40%);">- // FIXME</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = pcu_rx_rts_req_ptcch(fl1h->trx_no, rts_ind->u8Tn,</span><br><span style="color: hsl(120, 100%, 40%);">+ rts_ind->u32Fn, rts_ind->u8BlockNbr);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> default:</span><br><span> break;</span><br><span> }</span><br><span>diff --git a/src/osmo-bts-oc2g/oc2g_l1_if.c b/src/osmo-bts-oc2g/oc2g_l1_if.c</span><br><span>index f9768ae..a02e962 100644</span><br><span>--- a/src/osmo-bts-oc2g/oc2g_l1_if.c</span><br><span>+++ b/src/osmo-bts-oc2g/oc2g_l1_if.c</span><br><span>@@ -162,8 +162,11 @@</span><br><span> case GsmL1_Sapi_Pacch:</span><br><span> rc = pcu_rx_rts_req_pdtch(fl1h->trx_no, rts_ind->u8Tn,</span><br><span> rts_ind->u32Fn, rts_ind->u8BlockNbr);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> case GsmL1_Sapi_Ptcch:</span><br><span style="color: hsl(0, 100%, 40%);">- // FIXME</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = pcu_rx_rts_req_ptcch(fl1h->trx_no, rts_ind->u8Tn,</span><br><span style="color: hsl(120, 100%, 40%);">+ rts_ind->u32Fn, rts_ind->u8BlockNbr);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> default:</span><br><span> break;</span><br><span> }</span><br><span>diff --git a/src/osmo-bts-sysmo/sysmo_l1_if.c b/src/osmo-bts-sysmo/sysmo_l1_if.c</span><br><span>index 5d127dd..9b310cc 100644</span><br><span>--- a/src/osmo-bts-sysmo/sysmo_l1_if.c</span><br><span>+++ b/src/osmo-bts-sysmo/sysmo_l1_if.c</span><br><span>@@ -144,8 +144,11 @@</span><br><span> case GsmL1_Sapi_Pacch:</span><br><span> rc = pcu_rx_rts_req_pdtch(fl1h->trx_no, rts_ind->u8Tn,</span><br><span> rts_ind->u32Fn, rts_ind->u8BlockNbr);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> case GsmL1_Sapi_Ptcch:</span><br><span style="color: hsl(0, 100%, 40%);">- // FIXME</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = pcu_rx_rts_req_ptcch(fl1h->trx_no, rts_ind->u8Tn,</span><br><span style="color: hsl(120, 100%, 40%);">+ rts_ind->u32Fn, rts_ind->u8BlockNbr);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> default:</span><br><span> break;</span><br><span> }</span><br><span>diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp</span><br><span>index 883cb22..9c7724c 100644</span><br><span>--- a/src/pcu_l1_if.cpp</span><br><span>+++ b/src/pcu_l1_if.cpp</span><br><span>@@ -185,24 +185,21 @@</span><br><span> msgb_free(msg);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void pcu_l1if_tx_ptcch(msgb *msg, uint8_t trx, uint8_t ts, uint16_t arfcn,</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t fn, uint8_t block_nr)</span><br><span style="color: hsl(120, 100%, 40%);">+void pcu_l1if_tx_ptcch(uint8_t trx, uint8_t ts, uint16_t arfcn,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t fn, uint8_t block_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t *data, size_t data_len)</span><br><span> {</span><br><span> struct gprs_rlcmac_bts *bts = bts_main_data();</span><br><span> </span><br><span> if (bts->gsmtap_categ_mask & (1 << PCU_GSMTAP_C_DL_PTCCH))</span><br><span style="color: hsl(0, 100%, 40%);">- gsmtap_send(bts->gsmtap, arfcn, ts, GSMTAP_CHANNEL_PTCCH, 0, fn, 0, 0, msg->data, msg->len);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap_send(bts->gsmtap, arfcn, ts, GSMTAP_CHANNEL_PTCCH, 0, fn, 0, 0, data, data_len);</span><br><span> #ifdef ENABLE_DIRECT_PHY</span><br><span> if (bts->trx[trx].fl1h) {</span><br><span style="color: hsl(0, 100%, 40%);">- l1if_pdch_req(bts->trx[trx].fl1h, ts, 1, fn, arfcn, block_nr,</span><br><span style="color: hsl(0, 100%, 40%);">- msg->data, msg->len);</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ l1if_pdch_req(bts->trx[trx].fl1h, ts, 1, fn, arfcn, block_nr, data, data_len);</span><br><span> return;</span><br><span> }</span><br><span> #endif</span><br><span style="color: hsl(0, 100%, 40%);">- pcu_tx_data_req(trx, ts, PCU_IF_SAPI_PTCCH, arfcn, fn, block_nr,</span><br><span style="color: hsl(0, 100%, 40%);">- msg->data, msg->len);</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_tx_data_req(trx, ts, PCU_IF_SAPI_PTCCH, arfcn, fn, block_nr, data, data_len);</span><br><span> }</span><br><span> </span><br><span> void pcu_l1if_tx_agch(bitvec * block, int plen)</span><br><span>@@ -361,6 +358,25 @@</span><br><span> return gprs_rlcmac_rcv_rts_block(bts_main_data(),</span><br><span> trx, ts, fn, block_nr);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+extern "C" int pcu_rx_rts_req_ptcch(uint8_t trx, uint8_t ts,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t fn, uint8_t block_nr)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_rlcmac_bts *bts = bts_main_data();</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_rlcmac_pdch *pdch;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Prevent buffer overflow */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trx >= ARRAY_SIZE(bts->trx) || ts >= 8)</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%);">+ /* Make sure PDCH time-slot is enabled */</span><br><span style="color: hsl(120, 100%, 40%);">+ pdch = &bts->trx[trx].pdch[ts];</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!pdch->m_is_enabled)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EAGAIN;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_l1if_tx_ptcch(trx, ts, bts->trx[trx].arfcn, fn, block_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ pdch->ptcch_msg, GSM_MACBLOCK_LEN);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span> static int pcu_rx_rts_req(struct gsm_pcu_if_rts_req *rts_req)</span><br><span> {</span><br><span>@@ -377,13 +393,8 @@</span><br><span> rts_req->fn, rts_req->block_nr);</span><br><span> break;</span><br><span> case PCU_IF_SAPI_PTCCH:</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME */</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg = msgb_alloc(GSM_MACBLOCK_LEN, "l1_prim");</span><br><span style="color: hsl(0, 100%, 40%);">- memset(msgb_put(msg, GSM_MACBLOCK_LEN), 0x2b, GSM_MACBLOCK_LEN);</span><br><span style="color: hsl(0, 100%, 40%);">- pcu_l1if_tx_ptcch(msg, rts_req->trx_nr, rts_req->ts_nr,</span><br><span style="color: hsl(0, 100%, 40%);">- rts_req->arfcn, rts_req->fn, rts_req->block_nr);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_rx_rts_req_ptcch(rts_req->trx_nr, rts_req->ts_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ rts_req->fn, rts_req->block_nr);</span><br><span> break;</span><br><span> default:</span><br><span> LOGP(DL1IF, LOGL_ERROR, "Received PCU RTS request with "</span><br><span>diff --git a/src/pcu_l1_if.h b/src/pcu_l1_if.h</span><br><span>index cb2a6df..888ad28 100644</span><br><span>--- a/src/pcu_l1_if.h</span><br><span>+++ b/src/pcu_l1_if.h</span><br><span>@@ -154,8 +154,9 @@</span><br><span> #ifdef __cplusplus</span><br><span> void pcu_l1if_tx_pdtch(msgb *msg, uint8_t trx, uint8_t ts, uint16_t arfcn, </span><br><span> uint32_t fn, uint8_t block_nr);</span><br><span style="color: hsl(0, 100%, 40%);">-void pcu_l1if_tx_ptcch(msgb *msg, uint8_t trx, uint8_t ts, uint16_t arfcn, </span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t fn, uint8_t block_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+void pcu_l1if_tx_ptcch(uint8_t trx, uint8_t ts, uint16_t arfcn,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t fn, uint8_t block_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t *data, size_t data_len);</span><br><span> void pcu_l1if_tx_agch(bitvec * block, int len);</span><br><span> </span><br><span> void pcu_l1if_tx_pch(bitvec * block, int plen, const char *imsi);</span><br><span>@@ -174,6 +175,8 @@</span><br><span> #endif</span><br><span> int pcu_rx_rts_req_pdtch(uint8_t trx, uint8_t ts,</span><br><span> uint32_t fn, uint8_t block_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+int pcu_rx_rts_req_ptcch(uint8_t trx, uint8_t ts,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t fn, uint8_t block_nr);</span><br><span> </span><br><span> int pcu_rx_data_ind_pdtch(uint8_t trx, uint8_t ts, uint8_t *data,</span><br><span> uint8_t len, uint32_t fn, struct pcu_l1_meas *meas);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/16083">change 16083</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-pcu/+/16083"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ib204acce1a7e33f6651b9da2a7b4a9b9ae461093 </div>
<div style="display:none"> Gerrit-Change-Number: 16083 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </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>