Merge branch 'nr_pdsch_debug' into 'develop-nr'

Nr pdsch debug

See merge request oai/openairinterface5g!556

openair1/PHY/NR_TRANSPORT/nr_dlsch.c

@@ -215,7 +215,7 @@ uint8_t nr_generate_pdsch(NR_gNB_DLSCH_t dlsch,
   nr_dlsch_encoding(harq->pdu, slot, &dlsch, &frame_parms);
 #ifdef DEBUG_DLSCH
 printf("PDSCH encoding:\nPayload:\n");
-for (int i=0; i<TBS>>7; i++) {
+for (int i=0; i<harq->B>>7; i++) {
   for (int j=0; j<16; j++)
     printf("0x%02x\t", harq->pdu[(i<<4)+j]);
   printf("\n");
@@ -308,16 +308,13 @@ for (int i=0; i<n_dmrs>>4; i++) {
 
 
     // Non interleaved VRB to PRB mapping
-  uint16_t start_sc = frame_parms.first_carrier_offset + frame_parms.ssb_start_subcarrier;
-  if (start_sc >= frame_parms.ofdm_symbol_size)
-    start_sc -= frame_parms.ofdm_symbol_size;
- /*rel15->start_prb*NR_NB_SC_PER_RB +
-  ((pdcch_params.search_space_type == NFAPI_NR_SEARCH_SPACE_TYPE_COMMON) && (pdcch_params.dci_format == NFAPI_NR_DL_DCI_FORMAT_1_0))?\
-       ((frame_parms.ssb_start_subcarrier/NR_NB_SC_PER_RB + pdcch_params.rb_offset)*NR_NB_SC_PER_RB) : 0;*/
+ uint16_t start_sc = frame_parms.first_carrier_offset + rel15->start_prb*NR_NB_SC_PER_RB;
+ if (start_sc >= frame_parms.ofdm_symbol_size)
+   start_sc -= frame_parms.ofdm_symbol_size;
 
 #ifdef DEBUG_DLSCH_MAPPING
-printf("PDSCH resource mapping started (start SC %d\tstart symbol %d\tN_PRB %d\tnb_symbols %d)\n",
-start_sc, rel15->start_symbol, rel15->n_prb, rel15->nb_symbols);
+ printf("PDSCH resource mapping started (start SC %d\tstart symbol %d\tN_PRB %d\tnb_symbols %d)\n",
+	start_sc, rel15->start_symbol, rel15->n_prb, rel15->nb_symbols);
 #endif
 
   for (int ap=0; ap<rel15->nb_layers; ap++) {

openair1/PHY/NR_TRANSPORT/nr_tbs_tools.c

@@ -126,7 +126,7 @@ void nr_get_tbs(nfapi_nr_dl_config_dlsch_pdu *dlsch_pdu,
   uint16_t N_RE, Ninfo, Ninfo_prime, C, TBS=0, R;
   uint8_t table_idx, Qm, n, scale;
 
-  table_idx = get_table_idx(mcs_table, dci_format, rnti_type, ss_type);
+  table_idx = 1; //get_table_idx(mcs_table, dci_format, rnti_type, ss_type);
   scale = ((table_idx==2)&&((Imcs==20)||(Imcs==26)))?11:10;
   
   N_RE = min(156, N_RE_prime)*dlsch_rel15->n_prb;

openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c

@@ -1985,18 +1985,18 @@ void nr_dlsch_channel_level(int **dl_ch_estimates_ext,
 //==============================================================================================
 
 unsigned short nr_dlsch_extract_rbs_single(int **rxdataF,
-                                        int **dl_ch_estimates,
-                                        int **rxdataF_ext,
-                                        int **dl_ch_estimates_ext,
-                                        unsigned short pmi,
-                                        unsigned char *pmi_ext,
-                                        unsigned int *rb_alloc,
-                                        unsigned char symbol,
-										unsigned short start_rb,
-										unsigned short nb_rb_pdsch,
-                                        unsigned char nr_tti_rx,
-                                        uint32_t high_speed_flag,
-                                        NR_DL_FRAME_PARMS *frame_parms) {
+					   int **dl_ch_estimates,
+					   int **rxdataF_ext,
+					   int **dl_ch_estimates_ext,
+					   unsigned short pmi,
+					   unsigned char *pmi_ext,
+					   unsigned int *rb_alloc, //unused in NR
+					   unsigned char symbol,
+					   unsigned short start_rb,
+					   unsigned short nb_rb_pdsch,
+					   unsigned char nr_tti_rx,
+					   uint32_t high_speed_flag,
+					   NR_DL_FRAME_PARMS *frame_parms) {
 
 
 
@@ -2008,20 +2008,8 @@ unsigned short nr_dlsch_extract_rbs_single(int **rxdataF,
 
   unsigned char pilots=0,j=0;
 
-  //symbol_mod = (symbol>=(7-frame_parms->Ncp)) ? symbol-(7-frame_parms->Ncp) : symbol;
-  pilots = (symbol==2) ? 1 : 0; //to updated from config
-  //l=symbol;
-  //nsymb = (frame_parms->Ncp==NORMAL) ? 14:12;
-  k = frame_parms->first_carrier_offset + 516; //0
-
- /* if (frame_parms->frame_type == TDD) {  // TDD
-    sss_symb = nsymb-1;
-    pss_symb = 2;
-  } else {
-    sss_symb = (nsymb>>1)-2;
-    pss_symb = (nsymb>>1)-1;
-  }*/
-
+  pilots = (symbol==2) ? 1 : 0; //to updated from config!!!
+  k = frame_parms->first_carrier_offset + 12*start_rb; 
 
   for (aarx=0; aarx<frame_parms->nb_antennas_rx; aarx++) {
 

openair1/SIMULATION/NR_PHY/dlschsim.c

@@ -174,7 +174,7 @@ int main(int argc, char **argv) {
 	//logInit();
 	randominit(0);
 
-	while ((c = getopt(argc, argv, "df:hpg:i:j:n:l:m:r:s:S:y:z:M:N:F:R:P:")) != -1) {
+	while ((c = getopt(argc, argv, "df:hpg:i:j:n:l:m:r:s:S:y:z:M:N:F:R:P:L:")) != -1) {
 		switch (c) {
 		case 'f':
 			write_output_file = 1;
@@ -315,6 +315,10 @@ int main(int argc, char **argv) {
 
 			break;
 
+		case 'L':
+		  loglvl = atoi(optarg);
+		  break;
+
 		case 'm':
 			Imcs = atoi(optarg);
 			break;