DCI extraction validated for format 1-0 (273 PRBs)

openair1/PHY/NR_TRANSPORT/nr_dci_tools.c

@@ -31,7 +31,7 @@
  */
 
 #include "nr_dci.h"
-
+//#define DEBUG_FILL_DCI
 
 void nr_fill_cce_list(NR_gNB_DCI_ALLOC_t* dci_alloc, uint16_t n_shift, uint8_t m) {
 
@@ -112,11 +112,11 @@ void nr_fill_dci_and_dlsch(PHY_VARS_gNB *gNB,
                            NR_gNB_DCI_ALLOC_t *dci_alloc,
                            nfapi_nr_dl_config_request_pdu_t *pdu)
 {
-  NR_DL_FRAME_PARMS *fp = &gNB->frame_parms;
+
   uint8_t n_shift;
 
-  uint32_t *dci_pdu = dci_alloc->dci_pdu;
-  memset((void*)dci_pdu,0,4*sizeof(uint32_t));
+  uint64_t *dci_pdu = (uint64_t*)dci_alloc->dci_pdu;
+  memset((void*)dci_pdu,0,2*sizeof(uint64_t));
   nfapi_nr_dl_config_dci_dl_pdu_rel15_t *pdu_rel15 = &pdu->dci_dl_pdu.dci_dl_pdu_rel15;
   nfapi_nr_dl_config_pdcch_parameters_rel15_t *params_rel15 = &pdu->dci_dl_pdu.pdcch_params_rel15;
 
@@ -133,7 +133,6 @@ void nr_fill_dci_and_dlsch(PHY_VARS_gNB *gNB,
 				    dci_alloc->pdcch_params.rnti_type,
 				    N_RB,
 				    cfg);
-  printf("DCI size for n_RB_BWP %d => %d\n",N_RB,dci_alloc->size);
 
   AssertFatal(dci_alloc->size<=64, "DCI sizes above 64 bits not yet supported");
   n_shift = (dci_alloc->pdcch_params.config_type == NFAPI_NR_CSET_CONFIG_MIB_SIB1)?
@@ -146,21 +145,39 @@ void nr_fill_dci_and_dlsch(PHY_VARS_gNB *gNB,
   case NFAPI_NR_DL_DCI_FORMAT_1_0:
     switch(params_rel15->rnti_type) {
     case NFAPI_NR_RNTI_RA:
+      //      printf("dci_pdu %llx\n",(unsigned long long int)*dci_pdu);
       // Freq domain assignment
       fsize = (int)ceil( log2( (N_RB*(N_RB+1))>>1 ) );
-        	for (int i=0; i<fsize; i++)
-        		*dci_pdu |= ((pdu_rel15->frequency_domain_assignment>>(fsize-i-1))&1)<<(dci_alloc->size-pos++);
+      pos=fsize;
+      *dci_pdu |= ((pdu_rel15->frequency_domain_assignment&((1<<fsize)-1)) << (dci_alloc->size-pos)); 
+#ifdef DEBUG_FILL_DCI
+      printf("frequency-domain assignment %d (%d bits)=> %d (%llx)\n",pdu_rel15->frequency_domain_assignment,fsize,dci_alloc->size-pos,(unsigned long long int)*dci_pdu);
+#endif
       // Time domain assignment
-        	for (int i=0; i<4; i++)
-        		*dci_pdu |= ((pdu_rel15->time_domain_assignment>>(3-i))&1)<<(dci_alloc->size-pos++);
+      pos+=4;		   
+      *dci_pdu |= ((pdu_rel15->time_domain_assignment&0xf) << (dci_alloc->size-pos)); 
+#ifdef DEBUG_FILL_DCI
+      printf("time-domain assignment %d  (3 bits)=> %d (%llx)\n",pdu_rel15->time_domain_assignment,dci_alloc->size-pos,(unsigned long long int)*dci_pdu);
+#endif
       // VRB to PRB mapping
-        	*dci_pdu |= (pdu_rel15->vrb_to_prb_mapping&1)<<(dci_alloc->size-pos++);
+
+      pos++;
+      *dci_pdu |= (pdu_rel15->vrb_to_prb_mapping&0x1)<<(dci_alloc->size-pos);
+#ifdef DEBUG_FILL_DCI
+      printf("vrb to prb mapping %d  (1 bits)=> %d (%llx)\n",pdu_rel15->vrb_to_prb_mapping,dci_alloc->size-pos,(unsigned long long int)*dci_pdu);
+#endif
       // MCS
-        	for (int i=0; i<5; i++)
-        		*dci_pdu |= ((pdu_rel15->mcs>>(4-i))&1)<<(dci_alloc->size-pos++);
+      pos+=5;
+      *dci_pdu |= (pdu_rel15->mcs&0x1f)<<(dci_alloc->size-pos);
+#ifdef DEBUG_FILL_DCI
+      printf("mcs %d  (5 bits)=> %d (%llx)\n",pdu_rel15->mcs,dci_alloc->size-pos,(unsigned long long int)*dci_pdu);
+#endif
       // TB scaling
-        	for (int i=0; i<2; i++)
-        		*dci_pdu |= ((pdu_rel15->tb_scaling>>(1-i))&1)<<(dci_alloc->size-pos++);
+      pos+=2;
+      *dci_pdu |= (pdu_rel15->tb_scaling&0x3)<<(dci_alloc->size-pos);
+#ifdef DEBUG_FILL_DCI
+      printf("tb_scaling %d  (2 bits)=> %d (%llx)\n",pdu_rel15->tb_scaling,dci_alloc->size-pos,(unsigned long long int)*dci_pdu);
+#endif
       break;
 
     case NFAPI_NR_RNTI_C:  
@@ -171,7 +188,7 @@ void nr_fill_dci_and_dlsch(PHY_VARS_gNB *gNB,
       for (int i=0; i<fsize; i++) 
 	*dci_pdu |= ((pdu_rel15->frequency_domain_assignment>>(fsize-i-1))&1)<<(dci_alloc->size-pos++);
 
-          if ((pdu_rel15->frequency_domain_assignment+1)&1 ==0) //fsize are all 1  38.212 p86
+      if (((pdu_rel15->frequency_domain_assignment+1)&1) ==0) //fsize are all 1  38.212 p86
 	{
 	  // ra_preamble_index 6 bits
 	  for (int i=0; i<6; i++)
@@ -405,7 +422,7 @@ void nr_fill_dci_and_dlsch(PHY_VARS_gNB *gNB,
     break;
   }
 
-  LOG_I(PHY, "DCI PDU: [0]->0x%16x \t [1]->0x%16x \n",dci_pdu[0], dci_pdu[1]);
+  LOG_I(PHY, "DCI PDU: [0]->0x%16llxx \t [1]->0x%16llx \n",(long long unsigned int)dci_pdu[0], (long long unsigned int)dci_pdu[1]);
   LOG_I(PHY, "DCI type %d payload (size %d) generated on candidate %d\n", dci_alloc->pdcch_params.dci_format, dci_alloc->size, cand_idx);
 
 }

openair1/PHY/NR_UE_TRANSPORT/dci_nr.c

@@ -1439,7 +1439,7 @@ void nr_dci_decoding_procedure0(int s,
 
       t_nrPolar_paramsPtr currentPtrDCI=nr_polar_params(nrPolar_params, 1, sizeof_bits, L2);
       decoderState = polar_decoder_int16((int16_t*)&pdcch_vars[eNB_id]->e_rx[CCEind*9*6*2],
-					 dci_estimation,
+					 (uint64_t*)dci_estimation,
 					 currentPtrDCI);
       crc = decoderState;						   
       //crc = (crc16(&dci_decoded_output[current_thread_id][0], sizeof_bits) >> 16) ^ extract_crc(&dci_decoded_output[current_thread_id][0], sizeof_bits);

openair1/PHY/NR_UE_TRANSPORT/dci_tools_nr.c

@@ -30,6 +30,7 @@
  * \warning
  */
 //#include "PHY/defs.h"
+#include <stdint.h>
 #include "PHY/defs_nr_UE.h"
 //#include "PHY/NR_TRANSPORT/nr_dci.h"
 //#include "PHY/NR_UE_TRANSPORT/nr_transport_ue.h"
@@ -67,18 +68,28 @@ uint16_t nr_dci_field(uint32_t dci_pdu[4],
                       uint8_t dci_fields_sizes[NBR_NR_DCI_FIELDS],
                       uint8_t dci_field)
 {
-  uint16_t field_value  = 0 ;
+  //  uint16_t field_value  = 0 ;
   // first_bit_position contains the position of the first bit of the corresponding field within the dci pdu payload
-  uint16_t first_bit_position = 0;
+
   // last_bit_position contains the position of the last bit of the corresponding field within the dci pdu payload
-  uint16_t last_bit_position = 0;
-  uint8_t bit=0;
+  //  uint16_t last_bit_position = 0;
+  //  uint8_t bit=0;
   //printf("\tdci_field=%d, \tsize=%d \t|",dci_field,dci_fields_sizes[dci_field]);
-  for (int i=0; i<dci_field ; i++){
-    first_bit_position = first_bit_position + dci_fields_sizes[i];
+  int dci_size=0;
+
+  for (int i=0;i<NBR_NR_DCI_FIELDS;i++) dci_size+=dci_fields_sizes[i];
+
+  AssertFatal(dci_size<65,"DCI has %d > 64 bits, not supported for now\n",
+	      dci_size);
+
+  uint16_t first_bit_position = dci_size;
+  
+  for (int i=0; i<=dci_field ; i++){
+    first_bit_position = first_bit_position - dci_fields_sizes[i];
   }
-  last_bit_position = first_bit_position + dci_fields_sizes[dci_field];
+  //  last_bit_position = first_bit_position + dci_fields_sizes[dci_field];
   //printf("\tfirst_bit=%d,\tlast_bit=%d",first_bit_position,last_bit_position);
+  /*
   for (int i=0; i<4; i++)
     for (int j=0; j<32; j++){
       if ((((i*32)+j) >= first_bit_position) && (((i*32)+j) < last_bit_position)){
@@ -87,7 +98,13 @@ uint16_t nr_dci_field(uint32_t dci_pdu[4],
         //printf(" bit(%d)=%d[%d] ",(i*32)+j,bit,field_value);
       }
     }
-  return field_value;
+  */
+
+  uint64_t *dci_pdu64=(uint64_t*)&dci_pdu[0];
+
+  printf("pdu %llx, field %d, pos %d, size %d => %u\n",(long long unsigned int)*dci_pdu64,dci_field,first_bit_position,dci_fields_sizes[dci_field],
+	 (unsigned int)((*dci_pdu64>>first_bit_position)&((1<<dci_fields_sizes[dci_field])-1)));
+  return (uint16_t)((*dci_pdu64>>first_bit_position)&((1<<dci_fields_sizes[dci_field])-1));
 }
 
 int nr_extract_dci_info(PHY_VARS_NR_UE *ue,