<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11479">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">layer23/ccch_scan: unwrap dump_bcch() as gsm48_rx_bcch()<br><br>Change-Id: I382fbdb60513324164cd1147c36f3367bb6fb22c<br>---<br>M src/host/layer23/src/misc/app_ccch_scan.c<br>1 file changed, 11 insertions(+), 14 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/79/11479/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 88a2bef..4c88ded 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>@@ -130,11 +130,16 @@</span><br><span> l1ctl_tx_ccch_mode_req(ms, app_state.ccch_mode);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void dump_bcch(struct osmocom_ms *ms, uint8_t tc, const uint8_t *data)</span><br><span style="color: hsl(120, 100%, 40%);">+int gsm48_rx_bcch(struct msgb *msg, struct osmocom_ms *ms)</span><br><span> {</span><br><span> struct gsm48_system_information_type_header *si_hdr;</span><br><span style="color: hsl(0, 100%, 40%);">- si_hdr = (struct gsm48_system_information_type_header *) data;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t si_type = si_hdr->system_information;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t si_type, tc = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* FIXME: we have lost the gsm frame time until here,</span><br><span style="color: hsl(120, 100%, 40%);">+ * need to store it in some msgb context, so tc=0 */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ si_hdr = (struct gsm48_system_information_type_header *) msg->l3h;</span><br><span style="color: hsl(120, 100%, 40%);">+ si_type = si_hdr->system_information;</span><br><span> </span><br><span> LOGP(DRR, LOGL_INFO, "BCCH message (type=0x%02x): %s\n",</span><br><span> si_type, gsm48_rr_msg_name(si_type));</span><br><span>@@ -146,13 +151,15 @@</span><br><span> switch (si_type) {</span><br><span> case GSM48_MT_RR_SYSINFO_3:</span><br><span> handle_si3(ms,</span><br><span style="color: hsl(0, 100%, 40%);">- (struct gsm48_system_information_type_3 *) data);</span><br><span style="color: hsl(120, 100%, 40%);">+ (struct gsm48_system_information_type_3 *) si_hdr);</span><br><span> break;</span><br><span> </span><br><span> default:</span><br><span> /* We don't care about other types of SI */</span><br><span> break; /* thus there is nothing to do */</span><br><span> };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> }</span><br><span> </span><br><span> </span><br><span>@@ -446,16 +453,6 @@</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int gsm48_rx_bcch(struct msgb *msg, struct osmocom_ms *ms)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: we have lost the gsm frame time until here, need to store it</span><br><span style="color: hsl(0, 100%, 40%);">- * in some msgb context */</span><br><span style="color: hsl(0, 100%, 40%);">- //dump_bcch(dl->time.tc, ccch->data);</span><br><span style="color: hsl(0, 100%, 40%);">- dump_bcch(ms, 0, msg->l3h);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> void layer3_app_reset(void)</span><br><span> {</span><br><span> /* Reset state */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11479">change 11479</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/11479"/><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: I382fbdb60513324164cd1147c36f3367bb6fb22c </div>
<div style="display:none"> Gerrit-Change-Number: 11479 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>