maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nsymbs 2

Browse Source
This commit is contained in:
Guy De Souza
2018-10-29 16:17:56 +01:00
parent 25e9f02e8c
commit f3159e6884
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/PHY/NR_TRANSPORT/nr_dlsch.c
+7 -7
View File
@@ -126,7 +126,7 @@ void nr_pdsch_layer_mapping(uint16_t **mod_symbs,
case 2: case 2:
case 3: case 3:
case 4: case 4:
for (int i=0; i<n_symbs[0]/n_layers; i++) for (int i=0; i<n_symbs/n_layers; i++)
for (int l=0; l<n_layers; l++) { for (int l=0; l<n_layers; l++) {
tx_layers[l][i<<1] = mod_symbs[0][(n_layers*i+l)<<1]; tx_layers[l][i<<1] = mod_symbs[0][(n_layers*i+l)<<1];
tx_layers[l][(i<<1)+1] = mod_symbs[0][((n_layers*i+l)<<1)+1]; tx_layers[l][(i<<1)+1] = mod_symbs[0][((n_layers*i+l)<<1)+1];
@@ -134,12 +134,12 @@ void nr_pdsch_layer_mapping(uint16_t **mod_symbs,
break; break;
case 5: case 5:
for (int i=0; i<n_symbs[0]>>1; i++) for (int i=0; i<n_symbs>>1; i++)
for (int l=0; l<2; l++) { for (int l=0; l<2; l++) {
tx_layers[l][i<<1] = mod_symbs[0][((i<<1)+l)<<1]; tx_layers[l][i<<1] = mod_symbs[0][((i<<1)+l)<<1];
tx_layers[l][(i<<1)+1] = mod_symbs[0][(((i<<1)+l)<<1)+1]; tx_layers[l][(i<<1)+1] = mod_symbs[0][(((i<<1)+l)<<1)+1];
} }
for (int i=0; i<n_symbs[1]/3; i++) for (int i=0; i<n_symbs/3; i++)
for (int l=2; l<5; l++) { for (int l=2; l<5; l++) {
tx_layers[l][i<<1] = mod_symbs[1][(3*i+l)<<1]; tx_layers[l][i<<1] = mod_symbs[1][(3*i+l)<<1];
tx_layers[l][(i<<1)+1] = mod_symbs[1][((3*i+l)<<1)+1]; tx_layers[l][(i<<1)+1] = mod_symbs[1][((3*i+l)<<1)+1];
@@ -148,7 +148,7 @@ void nr_pdsch_layer_mapping(uint16_t **mod_symbs,
case 6: case 6:
for (int q=0; q<2; q++) for (int q=0; q<2; q++)
for (int i=0; i<n_symbs[q]/3; i++) for (int i=0; i<n_symbs/3; i++)
for (int l=0; l<3; l++) { for (int l=0; l<3; l++) {
tx_layers[l][i<<1] = mod_symbs[q][(3*i+l)<<1]; tx_layers[l][i<<1] = mod_symbs[q][(3*i+l)<<1];
tx_layers[l][(i<<1)+1] = mod_symbs[q][((3*i+l)<<1)+1]; tx_layers[l][(i<<1)+1] = mod_symbs[q][((3*i+l)<<1)+1];
@@ -156,12 +156,12 @@ void nr_pdsch_layer_mapping(uint16_t **mod_symbs,
break; break;
case 7: case 7:
for (int i=0; i<n_symbs[0]/3; i++) for (int i=0; i<n_symbs/3; i++)
for (int l=0; l<3; l++) { for (int l=0; l<3; l++) {
tx_layers[l][i<<1] = mod_symbs[1][(3*i+l)<<1]; tx_layers[l][i<<1] = mod_symbs[1][(3*i+l)<<1];
tx_layers[l][(i<<1)+1] = mod_symbs[1][((3*i+l)<<1)+1]; tx_layers[l][(i<<1)+1] = mod_symbs[1][((3*i+l)<<1)+1];
} }
for (int i=0; i<n_symbs[1]/4; i++) for (int i=0; i<n_symbs/4; i++)
for (int l=3; l<7; l++) { for (int l=3; l<7; l++) {
tx_layers[l][i<<1] = mod_symbs[0][((i<<2)+l)<<1]; tx_layers[l][i<<1] = mod_symbs[0][((i<<2)+l)<<1];
tx_layers[l][(i<<1)+1] = mod_symbs[0][(((i<<2)+l)<<1)+1]; tx_layers[l][(i<<1)+1] = mod_symbs[0][(((i<<2)+l)<<1)+1];
@@ -170,7 +170,7 @@ void nr_pdsch_layer_mapping(uint16_t **mod_symbs,
case 8: case 8:
for (int q=0; q<2; q++) for (int q=0; q<2; q++)
for (int i=0; i<n_symbs[q]>>2; i++) for (int i=0; i<n_symbs>>2; i++)
for (int l=0; l<3; l++) { for (int l=0; l<3; l++) {
tx_layers[l][i<<1] = mod_symbs[q][((i<<2)+l)<<1]; tx_layers[l][i<<1] = mod_symbs[q][((i<<2)+l)<<1];
tx_layers[l][(i<<1)+1] = mod_symbs[q][(((i<<2)+l)<<1)+1]; tx_layers[l][(i<<1)+1] = mod_symbs[q][(((i<<2)+l)<<1)+1];
openair1/PHY/NR_TRANSPORT/nr_dlsch.h
+1 -1
View File
@@ -75,7 +75,7 @@ void nr_pdsch_codeword_modulation(uint32_t *in,
void nr_pdsch_layer_mapping(uint16_t **mod_symbs, void nr_pdsch_layer_mapping(uint16_t **mod_symbs,
uint8_t n_codewords, uint8_t n_codewords,
uint8_t n_layers, uint8_t n_layers,
uint16_t *n_symbs, uint16_t n_symbs,
uint16_t **tx_layers); uint16_t **tx_layers);
uint8_t nr_generate_pdsch(NR_gNB_DLSCH_t dlsch, uint8_t nr_generate_pdsch(NR_gNB_DLSCH_t dlsch,