<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/14207">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trxcon: Use RSL channel mode #defines from libosmogsm<br><br>Wherever possible, use #defines from libosmogsm as opposed to magic<br>numbers. Using magic numbers in several places has the danger of<br>different programs/repositories having different views on what those<br>values mean.<br><br>Change-Id: I7ab4958801b3422973b67ff0452b90afa8a3f501<br>Related: OS#4027<br>Depends: libosmocore Change-Id I93e557358cf1c1b622f77f906959df7ca6d5cb12<br>---<br>M src/host/trxcon/sched_lchan_desc.c<br>M src/host/trxcon/sched_trx.c<br>2 files changed, 17 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/trxcon/sched_lchan_desc.c b/src/host/trxcon/sched_lchan_desc.c</span><br><span>index ee712d5..8bc336e 100644</span><br><span>--- a/src/host/trxcon/sched_lchan_desc.c</span><br><span>+++ b/src/host/trxcon/sched_lchan_desc.c</span><br><span>@@ -23,6 +23,7 @@</span><br><span> *</span><br><span> */</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsm/protocol/gsm_08_58.h></span><br><span> #include "sched_trx.h"</span><br><span> </span><br><span> /* Forward declaration of handlers */</span><br><span>@@ -94,31 +95,31 @@</span><br><span> },</span><br><span> {</span><br><span> TRXC_BCCH, "BCCH",</span><br><span style="color: hsl(0, 100%, 40%);">- 0x80, TRX_CH_LID_DEDIC,</span><br><span style="color: hsl(120, 100%, 40%);">+ RSL_CHAN_BCCH, TRX_CH_LID_DEDIC,</span><br><span> 4 * GSM_BURST_PL_LEN, TRX_CH_FLAG_AUTO,</span><br><span> rx_data_fn, NULL,</span><br><span> },</span><br><span> {</span><br><span> TRXC_RACH, "RACH",</span><br><span style="color: hsl(0, 100%, 40%);">- 0x88, TRX_CH_LID_DEDIC,</span><br><span style="color: hsl(120, 100%, 40%);">+ RSL_CHAN_RACH, TRX_CH_LID_DEDIC,</span><br><span> 0x00, TRX_CH_FLAG_AUTO,</span><br><span> NULL, tx_rach_fn,</span><br><span> },</span><br><span> {</span><br><span> TRXC_CCCH, "CCCH",</span><br><span style="color: hsl(0, 100%, 40%);">- 0x90, TRX_CH_LID_DEDIC,</span><br><span style="color: hsl(120, 100%, 40%);">+ RSL_CHAN_PCH_AGCH, TRX_CH_LID_DEDIC,</span><br><span> 4 * GSM_BURST_PL_LEN, TRX_CH_FLAG_AUTO,</span><br><span> rx_data_fn, NULL,</span><br><span> },</span><br><span> {</span><br><span> TRXC_TCHF, "TCH/F",</span><br><span style="color: hsl(0, 100%, 40%);">- 0x08, TRX_CH_LID_DEDIC,</span><br><span style="color: hsl(120, 100%, 40%);">+ RSL_CHAN_Bm_ACCHs, TRX_CH_LID_DEDIC,</span><br><span> 8 * GSM_BURST_PL_LEN, TRX_CH_FLAG_CBTX,</span><br><span> rx_tchf_fn, tx_tchf_fn,</span><br><span> },</span><br><span> {</span><br><span> TRXC_TCHH_0, "TCH/H(0)",</span><br><span style="color: hsl(0, 100%, 40%);">- 0x10, TRX_CH_LID_DEDIC,</span><br><span style="color: hsl(120, 100%, 40%);">+ RSL_CHAN_Lm_ACCHs, TRX_CH_LID_DEDIC,</span><br><span> 6 * GSM_BURST_PL_LEN, TRX_CH_FLAG_CBTX,</span><br><span> rx_tchh_fn, tx_tchh_fn,</span><br><span> },</span><br><span>@@ -292,25 +293,25 @@</span><br><span> },</span><br><span> {</span><br><span> TRXC_PDTCH, "PDTCH",</span><br><span style="color: hsl(0, 100%, 40%);">- 0xc0, TRX_CH_LID_DEDIC,</span><br><span style="color: hsl(120, 100%, 40%);">+ RSL_CHAN_OSMO_PDCH, TRX_CH_LID_DEDIC,</span><br><span> 12 * GSM_BURST_PL_LEN, TRX_CH_FLAG_PDCH,</span><br><span> rx_pdtch_fn, tx_pdtch_fn,</span><br><span> },</span><br><span> {</span><br><span> TRXC_PTCCH, "PTCCH",</span><br><span style="color: hsl(0, 100%, 40%);">- 0xc0, TRX_CH_LID_DEDIC,</span><br><span style="color: hsl(120, 100%, 40%);">+ RSL_CHAN_OSMO_PDCH, TRX_CH_LID_DEDIC,</span><br><span> 4 * GSM_BURST_PL_LEN, TRX_CH_FLAG_PDCH,</span><br><span> rx_data_fn, tx_data_fn,</span><br><span> },</span><br><span> [TRXC_SDCCH4_CBCH] = {</span><br><span> TRXC_SDCCH4_CBCH, "SDCCH/4(CBCH)",</span><br><span style="color: hsl(0, 100%, 40%);">- 0xc8, TRX_CH_LID_DEDIC,</span><br><span style="color: hsl(120, 100%, 40%);">+ RSL_CHAN_OSMO_CBCH4, TRX_CH_LID_DEDIC,</span><br><span> 4 * GSM_BURST_PL_LEN, TRX_CH_FLAG_AUTO,</span><br><span> rx_data_fn, NULL,</span><br><span> },</span><br><span> [TRXC_SDCCH8_CBCH] = {</span><br><span> TRXC_SDCCH8_CBCH, "SDCCH/8(CBCH)",</span><br><span style="color: hsl(0, 100%, 40%);">- 0xd0, TRX_CH_LID_DEDIC,</span><br><span style="color: hsl(120, 100%, 40%);">+ RSL_CHAN_OSMO_CBCH8, TRX_CH_LID_DEDIC,</span><br><span> 4 * GSM_BURST_PL_LEN, 0x00,</span><br><span> rx_data_fn, NULL,</span><br><span> },</span><br><span>diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c</span><br><span>index 721db02..4c93a3c 100644</span><br><span>--- a/src/host/trxcon/sched_trx.c</span><br><span>+++ b/src/host/trxcon/sched_trx.c</span><br><span>@@ -29,6 +29,7 @@</span><br><span> #include <stdbool.h></span><br><span> </span><br><span> #include <osmocom/gsm/a5.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsm/protocol/gsm_08_58.h></span><br><span> #include <osmocom/core/bits.h></span><br><span> #include <osmocom/core/msgb.h></span><br><span> #include <osmocom/core/logging.h></span><br><span>@@ -530,17 +531,17 @@</span><br><span> {</span><br><span> uint8_t cbits = chan_nr >> 3;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (cbits == 0x01)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cbits == ABIS_RSL_CHAN_NR_CBITS_Bm_ACCHs)</span><br><span> return GSM_PCHAN_TCH_F;</span><br><span style="color: hsl(0, 100%, 40%);">- else if ((cbits & 0x1e) == 0x02)</span><br><span style="color: hsl(120, 100%, 40%);">+ else if ((cbits & 0x1e) == ABIS_RSL_CHAN_NR_CBITS_Lm_ACCHs(0))</span><br><span> return GSM_PCHAN_TCH_H;</span><br><span style="color: hsl(0, 100%, 40%);">- else if ((cbits & 0x1c) == 0x04)</span><br><span style="color: hsl(120, 100%, 40%);">+ else if ((cbits & 0x1c) == ABIS_RSL_CHAN_NR_CBITS_SDCCH4_ACCH(0))</span><br><span> return GSM_PCHAN_CCCH_SDCCH4;</span><br><span style="color: hsl(0, 100%, 40%);">- else if ((cbits & 0x18) == 0x08)</span><br><span style="color: hsl(120, 100%, 40%);">+ else if ((cbits & 0x18) == ABIS_RSL_CHAN_NR_CBITS_SDCCH8_ACCH(0))</span><br><span> return GSM_PCHAN_SDCCH8_SACCH8C;</span><br><span style="color: hsl(0, 100%, 40%);">- else if ((cbits & 0x1f) == 0x19)</span><br><span style="color: hsl(120, 100%, 40%);">+ else if ((cbits & 0x1f) == ABIS_RSL_CHAN_NR_CBITS_OSMO_CBCH4)</span><br><span> return GSM_PCHAN_CCCH_SDCCH4_CBCH;</span><br><span style="color: hsl(0, 100%, 40%);">- else if ((cbits & 0x1f) == 0x1a)</span><br><span style="color: hsl(120, 100%, 40%);">+ else if ((cbits & 0x1f) == ABIS_RSL_CHAN_NR_CBITS_OSMO_CBCH8)</span><br><span> return GSM_PCHAN_SDCCH8_SACCH8C_CBCH;</span><br><span> </span><br><span> return GSM_PCHAN_NONE;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14207">change 14207</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/14207"/><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: I7ab4958801b3422973b67ff0452b90afa8a3f501 </div>
<div style="display:none"> Gerrit-Change-Number: 14207 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>