From 638d8f8d0dc06f3f0d0be3894ac7849736a83166 Mon Sep 17 00:00:00 2001
From: Mario Hudon <mario.hudon@interdigital.com>
Date: Wed, 26 Aug 2020 13:14:50 -0400
Subject: [PATCH] Fix endianness handling of the ssb_PositionsInBurst

---
 common/utils/asn1_conversions.h       |  4 ++--
 openair1/PHY/INIT/nr_parms.c          |  2 +-
 openair2/GNB_APP/gnb_config.c         | 15 +++------------
 openair2/LAYER2/NR_MAC_UE/config_ue.c |  4 ++--
 4 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/common/utils/asn1_conversions.h b/common/utils/asn1_conversions.h
index 050c065d9d..82dca54c08 100644
--- a/common/utils/asn1_conversions.h
+++ b/common/utils/asn1_conversions.h
@@ -101,11 +101,11 @@ static inline uint64_t BIT_STRING_to_uint64(BIT_STRING_t *asn) {
 
   shift = ((asn->size - 1) * 8) - asn->bits_unused;
   for (index = 0; index < (asn->size - 1); index++) {
-    result |= asn->buf[index] << shift;
+    result |= ((uint64_t)asn->buf[index]) << shift;
     shift -= 8;
   }
 
-  result |= asn->buf[index] >> asn->bits_unused;
+  result |= ((uint64_t)asn->buf[index]) >> asn->bits_unused;
 
   return result;
 }
diff --git a/openair1/PHY/INIT/nr_parms.c b/openair1/PHY/INIT/nr_parms.c
index c3fe9c54b1..7153b048e2 100644
--- a/openair1/PHY/INIT/nr_parms.c
+++ b/openair1/PHY/INIT/nr_parms.c
@@ -385,7 +385,7 @@ int nr_init_frame_parms_ue(NR_DL_FRAME_PARMS *fp,
     fp->Lmax = 64;
   }
 
-  fp->L_ssb = (((uint64_t) config->ssb_table.ssb_mask_list[1].ssb_mask)<<32) | config->ssb_table.ssb_mask_list[1].ssb_mask;
+  fp->L_ssb = (((uint64_t) config->ssb_table.ssb_mask_list[0].ssb_mask)<<32) | config->ssb_table.ssb_mask_list[1].ssb_mask;
   
   fp->N_ssb = 0;
   for (int p=0; p<fp->Lmax; p++)
diff --git a/openair2/GNB_APP/gnb_config.c b/openair2/GNB_APP/gnb_config.c
index 61aa10e47b..9cb88c42a4 100644
--- a/openair2/GNB_APP/gnb_config.c
+++ b/openair2/GNB_APP/gnb_config.c
@@ -223,20 +223,12 @@ void fix_scc(NR_ServingCellConfigCommon_t *scc,uint64_t ssbmap) {
     scc->ssb_PositionsInBurst->choice.shortBitmap.bits_unused = 4;
     scc->ssb_PositionsInBurst->choice.shortBitmap.buf = CALLOC(1,1);
     scc->ssb_PositionsInBurst->choice.shortBitmap.buf[0] = 0;
-    for (int i=0; i<8; i++) {
-      if (i<scc->ssb_PositionsInBurst->choice.shortBitmap.bits_unused)
-        curr_bit = 0;
-      else
-        curr_bit = (ssbmap>>(7-i))&0x01;
-      scc->ssb_PositionsInBurst->choice.shortBitmap.buf[0] |= curr_bit<<i;   
-    }
+    scc->ssb_PositionsInBurst->choice.shortBitmap.buf[0] = ssbmap & 0xF0;
   }else if(ssbmaplen==NR_ServingCellConfigCommon__ssb_PositionsInBurst_PR_mediumBitmap){
 	  scc->ssb_PositionsInBurst->choice.mediumBitmap.size = 1;
 	  scc->ssb_PositionsInBurst->choice.mediumBitmap.bits_unused = 0;
     scc->ssb_PositionsInBurst->choice.mediumBitmap.buf = CALLOC(1,1);
-    scc->ssb_PositionsInBurst->choice.mediumBitmap.buf[0] = 0;
-    for (int i=0; i<8; i++)
-      scc->ssb_PositionsInBurst->choice.mediumBitmap.buf[0] |= (((ssbmap>>(7-i))&0x01)<<i); 
+    scc->ssb_PositionsInBurst->choice.mediumBitmap.buf[0] = ssbmap;
   }else {
     scc->ssb_PositionsInBurst->choice.longBitmap.size = 8;
     scc->ssb_PositionsInBurst->choice.longBitmap.bits_unused = 0;
@@ -244,8 +236,7 @@ void fix_scc(NR_ServingCellConfigCommon_t *scc,uint64_t ssbmap) {
     for (int j=0; j<8; j++) {
        scc->ssb_PositionsInBurst->choice.longBitmap.buf[7-j] = 0;
        curr_bit = (ssbmap>>(j<<3))&(0xff);
-       for (int i=0; i<8; i++)
-         scc->ssb_PositionsInBurst->choice.longBitmap.buf[7-j] |= (((curr_bit>>(7-i))&0x01)<<i);
+       scc->ssb_PositionsInBurst->choice.longBitmap.buf[7-j] = curr_bit;
     }
   }
 
diff --git a/openair2/LAYER2/NR_MAC_UE/config_ue.c b/openair2/LAYER2/NR_MAC_UE/config_ue.c
index 1dcbeafc1f..91fffbc06c 100755
--- a/openair2/LAYER2/NR_MAC_UE/config_ue.c
+++ b/openair2/LAYER2/NR_MAC_UE/config_ue.c
@@ -244,8 +244,8 @@ void config_common_ue(NR_UE_MAC_INST_t *mac,
       cfg->ssb_table.ssb_mask_list[0].ssb_mask = 0;
       cfg->ssb_table.ssb_mask_list[1].ssb_mask = 0;
       for (i=0; i<4; i++) {
-        cfg->ssb_table.ssb_mask_list[0].ssb_mask += (scc->ssb_PositionsInBurst->choice.longBitmap.buf[i+4]<<i*8);
-        cfg->ssb_table.ssb_mask_list[1].ssb_mask += (scc->ssb_PositionsInBurst->choice.longBitmap.buf[i]<<i*8);
+        cfg->ssb_table.ssb_mask_list[0].ssb_mask += (scc->ssb_PositionsInBurst->choice.longBitmap.buf[i]<<i*8);
+        cfg->ssb_table.ssb_mask_list[1].ssb_mask += (scc->ssb_PositionsInBurst->choice.longBitmap.buf[i+4]<<i*8);
       }
       break;
     default: