<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24503">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Drop duplicated arfcn_range_encode.c available in libosmocore<br><br>This code is available in libosmocore since ~3 years ago<br>(fdf8b7b1beeb0cda262c5fb060a933aa7edb5e9a). Let's use it instead of<br>maintaining duplicated code which diverges over time.<br><br>Depends: osmo-bsc.git Iae058c35506bc25c9f4790889b89ac46aea664b6<br>(contains cherry-pick of bug fixed in osmo-bsc.git).<br><br>Change-Id: I53ad3067623077b6a8737c2a0aecc8b46bf71a15<br>---<br>M include/osmocom/bsc/Makefile.am<br>D include/osmocom/bsc/arfcn_range_encode.h<br>M include/osmocom/bsc/system_information.h<br>M src/osmo-bsc/Makefile.am<br>D src/osmo-bsc/arfcn_range_encode.c<br>M src/osmo-bsc/system_information.c<br>M tests/bsc/Makefile.am<br>M tests/gsm0408/Makefile.am<br>M tests/gsm0408/gsm0408_test.c<br>M tests/gsm0408/gsm0408_test.ok<br>M tests/handover/Makefile.am<br>11 files changed, 18 insertions(+), 783 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/Makefile.am b/include/osmocom/bsc/Makefile.am</span><br><span>index 7ca99fa..be27dae 100644</span><br><span>--- a/include/osmocom/bsc/Makefile.am</span><br><span>+++ b/include/osmocom/bsc/Makefile.am</span><br><span>@@ -4,7 +4,6 @@</span><br><span> abis_om2000.h \</span><br><span> abis_rsl.h \</span><br><span> acc.h \</span><br><span style="color: hsl(0, 100%, 40%);">- arfcn_range_encode.h \</span><br><span> assignment_fsm.h \</span><br><span> bsc_rll.h \</span><br><span> bsc_subscriber.h \</span><br><span>diff --git a/include/osmocom/bsc/arfcn_range_encode.h b/include/osmocom/bsc/arfcn_range_encode.h</span><br><span>deleted file mode 100644</span><br><span>index 7ec710c..0000000</span><br><span>--- a/include/osmocom/bsc/arfcn_range_encode.h</span><br><span>+++ /dev/null</span><br><span>@@ -1,26 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#ifndef ARFCN_RANGE_ENCODE_H</span><br><span style="color: hsl(0, 100%, 40%);">-#define ARFCN_RANGE_ENCODE_H</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <stdint.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-enum gsm48_range {</span><br><span style="color: hsl(0, 100%, 40%);">- ARFCN_RANGE_INVALID = -1,</span><br><span style="color: hsl(0, 100%, 40%);">- ARFCN_RANGE_128 = 127,</span><br><span style="color: hsl(0, 100%, 40%);">- ARFCN_RANGE_256 = 255,</span><br><span style="color: hsl(0, 100%, 40%);">- ARFCN_RANGE_512 = 511,</span><br><span style="color: hsl(0, 100%, 40%);">- ARFCN_RANGE_1024 = 1023,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#define RANGE_ENC_MAX_ARFCNS 29</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int range_enc_determine_range(const int *arfcns, int size, int *f0_out);</span><br><span style="color: hsl(0, 100%, 40%);">-int range_enc_arfcns(enum gsm48_range rng, const int *arfcns, int sze, int *out, int idx);</span><br><span style="color: hsl(0, 100%, 40%);">-int range_enc_find_index(enum gsm48_range rng, const int *arfcns, int size);</span><br><span style="color: hsl(0, 100%, 40%);">-int range_enc_filter_arfcns(int *arfcns, const int sze, const int f0, int *f0_included);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int range_enc_range128(uint8_t *chan_list, int f0, int *w);</span><br><span style="color: hsl(0, 100%, 40%);">-int range_enc_range256(uint8_t *chan_list, int f0, int *w);</span><br><span style="color: hsl(0, 100%, 40%);">-int range_enc_range512(uint8_t *chan_list, int f0, int *w);</span><br><span style="color: hsl(0, 100%, 40%);">-int range_enc_range1024(uint8_t *chan_list, int f0, int f0_incl, int *w);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span>diff --git a/include/osmocom/bsc/system_information.h b/include/osmocom/bsc/system_information.h</span><br><span>index e86a349..08d34f8 100644</span><br><span>--- a/include/osmocom/bsc/system_information.h</span><br><span>+++ b/include/osmocom/bsc/system_information.h</span><br><span>@@ -3,7 +3,7 @@</span><br><span> </span><br><span> #include <osmocom/gsm/sysinfo.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/bsc/arfcn_range_encode.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsm/gsm48_arfcn_range_encode.h></span><br><span> </span><br><span> struct gsm_bts;</span><br><span> </span><br><span>@@ -13,7 +13,7 @@</span><br><span> size_t si2q_earfcn_count(const struct osmo_earfcn_si2q *e);</span><br><span> unsigned range1024_p(unsigned n);</span><br><span> unsigned range512_q(unsigned m);</span><br><span style="color: hsl(0, 100%, 40%);">-int range_encode(enum gsm48_range r, int *arfcns, int arfcns_used, int *w,</span><br><span style="color: hsl(120, 100%, 40%);">+int range_encode(enum osmo_gsm48_range r, int *arfcns, int arfcns_used, int *w,</span><br><span> int f0, uint8_t *chan_list);</span><br><span> uint8_t si2q_num(struct gsm_bts *bts);</span><br><span> int bts_earfcn_add(struct gsm_bts *bts, uint16_t earfcn, uint8_t thresh_hi, uint8_t thresh_lo, uint8_t prio,</span><br><span>diff --git a/src/osmo-bsc/Makefile.am b/src/osmo-bsc/Makefile.am</span><br><span>index ca39825..f91c6bf 100644</span><br><span>--- a/src/osmo-bsc/Makefile.am</span><br><span>+++ b/src/osmo-bsc/Makefile.am</span><br><span>@@ -33,7 +33,6 @@</span><br><span> abis_om2000_vty.c \</span><br><span> abis_rsl.c \</span><br><span> acc.c \</span><br><span style="color: hsl(0, 100%, 40%);">- arfcn_range_encode.c \</span><br><span> assignment_fsm.c \</span><br><span> bsc_ctrl_commands.c \</span><br><span> bsc_ctrl_lookup.c \</span><br><span>diff --git a/src/osmo-bsc/arfcn_range_encode.c b/src/osmo-bsc/arfcn_range_encode.c</span><br><span>deleted file mode 100644</span><br><span>index 54d98a9..0000000</span><br><span>--- a/src/osmo-bsc/arfcn_range_encode.c</span><br><span>+++ /dev/null</span><br><span>@@ -1,340 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-/* gsm 04.08 system information (si) encoding and decoding</span><br><span style="color: hsl(0, 100%, 40%);">- * 3gpp ts 04.08 version 7.21.0 release 1998 / etsi ts 100 940 v7.21.0 */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/*</span><br><span style="color: hsl(0, 100%, 40%);">- * (C) 2012 Holger Hans Peter Freyther</span><br><span style="color: hsl(0, 100%, 40%);">- * (C) 2012 by On-Waves</span><br><span style="color: hsl(0, 100%, 40%);">- * All Rights Reserved</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(0, 100%, 40%);">- * it under the terms of the GNU Affero General Public License as published by</span><br><span style="color: hsl(0, 100%, 40%);">- * the Free Software Foundation; either version 3 of the License, or</span><br><span style="color: hsl(0, 100%, 40%);">- * (at your option) any later version.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(0, 100%, 40%);">- * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(0, 100%, 40%);">- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(0, 100%, 40%);">- * GNU Affero General Public License for more details.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * You should have received a copy of the GNU Affero General Public License</span><br><span style="color: hsl(0, 100%, 40%);">- * along with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/bsc/arfcn_range_encode.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/bsc/debug.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/gsm/protocol/gsm_04_08.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/core/utils.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <errno.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static inline int greatest_power_of_2_lesser_or_equal_to(int index)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int power_of_2 = 1;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- do {</span><br><span style="color: hsl(0, 100%, 40%);">- power_of_2 *= 2;</span><br><span style="color: hsl(0, 100%, 40%);">- } while (power_of_2 <= index);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* now go back one step */</span><br><span style="color: hsl(0, 100%, 40%);">- return power_of_2 / 2;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static inline int mod(int data, int range)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int res = data % range;</span><br><span style="color: hsl(0, 100%, 40%);">- while (res < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- res += range;</span><br><span style="color: hsl(0, 100%, 40%);">- return res;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/**</span><br><span style="color: hsl(0, 100%, 40%);">- * Determine at which index to split the ARFCNs to create an</span><br><span style="color: hsl(0, 100%, 40%);">- * equally size partition for the given range. Return -1 if</span><br><span style="color: hsl(0, 100%, 40%);">- * no such partition exists.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-int range_enc_find_index(enum gsm48_range range, const int *freqs, const int size)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int i, j, n;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- const int RANGE_DELTA = (range - 1) / 2;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < size; ++i) {</span><br><span style="color: hsl(0, 100%, 40%);">- n = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- for (j = 0; j < size; ++j) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (mod(freqs[j] - freqs[i], range) <= RANGE_DELTA)</span><br><span style="color: hsl(0, 100%, 40%);">- n += 1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (n - 1 == (size - 1) / 2)</span><br><span style="color: hsl(0, 100%, 40%);">- return i;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* Worker for range_enc_arfcns(), do not call directly. */</span><br><span style="color: hsl(0, 100%, 40%);">-int _range_enc_arfcns(enum gsm48_range range,</span><br><span style="color: hsl(0, 100%, 40%);">- const int *arfcns, int size, int *out,</span><br><span style="color: hsl(0, 100%, 40%);">- const int index)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int split_at;</span><br><span style="color: hsl(0, 100%, 40%);">- int i;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /*</span><br><span style="color: hsl(0, 100%, 40%);">- * The below is a GNU extension and we can remove it when</span><br><span style="color: hsl(0, 100%, 40%);">- * we move to a quicksort like in-situ swap with the pivot.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">- int arfcns_left[size / 2];</span><br><span style="color: hsl(0, 100%, 40%);">- int arfcns_right[size / 2];</span><br><span style="color: hsl(0, 100%, 40%);">- int l_size;</span><br><span style="color: hsl(0, 100%, 40%);">- int r_size;</span><br><span style="color: hsl(0, 100%, 40%);">- int l_origin;</span><br><span style="color: hsl(0, 100%, 40%);">- int r_origin;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Now do the processing */</span><br><span style="color: hsl(0, 100%, 40%);">- split_at = range_enc_find_index(range, arfcns, size);</span><br><span style="color: hsl(0, 100%, 40%);">- if (split_at < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* we now know where to split */</span><br><span style="color: hsl(0, 100%, 40%);">- out[index] = 1 + arfcns[split_at];</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* calculate the work that needs to be done for the leafs */</span><br><span style="color: hsl(0, 100%, 40%);">- l_origin = mod(arfcns[split_at] + ((range - 1) / 2) + 1, range);</span><br><span style="color: hsl(0, 100%, 40%);">- r_origin = mod(arfcns[split_at] + 1, range);</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0, l_size = 0, r_size = 0; i < size; ++i) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (mod(arfcns[i] - l_origin, range) < range / 2)</span><br><span style="color: hsl(0, 100%, 40%);">- arfcns_left[l_size++] = mod(arfcns[i] - l_origin, range);</span><br><span style="color: hsl(0, 100%, 40%);">- if (mod(arfcns[i] - r_origin, range) < range / 2)</span><br><span style="color: hsl(0, 100%, 40%);">- arfcns_right[r_size++] = mod(arfcns[i] - r_origin, range);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /*</span><br><span style="color: hsl(0, 100%, 40%);">- * Now recurse and we need to make this iterative... but as the</span><br><span style="color: hsl(0, 100%, 40%);">- * tree is balanced the stack will not be too deep.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">- if (l_size)</span><br><span style="color: hsl(0, 100%, 40%);">- range_enc_arfcns(range / 2, arfcns_left, l_size,</span><br><span style="color: hsl(0, 100%, 40%);">- out, index + greatest_power_of_2_lesser_or_equal_to(index + 1));</span><br><span style="color: hsl(0, 100%, 40%);">- if (r_size)</span><br><span style="color: hsl(0, 100%, 40%);">- range_enc_arfcns((range - 1) / 2, arfcns_right, r_size,</span><br><span style="color: hsl(0, 100%, 40%);">- out, index + (2 * greatest_power_of_2_lesser_or_equal_to(index + 1)));</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 style="color: hsl(0, 100%, 40%);">-/**</span><br><span style="color: hsl(0, 100%, 40%);">- * Range encode the ARFCN list.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param range The range to use.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param arfcns The list of ARFCNs</span><br><span style="color: hsl(0, 100%, 40%);">- * \param size The size of the list of ARFCNs</span><br><span style="color: hsl(0, 100%, 40%);">- * \param out Place to store the W(i) output.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-int range_enc_arfcns(enum gsm48_range range,</span><br><span style="color: hsl(0, 100%, 40%);">- const int *arfcns, int size, int *out,</span><br><span style="color: hsl(0, 100%, 40%);">- const int index)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- if (size <= 0)</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%);">- if (size == 1) {</span><br><span style="color: hsl(0, 100%, 40%);">- out[index] = 1 + arfcns[0];</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 style="color: hsl(0, 100%, 40%);">- return _range_enc_arfcns(range, arfcns, size, out, index);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/*</span><br><span style="color: hsl(0, 100%, 40%);">- * The easiest is to use f0 == arfcns[0]. This means that under certain</span><br><span style="color: hsl(0, 100%, 40%);">- * circumstances we can encode less ARFCNs than possible with an optimal f0.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * TODO: Solve the optimisation problem and pick f0 so that the max distance</span><br><span style="color: hsl(0, 100%, 40%);">- * is the smallest. Taking into account the modulo operation. I think picking</span><br><span style="color: hsl(0, 100%, 40%);">- * size/2 will be the optimal arfcn.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-/**</span><br><span style="color: hsl(0, 100%, 40%);">- * This implements the range determination as described in GSM 04.08 J4. The</span><br><span style="color: hsl(0, 100%, 40%);">- * result will be a base frequency f0 and the range to use. Note that for range</span><br><span style="color: hsl(0, 100%, 40%);">- * 1024 encoding f0 always refers to ARFCN 0 even if it is not an element of</span><br><span style="color: hsl(0, 100%, 40%);">- * the arfcns list.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] arfcns The input frequencies, they must be sorted, lowest number first</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] size The length of the array</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[out] f0 The selected F0 base frequency. It might not be inside the list</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-int range_enc_determine_range(const int *arfcns, const int size, int *f0)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int max = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* don't dereference arfcns[] array if size is 0 */</span><br><span style="color: hsl(0, 100%, 40%);">- if (size == 0)</span><br><span style="color: hsl(0, 100%, 40%);">- return ARFCN_RANGE_128;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /*</span><br><span style="color: hsl(0, 100%, 40%);">- * Go for the easiest. And pick arfcns[0] == f0.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">- max = arfcns[size - 1] - arfcns[0];</span><br><span style="color: hsl(0, 100%, 40%);">- *f0 = arfcns[0];</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (max < 128 && size <= 29)</span><br><span style="color: hsl(0, 100%, 40%);">- return ARFCN_RANGE_128;</span><br><span style="color: hsl(0, 100%, 40%);">- if (max < 256 && size <= 22)</span><br><span style="color: hsl(0, 100%, 40%);">- return ARFCN_RANGE_256;</span><br><span style="color: hsl(0, 100%, 40%);">- if (max < 512 && size <= 18)</span><br><span style="color: hsl(0, 100%, 40%);">- return ARFCN_RANGE_512;</span><br><span style="color: hsl(0, 100%, 40%);">- if (max < 1024 && size <= 17) {</span><br><span style="color: hsl(0, 100%, 40%);">- *f0 = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- return ARFCN_RANGE_1024;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return ARFCN_RANGE_INVALID;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static void write_orig_arfcn(uint8_t *chan_list, int f0)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- chan_list[0] |= (f0 >> 9) & 1;</span><br><span style="color: hsl(0, 100%, 40%);">- chan_list[1] = (f0 >> 1);</span><br><span style="color: hsl(0, 100%, 40%);">- chan_list[2] = (f0 & 1) << 7;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static void write_all_wn(uint8_t *chan_list, int bit_offs,</span><br><span style="color: hsl(0, 100%, 40%);">- int *w, int w_size, int w1_len)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int octet_offs = 0; /* offset into chan_list */</span><br><span style="color: hsl(0, 100%, 40%);">- int wk_len = w1_len; /* encoding size in bits of w[k] */</span><br><span style="color: hsl(0, 100%, 40%);">- int k; /* 1 based */</span><br><span style="color: hsl(0, 100%, 40%);">- int level = 0; /* tree level, top level = 0 */</span><br><span style="color: hsl(0, 100%, 40%);">- int lvl_left = 1; /* nodes per tree level */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* W(2^i) to W(2^(i+1)-1) are on w1_len-i bits when present */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (k = 1; k <= w_size; k++) {</span><br><span style="color: hsl(0, 100%, 40%);">- int wk_left = wk_len;</span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DRR,</span><br><span style="color: hsl(0, 100%, 40%);">- "k=%d, wk_len=%d, offs=%d:%d, level=%d, "</span><br><span style="color: hsl(0, 100%, 40%);">- "lvl_left=%d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- k, wk_len, octet_offs, bit_offs, level, lvl_left);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- while (wk_left > 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- int cur_bits = 8 - bit_offs;</span><br><span style="color: hsl(0, 100%, 40%);">- int cur_mask;</span><br><span style="color: hsl(0, 100%, 40%);">- int wk_slice;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (cur_bits > wk_left)</span><br><span style="color: hsl(0, 100%, 40%);">- cur_bits = wk_left;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- cur_mask = ((1 << cur_bits) - 1);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DRR,</span><br><span style="color: hsl(0, 100%, 40%);">- " wk_left=%d, cur_bits=%d, offs=%d:%d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- wk_left, cur_bits, octet_offs, bit_offs);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* advance */</span><br><span style="color: hsl(0, 100%, 40%);">- wk_left -= cur_bits;</span><br><span style="color: hsl(0, 100%, 40%);">- bit_offs += cur_bits;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* right aligned wk data for current out octet */</span><br><span style="color: hsl(0, 100%, 40%);">- wk_slice = (w[k-1] >> wk_left) & cur_mask;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* cur_bits now contains the number of bits</span><br><span style="color: hsl(0, 100%, 40%);">- * that are to be copied from wk to the chan_list.</span><br><span style="color: hsl(0, 100%, 40%);">- * wk_left is set to the number of bits that must</span><br><span style="color: hsl(0, 100%, 40%);">- * not yet be copied.</span><br><span style="color: hsl(0, 100%, 40%);">- * bit_offs points after the bit area that is going to</span><br><span style="color: hsl(0, 100%, 40%);">- * be overwritten:</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * wk_left</span><br><span style="color: hsl(0, 100%, 40%);">- * |</span><br><span style="color: hsl(0, 100%, 40%);">- * v</span><br><span style="color: hsl(0, 100%, 40%);">- * wk: WWWWWWWWWWW</span><br><span style="color: hsl(0, 100%, 40%);">- * |||||<-- wk_slice, cur_bits=5</span><br><span style="color: hsl(0, 100%, 40%);">- * --WWWWW-</span><br><span style="color: hsl(0, 100%, 40%);">- * ^</span><br><span style="color: hsl(0, 100%, 40%);">- * |</span><br><span style="color: hsl(0, 100%, 40%);">- * bit_offs</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DRR,</span><br><span style="color: hsl(0, 100%, 40%);">- " wk=%02x, slice=%02x/%02x, cl=%02x\n",</span><br><span style="color: hsl(0, 100%, 40%);">- w[k-1], wk_slice, cur_mask, wk_slice << (8 - bit_offs));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- chan_list[octet_offs] &= ~(cur_mask << (8 - bit_offs));</span><br><span style="color: hsl(0, 100%, 40%);">- chan_list[octet_offs] |= wk_slice << (8 - bit_offs);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* adjust output */</span><br><span style="color: hsl(0, 100%, 40%);">- if (bit_offs == 8) {</span><br><span style="color: hsl(0, 100%, 40%);">- bit_offs = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- octet_offs += 1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* adjust bit sizes */</span><br><span style="color: hsl(0, 100%, 40%);">- lvl_left -= 1;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!lvl_left) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* completed tree level, advance to next */</span><br><span style="color: hsl(0, 100%, 40%);">- level += 1;</span><br><span style="color: hsl(0, 100%, 40%);">- lvl_left = 1 << level;</span><br><span style="color: hsl(0, 100%, 40%);">- wk_len -= 1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int range_enc_range128(uint8_t *chan_list, int f0, int *w)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- chan_list[0] = 0x8C;</span><br><span style="color: hsl(0, 100%, 40%);">- write_orig_arfcn(chan_list, f0);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- write_all_wn(&chan_list[2], 1, w, 28, 7);</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 style="color: hsl(0, 100%, 40%);">-int range_enc_range256(uint8_t *chan_list, int f0, int *w)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- chan_list[0] = 0x8A;</span><br><span style="color: hsl(0, 100%, 40%);">- write_orig_arfcn(chan_list, f0);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- write_all_wn(&chan_list[2], 1, w, 21, 8);</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 style="color: hsl(0, 100%, 40%);">-int range_enc_range512(uint8_t *chan_list, int f0, int *w)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- chan_list[0] = 0x88;</span><br><span style="color: hsl(0, 100%, 40%);">- write_orig_arfcn(chan_list, f0);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- write_all_wn(&chan_list[2], 1, w, 17, 9);</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 style="color: hsl(0, 100%, 40%);">-int range_enc_range1024(uint8_t *chan_list, int f0, int f0_included, int *w)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- chan_list[0] = 0x80 | (f0_included << 2);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- write_all_wn(&chan_list[0], 6, w, 16, 10);</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 style="color: hsl(0, 100%, 40%);">-int range_enc_filter_arfcns(int *arfcns,</span><br><span style="color: hsl(0, 100%, 40%);">- const int size, const int f0, int *f0_included)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int i, j = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- *f0_included = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < size; ++i) {</span><br><span style="color: hsl(0, 100%, 40%);">- /*</span><br><span style="color: hsl(0, 100%, 40%);">- * Appendix J.4 says the following:</span><br><span style="color: hsl(0, 100%, 40%);">- * All frequencies except F(0), minus F(0) + 1.</span><br><span style="color: hsl(0, 100%, 40%);">- * I assume we need to exclude it here.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">- if (arfcns[i] == f0) {</span><br><span style="color: hsl(0, 100%, 40%);">- *f0_included = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- arfcns[j++] = mod(arfcns[i] - (f0 + 1), 1024);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return j;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span>diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c</span><br><span>index eddc650..21cbcae 100644</span><br><span>--- a/src/osmo-bsc/system_information.c</span><br><span>+++ b/src/osmo-bsc/system_information.c</span><br><span>@@ -33,11 +33,11 @@</span><br><span> #include <osmocom/gsm/gsm48_ie.h></span><br><span> #include <osmocom/gsm/gsm48_rest_octets.h></span><br><span> #include <osmocom/gsm/gsm48.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsm/gsm48_arfcn_range_encode.h></span><br><span> </span><br><span> #include <osmocom/bsc/debug.h></span><br><span> #include <osmocom/bsc/gsm_data.h></span><br><span> #include <osmocom/bsc/abis_rsl.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/bsc/arfcn_range_encode.h></span><br><span> #include <osmocom/bsc/gsm_04_08_rr.h></span><br><span> #include <osmocom/bsc/acc.h></span><br><span> #include <osmocom/bsc/neighbor_ident.h></span><br><span>@@ -431,7 +431,7 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int range_encode(enum gsm48_range r, int *arfcns, int arfcns_used, int *w,</span><br><span style="color: hsl(120, 100%, 40%);">+int range_encode(enum osmo_gsm48_range r, int *arfcns, int arfcns_used, int *w,</span><br><span> int f0, uint8_t *chan_list)</span><br><span> {</span><br><span> /*</span><br><span>@@ -440,22 +440,22 @@</span><br><span> */</span><br><span> int rc, f0_included;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- range_enc_filter_arfcns(arfcns, arfcns_used, f0, &f0_included);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsm48_range_enc_filter_arfcns(arfcns, arfcns_used, f0, &f0_included);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = range_enc_arfcns(r, arfcns, arfcns_used, w, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_gsm48_range_enc_arfcns(r, arfcns, arfcns_used, w, 0);</span><br><span> if (rc < 0)</span><br><span> return rc;</span><br><span> </span><br><span> /* Select the range and the amount of bits needed */</span><br><span> switch (r) {</span><br><span style="color: hsl(0, 100%, 40%);">- case ARFCN_RANGE_128:</span><br><span style="color: hsl(0, 100%, 40%);">- return range_enc_range128(chan_list, f0, w);</span><br><span style="color: hsl(0, 100%, 40%);">- case ARFCN_RANGE_256:</span><br><span style="color: hsl(0, 100%, 40%);">- return range_enc_range256(chan_list, f0, w);</span><br><span style="color: hsl(0, 100%, 40%);">- case ARFCN_RANGE_512:</span><br><span style="color: hsl(0, 100%, 40%);">- return range_enc_range512(chan_list, f0, w);</span><br><span style="color: hsl(0, 100%, 40%);">- case ARFCN_RANGE_1024:</span><br><span style="color: hsl(0, 100%, 40%);">- return range_enc_range1024(chan_list, f0, f0_included, w);</span><br><span style="color: hsl(120, 100%, 40%);">+ case OSMO_GSM48_ARFCN_RANGE_128:</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_gsm48_range_enc_128(chan_list, f0, w);</span><br><span style="color: hsl(120, 100%, 40%);">+ case OSMO_GSM48_ARFCN_RANGE_256:</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_gsm48_range_enc_256(chan_list, f0, w);</span><br><span style="color: hsl(120, 100%, 40%);">+ case OSMO_GSM48_ARFCN_RANGE_512:</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_gsm48_range_enc_512(chan_list, f0, w);</span><br><span style="color: hsl(120, 100%, 40%);">+ case OSMO_GSM48_ARFCN_RANGE_1024:</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_gsm48_range_enc_1024(chan_list, f0, f0_included, w);</span><br><span> default:</span><br><span> return -ERANGE;</span><br><span> };</span><br><span>@@ -468,8 +468,8 @@</span><br><span> const struct bitvec *bv, const struct gsm_bts *bts,</span><br><span> bool bis, bool ter, bool pgsm)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- int arfcns[RANGE_ENC_MAX_ARFCNS];</span><br><span style="color: hsl(0, 100%, 40%);">- int w[RANGE_ENC_MAX_ARFCNS];</span><br><span style="color: hsl(120, 100%, 40%);">+ int arfcns[OSMO_GSM48_RANGE_ENC_MAX_ARFCNS];</span><br><span style="color: hsl(120, 100%, 40%);">+ int w[OSMO_GSM48_RANGE_ENC_MAX_ARFCNS];</span><br><span> int arfcns_used = 0;</span><br><span> int i, range, f0;</span><br><span> </span><br><span>@@ -488,8 +488,8 @@</span><br><span> /*</span><br><span> * Check if the given list of ARFCNs can be encoded.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">- range = range_enc_determine_range(arfcns, arfcns_used, &f0);</span><br><span style="color: hsl(0, 100%, 40%);">- if (range == ARFCN_RANGE_INVALID)</span><br><span style="color: hsl(120, 100%, 40%);">+ range = osmo_gsm48_range_enc_determine_range(arfcns, arfcns_used, &f0);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (range == OSMO_GSM48_ARFCN_RANGE_INVALID)</span><br><span> return -2;</span><br><span> </span><br><span> memset(w, 0, sizeof(w));</span><br><span>diff --git a/tests/bsc/Makefile.am b/tests/bsc/Makefile.am</span><br><span>index 2cc57a4..d08ca18 100644</span><br><span>--- a/tests/bsc/Makefile.am</span><br><span>+++ b/tests/bsc/Makefile.am</span><br><span>@@ -36,7 +36,6 @@</span><br><span> bsc_test_LDADD = \</span><br><span> $(top_builddir)/src/osmo-bsc/abis_nm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/acc.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/arfcn_range_encode.o \</span><br><span> $(top_builddir)/src/osmo-bsc/osmo_bsc_filter.o \</span><br><span> $(top_builddir)/src/osmo-bsc/bsc_subscriber.o \</span><br><span> $(top_builddir)/src/osmo-bsc/bts.o \</span><br><span>diff --git a/tests/gsm0408/Makefile.am b/tests/gsm0408/Makefile.am</span><br><span>index 571e7e6..271a0fd 100644</span><br><span>--- a/tests/gsm0408/Makefile.am</span><br><span>+++ b/tests/gsm0408/Makefile.am</span><br><span>@@ -27,7 +27,6 @@</span><br><span> $(top_builddir)/src/osmo-bsc/abis_nm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/acc.o \</span><br><span> $(top_builddir)/src/osmo-bsc/gsm_04_08_rr.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/arfcn_range_encode.o \</span><br><span> $(top_builddir)/src/osmo-bsc/bts.o \</span><br><span> $(top_builddir)/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.o \</span><br><span> $(top_builddir)/src/osmo-bsc/bts_sm.o \</span><br><span>diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c</span><br><span>index 7c92c36..4255ab2 100644</span><br><span>--- a/tests/gsm0408/gsm0408_test.c</span><br><span>+++ b/tests/gsm0408/gsm0408_test.c</span><br><span>@@ -26,7 +26,6 @@</span><br><span> </span><br><span> #include <osmocom/bsc/gsm_data.h></span><br><span> #include <osmocom/bsc/debug.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/bsc/arfcn_range_encode.h></span><br><span> #include <osmocom/bsc/system_information.h></span><br><span> #include <osmocom/bsc/abis_rsl.h></span><br><span> #include <osmocom/bsc/bts.h></span><br><span>@@ -274,338 +273,6 @@</span><br><span> bts_del(bts);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct {</span><br><span style="color: hsl(0, 100%, 40%);">- int range;</span><br><span style="color: hsl(0, 100%, 40%);">- int arfcns_num;</span><br><span style="color: hsl(0, 100%, 40%);">- int arfcns[RANGE_ENC_MAX_ARFCNS];</span><br><span style="color: hsl(0, 100%, 40%);">-} arfcn_test_ranges[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- {ARFCN_RANGE_512, 12,</span><br><span style="color: hsl(0, 100%, 40%);">- { 1, 12, 31, 51, 57, 91, 97, 98, 113, 117, 120, 125 }},</span><br><span style="color: hsl(0, 100%, 40%);">- {ARFCN_RANGE_512, 17,</span><br><span style="color: hsl(0, 100%, 40%);">- { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 }},</span><br><span style="color: hsl(0, 100%, 40%);">- {ARFCN_RANGE_512, 18,</span><br><span style="color: hsl(0, 100%, 40%);">- { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18 }},</span><br><span style="color: hsl(0, 100%, 40%);">- {ARFCN_RANGE_512, 18,</span><br><span style="color: hsl(0, 100%, 40%);">- { 1, 17, 31, 45, 58, 79, 81, 97,</span><br><span style="color: hsl(0, 100%, 40%);">- 113, 127, 213, 277, 287, 311, 331, 391,</span><br><span style="color: hsl(0, 100%, 40%);">- 417, 511 }},</span><br><span style="color: hsl(0, 100%, 40%);">- {ARFCN_RANGE_512, 6,</span><br><span style="color: hsl(0, 100%, 40%);">- { 1, 17, 31, 45, 58, 79 }},</span><br><span style="color: hsl(0, 100%, 40%);">- {ARFCN_RANGE_512, 6,</span><br><span style="color: hsl(0, 100%, 40%);">- { 10, 17, 31, 45, 58, 79 }},</span><br><span style="color: hsl(0, 100%, 40%);">- {ARFCN_RANGE_1024, 17,</span><br><span style="color: hsl(0, 100%, 40%);">- { 0, 17, 31, 45, 58, 79, 81, 97,</span><br><span style="color: hsl(0, 100%, 40%);">- 113, 127, 213, 277, 287, 311, 331, 391,</span><br><span style="color: hsl(0, 100%, 40%);">- 1023 }},</span><br><span style="color: hsl(0, 100%, 40%);">- {ARFCN_RANGE_1024, 16,</span><br><span style="color: hsl(0, 100%, 40%);">- { 17, 31, 45, 58, 79, 81, 97, 113,</span><br><span style="color: hsl(0, 100%, 40%);">- 127, 213, 277, 287, 311, 331, 391, 1023 }},</span><br><span style="color: hsl(0, 100%, 40%);">- {-1}</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static int test_single_range_encoding(int range, const int *orig_arfcns,</span><br><span style="color: hsl(0, 100%, 40%);">- int arfcns_num, int silent)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int arfcns[RANGE_ENC_MAX_ARFCNS];</span><br><span style="color: hsl(0, 100%, 40%);">- int w[RANGE_ENC_MAX_ARFCNS];</span><br><span style="color: hsl(0, 100%, 40%);">- int f0_included = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- int rc, f0;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t chan_list[16] = {0};</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_sysinfo_freq dec_freq[1024] = {{0}};</span><br><span style="color: hsl(0, 100%, 40%);">- int dec_arfcns[RANGE_ENC_MAX_ARFCNS] = {0};</span><br><span style="color: hsl(0, 100%, 40%);">- int dec_arfcns_count = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- int arfcns_used = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- int i;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- arfcns_used = arfcns_num;</span><br><span style="color: hsl(0, 100%, 40%);">- memmove(arfcns, orig_arfcns, sizeof(arfcns));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- f0 = range == ARFCN_RANGE_1024 ? 0 : arfcns[0];</span><br><span style="color: hsl(0, 100%, 40%);">- /*</span><br><span style="color: hsl(0, 100%, 40%);">- * Manipulate the ARFCN list according to the rules in J4 depending</span><br><span style="color: hsl(0, 100%, 40%);">- * on the selected range.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">- arfcns_used = range_enc_filter_arfcns(arfcns, arfcns_used,</span><br><span style="color: hsl(0, 100%, 40%);">- f0, &f0_included);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- memset(w, 0, sizeof(w));</span><br><span style="color: hsl(0, 100%, 40%);">- range_enc_arfcns(range, arfcns, arfcns_used, w, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!silent)</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "range=%d, arfcns_used=%d, f0=%d, f0_included=%d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- range, arfcns_used, f0, f0_included);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Select the range and the amount of bits needed */</span><br><span style="color: hsl(0, 100%, 40%);">- switch (range) {</span><br><span style="color: hsl(0, 100%, 40%);">- case ARFCN_RANGE_128:</span><br><span style="color: hsl(0, 100%, 40%);">- range_enc_range128(chan_list, f0, w);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case ARFCN_RANGE_256:</span><br><span style="color: hsl(0, 100%, 40%);">- range_enc_range256(chan_list, f0, w);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case ARFCN_RANGE_512:</span><br><span style="color: hsl(0, 100%, 40%);">- range_enc_range512(chan_list, f0, w);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case ARFCN_RANGE_1024:</span><br><span style="color: hsl(0, 100%, 40%);">- range_enc_range1024(chan_list, f0, f0_included, w);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- return 1;</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!silent)</span><br><span style="color: hsl(0, 100%, 40%);">- printf("chan_list = %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_hexdump(chan_list, sizeof(chan_list)));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- rc = gsm48_decode_freq_list(dec_freq, chan_list, sizeof(chan_list),</span><br><span style="color: hsl(0, 100%, 40%);">- 0xfe, 1);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc != 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Cannot decode freq list, rc = %d\n", rc);</span><br><span style="color: hsl(0, 100%, 40%);">- return 1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < ARRAY_SIZE(dec_freq); i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (dec_freq[i].mask &&</span><br><span style="color: hsl(0, 100%, 40%);">- dec_arfcns_count < ARRAY_SIZE(dec_arfcns))</span><br><span style="color: hsl(0, 100%, 40%);">- dec_arfcns[dec_arfcns_count++] = i;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!silent) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Decoded freqs %d (expected %d)\n",</span><br><span style="color: hsl(0, 100%, 40%);">- dec_arfcns_count, arfcns_num);</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Decoded: ");</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < dec_arfcns_count; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("%d ", dec_arfcns[i]);</span><br><span style="color: hsl(0, 100%, 40%);">- if (dec_arfcns[i] != orig_arfcns[i])</span><br><span style="color: hsl(0, 100%, 40%);">- printf("(!= %d) ", orig_arfcns[i]);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- printf("\n");</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (dec_arfcns_count != arfcns_num) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Wrong number of arfcns\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return 1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (memcmp(dec_arfcns, orig_arfcns, sizeof(dec_arfcns)) != 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Decoding error, got wrong freqs\n");</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, " w = ");</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < ARRAY_SIZE(w); i++)</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "%d ", w[i]);</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return 1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</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 style="color: hsl(0, 100%, 40%);">-static void test_random_range_encoding(int range, int max_arfcn_num)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int arfcns_num = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- int test_idx;</span><br><span style="color: hsl(0, 100%, 40%);">- int rc, max_count;</span><br><span style="color: hsl(0, 100%, 40%);">- int num_tests = 1024;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Random range test: range %d, max num ARFCNs %d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- range, max_arfcn_num);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- srandom(1);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (max_count = 1; max_count < max_arfcn_num; max_count++) {</span><br><span style="color: hsl(0, 100%, 40%);">- for (test_idx = 0; test_idx < num_tests; test_idx++) {</span><br><span style="color: hsl(0, 100%, 40%);">- int count;</span><br><span style="color: hsl(0, 100%, 40%);">- int i;</span><br><span style="color: hsl(0, 100%, 40%);">- int min_freq = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- int rnd_arfcns[RANGE_ENC_MAX_ARFCNS] = {0};</span><br><span style="color: hsl(0, 100%, 40%);">- char rnd_arfcns_set[1024] = {0};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (range < ARFCN_RANGE_1024)</span><br><span style="color: hsl(0, 100%, 40%);">- min_freq = random() % (1023 - range);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (count = max_count; count; ) {</span><br><span style="color: hsl(0, 100%, 40%);">- int arfcn = min_freq + random() % (range + 1);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(arfcn < ARRAY_SIZE(rnd_arfcns_set));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!rnd_arfcns_set[arfcn]) {</span><br><span style="color: hsl(0, 100%, 40%);">- rnd_arfcns_set[arfcn] = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- count -= 1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- arfcns_num = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < ARRAY_SIZE(rnd_arfcns_set); i++)</span><br><span style="color: hsl(0, 100%, 40%);">- if (rnd_arfcns_set[i])</span><br><span style="color: hsl(0, 100%, 40%);">- rnd_arfcns[arfcns_num++] = i;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- rc = test_single_range_encoding(range, rnd_arfcns,</span><br><span style="color: hsl(0, 100%, 40%);">- arfcns_num, 1);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc != 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Failed on test %d, range %d, num ARFCNs %d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- test_idx, range, max_count);</span><br><span style="color: hsl(0, 100%, 40%);">- test_single_range_encoding(range, rnd_arfcns,</span><br><span style="color: hsl(0, 100%, 40%);">- arfcns_num, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static void test_range_encoding()</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int *arfcns;</span><br><span style="color: hsl(0, 100%, 40%);">- int arfcns_num = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- int test_idx;</span><br><span style="color: hsl(0, 100%, 40%);">- int range;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (test_idx = 0; arfcn_test_ranges[test_idx].arfcns_num > 0; test_idx++)</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- arfcns_num = arfcn_test_ranges[test_idx].arfcns_num;</span><br><span style="color: hsl(0, 100%, 40%);">- arfcns = &arfcn_test_ranges[test_idx].arfcns[0];</span><br><span style="color: hsl(0, 100%, 40%);">- range = arfcn_test_ranges[test_idx].range;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Range test %d: range %d, num ARFCNs %d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- test_idx, range, arfcns_num);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- test_single_range_encoding(range, arfcns, arfcns_num, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- test_random_range_encoding(ARFCN_RANGE_128, 29);</span><br><span style="color: hsl(0, 100%, 40%);">- test_random_range_encoding(ARFCN_RANGE_256, 22);</span><br><span style="color: hsl(0, 100%, 40%);">- test_random_range_encoding(ARFCN_RANGE_512, 18);</span><br><span style="color: hsl(0, 100%, 40%);">- test_random_range_encoding(ARFCN_RANGE_1024, 16);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static int freqs1[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- 12, 70, 121, 190, 250, 320, 401, 475, 520, 574, 634, 700, 764, 830, 905, 980</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static int freqs2[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- 402, 460, 1, 67, 131, 197, 272, 347,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static int freqs3[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- 68, 128, 198, 279, 353, 398, 452,</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static int w_out[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- 122, 2, 69, 204, 75, 66, 60, 70, 83, 3, 24, 67, 54, 64, 70, 9,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static int range128[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- 1, 1 + 127,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static int range256[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- 1, 1 + 128,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static int range512[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- 1, 1+ 511,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static void test_arfcn_filter()</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int arfcns[50], i, res, f0_included;</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < ARRAY_SIZE(arfcns); ++i)</span><br><span style="color: hsl(0, 100%, 40%);">- arfcns[i] = (i + 1) * 2;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* check that the arfcn is taken out. f0_included is only set for Range1024 */</span><br><span style="color: hsl(0, 100%, 40%);">- f0_included = 24;</span><br><span style="color: hsl(0, 100%, 40%);">- res = range_enc_filter_arfcns(arfcns, ARRAY_SIZE(arfcns),</span><br><span style="color: hsl(0, 100%, 40%);">- arfcns[0], &f0_included);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(res, ==, ARRAY_SIZE(arfcns) - 1);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(f0_included, ==, 1);</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < res; ++i)</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(arfcns[i], ==, ((i+2) * 2) - (2+1));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* check with range1024, ARFCN 0 is included */</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < ARRAY_SIZE(arfcns); ++i)</span><br><span style="color: hsl(0, 100%, 40%);">- arfcns[i] = i * 2;</span><br><span style="color: hsl(0, 100%, 40%);">- res = range_enc_filter_arfcns(arfcns, ARRAY_SIZE(arfcns),</span><br><span style="color: hsl(0, 100%, 40%);">- 0, &f0_included);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(res, ==, ARRAY_SIZE(arfcns) - 1);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(f0_included, ==, 1);</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < res; ++i)</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(arfcns[i], ==, (i + 1) * 2 - 1);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* check with range1024, ARFCN 0 not included */</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < ARRAY_SIZE(arfcns); ++i)</span><br><span style="color: hsl(0, 100%, 40%);">- arfcns[i] = (i + 1) * 2;</span><br><span style="color: hsl(0, 100%, 40%);">- res = range_enc_filter_arfcns(arfcns, ARRAY_SIZE(arfcns),</span><br><span style="color: hsl(0, 100%, 40%);">- 0, &f0_included);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(res, ==, ARRAY_SIZE(arfcns));</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(f0_included, ==, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < res; ++i)</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(arfcns[i], ==, ((i + 1) * 2) - 1);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static void test_print_encoding()</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int rc;</span><br><span style="color: hsl(0, 100%, 40%);">- int w[17];</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t chan_list[16];</span><br><span style="color: hsl(0, 100%, 40%);">- memset(chan_list, 0x23, sizeof(chan_list));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (rc = 0; rc < ARRAY_SIZE(w); ++rc)</span><br><span style="color: hsl(0, 100%, 40%);">- switch (rc % 3) {</span><br><span style="color: hsl(0, 100%, 40%);">- case 0:</span><br><span style="color: hsl(0, 100%, 40%);">- w[rc] = 0xAAAA;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case 1:</span><br><span style="color: hsl(0, 100%, 40%);">- w[rc] = 0x5555;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case 2:</span><br><span style="color: hsl(0, 100%, 40%);">- w[rc] = 0x9696;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- range_enc_range512(chan_list, (1 << 9) | 0x96, w);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Range512: %s\n", osmo_hexdump(chan_list, ARRAY_SIZE(chan_list)));</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static void test_si_range_helpers()</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int ws[(sizeof(freqs1)/sizeof(freqs1[0]))];</span><br><span style="color: hsl(0, 100%, 40%);">- int i, f0 = 0xFFFFFF;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- memset(&ws[0], 0x23, sizeof(ws));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- i = range_enc_find_index(1023, freqs1, ARRAY_SIZE(freqs1));</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Element is: %d => freqs[i] = %d\n", i, i >= 0 ? freqs1[i] : -1);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(i, ==, 2);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- i = range_enc_find_index(511, freqs2, ARRAY_SIZE(freqs2));</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Element is: %d => freqs[i] = %d\n", i, i >= 0 ? freqs2[i] : -1);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(i, ==, 2);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- i = range_enc_find_index(511, freqs3, ARRAY_SIZE(freqs3));</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Element is: %d => freqs[i] = %d\n", i, i >= 0 ? freqs3[i] : -1);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(i, ==, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- range_enc_arfcns(1023, freqs1, ARRAY_SIZE(freqs1), ws, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < sizeof(freqs1)/sizeof(freqs1[0]); ++i) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("w[%d]=%d\n", i, ws[i]);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(ws[i], ==, w_out[i]);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- i = range_enc_determine_range(range128, ARRAY_SIZE(range128), &f0);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(i, ==, ARFCN_RANGE_128);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(f0, ==, 1);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- i = range_enc_determine_range(range256, ARRAY_SIZE(range256), &f0);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(i, ==, ARFCN_RANGE_256);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(f0, ==, 1);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- i = range_enc_determine_range(range512, ARRAY_SIZE(range512), &f0);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(i, ==, ARFCN_RANGE_512);</span><br><span style="color: hsl(0, 100%, 40%);">- VERIFY(f0, ==, 1);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static void test_si_ba_ind(struct gsm_network *net)</span><br><span> {</span><br><span> struct gsm_bts *bts = bts_init(net);</span><br><span>@@ -915,11 +582,6 @@</span><br><span> }</span><br><span> bsc_gsmnet = net;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- test_si_range_helpers();</span><br><span style="color: hsl(0, 100%, 40%);">- test_arfcn_filter();</span><br><span style="color: hsl(0, 100%, 40%);">- test_print_encoding();</span><br><span style="color: hsl(0, 100%, 40%);">- test_range_encoding();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> test_si2q_segfault(net);</span><br><span> test_si2q_e(net);</span><br><span> test_si2q_u(net);</span><br><span>diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok</span><br><span>index f1aa463..b22d0c2 100644</span><br><span>--- a/tests/gsm0408/gsm0408_test.ok</span><br><span>+++ b/tests/gsm0408/gsm0408_test.ok</span><br><span>@@ -1,59 +1,3 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Element is: 2 => freqs[i] = 121</span><br><span style="color: hsl(0, 100%, 40%);">-Element is: 2 => freqs[i] = 1</span><br><span style="color: hsl(0, 100%, 40%);">-Element is: 0 => freqs[i] = 68</span><br><span style="color: hsl(0, 100%, 40%);">-w[0]=122</span><br><span style="color: hsl(0, 100%, 40%);">-w[1]=2</span><br><span style="color: hsl(0, 100%, 40%);">-w[2]=69</span><br><span style="color: hsl(0, 100%, 40%);">-w[3]=204</span><br><span style="color: hsl(0, 100%, 40%);">-w[4]=75</span><br><span style="color: hsl(0, 100%, 40%);">-w[5]=66</span><br><span style="color: hsl(0, 100%, 40%);">-w[6]=60</span><br><span style="color: hsl(0, 100%, 40%);">-w[7]=70</span><br><span style="color: hsl(0, 100%, 40%);">-w[8]=83</span><br><span style="color: hsl(0, 100%, 40%);">-w[9]=3</span><br><span style="color: hsl(0, 100%, 40%);">-w[10]=24</span><br><span style="color: hsl(0, 100%, 40%);">-w[11]=67</span><br><span style="color: hsl(0, 100%, 40%);">-w[12]=54</span><br><span style="color: hsl(0, 100%, 40%);">-w[13]=64</span><br><span style="color: hsl(0, 100%, 40%);">-w[14]=70</span><br><span style="color: hsl(0, 100%, 40%);">-w[15]=9</span><br><span style="color: hsl(0, 100%, 40%);">-Range512: 89 4b 2a 95 65 95 55 2c a9 55 aa 55 6a 95 59 55 </span><br><span style="color: hsl(0, 100%, 40%);">-Range test 0: range 511, num ARFCNs 12</span><br><span style="color: hsl(0, 100%, 40%);">-chan_list = 88 00 98 34 85 36 7c 50 22 dc 5e ec 00 00 00 00 </span><br><span style="color: hsl(0, 100%, 40%);">-Decoded freqs 12 (expected 12)</span><br><span style="color: hsl(0, 100%, 40%);">-Decoded: 1 12 31 51 57 91 97 98 113 117 120 125 </span><br><span style="color: hsl(0, 100%, 40%);">-Range test 1: range 511, num ARFCNs 17</span><br><span style="color: hsl(0, 100%, 40%);">-chan_list = 88 00 82 7f 01 3f 7e 04 0b ff ff fc 10 41 07 e0 </span><br><span style="color: hsl(0, 100%, 40%);">-Decoded freqs 17 (expected 17)</span><br><span style="color: hsl(0, 100%, 40%);">-Decoded: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 </span><br><span style="color: hsl(0, 100%, 40%);">-Range test 2: range 511, num ARFCNs 18</span><br><span style="color: hsl(0, 100%, 40%);">-chan_list = 88 00 82 7f 01 7f 7e 04 0b ff ff fc 10 41 07 ff </span><br><span style="color: hsl(0, 100%, 40%);">-Decoded freqs 18 (expected 18)</span><br><span style="color: hsl(0, 100%, 40%);">-Decoded: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 </span><br><span style="color: hsl(0, 100%, 40%);">-Range test 3: range 511, num ARFCNs 18</span><br><span style="color: hsl(0, 100%, 40%);">-chan_list = 88 00 94 3a 44 32 d7 2a 43 2a 13 94 e5 38 39 f6 </span><br><span style="color: hsl(0, 100%, 40%);">-Decoded freqs 18 (expected 18)</span><br><span style="color: hsl(0, 100%, 40%);">-Decoded: 1 17 31 45 58 79 81 97 113 127 213 277 287 311 331 391 417 511 </span><br><span style="color: hsl(0, 100%, 40%);">-Range test 4: range 511, num ARFCNs 6</span><br><span style="color: hsl(0, 100%, 40%);">-chan_list = 88 00 8b 3c 88 b9 6b 00 00 00 00 00 00 00 00 00 </span><br><span style="color: hsl(0, 100%, 40%);">-Decoded freqs 6 (expected 6)</span><br><span style="color: hsl(0, 100%, 40%);">-Decoded: 1 17 31 45 58 79 </span><br><span style="color: hsl(0, 100%, 40%);">-Range test 5: range 511, num ARFCNs 6</span><br><span style="color: hsl(0, 100%, 40%);">-chan_list = 88 05 08 fc 88 b9 6b 00 00 00 00 00 00 00 00 00 </span><br><span style="color: hsl(0, 100%, 40%);">-Decoded freqs 6 (expected 6)</span><br><span style="color: hsl(0, 100%, 40%);">-Decoded: 10 17 31 45 58 79 </span><br><span style="color: hsl(0, 100%, 40%);">-Range test 6: range 1023, num ARFCNs 17</span><br><span style="color: hsl(0, 100%, 40%);">-chan_list = 84 71 e4 ab b9 58 05 cb 39 17 fd b0 75 62 0f 2f </span><br><span style="color: hsl(0, 100%, 40%);">-Decoded freqs 17 (expected 17)</span><br><span style="color: hsl(0, 100%, 40%);">-Decoded: 0 17 31 45 58 79 81 97 113 127 213 277 287 311 331 391 1023 </span><br><span style="color: hsl(0, 100%, 40%);">-Range test 7: range 1023, num ARFCNs 16</span><br><span style="color: hsl(0, 100%, 40%);">-chan_list = 80 71 e4 ab b9 58 05 cb 39 17 fd b0 75 62 0f 2f </span><br><span style="color: hsl(0, 100%, 40%);">-Decoded freqs 16 (expected 16)</span><br><span style="color: hsl(0, 100%, 40%);">-Decoded: 17 31 45 58 79 81 97 113 127 213 277 287 311 331 391 1023 </span><br><span style="color: hsl(0, 100%, 40%);">-Random range test: range 127, max num ARFCNs 29</span><br><span style="color: hsl(0, 100%, 40%);">-Random range test: range 255, max num ARFCNs 22</span><br><span style="color: hsl(0, 100%, 40%);">-Random range test: range 511, max num ARFCNs 18</span><br><span style="color: hsl(0, 100%, 40%);">-Random range test: range 1023, max num ARFCNs 16</span><br><span> BTS allocation OK in test_si2q_segfault()</span><br><span> Test SI2quater UARFCN (same scrambling code and diversity):</span><br><span> generating SI2quater for 0 EARFCNs and 1 UARFCNs...</span><br><span>diff --git a/tests/handover/Makefile.am b/tests/handover/Makefile.am</span><br><span>index b3bc21f..f0b2e7a 100644</span><br><span>--- a/tests/handover/Makefile.am</span><br><span>+++ b/tests/handover/Makefile.am</span><br><span>@@ -47,7 +47,6 @@</span><br><span> $(top_builddir)/src/osmo-bsc/abis_om2000_vty.o \</span><br><span> $(top_builddir)/src/osmo-bsc/abis_rsl.o \</span><br><span> $(top_builddir)/src/osmo-bsc/acc.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/osmo-bsc/arfcn_range_encode.o \</span><br><span> $(top_builddir)/src/osmo-bsc/assignment_fsm.o \</span><br><span> $(top_builddir)/src/osmo-bsc/bsc_ctrl_commands.o \</span><br><span> $(top_builddir)/src/osmo-bsc/bsc_init.o \</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24503">change 24503</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-bsc/+/24503"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I53ad3067623077b6a8737c2a0aecc8b46bf71a15 </div>
<div style="display:none"> Gerrit-Change-Number: 24503 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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: 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>