fix after bad merge with develop

openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc_avx512/bnProcPc_gen_BG1_avx512.c

@@ -1354,7 +1354,6 @@ fprintf(fd,  "// Process group with <23 CNs \n");
         fprintf(fd, "    p_bnProcBuf     = (simde__m256i*) &bnProcBuf    [%u];\n", lut_startAddrBnGroups[idxBnGroup]);
         fprintf(fd, "    p_llrProcBuf    = (simde__m256i*) &llrProcBuf   [%d];\n", lut_startAddrBnGroupsLlr[idxBnGroup]);
         fprintf(fd, "    p_llrRes        = (simde__m512i*) &llrRes       [%d];\n", lut_startAddrBnGroupsLlr[idxBnGroup]);
->>>>>>> 40d400cc61 (Use SIMDE)
         // Loop over BNs
         fprintf(fd,"        for (int i=0,j=0;i<M;i++,j+=2) {\n");
             // First 16 LLRs of first CN
@@ -1637,7 +1636,6 @@ fprintf(fd,  "// Process group with 28 CNs \n");
         fprintf(fd, "    p_bnProcBuf     = (simde__m256i*) &bnProcBuf    [%u];\n", lut_startAddrBnGroups[idxBnGroup]);
         fprintf(fd, "    p_llrProcBuf    = (simde__m256i*) &llrProcBuf   [%d];\n", lut_startAddrBnGroupsLlr[idxBnGroup]);
         fprintf(fd, "    p_llrRes        = (simde__m512i*) &llrRes       [%d];\n", lut_startAddrBnGroupsLlr[idxBnGroup]);
->>>>>>> 40d400cc61 (Use SIMDE)
         // Loop over BNs
         fprintf(fd,"        for (int i=0,j=0;i<M;i++,j+=2) {\n");
             // First 16 LLRs of first CN

openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/generator_bnProc_avx512/bnProcPc_gen_BG2_avx512.c

@@ -1242,7 +1242,7 @@ fprintf(fd,  "// Process group with 21 CNs \n");
         // Set pointers to start of group 2
         fprintf(fd, "    p_bnProcBuf     = (simde__m256i*) &bnProcBuf    [%u];\n", lut_startAddrBnGroups[idxBnGroup]);
         fprintf(fd, "    p_llrProcBuf    = (simde__m256i*) &llrProcBuf   [%d];\n", lut_startAddrBnGroupsLlr[idxBnGroup]);
-        fprintf(fd, "    p_llrRes        = (simde__m512i*) &llrRes       [%d];\n", lut_startAddrBnGroupsLlr[idxBnGroup]);u
+        fprintf(fd, "    p_llrRes        = (simde__m512i*) &llrRes       [%d];\n", lut_startAddrBnGroupsLlr[idxBnGroup]);
         // Loop over BNs
         fprintf(fd,"            for (int i=0,j=0;i<M;i++,j+=2) {\n");
             // First 16 LLRs of first CN

radio/ETHERNET/USERSPACE/LIB/eth_udp.c

@@ -322,7 +322,7 @@ void *trx_eth_write_udp_cmd(udpTXelem_t *udpTXelem) {
   if (TS_advance < (nsamps/2)) {
      LOG_W(PHY,"Starting TX FH for TS %llu absslot %llu(%llu) last_rxTS %llu TS_advance %llu samples\n",(unsigned long long)timestamp,(unsigned long long)timestamp/nsamps,((unsigned long long)timestamp/nsamps)%20,(unsigned long long)last_rxTS,(unsigned long long)TS_advance);
   }
-     void *buff2;
+  void *buff2;
   int nsamps2 = 256>>3;
   simde__m256i buff_tx[nsamps2 + 1];
   buff2 = (void *)&buff_tx[1] - APP_HEADER_SIZE_BYTES;