From 13d6147e03db0c40a80ef5f4826a2fb493d542de Mon Sep 17 00:00:00 2001
From: Laurent Thomas <lts@open-cells.com>
Date: Thu, 2 Dec 2021 13:31:15 +0100
Subject: [PATCH] fix code review and cross compilation issue

---
 openair1/PHY/CODING/crc_byte.c    | 38 +++++++++++++++----------------
 openair1/PHY/CODING/nrLDPC_defs.h | 20 ++++++++--------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/openair1/PHY/CODING/crc_byte.c b/openair1/PHY/CODING/crc_byte.c
index 277598b4b4..c3b141db8e 100644
--- a/openair1/PHY/CODING/crc_byte.c
+++ b/openair1/PHY/CODING/crc_byte.c
@@ -153,22 +153,22 @@ unsigned int crc24a (unsigned char * inptr,
 {
   int octetlen = bitlen / 8;  /* Change in octets */
 
-#ifndef USE_INTEL_CRC
-  unsigned int crc = 0;
-  int resbit = (bitlen % 8);
-
-  while (octetlen-- > 0) {
-    //   printf("crc24a: in %x => crc %x\n",crc,*inptr);
-    crc = (crc << 8) ^ crc24aTable[(*inptr++) ^ (crc >> 24)];
-  }
-
-  if (resbit > 0)
-    crc = (crc << resbit) ^ crc24aTable[((*inptr) >> (8 - resbit)) ^ (crc >> (32 - resbit))];
-  return crc;
-#else
-  return crc32_calc_pclmulqdq(inptr, octetlen, 0,
+  if ( bitlen % 8 || !__builtin_cpu_supports ("pclmul") ) {
+    unsigned int crc = 0;
+    int resbit = (bitlen % 8);
+    
+    while (octetlen-- > 0) {
+      //   printf("crc24a: in %x => crc %x\n",crc,*inptr);
+      crc = (crc << 8) ^ crc24aTable[(*inptr++) ^ (crc >> 24)];
+    }
+    
+    if (resbit > 0)
+      crc = (crc << resbit) ^ crc24aTable[((*inptr) >> (8 - resbit)) ^ (crc >> (32 - resbit))];
+    return crc;
+  } else {
+    return crc32_calc_pclmulqdq(inptr, octetlen, 0,
                               &lte_crc24a_pclmulqdq);
-#endif
+  }
 
 }
 
@@ -186,8 +186,8 @@ unsigned int crc24b (unsigned char * inptr,
 	   	     int bitlen)
 {
   int octetlen = bitlen / 8;  /* Change in octets */
-
-#ifndef USE_INTEL_CRC
+  
+  if ( bitlen % 8 || !__builtin_cpu_supports ("pclmul") ) {
   unsigned int crc = 0;
   int resbit = (bitlen % 8);
 
@@ -200,10 +200,10 @@ unsigned int crc24b (unsigned char * inptr,
     crc = (crc << resbit) ^ crc24bTable[((*inptr) >> (8 - resbit)) ^ (crc >> (32 - resbit))];
 
   return crc;
-#else
+  } else {
   return crc32_calc_pclmulqdq(inptr, octetlen, 0,
                               &lte_crc24b_pclmulqdq);
-#endif
+  }
 }
 
 unsigned int crc24c (unsigned char * inptr,
diff --git a/openair1/PHY/CODING/nrLDPC_defs.h b/openair1/PHY/CODING/nrLDPC_defs.h
index 67248d971c..0d7ff9ef9f 100644
--- a/openair1/PHY/CODING/nrLDPC_defs.h
+++ b/openair1/PHY/CODING/nrLDPC_defs.h
@@ -38,12 +38,12 @@
 */
 typedef struct {
   unsigned int n_segments;          // optim8seg
-	unsigned int macro_num; // optim8segmulti
-	unsigned char gen_code; //orig
-	time_stats_t *tinput;
-	time_stats_t *tprep;
-	time_stats_t *tparity;
-	time_stats_t *toutput;
+  unsigned int macro_num; // optim8segmulti
+  unsigned char gen_code; //orig
+  time_stats_t *tinput;
+  time_stats_t *tprep;
+  time_stats_t *tparity;
+  time_stats_t *toutput;
   int Kr;
   uint32_t Kb;
   uint32_t *Zc;
@@ -58,10 +58,10 @@ typedef struct {
   uint32_t F;
   /// LDPC-code outputs
   uint8_t *d[MAX_NUM_NR_DLSCH_SEGMENTS];
-}encoder_implemparams_t;
+} encoder_implemparams_t;
 #define INIT0_LDPCIMPLEMPARAMS {0,0,0,NULL,NULL,NULL,NULL}
-typedef void(*nrLDPC_initcallfunc_t)(t_nrLDPC_dec_params* p_decParams, int8_t* p_llr, int8_t* p_out);
-typedef int(*nrLDPC_encoderfunc_t)(unsigned char **,unsigned char **,int,int,short, short, encoder_implemparams_t*);
+typedef void(*nrLDPC_initcallfunc_t)(t_nrLDPC_dec_params *p_decParams, int8_t *p_llr, int8_t *p_out);
+typedef int(*nrLDPC_encoderfunc_t)(unsigned char **,unsigned char **,int,int,short, short, encoder_implemparams_t *);
 //============================================================================================================================
 // decoder interface
 /**
@@ -71,5 +71,5 @@ typedef int(*nrLDPC_encoderfunc_t)(unsigned char **,unsigned char **,int,int,sho
    \param p_llrOut Output vector
    \param p_profiler LDPC profiler statistics
 */
-typedef int32_t(*nrLDPC_decoderfunc_t)(t_nrLDPC_dec_params* , int8_t*, int8_t* , t_nrLDPC_procBuf* , t_nrLDPC_time_stats* );
+typedef int32_t(*nrLDPC_decoderfunc_t)(t_nrLDPC_dec_params *, int8_t *, int8_t *, t_nrLDPC_procBuf *, t_nrLDPC_time_stats * );
 #endif