[S] Change in osmocom-bb[master]: Correctly extract bits from SI2*/SI5*

[jolly]

jolly has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/osmocom-bb/+/34604?usp=email )


Change subject: Correctly extract bits from SI2*/SI5*
......................................................................

Correctly extract bits from SI2*/SI5*

These bits are:
 * EXT-IND
 * BA-IND
 * Multiband reporting

Change-Id: Ie5349464fed0a4276955235c7c87b5bcb299f20d
---
M src/host/layer23/src/common/sysinfo.c
1 file changed, 26 insertions(+), 12 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/04/34604/1

diff --git a/src/host/layer23/src/common/sysinfo.c 
b/src/host/layer23/src/common/sysinfo.c
index 7af1d93..66b87eb 100644
--- a/src/host/layer23/src/common/sysinfo.c
+++ b/src/host/layer23/src/common/sysinfo.c
@@ -636,8 +636,8 @@
        memcpy(s->si2_msg, si, OSMO_MIN(len, sizeof(s->si2_msg)));

        /* Neighbor Cell Description */
-       s->nb_ext_ind_si2 = (si->bcch_frequency_list[0] >> 6) & 1;
-       s->nb_ba_ind_si2 = (si->bcch_frequency_list[0] >> 5) & 1;
+       s->nb_ext_ind_si2 = (si->bcch_frequency_list[0] >> 5) & 1;
+       s->nb_ba_ind_si2 = (si->bcch_frequency_list[0] >> 4) & 1;
        decode_freq_list(s->freq, si->bcch_frequency_list,
                         sizeof(si->bcch_frequency_list),
                         0xce, FREQ_TYPE_NCELL_2);
@@ -657,8 +657,8 @@
        memcpy(s->si2b_msg, si, OSMO_MIN(len, sizeof(s->si2b_msg)));

        /* Neighbor Cell Description */
-       s->nb_ext_ind_si2bis = (si->bcch_frequency_list[0] >> 6) & 1;
-       s->nb_ba_ind_si2bis = (si->bcch_frequency_list[0] >> 5) & 1;
+       s->nb_ext_ind_si2bis = (si->bcch_frequency_list[0] >> 5) & 1;
+       s->nb_ba_ind_si2bis = (si->bcch_frequency_list[0] >> 4) & 1;
        decode_freq_list(s->freq, si->bcch_frequency_list,
                sizeof(si->bcch_frequency_list), 0xce, FREQ_TYPE_NCELL_2bis);
        /* RACH Control Parameter */
@@ -675,8 +675,8 @@
        memcpy(s->si2t_msg, si, OSMO_MIN(len, sizeof(s->si2t_msg)));

        /* Neighbor Cell Description 2 */
-       s->nb_multi_rep_si2ter = (si->ext_bcch_frequency_list[0] >> 6) & 3;
-       s->nb_ba_ind_si2ter = (si->ext_bcch_frequency_list[0] >> 5) & 1;
+       s->nb_multi_rep_si2ter = (si->ext_bcch_frequency_list[0] >> 5) & 3;
+       s->nb_ba_ind_si2ter = (si->ext_bcch_frequency_list[0] >> 4) & 1;
        decode_freq_list(s->freq, si->ext_bcch_frequency_list,
                sizeof(si->ext_bcch_frequency_list), 0x8e,
                        FREQ_TYPE_NCELL_2ter);
@@ -780,8 +780,8 @@
        memcpy(s->si5_msg, si, OSMO_MIN(len, sizeof(s->si5_msg)));

        /* Neighbor Cell Description */
-       s->nb_ext_ind_si5 = (si->bcch_frequency_list[0] >> 6) & 1;
-       s->nb_ba_ind_si5 = (si->bcch_frequency_list[0] >> 5) & 1;
+       s->nb_ext_ind_si5 = (si->bcch_frequency_list[0] >> 5) & 1;
+       s->nb_ba_ind_si5 = (si->bcch_frequency_list[0] >> 4) & 1;
        decode_freq_list(s->freq, si->bcch_frequency_list,
                         sizeof(si->bcch_frequency_list),
                         0xce, FREQ_TYPE_REP_5);
@@ -797,8 +797,8 @@
        memcpy(s->si5b_msg, si, OSMO_MIN(len, sizeof(s->si5b_msg)));

        /* Neighbor Cell Description */
-       s->nb_ext_ind_si5bis = (si->bcch_frequency_list[0] >> 6) & 1;
-       s->nb_ba_ind_si5bis = (si->bcch_frequency_list[0] >> 5) & 1;
+       s->nb_ext_ind_si5bis = (si->bcch_frequency_list[0] >> 5) & 1;
+       s->nb_ba_ind_si5bis = (si->bcch_frequency_list[0] >> 4) & 1;
        decode_freq_list(s->freq, si->bcch_frequency_list,
                         sizeof(si->bcch_frequency_list),
                         0xce, FREQ_TYPE_REP_5bis);
@@ -814,8 +814,8 @@
        memcpy(s->si5t_msg, si, OSMO_MIN(len, sizeof(s->si5t_msg)));

        /* Neighbor Cell Description */
-       s->nb_multi_rep_si5ter = (si->bcch_frequency_list[0] >> 6) & 3;
-       s->nb_ba_ind_si5ter = (si->bcch_frequency_list[0] >> 5) & 1;
+       s->nb_multi_rep_si5ter = (si->bcch_frequency_list[0] >> 5) & 3;
+       s->nb_ba_ind_si5ter = (si->bcch_frequency_list[0] >> 4) & 1;
        decode_freq_list(s->freq, si->bcch_frequency_list,
                         sizeof(si->bcch_frequency_list),
                         0x8e, FREQ_TYPE_REP_5ter);

--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34604?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: Ie5349464fed0a4276955235c7c87b5bcb299f20d
Gerrit-Change-Number: 34604
Gerrit-PatchSet: 1
Gerrit-Owner: jolly <andr...@eversberg.eu>
Gerrit-MessageType: newchange