<p>Harald Welte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/14136">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">layer23: fix tons of compiler warnings, mostly OSMO_DEPRECATED related<br><br>Change-Id: I03918bd864c711b377a795186123c85bb6f4dc4a<br>---<br>M src/host/layer23/src/common/networks.c<br>M src/host/layer23/src/misc/bcch_scan.c<br>M src/host/layer23/src/mobile/gsm322.c<br>M src/host/layer23/src/mobile/gsm411_sms.c<br>M src/host/layer23/src/mobile/gsm480_ss.c<br>M src/host/layer23/src/mobile/gsm48_rr.c<br>M src/host/layer23/src/mobile/subscriber.c<br>7 files changed, 36 insertions(+), 26 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/36/14136/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/layer23/src/common/networks.c b/src/host/layer23/src/common/networks.c</span><br><span>index 40b70a1..b4757e9 100644</span><br><span>--- a/src/host/layer23/src/common/networks.c</span><br><span>+++ b/src/host/layer23/src/common/networks.c</span><br><span>@@ -1822,33 +1822,33 @@</span><br><span> </span><br><span> const char *gsm_print_mcc(uint16_t mcc)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- static char string[5] = "000";</span><br><span style="color: hsl(120, 100%, 40%);">+ static char string[6] = "000";</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- snprintf(string, 4, "%03x", mcc);</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(string, 5, "%03x", mcc);</span><br><span> return string;</span><br><span> }</span><br><span> </span><br><span> const char *gsm_print_mnc(uint16_t mnc)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- static char string[7];</span><br><span style="color: hsl(120, 100%, 40%);">+ static char string[8];</span><br><span> </span><br><span> /* invalid format: return hex value */</span><br><span> if ((mnc & 0xf000)</span><br><span> || (mnc & 0x0f00) > 0x0900</span><br><span> || (mnc & 0x00f0) > 0x0090</span><br><span> || ((mnc & 0x000f) > 0x0009 && (mnc & 0x000f) < 0x000f)) {</span><br><span style="color: hsl(0, 100%, 40%);">- snprintf(string, 6, "0x%03x", mnc);</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(string, 7, "0x%03x", mnc);</span><br><span> return string;</span><br><span> }</span><br><span> </span><br><span> /* two digits */</span><br><span> if ((mnc & 0x000f) == 0x000f) {</span><br><span style="color: hsl(0, 100%, 40%);">- snprintf(string, 6, "%02x", mnc >> 4);</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(string, 7, "%02x", mnc >> 4);</span><br><span> return string;</span><br><span> }</span><br><span> </span><br><span> /* three digits */</span><br><span style="color: hsl(0, 100%, 40%);">- snprintf(string, 6, "%03x", mnc);</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(string, 7, "%03x", mnc);</span><br><span> return string;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/host/layer23/src/misc/bcch_scan.c b/src/host/layer23/src/misc/bcch_scan.c</span><br><span>index 3ba3a1c..5dc0bc3 100644</span><br><span>--- a/src/host/layer23/src/misc/bcch_scan.c</span><br><span>+++ b/src/host/layer23/src/misc/bcch_scan.c</span><br><span>@@ -199,9 +199,13 @@</span><br><span> case BSCAN_S_WAIT_DATA:</span><br><span> cinfo_next_cell(data);</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case BSCAN_S_NONE:</span><br><span style="color: hsl(120, 100%, 40%);">+ case BSCAN_S_DONE:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#if 0</span><br><span> /* Update cell_info for current cell with received BCCH info */</span><br><span> static int rx_bcch_info(const uint8_t *data)</span><br><span> {</span><br><span>@@ -233,12 +237,13 @@</span><br><span> static int rx_sch_info()</span><br><span> {</span><br><span> /* FIXME */</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> </span><br><span> static int bscan_sig_cb(unsigned int subsys, unsigned int signal,</span><br><span> void *handler_data, void *signal_data)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct cell_info *ci = fps.cur_cell;</span><br><span> struct osmocom_ms *ms;</span><br><span> struct osmobb_meas_res *mr;</span><br><span> uint16_t arfcn;</span><br><span>@@ -279,6 +284,9 @@</span><br><span> }</span><br><span> _cinfo_start_arfcn(rc);</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case FPS_S_NONE:</span><br><span style="color: hsl(120, 100%, 40%);">+ case FPS_S_BINFO:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> }</span><br><span> break;</span><br><span> case S_L1CTL_FBSB_RESP:</span><br><span>diff --git a/src/host/layer23/src/mobile/gsm322.c b/src/host/layer23/src/mobile/gsm322.c</span><br><span>index bfe6329..cfd70d8 100644</span><br><span>--- a/src/host/layer23/src/mobile/gsm322.c</span><br><span>+++ b/src/host/layer23/src/mobile/gsm322.c</span><br><span>@@ -1867,7 +1867,7 @@</span><br><span> </span><br><span> /* check C1 criteria not fullfilled */</span><br><span> // TODO: class 3 DCS mobile</span><br><span style="color: hsl(0, 100%, 40%);">- band = gsm_arfcn2band(index2arfcn(i));</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm_arfcn2band_rc(index2arfcn(i), &band);</span><br><span> class = class_of_band(ms, band);</span><br><span> c1 = calculate_c1(DCS, rxlev2dbm(cs->list[i].rxlev),</span><br><span> s->rxlev_acc_min_db,</span><br><span>@@ -4129,7 +4129,8 @@</span><br><span> struct gsm48_sysinfo *s;</span><br><span> int i = 0, reselect = 0;</span><br><span> uint16_t acc_class;</span><br><span style="color: hsl(0, 100%, 40%);">- int band, class;</span><br><span style="color: hsl(120, 100%, 40%);">+ int class;</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gsm_band band;</span><br><span> struct gsm322_neighbour *nb;</span><br><span> time_t now;</span><br><span> char arfcn_text[10];</span><br><span>@@ -4200,7 +4201,7 @@</span><br><span> nb->prio_low = 1;</span><br><span> </span><br><span> /* get C1 & C2 */</span><br><span style="color: hsl(0, 100%, 40%);">- band = gsm_arfcn2band(nb->arfcn);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm_arfcn2band_rc(nb->arfcn, &band);</span><br><span> class = class_of_band(ms, band);</span><br><span> nb->c1 = calculate_c1(DNB, nb->rla_c_dbm, s->rxlev_acc_min_db,</span><br><span> ms_pwr_dbm(band, s->ms_txpwr_max_cch),</span><br><span>@@ -4697,9 +4698,11 @@</span><br><span> struct llist_head sorted;</span><br><span> struct llist_head *lh, *lh2;</span><br><span> struct gsm48_sysinfo *s = &cs->sel_si;</span><br><span style="color: hsl(0, 100%, 40%);">- int band = gsm_arfcn2band(cs->arfcn);</span><br><span style="color: hsl(0, 100%, 40%);">- int class = class_of_band(cs->ms, band);</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gsm_band band;</span><br><span style="color: hsl(120, 100%, 40%);">+ int class;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ gsm_arfcn2band_rc(cs->arfcn, &band);</span><br><span style="color: hsl(120, 100%, 40%);">+ class = class_of_band(cs->ms, band);</span><br><span> </span><br><span> /* calculate the RAL_C of serving cell */</span><br><span> if (cs->rxlev_count) {</span><br><span>diff --git a/src/host/layer23/src/mobile/gsm411_sms.c b/src/host/layer23/src/mobile/gsm411_sms.c</span><br><span>index c476ff4..08df0f2 100644</span><br><span>--- a/src/host/layer23/src/mobile/gsm411_sms.c</span><br><span>+++ b/src/host/layer23/src/mobile/gsm411_sms.c</span><br><span>@@ -271,8 +271,8 @@</span><br><span> strcpy(gsms->address, "0");</span><br><span> else</span><br><span> gsms->address[0] = '\0';</span><br><span style="color: hsl(0, 100%, 40%);">- gsm48_decode_bcd_number(gsms->address + strlen(gsms->address),</span><br><span style="color: hsl(0, 100%, 40%);">- sizeof(gsms->address) - strlen(gsms->address), address_lv, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm48_decode_bcd_number2(gsms->address + strlen(gsms->address),</span><br><span style="color: hsl(120, 100%, 40%);">+ sizeof(gsms->address) - strlen(gsms->address), address_lv, sizeof(address_lv), 1);</span><br><span> smsp += oa_len_bytes;</span><br><span> </span><br><span> gsms->protocol_id = *smsp++;</span><br><span>diff --git a/src/host/layer23/src/mobile/gsm480_ss.c b/src/host/layer23/src/mobile/gsm480_ss.c</span><br><span>index 5ff3ce6..edc9c97 100644</span><br><span>--- a/src/host/layer23/src/mobile/gsm480_ss.c</span><br><span>+++ b/src/host/layer23/src/mobile/gsm480_ss.c</span><br><span>@@ -884,9 +884,9 @@</span><br><span> strcpy(number, "0");</span><br><span> else</span><br><span> number[0] = '\0';</span><br><span style="color: hsl(0, 100%, 40%);">- gsm48_decode_bcd_number(number + strlen(number),</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm48_decode_bcd_number2(number + strlen(number),</span><br><span> sizeof(number) - strlen(number),</span><br><span style="color: hsl(0, 100%, 40%);">- tag_data - 1, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ tag_data - 1, tag_len + 1, 1);</span><br><span> vty_notify(ms, "Destination: %s\n", number);</span><br><span> break;</span><br><span> }</span><br><span>diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c</span><br><span>index c074323..a94fc99 100644</span><br><span>--- a/src/host/layer23/src/mobile/gsm48_rr.c</span><br><span>+++ b/src/host/layer23/src/mobile/gsm48_rr.c</span><br><span>@@ -1516,6 +1516,9 @@</span><br><span> int slots;</span><br><span> uint8_t chan_req;</span><br><span> uint8_t tx_power;</span><br><span style="color: hsl(120, 100%, 40%);">+ enum gsm_band band;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm_arfcn2band_rc(cs->arfcn, &band);</span><br><span> </span><br><span> /* already assigned */</span><br><span> if (rr->wait_assign == 2)</span><br><span>@@ -1657,8 +1660,7 @@</span><br><span> if (set->alter_tx_power) {</span><br><span> tx_power = set->alter_tx_power_value;</span><br><span> LOGP(DRR, LOGL_INFO, "Use alternative tx-power %d (%d dBm)\n",</span><br><span style="color: hsl(0, 100%, 40%);">- tx_power,</span><br><span style="color: hsl(0, 100%, 40%);">- ms_pwr_dbm(gsm_arfcn2band(cs->arfcn), tx_power));</span><br><span style="color: hsl(120, 100%, 40%);">+ tx_power, ms_pwr_dbm(band, tx_power));</span><br><span> } else {</span><br><span> tx_power = s->ms_txpwr_max_cch;</span><br><span> /* power offset in case of DCS1800 */</span><br><span>@@ -1666,15 +1668,12 @@</span><br><span> && (cs->arfcn & 1023) <= 885) {</span><br><span> LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value "</span><br><span> "%d (%d dBm) with offset %d dBm\n", tx_power,</span><br><span style="color: hsl(0, 100%, 40%);">- ms_pwr_dbm(gsm_arfcn2band(cs->arfcn), tx_power),</span><br><span style="color: hsl(0, 100%, 40%);">- s->po_value * 2);</span><br><span style="color: hsl(120, 100%, 40%);">+ ms_pwr_dbm(band, tx_power), s->po_value * 2);</span><br><span> /* use reserved bits 7,8 for offset (+ X * 2dB) */</span><br><span> tx_power |= s->po_value << 6;</span><br><span> } else</span><br><span> LOGP(DRR, LOGL_INFO, "Use MS-TXPWR-MAX-CCH power value "</span><br><span style="color: hsl(0, 100%, 40%);">- "%d (%d dBm)\n", tx_power,</span><br><span style="color: hsl(0, 100%, 40%);">- ms_pwr_dbm(gsm_arfcn2band(cs->arfcn),</span><br><span style="color: hsl(0, 100%, 40%);">- tx_power));</span><br><span style="color: hsl(120, 100%, 40%);">+ "%d (%d dBm)\n", tx_power, ms_pwr_dbm(band, tx_power));</span><br><span> }</span><br><span> ncch->data[7] = tx_power;</span><br><span> </span><br><span>diff --git a/src/host/layer23/src/mobile/subscriber.c b/src/host/layer23/src/mobile/subscriber.c</span><br><span>index e1e6331..b2eacc5 100644</span><br><span>--- a/src/host/layer23/src/mobile/subscriber.c</span><br><span>+++ b/src/host/layer23/src/mobile/subscriber.c</span><br><span>@@ -348,9 +348,9 @@</span><br><span> strcpy(subscr->sms_sca, "+");</span><br><span> if (((smsp->ts_sca[1] & 0x70) >> 4) == 2)</span><br><span> strcpy(subscr->sms_sca, "0");</span><br><span style="color: hsl(0, 100%, 40%);">- gsm48_decode_bcd_number(subscr->sms_sca +</span><br><span style="color: hsl(0, 100%, 40%);">- strlen(subscr->sms_sca), sizeof(subscr->sms_sca)</span><br><span style="color: hsl(0, 100%, 40%);">- - strlen(subscr->sms_sca), smsp->ts_sca, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm48_decode_bcd_number2(subscr->sms_sca + strlen(subscr->sms_sca),</span><br><span style="color: hsl(120, 100%, 40%);">+ sizeof(subscr->sms_sca) - strlen(subscr->sms_sca),</span><br><span style="color: hsl(120, 100%, 40%);">+ smsp->ts_sca, sizeof(smsp->ts_sca), 1);</span><br><span> }</span><br><span> </span><br><span> LOGP(DMM, LOGL_INFO, "received SMSP from SIM (sca=%s)\n",</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14136">change 14136</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/14136"/><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: I03918bd864c711b377a795186123c85bb6f4dc4a </div>
<div style="display:none"> Gerrit-Change-Number: 14136 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>