Merge branch 'develop-nr-fix' into 'develop-nr'

adding crcTableInit to make lte-softmodem work again. some code cleanup.

See merge request oai/openairinterface5g!423

openair1/PHY/CODING/crc_byte.c

@@ -255,48 +255,6 @@ unsigned int crcPayload(unsigned char * inptr, int bitlen, uint32_t* crc256Table
         return crc;
 }
 
-void nr_crc_computation(uint8_t* input, uint8_t* output, uint16_t payloadBits, uint16_t crcParityBits, uint32_t* crc256Table)
-{
-        //Create payload in bit
-        uint8_t* input2 = (uint8_t*)malloc(payloadBits); //divided by 8 (in bits) 
-        uint8_t mask = 128; // 10000000
-        
-        for(uint8_t ind=0; ind<(payloadBits/8); ind++)
-        {
-                input2[ind]=0;
-                for(uint8_t ind2=0; ind2<8; ind2++)
-                { 
-                        if(input[8*ind+ind2])
-                        {
-                                input2[ind] = input2[ind] | mask;
-                        }
-                        mask= mask >> 1;
-                }
-                mask=128;
-        }
-
-        //crcTable256Init(poly);
-
-        unsigned int crcBits;   
-        crcBits = crcPayload(input2, payloadBits, crc256Table);
-	
-        //create crc in byte
-        unsigned int mask2=0x80000000; //100...
-        
-        for(uint8_t ind=0; ind<crcParityBits; ind++)
-        {
-                if(crcBits & mask2)
-                        output[ind]=1;
-                else
-                        output[ind]=0;
-
-		mask2 = mask2 >> 1;
-        }
-      
-}
-
-
-
 
 
 #ifdef DEBUG_CRC

openair1/PHY/CODING/nrPolar_tools/nr_crc_byte.c

@@ -21,132 +21,7 @@
 
 #include "PHY/CODING/nrPolar_tools/nr_polar_defs.h"
 
-/*
-// ----- New implementation ----
-uint32_t poly6 = 0x84000000; // 10000100000... -> D^6+D^5+1
-uint32_t poly11 = 0xc4200000; //11000100001000... -> D^11+D^10+D^9+D^5+1
-uint32_t poly16 = 0x10210000; //00100000010000100... - > D^16+D^12+D^5+1
-uint32_t poly24a = 0x864cfb00; //100001100100110011111011 -> D^24+D^23+D^18+D^17+D^14+D^11+D^10+D^7+D^6+D^5+D^4+D^3+D+1
-uint32_t poly24b = 0x80006300; //100000000000000001100011 -> D^24+D^23+D^6+D^5+D+1
-uint32_t poly24c = 0xB2B11700; //101100101011000100010111 -> D^24...
-
-//static unsigned int crc256Table[256];
-
-void nr_crc_computation(uint8_t* input, uint8_t* output, uint16_t payloadBits, uint16_t crcParityBits, uint32_t* crc256Table)
-{
-	//Create payload in bit
-	uint8_t* input2 = (uint8_t*)malloc(payloadBits); //divided by 8 (in bits) 
-        uint8_t mask = 128; // 10000000
-	
-        for(uint8_t ind=0; ind<(payloadBits/8); ind++)
-        {
-		input2[ind]=0;
-                for(uint8_t ind2=0; ind2<8; ind2++)
-                { 
-                        if(input[8*ind+ind2])
-                        {
-                                input2[ind] = input2[ind] | mask;
-                        }
-                        mask= mask >> 1;
-	        }
-                mask=128;
-        }
-
-        //crcTable256Init(poly);
-
-	unsigned int crcBits;	
-	crcBits = crcPayload(input2, payloadBits, crc256Table);
 
-	//create crc in byte
-	unsigned int mask2=0x80000000; //100...
-	output = (uint8_t*)malloc(sizeof(uint8_t)*crcParityBits);
-
-	for(uint8_t ind=0; ind<crcParityBits; ind++)
-        {
-		if(crcBits & mask2)
-			output[ind]=1;
-		else
-			output[ind]=0;
-
-		mask2 = mask2 >> 1;
-	}
-      
-}
-
-unsigned int crcbit (unsigned char* inputptr, int octetlen, unsigned int poly)
-{
-	unsigned int i, crc = 0, c;
-
-  	while (octetlen-- > 0) {
-    		c = (*inputptr++) << 24;
-	
-    		for (i = 8; i != 0; i--) {
-      			if ((1 << 31) & (c ^ crc))
-        			crc = (crc << 1) ^ poly;
-      			else
-        			crc <<= 1;
-
-      			c <<= 1;
-    		}
-  	}
-	
-  	return crc;
-}
-
-void crcTableInit (void)
-{	
-	unsigned char c = 0;
-
-	do {
-    	       	crc6Table[c] = crcbit(&c, 1, poly6);
-        	crc11Table[c]= crcbit(&c, 1, poly11);
-		crc16Table[c] =crcbit(&c, 1, poly16);
-		crc24aTable[c]=crcbit(&c, 1, poly24a);
-		crc24bTable[c]=crcbit(&c, 1, poly24b);
-		crc24cTable[c]=crcbit(&c, 1, poly24c);
-
-	} while (++c);
-}
-
-void crcTable256Init (uint32_t poly, uint32_t* crc256Table)
-{
-        unsigned char c = 0;
-//	crc256Table = malloc(sizeof(uint32_t)*256);
-
-        do {
-		crc256Table[c] = crcbit(&c, 1, poly);
-
-//                crc6Table[c] = crcbit(&c, 1, poly6);
-  //              crc11Table[c]= crcbit(&c, 1, poly11);
-//                crc16Table[c] =crcbit(&c, 1, poly16);
-//                crc24aTable[c]=crcbit(&c, 1, poly24a);
-//                crc24bTable[c]=crcbit(&c, 1, poly24b);
-//                crc24cTable[c]=crcbit(&c, 1, poly24c);
-
-        } while (++c);
-
-	//return crc256Table;
-}
-
-unsigned int crcPayload(unsigned char * inptr, int bitlen, uint32_t* crc256Table)
-{
-	int octetlen, resbit;
-        unsigned int crc = 0;
-        octetlen = bitlen/8; // Change in bytes
-        resbit = (bitlen % 8);
-
-        while (octetlen-- > 0)
-        {
-                crc = (crc << 8) ^ crc256Table[(*inptr++) ^ (crc >> 24)];
-        }
-
-        if (resbit > 0)
-        {
-                crc = (crc << resbit) ^ crc256Table[((*inptr) >> (8 - resbit)) ^ (crc >> (32 - resbit))];
-        }
-        return crc;
-}
-*/
 // ----- Old implementation ----
 uint8_t **crc24c_generator_matrix(uint16_t payloadSizeBits){
 

openair1/PHY/INIT/init_top.c

@@ -72,6 +72,7 @@ void init_lte_top(LTE_DL_FRAME_PARMS *frame_parms)
 
   init_dfts();
 
+  crcTableInit();
 
   phy_generate_viterbi_tables_lte();
 

openair1/PHY/INIT/nr_init.c

@@ -115,6 +115,10 @@ int phy_init_nr_gNB(PHY_VARS_gNB *gNB,
         );*/
   LOG_D(PHY,"[MSC_NEW][FRAME 00000][PHY_gNB][MOD %02"PRIu8"][]\n", gNB->Mod_id);
 
+  crcTableInit();
+
+  init_dfts();
+  
   // PBCH DMRS gold sequences generation
   nr_init_pbch_dmrs(gNB);
   // Polar encoder init for PBCH

openair1/PHY/INIT/nr_init_ue.c

@@ -947,6 +947,8 @@ void phy_init_nr_top(PHY_VARS_NR_UE *ue)
 
   crcTableInit();
 
+  init_dfts();
+  
   ccodedot11_init();
   ccodedot11_init_inv();
 

openair1/PHY/LTE_TRANSPORT/drs_modulation.c

-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-/*! \file PHY/LTE_TRANSPORT/drs_modulation.c
-* \brief Top-level routines for generating the Demodulation Reference Signals from 36-211, V8.6 2009-03
-* \author R. Knopp, F. Kaltenberger, A. Bhamri
-* \date 2011
-* \version 0.1
-* \company Eurecom
-* \email: knopp@eurecom.fr,florian.kaltenberger@eurecom.fr,ankit.bhamri@eurecom.fr
-* \note
-* \warning
-*/
-#include "PHY/defs.h"
-#include "PHY/extern.h"
-#include "PHY/sse_intrin.h"
-//#define DEBUG_DRS
-
-int generate_drs_pusch(PHY_VARS_UE *ue,
-		       UE_rxtx_proc_t *proc,
-                       uint8_t eNB_id,
-                       short amp,
-                       unsigned int subframe,
-                       unsigned int first_rb,
-                       unsigned int nb_rb,
-                       uint8_t ant)
-{
-
-  uint16_t k,l,Msc_RS,Msc_RS_idx,rb,drs_offset;
-  uint16_t * Msc_idx_ptr;
-  int subframe_offset,re_offset,symbol_offset;
-
-  //uint32_t phase_shift; // phase shift for cyclic delay in DM RS
-  //uint8_t alpha_ind;
-
-  int16_t alpha_re[12] = {32767, 28377, 16383,     0,-16384,  -28378,-32768,-28378,-16384,    -1, 16383, 28377};
-  int16_t alpha_im[12] = {0,     16383, 28377, 32767, 28377,   16383,     0,-16384,-28378,-32768,-28378,-16384};
-
-  uint8_t cyclic_shift,cyclic_shift0,cyclic_shift1;
-  LTE_DL_FRAME_PARMS *frame_parms = &ue->frame_parms;
-  int32_t *txdataF = ue->common_vars.txdataF[ant];
-  uint32_t u,v,alpha_ind;
-  uint32_t u0=frame_parms->pusch_config_common.ul_ReferenceSignalsPUSCH.grouphop[subframe<<1];
-  uint32_t u1=frame_parms->pusch_config_common.ul_ReferenceSignalsPUSCH.grouphop[1+(subframe<<1)];
-  uint32_t v0=frame_parms->pusch_config_common.ul_ReferenceSignalsPUSCH.seqhop[subframe<<1];
-  uint32_t v1=frame_parms->pusch_config_common.ul_ReferenceSignalsPUSCH.seqhop[1+(subframe<<1)];
-  int32_t ref_re,ref_im;
-  uint8_t harq_pid = subframe2harq_pid(frame_parms,proc->frame_tx,subframe);
-
-  cyclic_shift0 = (frame_parms->pusch_config_common.ul_ReferenceSignalsPUSCH.cyclicShift +
-                   ue->ulsch[eNB_id]->harq_processes[harq_pid]->n_DMRS2 +
-                   frame_parms->pusch_config_common.ul_ReferenceSignalsPUSCH.nPRS[subframe<<1]+
-                   ((ue->ulsch[0]->cooperation_flag==2)?10:0)+
-                   ant*6) % 12;
-  //  printf("PUSCH.cyclicShift %d, n_DMRS2 %d, nPRS %d\n",frame_parms->pusch_config_common.ul_ReferenceSignalsPUSCH.cyclicShift,ue->ulsch[eNB_id]->n_DMRS2,ue->lte_frame_parms.pusch_config_common.ul_ReferenceSignalsPUSCH.nPRS[subframe<<1]);
-  cyclic_shift1 = (frame_parms->pusch_config_common.ul_ReferenceSignalsPUSCH.cyclicShift +
-                   ue->ulsch[eNB_id]->harq_processes[harq_pid]->n_DMRS2 +
-                   frame_parms->pusch_config_common.ul_ReferenceSignalsPUSCH.nPRS[(subframe<<1)+1]+
-                   ((ue->ulsch[0]->cooperation_flag==2)?10:0)+
-                   ant*6) % 12;
-
-  //       cyclic_shift0 = 0;
-  //        cyclic_shift1 = 0;
-  Msc_RS = 12*nb_rb;
-
-  Msc_idx_ptr = (uint16_t*) bsearch(&Msc_RS, dftsizes, 33, sizeof(uint16_t), compareints);
-
-  if (Msc_idx_ptr)
-    Msc_RS_idx = Msc_idx_ptr - dftsizes;
-  else {
-    LOG_I(PHY,"generate_drs_pusch: index for Msc_RS=%d not found\n",Msc_RS);
-    return(-1);
-  }
-
-  for (l = (3 - frame_parms->Ncp),u=u0,v=v0,cyclic_shift=cyclic_shift0;
-       l<frame_parms->symbols_per_tti;
-       l += (7 - frame_parms->Ncp),u=u1,v=v1,cyclic_shift=cyclic_shift1) {
-
-    drs_offset = 0;
-#ifdef DEBUG_DRS
-    printf("drs_modulation: Msc_RS = %d, Msc_RS_idx = %d, u=%d,v=%d\n",Msc_RS, Msc_RS_idx,u,v);
-#endif
-
-
-    re_offset = frame_parms->first_carrier_offset;
-    subframe_offset = subframe*frame_parms->symbols_per_tti*frame_parms->ofdm_symbol_size;
-    symbol_offset = subframe_offset + frame_parms->ofdm_symbol_size*l;
-
-
-#ifdef DEBUG_DRS
-    printf("generate_drs_pusch: symbol_offset %d, subframe offset %d, cyclic shift %d\n",symbol_offset,subframe_offset,cyclic_shift);
-#endif
-    alpha_ind = 0;
-
-    for (rb=0; rb<frame_parms->N_RB_UL; rb++) {
-
-      if ((rb >= first_rb) && (rb<(first_rb+nb_rb))) {
-
-#ifdef DEBUG_DRS
-        printf("generate_drs_pusch: doing RB %d, re_offset=%d, drs_offset=%d,cyclic shift %d\n",rb,re_offset,drs_offset,cyclic_shift);
-#endif
-
-        for (k=0; k<12; k++) {
-          ref_re = (int32_t) ul_ref_sigs[u][v][Msc_RS_idx][drs_offset<<1];
-          ref_im = (int32_t) ul_ref_sigs[u][v][Msc_RS_idx][(drs_offset<<1)+1];
-
-          ((int16_t*) txdataF)[2*(symbol_offset + re_offset)]   = (int16_t) (((ref_re*alpha_re[alpha_ind]) -
-              (ref_im*alpha_im[alpha_ind]))>>15);
-          ((int16_t*) txdataF)[2*(symbol_offset + re_offset)+1] = (int16_t) (((ref_re*alpha_im[alpha_ind]) +
-              (ref_im*alpha_re[alpha_ind]))>>15);
-          ((short*) txdataF)[2*(symbol_offset + re_offset)]   = (short) ((((short*) txdataF)[2*(symbol_offset + re_offset)]*(int32_t)amp)>>15);
-          ((short*) txdataF)[2*(symbol_offset + re_offset)+1] = (short) ((((short*) txdataF)[2*(symbol_offset + re_offset)+1]*(int32_t)amp)>>15);
-
-
-          alpha_ind = (alpha_ind + cyclic_shift);
-
-          if (alpha_ind > 11)
-            alpha_ind-=12;
-
-#ifdef DEBUG_DRS
-          printf("symbol_offset %d, alpha_ind %d , re_offset %d : (%d,%d)\n",
-              symbol_offset,
-              alpha_ind,
-              re_offset,
-              ((short*) txdataF)[2*(symbol_offset + re_offset)],
-              ((short*) txdataF)[2*(symbol_offset + re_offset)+1]);
-
-#endif  // DEBUG_DRS
-          re_offset++;
-          drs_offset++;
-
-          if (re_offset >= frame_parms->ofdm_symbol_size)
-            re_offset = 0;
-        }
-
-      } else {
-        re_offset+=12; // go to next RB
-
-        // check if we crossed the symbol boundary and skip DC
-
-        if (re_offset >= frame_parms->ofdm_symbol_size) {
-          if (frame_parms->N_RB_DL&1)  // odd number of RBs
-            re_offset=6;
-          else                         // even number of RBs (doesn't straddle DC)
-            re_offset=0;
-        }
-
-
-      }
-    }
-  }
-
-  return(0);
-}
-

openair1/PHY/defs_RU.h

@@ -35,7 +35,6 @@
 
 
 #define MAX_BANDS_PER_RRU 4
-#define MAX_NUM_RU_PER_gNB MAX_NUM_RU_PER_eNB
 
 
 #ifdef OCP_FRAMEWORK

openair1/PHY/defs_gNB.h

@@ -38,6 +38,7 @@
 #include "CODING/nrPolar_tools/nr_polar_pbch_defs.h"
 #include "openair2/NR_PHY_INTERFACE/NR_IF_Module.h"
 
+#define MAX_NUM_RU_PER_gNB MAX_NUM_RU_PER_eNB
 
 typedef struct {
   uint8_t pbch_a[NR_POLAR_PBCH_PAYLOAD_BITS>>3];

openair2/LAYER2/MAC/mac.h

@@ -77,11 +77,6 @@
 
 #include "targets/ARCH/COMMON/common_lib.h"
 
-//solve implicit declaration
-#include "PHY/LTE_ESTIMATION/lte_estimation.h"
-#include "PHY/LTE_TRANSPORT/transport_proto.h"
-#include "PHY/LTE_TRANSPORT/transport_common_proto.h"
-
 /** @defgroup _mac  MAC
  * @ingroup _oai2
  * @{

targets/RT/USER/lte-enb.c

@@ -207,7 +207,7 @@ static inline int rxtx(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc, char *thread_nam
   // ****************************************
   // Common RX procedures subframe n
 
-  T(T_GNB_PHY_DL_TICK, T_INT(eNB->Mod_id), T_INT(proc->frame_tx), T_INT(proc->subframe_tx));
+  T(T_ENB_PHY_DL_TICK, T_INT(eNB->Mod_id), T_INT(proc->frame_tx), T_INT(proc->subframe_tx));
 
   // if this is IF5 or 3GPP_eNB
   if (eNB && eNB->RU_list && eNB->RU_list[0] && eNB->RU_list[0]->function < NGFI_RAU_IF4p5) {

targets/RT/USER/nr-softmodem.c

@@ -886,7 +886,6 @@ static  void wait_nfapi_init(char *thread_name) {
 
 int main( int argc, char **argv )
 {
-	crcTableInit();
   int i;
 #if defined (XFORMS)
   //void *status;