<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/24616">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
dexter: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">rsl: Use switch statement in rsl_rx_bcch_info()<br><br>This is a preparation for new commit, which makes it easier to add new<br>SIs being sent.<br><br>Change-Id: I27774ca36d1e740b6a502cfb280aba0ea82b9dbe<br>---<br>M src/common/rsl.c<br>1 file changed, 18 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/rsl.c b/src/common/rsl.c</span><br><span>index 516e609..7f9af84 100644</span><br><span>--- a/src/common/rsl.c</span><br><span>+++ b/src/common/rsl.c</span><br><span>@@ -456,6 +456,7 @@</span><br><span> enum osmo_sysinfo_type osmo_si;</span><br><span> struct gsm48_system_information_type_2quater *si2q;</span><br><span> struct bitvec bv;</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t *si_buf;</span><br><span> rsl_tlv_parse(&tp, msgb_l3(msg), msgb_l3len(msg));</span><br><span> </span><br><span> /* 9.3.30 System Info Type */</span><br><span>@@ -518,7 +519,8 @@</span><br><span> </span><br><span> bts->si_valid |= (1 << osmo_si);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (SYSINFO_TYPE_3 == osmo_si) {</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (osmo_si) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case SYSINFO_TYPE_3:</span><br><span> if (trx->nr == 0 && num_agch(trx, "RSL") != 1) {</span><br><span> lchan_deactivate(&trx->bts->c0->ts[0].lchan[CCCH_LCHAN]);</span><br><span> /* will be reactivated by sapi_deactivate_cb() */</span><br><span>@@ -526,29 +528,33 @@</span><br><span> LCHAN_REL_ACT_REACT;</span><br><span> }</span><br><span> /* decode original SI3 Rest Octets as sent by BSC */</span><br><span style="color: hsl(0, 100%, 40%);">- const uint8_t *si3_ro_buf = (uint8_t *) GSM_BTS_SI(bts, osmo_si);</span><br><span style="color: hsl(0, 100%, 40%);">- si3_ro_buf += offsetof(struct gsm48_system_information_type_3, rest_octets);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_gsm48_rest_octets_si3_decode(&bts->si3_ro_decoded, si3_ro_buf);</span><br><span style="color: hsl(120, 100%, 40%);">+ si_buf = (const uint8_t *) GSM_BTS_SI(bts, osmo_si);</span><br><span style="color: hsl(120, 100%, 40%);">+ si_buf += offsetof(struct gsm48_system_information_type_3, rest_octets);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsm48_rest_octets_si3_decode(&bts->si3_ro_decoded, si_buf);</span><br><span> /* patch out GPRS indicator from binary if PCU is not connected; will be enabled</span><br><span> * after PCU connects */</span><br><span> regenerate_si3_restoctets(bts);</span><br><span> pcu_tx_si(trx->bts, SYSINFO_TYPE_3, true);</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (SYSINFO_TYPE_4 == osmo_si) {</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case SYSINFO_TYPE_4:</span><br><span> /* decode original SI4 Rest Octets as sent by BSC */</span><br><span style="color: hsl(0, 100%, 40%);">- const uint8_t *si4 = (uint8_t *) GSM_BTS_SI(bts, osmo_si);</span><br><span style="color: hsl(0, 100%, 40%);">- int si4_ro_offset = get_si4_ro_offset(si4);</span><br><span style="color: hsl(120, 100%, 40%);">+ si_buf = (const uint8_t *) GSM_BTS_SI(bts, osmo_si);</span><br><span style="color: hsl(120, 100%, 40%);">+ int si4_ro_offset = get_si4_ro_offset(si_buf);</span><br><span> if (si4_ro_offset > 0) {</span><br><span> osmo_gsm48_rest_octets_si4_decode(&bts->si4_ro_decoded,</span><br><span style="color: hsl(0, 100%, 40%);">- si4 + si4_ro_offset,</span><br><span style="color: hsl(120, 100%, 40%);">+ si_buf + si4_ro_offset,</span><br><span> GSM_MACBLOCK_LEN - si4_ro_offset);</span><br><span> /* patch out GPRS indicator from binary if PCU is not connected; will be</span><br><span> * enabled after PCU connects */</span><br><span> regenerate_si4_restoctets(bts);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (SYSINFO_TYPE_13 == osmo_si) {</span><br><span style="color: hsl(0, 100%, 40%);">- pcu_tx_si(trx->bts, SYSINFO_TYPE_13, true);</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (SYSINFO_TYPE_1 == osmo_si) {</span><br><span style="color: hsl(0, 100%, 40%);">- pcu_tx_si(trx->bts, SYSINFO_TYPE_1, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case SYSINFO_TYPE_1:</span><br><span style="color: hsl(120, 100%, 40%);">+ case SYSINFO_TYPE_13:</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_tx_si(trx->bts, osmo_si, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> }</span><br><span> </span><br><span> } else if (TLVP_PRESENT(&tp, RSL_IE_L3_INFO)) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/24616">change 24616</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/+/24616"/><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: I27774ca36d1e740b6a502cfb280aba0ea82b9dbe </div>
<div style="display:none"> Gerrit-Change-Number: 24616 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </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>