Commit 667543b6 authored by hongzhi wang's avatar hongzhi wang

Merge branch 'nr_pdsch' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_pdsch

parents dd55d0f6 7abda1ec
...@@ -341,6 +341,8 @@ int nr_dlsch_encoding(unsigned char *a, ...@@ -341,6 +341,8 @@ int nr_dlsch_encoding(unsigned char *a,
Kr = dlsch->harq_processes[harq_pid]->K; Kr = dlsch->harq_processes[harq_pid]->K;
//Kr_bytes = Kr>>3; //Kr_bytes = Kr>>3;
//printf("segment Z %d kb %d k %d Kr %d BG %d\n", *pz,kb,dlsch->harq_processes[harq_pid]->K,Kr,BG);
//start_meas(te_stats); //start_meas(te_stats);
for (r=0; r<dlsch->harq_processes[harq_pid]->C; r++) { for (r=0; r<dlsch->harq_processes[harq_pid]->C; r++) {
d_tmp[r] = &dlsch->harq_processes[harq_pid]->d[r][0]; d_tmp[r] = &dlsch->harq_processes[harq_pid]->d[r][0];
......
...@@ -468,7 +468,7 @@ gNB->dlsch[k][i]->Nsoft = 10; ...@@ -468,7 +468,7 @@ gNB->dlsch[k][i]->Nsoft = 10;
unsigned int TBS = 8424; unsigned int TBS = 8424;
unsigned int available_bits; unsigned int available_bits;
uint16_t nb_symb_sch =4; uint16_t nb_symb_sch =8;
uint8_t nb_re_dmrs = 6; uint8_t nb_re_dmrs = 6;
uint16_t length_dmrs = 1; uint16_t length_dmrs = 1;
unsigned char mod_order; unsigned char mod_order;
...@@ -487,7 +487,7 @@ gNB->dlsch[k][i]->Nsoft = 10; ...@@ -487,7 +487,7 @@ gNB->dlsch[k][i]->Nsoft = 10;
// dlsch->harq_processes[0]->nb_rb,dlsch->harq_processes[0]->mcs,dlsch->harq_processes[0]->Nl); // dlsch->harq_processes[0]->nb_rb,dlsch->harq_processes[0]->mcs,dlsch->harq_processes[0]->Nl);
mod_order = nr_get_Qm(Imcs,1); mod_order = nr_get_Qm(Imcs,1);
available_bits = nr_get_G(nb_rb, nb_symb_sch, nb_re_dmrs, length_dmrs,2,1); available_bits = nr_get_G(nb_rb, nb_symb_sch, nb_re_dmrs, length_dmrs,mod_order,1);
TBS= nr_compute_tbs(Imcs,nb_rb,nb_symb_sch,nb_re_dmrs,length_dmrs,Nl); TBS= nr_compute_tbs(Imcs,nb_rb,nb_symb_sch,nb_re_dmrs,length_dmrs,Nl);
printf("available bits %d TBS %d mod_order %d\n",available_bits, TBS, mod_order); printf("available bits %d TBS %d mod_order %d\n",available_bits, TBS, mod_order);
//dlsch->harq_ids[subframe]= 0; //dlsch->harq_ids[subframe]= 0;
...@@ -526,8 +526,8 @@ gNB->dlsch[k][i]->Nsoft = 10; ...@@ -526,8 +526,8 @@ gNB->dlsch[k][i]->Nsoft = 10;
estimated_output = harq_process->b; estimated_output = harq_process->b;
for (int i=0; i<TBS/8; i++) /*for (int i=0; i<TBS/8; i++)
printf("test input[%d]=%d \n",i,test_input[i]); printf("test input[%d]=%d \n",i,test_input[i]);*/
//printf("crc32: [0]->0x%08x\n",crc24c(test_input, 32)); //printf("crc32: [0]->0x%08x\n",crc24c(test_input, 32));
......
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