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

Bug fixes in "ulschsim.c" and "nr_ulsch_coding.c" + minor cleanups

Browse Source
This commit is contained in:
Ahmed Hussein
2019-06-04 11:33:36 +02:00
committed by Thomas Schlichter
parent 73db162804
commit 54c96644ae
4 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
+6 -7
View File
@@ -301,16 +301,15 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *phy_vars_gNB,
t_nrLDPC_time_stats* p_procTime = &procTime ; t_nrLDPC_time_stats* p_procTime = &procTime ;
t_nrLDPC_procBuf** p_nrLDPC_procBuf = harq_process->p_nrLDPC_procBuf; t_nrLDPC_procBuf** p_nrLDPC_procBuf = harq_process->p_nrLDPC_procBuf;
int16_t z [68*384]; int16_t z [68*384];
int8_t l [68*384]; int8_t l [68*384];
//int16_t inv_d [68*384]; uint8_t kc;
uint8_t kc; uint8_t Ilbrm = 0;
uint8_t Ilbrm = 0;
uint32_t Tbslbrm = 950984; uint32_t Tbslbrm = 950984;
uint16_t nb_rb = 30; //to update uint16_t nb_rb = 30; //to update
uint8_t nb_re_dmrs = 6; uint8_t nb_re_dmrs = 6;
uint16_t length_dmrs = 1; uint16_t length_dmrs = 1;
double Coderate = 0.0; double Coderate = 0.0;
uint32_t i,j; uint32_t i,j;
openair1/PHY/NR_UE_TRANSPORT/nr_transport_ue.h
+1 -1
View File
@@ -153,7 +153,7 @@ typedef struct {
/// Number of soft channel bits /// Number of soft channel bits
uint32_t G; uint32_t G;
// Number of modulated symbols carrying data // Number of modulated symbols carrying data
uint8_t num_of_mod_symbols; uint32_t num_of_mod_symbols;
// This is "L" in TS 38.214 V15.4.0 subclause 6.1.2.1 // This is "L" in TS 38.214 V15.4.0 subclause 6.1.2.1
uint8_t number_of_symbols; uint8_t number_of_symbols;
// This is "S" in TS 38.214 V15.4.0 subclause 6.1.2.1 // This is "S" in TS 38.214 V15.4.0 subclause 6.1.2.1
openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
+1 -1
View File
@@ -446,7 +446,7 @@ int nr_ulsch_encoding(NR_UE_ULSCH_t *ulsch,
} }
memcpy(ulsch->g,harq_process->f,G>>3); // g is the concatenated code block memcpy(ulsch->g,harq_process->f,G); // g is the concatenated code block
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_ENB_DLSCH_ENCODING, VCD_FUNCTION_OUT); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_ENB_DLSCH_ENCODING, VCD_FUNCTION_OUT);
openair1/SIMULATION/NR_PHY/ulschsim.c
+1 -5
View File
@@ -138,9 +138,7 @@ int main(int argc, char **argv) {
uint16_t N_RB_DL = 106, N_RB_UL = 106, mu = 1; uint16_t N_RB_DL = 106, N_RB_UL = 106, mu = 1;
//unsigned char frame_type = 0; //unsigned char frame_type = 0;
int frame = 0, subframe = 0; int frame = 0, subframe = 0;
int frame_length_complex_samples;
NR_DL_FRAME_PARMS *frame_parms; NR_DL_FRAME_PARMS *frame_parms;
uint32_t Nsoft = 0;
double sigma; double sigma;
unsigned char qbits = 8; unsigned char qbits = 8;
int ret; int ret;
@@ -374,8 +372,6 @@ int main(int argc, char **argv) {
phy_init_nr_gNB(gNB, 0, 0); phy_init_nr_gNB(gNB, 0, 0);
frame_length_complex_samples = frame_parms->samples_per_subframe;
//configure UE //configure UE
UE = malloc(sizeof(PHY_VARS_NR_UE)); UE = malloc(sizeof(PHY_VARS_NR_UE));
memcpy(&UE->frame_parms, frame_parms, sizeof(NR_DL_FRAME_PARMS)); memcpy(&UE->frame_parms, frame_parms, sizeof(NR_DL_FRAME_PARMS));
@@ -513,7 +509,7 @@ int main(int argc, char **argv) {
} }
*/ */
if (ulsch_ue->harq_processes[0]->f[i] == 0) if (ulsch_ue->g[i] == 0)
modulated_input[i] = 1.0; ///sqrt(2); //QPSK modulated_input[i] = 1.0; ///sqrt(2); //QPSK
else else
modulated_input[i] = -1.0; ///sqrt(2); modulated_input[i] = -1.0; ///sqrt(2);