Merge remote-tracking branch 'origin/NR_UE_PBCH_fix' into integration_2023_w38

cmake_targets/autotests/test_case_list.xml

@@ -110,11 +110,11 @@
     </testCase>
 
      <testCase id="nr_pbchsim.106rb">
-      <desc>nr_pbchsim Test cases. (Test1: PBCH-only, 106 PRB),
+      <desc>nr_pbchsim Test cases. (Test1: PBCH-only, 106 PRB, NID 2),
                                    (Test2: PBCH and synchronization, 106PBR),
                                    (Test3: PBCH and synchronization, 106PBR, SSB SC OFFSET 6)</desc>
       <main_exec>nr_pbchsim</main_exec>
-      <main_exec_args>-s-11 -S-8 -n10 -R106
+      <main_exec_args>-s-11 -S-8 -n10 -R106 -N2
                       -s-11 -S-8 -n10 -o8000 -I -R106
                       -s-11 -S-8 -n10 -R106 -O6</main_exec_args>
       <tags>test1 test2 test3</tags>

openair1/PHY/NR_UE_TRANSPORT/nr_pbch.c

@@ -57,11 +57,11 @@ static uint16_t nr_pbch_extract(uint32_t rxdataF_sz,
                                 struct complex16 dl_ch_estimates_ext[][PBCH_MAX_RE_PER_SYMBOL],
                                 uint32_t symbol,
                                 uint32_t s_offset,
-                                NR_DL_FRAME_PARMS *frame_parms,
-                                int nushiftmod4)
+                                NR_DL_FRAME_PARMS *frame_parms)
 {
   uint16_t rb;
   uint8_t i, j, aarx;
+  int nushiftmod4 = frame_parms->Nid_cell % 4;
   AssertFatal(symbol>=1 && symbol<5,
               "symbol %d illegal for PBCH extraction\n",
               symbol);
@@ -412,8 +412,7 @@ int nr_rx_pbch(PHY_VARS_NR_UE *ue,
                     dl_ch_estimates_ext,
                     symbol,
                     symbol_offset,
-                    frame_parms,
-                    nushift);
+                    frame_parms);
 #ifdef DEBUG_PBCH
     LOG_I(PHY,"[PHY] PBCH Symbol %d ofdm size %d\n",symbol, frame_parms->ofdm_symbol_size );
     LOG_I(PHY,"[PHY] PBCH starting channel_level\n");