<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/14273">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trxcon/scheduler: move PRIM_IS[_EXT]_RACH macros to sched_trx.h<br><br>Both PRIM_IS_RACH() and PRIM_IS_EXT_RACH() macros to be used for<br>handover RACH detection in the follow up changes, thus we need<br>have them widely available. Let's also give them better names:<br><br> PRIM_IS_EXT_RACH -> PRIM_IS_RACH11<br> PRIM_IS_RACH -> PRIM_IS_RACH8<br><br>and introduce a new generic one for checking whether a given<br>primitive is RACH in general (either 8-bit or 11-bit) or not.<br><br>Change-Id: Ibc39c57fda000647be1829786f6423dcf3f435cd<br>---<br>M src/host/trxcon/sched_lchan_rach.c<br>M src/host/trxcon/sched_trx.h<br>2 files changed, 13 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/trxcon/sched_lchan_rach.c b/src/host/trxcon/sched_lchan_rach.c</span><br><span>index 565d693..7d202b8 100644</span><br><span>--- a/src/host/trxcon/sched_lchan_rach.c</span><br><span>+++ b/src/host/trxcon/sched_lchan_rach.c</span><br><span>@@ -40,12 +40,6 @@</span><br><span> #include "trx_if.h"</span><br><span> #include "l1ctl.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* FIXME: we need a better way to identify / distinguish primitives */</span><br><span style="color: hsl(0, 100%, 40%);">-#define PRIM_IS_EXT_RACH(prim) \</span><br><span style="color: hsl(0, 100%, 40%);">- (prim->payload_len == sizeof(struct l1ctl_ext_rach_req))</span><br><span style="color: hsl(0, 100%, 40%);">-#define PRIM_IS_RACH(prim) \</span><br><span style="color: hsl(0, 100%, 40%);">- (prim->payload_len == sizeof(struct l1ctl_rach_req))</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* 3GPP TS 05.02, section 5.2.7 "Access burst (AB)" */</span><br><span> #define RACH_EXT_TAIL_BITS_LEN 8</span><br><span> #define RACH_SYNCH_SEQ_LEN 41</span><br><span>@@ -94,7 +88,7 @@</span><br><span> int i, rc;</span><br><span> </span><br><span> /* Is it extended (11-bit) RACH or not? */</span><br><span style="color: hsl(0, 100%, 40%);">- if (PRIM_IS_EXT_RACH(lchan->prim)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (PRIM_IS_RACH11(lchan->prim)) {</span><br><span> ext_req = (struct l1ctl_ext_rach_req *) lchan->prim->payload;</span><br><span> synch_seq = ext_req->synch_seq;</span><br><span> </span><br><span>@@ -120,7 +114,7 @@</span><br><span> sched_prim_drop(lchan);</span><br><span> return rc;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (PRIM_IS_RACH(lchan->prim)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (PRIM_IS_RACH8(lchan->prim)) {</span><br><span> req = (struct l1ctl_rach_req *) lchan->prim->payload;</span><br><span> synch_seq = RACH_SYNCH_SEQ_TS0;</span><br><span> </span><br><span>@@ -162,7 +156,7 @@</span><br><span> memset(burst_ptr, 0, burst + GSM_BURST_LEN - burst_ptr);</span><br><span> </span><br><span> LOGP(DSCHD, LOGL_DEBUG, "Transmitting %s RACH (%s) fn=%u\n",</span><br><span style="color: hsl(0, 100%, 40%);">- PRIM_IS_EXT_RACH(lchan->prim) ? "extended (11-bit)" : "regular (8-bit)",</span><br><span style="color: hsl(120, 100%, 40%);">+ PRIM_IS_RACH11(lchan->prim) ? "extended (11-bit)" : "regular (8-bit)",</span><br><span> get_value_string(rach_synch_seq_names, synch_seq), fn);</span><br><span> </span><br><span> /* Forward burst to scheduler */</span><br><span>diff --git a/src/host/trxcon/sched_trx.h b/src/host/trxcon/sched_trx.h</span><br><span>index fcb78a7..6ef9ce4 100644</span><br><span>--- a/src/host/trxcon/sched_trx.h</span><br><span>+++ b/src/host/trxcon/sched_trx.h</span><br><span>@@ -309,6 +309,16 @@</span><br><span> #define CHAN_IS_SACCH(chan) \</span><br><span> (trx_lchan_desc[chan].link_id & TRX_CH_LID_SACCH)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* FIXME: we need a better way to identify / distinguish primitives */</span><br><span style="color: hsl(120, 100%, 40%);">+#define PRIM_IS_RACH11(prim) \</span><br><span style="color: hsl(120, 100%, 40%);">+ (prim->payload_len == sizeof(struct l1ctl_ext_rach_req))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define PRIM_IS_RACH8(prim) \</span><br><span style="color: hsl(120, 100%, 40%);">+ (prim->payload_len == sizeof(struct l1ctl_rach_req))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define PRIM_IS_RACH(prim) \</span><br><span style="color: hsl(120, 100%, 40%);">+ (PRIM_IS_RACH8(prim) || PRIM_IS_RACH11(prim))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #define PRIM_IS_TCH(prim) \</span><br><span> (CHAN_IS_TCH(prim->chan) && prim->payload_len != GSM_MACBLOCK_LEN)</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14273">change 14273</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/14273"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ibc39c57fda000647be1829786f6423dcf3f435cd </div>
<div style="display:none"> Gerrit-Change-Number: 14273 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>