Skip to content

O
OpenXG-RAN
Commit 9a9a83d2 authored by Guy De Souza's avatar Guy De Souza
Browse files
Options

Interleaving fix

parent aeb298d0
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 17 deletions
openair1/PHY/NR_TRANSPORT/nr_pbch.c
View file @ 9a9a83d2
...@@ -206,7 +206,7 @@ int nr_generate_pbch(NR_gNB_PBCH *pbch, ...@@ -206,7 +206,7 @@ int nr_generate_pbch(NR_gNB_PBCH *pbch,
NR_DL_FRAME_PARMS *frame_parms) NR_DL_FRAME_PARMS *frame_parms)
{ {
int j,k,l,m; int k,l,m;
int16_t a; int16_t a;
int16_t mod_pbch_e[NR_POLAR_PBCH_E]; int16_t mod_pbch_e[NR_POLAR_PBCH_E];
uint8_t idx=0; uint8_t idx=0;
...@@ -225,7 +225,7 @@ int nr_generate_pbch(NR_gNB_PBCH *pbch, ...@@ -225,7 +225,7 @@ int nr_generate_pbch(NR_gNB_PBCH *pbch,
#ifdef DEBUG_PBCH_ENCODING #ifdef DEBUG_PBCH_ENCODING
printf("Byte endian fix:\n"); printf("Byte endian fix:\n");
for (int i=0; i<4; i++) for (int i=0; i<4; i++)
printf("pbch_a[%d]: 0x%02x\n", i, pbch->pbch_a[i]); printf("pbch_a[%d]: 0x%02x\n", i, pbch->pbch_a[i]);
#endif #endif
// Extra byte generation // Extra byte generation
...@@ -242,24 +242,24 @@ int nr_generate_pbch(NR_gNB_PBCH *pbch, ...@@ -242,24 +242,24 @@ int nr_generate_pbch(NR_gNB_PBCH *pbch,
#ifdef DEBUG_PBCH_ENCODING #ifdef DEBUG_PBCH_ENCODING
printf("Extra byte:\n"); printf("Extra byte:\n");
for (int i=0; i<4; i++) for (int i=0; i<4; i++)
printf("pbch_a[%d]: 0x%02x\n", i, pbch->pbch_a[i]); printf("pbch_a[%d]: 0x%02x\n", i, pbch->pbch_a[i]);
#endif #endif
// Payload interleaving // Payload interleaving
uint8_t *in = &pbch->pbch_a[3]; uint32_t in=0, out=0;
uint8_t *out = &pbch->pbch_a_interleaved[3]; for (int i=0; i<NR_POLAR_PBCH_PAYLOAD_BITS>>3; i++)
for (int i=0; i<32; i++) { in |= (uint32_t)(pbch->pbch_a[i]<<((3-i)<<3));
j = i&7;
if (!j) { for (int i=0; i<32; i++)
in--; out |= ((in>>i)&1)<<(nr_pbch_payload_interleaver(i));
out--;
} for (int i=0; i<NR_POLAR_PBCH_PAYLOAD_BITS>>3; i++)
(*out) |= (((*in)>>j)&1)<<((nr_pbch_payload_interleaver(i))&7); pbch->pbch_a_interleaved[i] = (uint8_t)((out>>(i<<3))&0xff);
}
#ifdef DEBUG_PBCH_ENCODING #ifdef DEBUG_PBCH_ENCODING
printf("Interleaving:\n"); printf("Interleaving:\n");
for (int i=0; i<4; i++) for (int i=0; i<4; i++)
printf("pbch_a_interleaved[%d]: 0x%02x\n", i, pbch->pbch_a_interleaved[i]); printf("pbch_a_interleaved[%d]: 0x%02x\n", i, pbch->pbch_a_interleaved[i]);
#endif #endif
// Scrambling // Scrambling
...@@ -269,7 +269,7 @@ int nr_generate_pbch(NR_gNB_PBCH *pbch, ...@@ -269,7 +269,7 @@ int nr_generate_pbch(NR_gNB_PBCH *pbch,
#ifdef DEBUG_PBCH_ENCODING #ifdef DEBUG_PBCH_ENCODING
printf("Payload scrambling:\n"); printf("Payload scrambling:\n");
for (int i=0; i<4; i++) for (int i=0; i<4; i++)
printf("pbch_a_prime[%d]: 0x%02x\n", i, pbch->pbch_a_prime[i]); printf("pbch_a_prime[%d]: 0x%02x\n", i, pbch->pbch_a_prime[i]);
#endif #endif
...@@ -278,7 +278,7 @@ int nr_generate_pbch(NR_gNB_PBCH *pbch, ...@@ -278,7 +278,7 @@ int nr_generate_pbch(NR_gNB_PBCH *pbch,
#ifdef DEBUG_PBCH_ENCODING #ifdef DEBUG_PBCH_ENCODING
printf("Channel coding:\n"); printf("Channel coding:\n");
for (int i=0; i<NR_POLAR_PBCH_E>>3; i++) for (int i=0; i<NR_POLAR_PBCH_E>>3; i++)
printf("pbch_e[%d]: 0x%02x\t", i, pbch->pbch_e[i]); printf("pbch_e[%d]: 0x%02x\t", i, pbch->pbch_e[i]);
printf("\n"); printf("\n");
#endif #endif
...@@ -289,7 +289,7 @@ int nr_generate_pbch(NR_gNB_PBCH *pbch, ...@@ -289,7 +289,7 @@ int nr_generate_pbch(NR_gNB_PBCH *pbch,
#ifdef DEBUG_PBCH_ENCODING #ifdef DEBUG_PBCH_ENCODING
printf("Scrambling:\n"); printf("Scrambling:\n");
for (int i=0; i<NR_POLAR_PBCH_E>>3; i++) for (int i=0; i<NR_POLAR_PBCH_E>>3; i++)
printf("pbch_e[%d]: 0x%02x\t", i, pbch->pbch_e[i]); printf("pbch_e[%d]: 0x%02x\t", i, pbch->pbch_e[i]);
printf("\n"); printf("\n");
#endif #endif
......
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