<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11172">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">layer23/app_ccch_scan.c: clean up copy-pasted code<br><br>By definition, 'ccch_scan' application is intended to be used for<br>monitoring of CCCH channels on C0/TS0. There is no need to send<br>RACH requests, therefore there is no need to care about the<br>mobile allocation from SI1 message.<br><br>Most likely, this "dead" code was copy-pasted from mobile<br>application. Let's clean it up!<br><br>Change-Id: I7c2f47cbc825a5e5a50863d842729d3d8408b9dd<br>---<br>M src/host/layer23/src/misc/app_ccch_scan.c<br>1 file changed, 1 insertion(+), 47 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/72/11172/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/layer23/src/misc/app_ccch_scan.c b/src/host/layer23/src/misc/app_ccch_scan.c</span><br><span>index f92b13b..d8cb912 100644</span><br><span>--- a/src/host/layer23/src/misc/app_ccch_scan.c</span><br><span>+++ b/src/host/layer23/src/misc/app_ccch_scan.c</span><br><span>@@ -42,14 +42,9 @@</span><br><span> #include <l1ctl_proto.h></span><br><span> </span><br><span> static struct {</span><br><span style="color: hsl(0, 100%, 40%);">- int has_si1;</span><br><span> int ccch_mode;</span><br><span style="color: hsl(0, 100%, 40%);">- int ccch_enabled;</span><br><span style="color: hsl(0, 100%, 40%);">- int rach_count;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_sysinfo_freq cell_arfcns[1024];</span><br><span> } app_state;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static void dump_bcch(struct osmocom_ms *ms, uint8_t tc, const uint8_t *data)</span><br><span> {</span><br><span> struct gsm48_system_information_type_header *si_hdr;</span><br><span>@@ -62,18 +57,6 @@</span><br><span> if (tc != 0)</span><br><span> LOGP(DRR, LOGL_ERROR, "SI1 on the wrong TC: %d\n", tc);</span><br><span> #endif</span><br><span style="color: hsl(0, 100%, 40%);">- if (!app_state.has_si1) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm48_system_information_type_1 *si1 =</span><br><span style="color: hsl(0, 100%, 40%);">- (struct gsm48_system_information_type_1 *)data;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- gsm48_decode_freq_list(app_state.cell_arfcns,</span><br><span style="color: hsl(0, 100%, 40%);">- si1->cell_channel_description,</span><br><span style="color: hsl(0, 100%, 40%);">- sizeof(si1->cell_channel_description),</span><br><span style="color: hsl(0, 100%, 40%);">- 0xff, 0x01);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- app_state.has_si1 = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DRR, LOGL_ERROR, "SI1 received.\n");</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> break;</span><br><span> case GSM48_MT_RR_SYSINFO_2:</span><br><span> #ifdef BCCH_TC_CHECK</span><br><span>@@ -182,8 +165,6 @@</span><br><span> if (ia->page_mode & 0xf0)</span><br><span> return 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: compare RA and GSM time with when we sent RACH req */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> rsl_dec_chan_nr(ia->chan_desc.chan_nr, &ch_type, &ch_subch, &ch_ts);</span><br><span> </span><br><span> if (!ia->chan_desc.h0.h) {</span><br><span>@@ -199,9 +180,7 @@</span><br><span> </span><br><span> } else {</span><br><span> /* Hopping */</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t maio, hsn, ma_len;</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t ma[64], arfcn;</span><br><span style="color: hsl(0, 100%, 40%);">- int i, j, k;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t maio, hsn;</span><br><span> </span><br><span> hsn = ia->chan_desc.h1.hsn;</span><br><span> maio = ia->chan_desc.h1.maio_low | (ia->chan_desc.h1.maio_high << 2);</span><br><span>@@ -210,19 +189,6 @@</span><br><span> "HSN=%u, MAIO=%u, TS=%u, SS=%u, TSC=%u) ", ia->req_ref.ra,</span><br><span> ia->chan_desc.chan_nr, hsn, maio, ch_ts, ch_subch,</span><br><span> ia->chan_desc.h1.tsc);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* decode mobile allocation */</span><br><span style="color: hsl(0, 100%, 40%);">- ma_len = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- for (i=1, j=0; i<=1024; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- arfcn = i & 1023;</span><br><span style="color: hsl(0, 100%, 40%);">- if (app_state.cell_arfcns[arfcn].mask & 0x01) {</span><br><span style="color: hsl(0, 100%, 40%);">- k = ia->mob_alloc_len - (j>>3) - 1;</span><br><span style="color: hsl(0, 100%, 40%);">- if (ia->mob_alloc[k] & (1 << (j&7))) {</span><br><span style="color: hsl(0, 100%, 40%);">- ma[ma_len++] = arfcn;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- j++;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> }</span><br><span> </span><br><span> LOGPC(DRR, LOGL_NOTICE, "\n");</span><br><span>@@ -449,25 +415,13 @@</span><br><span> //dump_bcch(dl->time.tc, ccch->data);</span><br><span> dump_bcch(ms, 0, msg->l3h);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Req channel logic */</span><br><span style="color: hsl(0, 100%, 40%);">- if (app_state.ccch_enabled && (app_state.rach_count < 2)) {</span><br><span style="color: hsl(0, 100%, 40%);">- l1ctl_tx_rach_req(ms, app_state.rach_count, 0,</span><br><span style="color: hsl(0, 100%, 40%);">- app_state.ccch_mode == CCCH_MODE_COMBINED);</span><br><span style="color: hsl(0, 100%, 40%);">- app_state.rach_count++;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span> void layer3_app_reset(void)</span><br><span> {</span><br><span> /* Reset state */</span><br><span style="color: hsl(0, 100%, 40%);">- app_state.has_si1 = 0;</span><br><span> app_state.ccch_mode = CCCH_MODE_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">- app_state.ccch_enabled = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- app_state.rach_count = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- memset(&app_state.cell_arfcns, 0x00, sizeof(app_state.cell_arfcns));</span><br><span> }</span><br><span> </span><br><span> static int signal_cb(unsigned int subsys, unsigned int signal,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11172">change 11172</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/11172"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I7c2f47cbc825a5e5a50863d842729d3d8408b9dd </div>
<div style="display:none"> Gerrit-Change-Number: 11172 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>