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

Merge remote-tracking branch 'origin/physim-hotfix' into ldpc-decoder-codegen

Browse Source
This commit is contained in:
Raymond Knopp
2022-01-13 10:35:32 +01:00
parent 08100357f7 f44d1ccfeb
commit 7090db60bc
3 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/SIMULATION/LTE_PHY/dlsim.c
+1 -1
View File
@@ -1234,7 +1234,7 @@ int main(int argc, char **argv) {
break; break;
} }
for (k=0; k<NUMBER_OF_UE_MAX; k++) { for (k=0; k<n_users; k++) {
// Create transport channel structures for 2 transport blocks (MIMO) // Create transport channel structures for 2 transport blocks (MIMO)
for (i=0; i<2; i++) { for (i=0; i<2; i++) {
eNB->dlsch[k][i] = new_eNB_dlsch(Kmimo,8,Nsoft,N_RB_DL,0,&eNB->frame_parms); eNB->dlsch[k][i] = new_eNB_dlsch(Kmimo,8,Nsoft,N_RB_DL,0,&eNB->frame_parms);
openair1/SIMULATION/LTE_PHY/mbmssim.c
+7 -11
View File
@@ -1339,20 +1339,16 @@ int main(int argc, char **argv) {
break; break;
} }
for (k=0; k<NUMBER_OF_UE_MAX; k++) { // Create transport channel structures for 1 transport block
// Create transport channel structures for 2 transport blocks (MIMO) eNB->dlsch[0][0] = new_eNB_dlsch(Kmimo,8,Nsoft,N_RB_DL,0,&eNB->frame_parms);
for (i=0; i<2; i++) {
eNB->dlsch[k][i] = new_eNB_dlsch(Kmimo,8,Nsoft,N_RB_DL,0,&eNB->frame_parms);
if (!eNB->dlsch[k][i]) { if (!eNB->dlsch[0][0]) {
printf("Can't get eNB dlsch structures\n"); printf("Can't get eNB dlsch structures\n");
exit(-1); exit(-1);
}
eNB->dlsch[k][i]->rnti = n_rnti+k;
}
} }
eNB->dlsch[0][0]->rnti = n_rnti+k;
#ifdef ENABLE_MBMS_SIM #ifdef ENABLE_MBMS_SIM
eNB->dlsch_MCH = new_eNB_dlsch(1,8,Nsoft,N_RB_DL, 0, &eNB->frame_parms); eNB->dlsch_MCH = new_eNB_dlsch(1,8,Nsoft,N_RB_DL, 0, &eNB->frame_parms);
#endif #endif
openair1/SIMULATION/LTE_PHY/ulsim.c
+2 -2
View File
@@ -352,7 +352,7 @@ int main(int argc, char **argv) {
unsigned short input_buffer_length; unsigned short input_buffer_length;
unsigned int ret; unsigned int ret;
unsigned int coded_bits_per_codeword,nsymb; unsigned int coded_bits_per_codeword,nsymb;
unsigned int tx_lev=0,tx_lev_dB,trials,errs[5]= {0,0,0,0,0},round_trials[4]= {0,0,0,0}; unsigned int tx_lev=0,tx_lev_dB=0,trials,errs[5]= {0,0,0,0,0},round_trials[4]= {0,0,0,0};
FILE *bler_fd=NULL; FILE *bler_fd=NULL;
char bler_fname[512]; char bler_fname[512];
FILE *time_meas_fd=NULL; FILE *time_meas_fd=NULL;
@@ -743,7 +743,7 @@ int main(int argc, char **argv) {
UE2eNB->max_Doppler = maxDoppler; UE2eNB->max_Doppler = maxDoppler;
// NN: N_RB_UL has to be defined in ulsim // NN: N_RB_UL has to be defined in ulsim
for (int k=0; k<NUMBER_OF_UE_MAX; k++) eNB->ulsch[k] = new_eNB_ulsch(max_turbo_iterations,N_RB_DL,0); for (int k=0; k<1; k++) eNB->ulsch[k] = new_eNB_ulsch(max_turbo_iterations,N_RB_DL,0);
UE->ulsch[0] = new_ue_ulsch(N_RB_DL,0); UE->ulsch[0] = new_ue_ulsch(N_RB_DL,0);
printf("ULSCH %p\n",UE->ulsch[0]); printf("ULSCH %p\n",UE->ulsch[0]);