Commit 38c5faba authored by francescomani's avatar francescomani

fix for PBCH decoding with cell ID != 0

parent 79fd37b4
...@@ -110,11 +110,11 @@ ...@@ -110,11 +110,11 @@
</testCase> </testCase>
<testCase id="nr_pbchsim.106rb"> <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), (Test2: PBCH and synchronization, 106PBR),
(Test3: PBCH and synchronization, 106PBR, SSB SC OFFSET 6)</desc> (Test3: PBCH and synchronization, 106PBR, SSB SC OFFSET 6)</desc>
<main_exec>nr_pbchsim</main_exec> <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 -o8000 -I -R106
-s-11 -S-8 -n10 -R106 -O6</main_exec_args> -s-11 -S-8 -n10 -R106 -O6</main_exec_args>
<tags>test1 test2 test3</tags> <tags>test1 test2 test3</tags>
......
...@@ -57,11 +57,11 @@ static uint16_t nr_pbch_extract(uint32_t rxdataF_sz, ...@@ -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], struct complex16 dl_ch_estimates_ext[][PBCH_MAX_RE_PER_SYMBOL],
uint32_t symbol, uint32_t symbol,
uint32_t s_offset, uint32_t s_offset,
NR_DL_FRAME_PARMS *frame_parms, NR_DL_FRAME_PARMS *frame_parms)
int nushiftmod4)
{ {
uint16_t rb; uint16_t rb;
uint8_t i, j, aarx; uint8_t i, j, aarx;
int nushiftmod4 = frame_parms->Nid_cell % 4;
AssertFatal(symbol>=1 && symbol<5, AssertFatal(symbol>=1 && symbol<5,
"symbol %d illegal for PBCH extraction\n", "symbol %d illegal for PBCH extraction\n",
symbol); symbol);
...@@ -441,8 +441,7 @@ int nr_rx_pbch(PHY_VARS_NR_UE *ue, ...@@ -441,8 +441,7 @@ int nr_rx_pbch(PHY_VARS_NR_UE *ue,
dl_ch_estimates_ext, dl_ch_estimates_ext,
symbol, symbol,
symbol_offset, symbol_offset,
frame_parms, frame_parms);
nushift);
#ifdef DEBUG_PBCH #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 Symbol %d ofdm size %d\n",symbol, frame_parms->ofdm_symbol_size );
LOG_I(PHY,"[PHY] PBCH starting channel_level\n"); LOG_I(PHY,"[PHY] PBCH starting channel_level\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment