fix CI warnings

openair1/PHY/LTE_TRANSPORT/dlsch_scrambling.c

@@ -125,7 +125,7 @@ void dlsch_scrambling(LTE_DL_FRAME_PARMS *frame_parms,
   for (n=0; n<(1+(G>>5)); n++) {
 
 #ifdef DEBUG_SCRAMBLING
-    for (int k=0;k<32;k++) printf("scrambling %d : %d xor %d = %d\n",k+(n<<5),e[k],(s>>k)&1,e[k]^((s>>k)&1));
+    for (int k=0;k<32;k++) printf("scrambling %d : %u xor %d = %u\n",k+(n<<5),e[k],(s>>k)&1,e[k]^((s>>k)&1));
 #endif
 
                 

openair1/PHY/LTE_TRANSPORT/transport_common.h

@@ -37,7 +37,7 @@
 #include "mdci.h"
 //#include "uci.h"
 #ifndef STANDALONE_COMPILE
-#include "UTIL/LISTS/list.h"
+  #include "UTIL/LISTS/list.h"
 #endif
 #include <nfapi/open-nFAPI/nfapi/public_inc/nfapi_interface.h>
 
@@ -68,19 +68,19 @@
 #define MAX_NUM_RE (14*1200)
 
 #if !defined(SI_RNTI)
-#define SI_RNTI  (rnti_t)0xffff
+  #define SI_RNTI  (rnti_t)0xffff
 #endif
 #if !defined(M_RNTI)
-#define M_RNTI   (rnti_t)0xfffd
+  #define M_RNTI   (rnti_t)0xfffd
 #endif
 #if !defined(P_RNTI)
-#define P_RNTI   (rnti_t)0xfffe
+  #define P_RNTI   (rnti_t)0xfffe
 #endif
 #if !defined(CBA_RNTI)
-#define CBA_RNTI (rnti_t)0xfff4
+  #define CBA_RNTI (rnti_t)0xfff4
 #endif
 #if !defined(C_RNTI)
-#define C_RNTI   (rnti_t)0x1234
+  #define C_RNTI   (rnti_t)0x1234
 #endif
 // These are the codebook indexes according to Table 6.3.4.2.3-1 of 36.211
 //1 layer
@@ -94,7 +94,8 @@
 #define PMI_2A_R1_1j 2
 
 typedef enum { SEARCH_EXIST=0,
-	       SEARCH_EXIST_OR_FREE} find_type_t;
+               SEARCH_EXIST_OR_FREE
+             } find_type_t;
 
 typedef enum {
   SCH_IDLE=0,

openair1/PHY/LTE_TRANSPORT/transport_eNB.h

@@ -38,7 +38,7 @@
 #include "mdci.h"
 #include "uci_common.h"
 #ifndef STANDALONE_COMPILE
-#include "UTIL/LISTS/list.h"
+  #include "UTIL/LISTS/list.h"
 #endif
 
 

openair1/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c

@@ -174,7 +174,7 @@ int rx_pdsch(PHY_VARS_UE *ue,
         dlsch1_harq  = NULL;
         codeword_TB0 = -1;
 #ifdef DEBUG_HARQ
-        printf("[DEMOD] I am assuming only TB1 is active, it is in cw %d\n", dlsch0_harq->codeword);
+        printf("[DEMOD] I am assuming only TB1 is active, it is in cw %u\n", dlsch0_harq->codeword);
 #endif
       } else {
         LOG_E(PHY,"[UE][FATAL] Frame %d subframe %d: no active DLSCH\n",ue->proc.proc_rxtx[0].frame_rx,subframe);
@@ -251,7 +251,7 @@ int rx_pdsch(PHY_VARS_UE *ue,
 
 #endif
 #ifdef DEBUG_HARQ
-  printf("Demod  dlsch0_harq->pmi_alloc %d\n",  dlsch0_harq->pmi_alloc);
+  printf("Demod  dlsch0_harq->pmi_alloc %u\n",  dlsch0_harq->pmi_alloc);
 #endif
 
   if (frame_parms->nb_antenna_ports_eNB>1 && beamforming_mode==0) {
@@ -2204,7 +2204,7 @@ void dlsch_channel_compensation_TM56(int **rxdataF_ext,
 
     for (rb=0; rb<nb_rb; rb++) {
 #ifdef DEBUG_DLSCH_DEMOD
-      printf("mode 6 prec: rb %d, pmi->%u\n",rb,pmi_ext[rb]);
+      printf("mode 6 prec: rb %u, pmi->%u\n",rb,pmi_ext[rb]);
 #endif
       prec2A_TM56_128(pmi_ext[rb],&dl_ch0_128b[0],&dl_ch1_128b[0]);
       prec2A_TM56_128(pmi_ext[rb],&dl_ch0_128b[1],&dl_ch1_128b[1]);

openair1/SCHED/phy_procedures_lte_eNb.c

@@ -308,6 +308,7 @@ bool dlsch_procedures(PHY_VARS_eNB *eNB,
     if(eNB->dlsch_encoding_stats.p_time>500*3000 && opp_enabled == 1) {
       print_meas_now(&eNB->dlsch_encoding_stats,"total coding",stderr);
     }
+
 #ifdef PHY_TX_THREAD
     dlsch->active[subframe] = 0;
 #else
@@ -317,6 +318,7 @@ bool dlsch_procedures(PHY_VARS_eNB *eNB,
     LOG_D(PHY,"Generated DLSCH dlsch_harq[round:%d]\n",dlsch_harq->round);
     return true;
   }
+
   return false;
 }
 
@@ -357,7 +359,6 @@ void pdsch_procedures(PHY_VARS_eNB *eNB,
                    dlsch,
                    dlsch->ue_type==NOCE ? dlsch1 : (LTE_eNB_DLSCH_t *)NULL);
   stop_meas(&eNB->dlsch_modulation_stats);
-
   LOG_D(PHY,"Generated PDSCH dlsch_harq[round:%d]\n",dlsch_harq->round);
 }
 
@@ -452,7 +453,7 @@ void phy_procedures_eNB_TX(PHY_VARS_eNB *eNB,
   VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME(VCD_SIGNAL_DUMPER_VARIABLES_DCI_INFO,num_pdcch_symbols);
   VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME (VCD_SIGNAL_DUMPER_VARIABLES_DCI_INFO, (frame * 10) + subframe);
 
-  if (num_pdcch_symbols == 0){
+  if (num_pdcch_symbols == 0) {
     LOG_E(PHY,"[eNB %"PRIu8"] Frame %d, subframe %d: Calling generate_dci_top (pdcch) (num_dci %"PRIu8") num_pdcch_symbols:%d\n",eNB->Mod_id,frame, subframe, num_dci, num_pdcch_symbols);
     return;
   }
@@ -635,7 +636,6 @@ uci_procedures(PHY_VARS_eNB *eNB,
             subframe,
             uci->type,
             i);
-      
       uci->active = 0;
 
       // Null out PUCCH PRBs for noise measurement
@@ -643,24 +643,30 @@ uci_procedures(PHY_VARS_eNB *eNB,
         case 6:
           eNB->rb_mask_ul[0] |= (0x1 | (1 << 5)); // position 5
           break;
+
         case 15:
           eNB->rb_mask_ul[0] |= (0x1 | (1 << 14)); // position 14
           break;
+
         case 25:
           eNB->rb_mask_ul[0] |= (0x1 | (1 << 24)); // position 24
           break;
+
         case 50:
           eNB->rb_mask_ul[0] |= 0x1;
           eNB->rb_mask_ul[1] |= (1 << 17); // position 49 (49-32)
           break;
+
         case 75:
           eNB->rb_mask_ul[0] |= 0x1;
           eNB->rb_mask_ul[2] |= (1 << 10); // position 74 (74-64)
           break;
+
         case 100:
           eNB->rb_mask_ul[0] |= 0x1;
           eNB->rb_mask_ul[3] |= (1 << 3); // position 99 (99-96)
           break;
+
         default:
           LOG_E(PHY,"Unknown number for N_RB_UL %d\n", fp->N_RB_UL);
           break;
@@ -859,6 +865,7 @@ uci_procedures(PHY_VARS_eNB *eNB,
                   uci->rnti,uci->type,SR_payload,frame,subframe,pucch_b0b1[0][0],pucch_b0b1[0][1],pucch_b0b1[1][0],pucch_b0b1[1][1]);
 #endif
 #endif
+
             if (SR_payload == 1) { // this implements Table 7.3.1 from 36.213
               if (pucch_b0b1[0][0] == 4) { // there isn't a likely transmission
                 harq_ack[0] = 4; // DTX
@@ -1492,10 +1499,8 @@ static void do_release_harq(PHY_VARS_eNB *eNB,
   int harq_pid;
   int subframe_tx;
   int frame_tx;
-
   AssertFatal(UE_id != -1, "No existing dlsch context\n");
   AssertFatal(UE_id < NUMBER_OF_UE_MAX, "Returned UE_id %d >= %d (NUMBER_OF_UE_MAX)\n", UE_id, NUMBER_OF_UE_MAX);
-
   dlsch0 = eNB->dlsch[UE_id][0];
   dlsch1 = eNB->dlsch[UE_id][1];
 
@@ -1505,18 +1510,16 @@ static void do_release_harq(PHY_VARS_eNB *eNB,
                                          frame,
                                          subframe,
                                          subframe_tx);
-
     harq_pid = dlsch0->harq_ids[frame_tx%2][subframe_tx];
 
     if((harq_pid < 0) || (harq_pid >= dlsch0->Mdlharq)) {
       LOG_E(PHY,"illegal harq_pid %d %s:%d\n", harq_pid, __FILE__, __LINE__);
       return;
     }
+
     dlsch0_harq = dlsch0->harq_processes[harq_pid];
     dlsch1_harq = dlsch1->harq_processes[harq_pid];
-    
     AssertFatal(dlsch0_harq != NULL, "dlsch0_harq is null\n");
-
 #if T_TRACER
 
     if (after_rounds != -1) {
@@ -1541,7 +1544,6 @@ static void do_release_harq(PHY_VARS_eNB *eNB,
       dlsch0_harq->status = SCH_IDLE;
       dlsch0->harq_mask &= ~(1 << harq_pid);
     }
-
   } else {
     /* Release all processes in the bundle that was acked, based on mask */
     /* This is at most 4 for multiplexing and 9 for bundling/special bundling */
@@ -1551,7 +1553,6 @@ static void do_release_harq(PHY_VARS_eNB *eNB,
       subframe_tx = ul_ACK_subframe2_dl_subframe(&eNB->frame_parms,
                     subframe,
                     m);
-
       frame_tx = ul_ACK_subframe2_dl_frame(&eNB->frame_parms,
                                            frame,
                                            subframe,
@@ -1564,12 +1565,12 @@ static void do_release_harq(PHY_VARS_eNB *eNB,
           LOG_E(PHY,"illegal harq_pid %d %s:%d\n", harq_pid, __FILE__, __LINE__);
           return;
         }
+
         dlsch0_harq = dlsch0->harq_processes[harq_pid];
         dlsch1_harq = dlsch1->harq_processes[harq_pid];
-
         AssertFatal(dlsch0_harq != NULL, "Dlsch0_harq is null\n");
-
 #if T_TRACER
+
         if (after_rounds != -1) {
           T(T_ENB_PHY_DLSCH_UE_NACK,
             T_INT(0),
@@ -1585,7 +1586,9 @@ static void do_release_harq(PHY_VARS_eNB *eNB,
             T_INT(dlsch0->rnti),
             T_INT(harq_pid));
         }
+
 #endif
+
         if (dlsch0_harq->round >= after_rounds) {
           dlsch0_harq->status = SCH_IDLE;
 
@@ -1997,43 +2000,50 @@ void phy_procedures_eNB_uespec_RX(PHY_VARS_eNB *eNB,L1_rxtx_proc_t *proc) {
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_RX_UESPEC, 0 );
 }
 
-void release_rnti_of_phy(module_id_t mod_id){
+void release_rnti_of_phy(module_id_t mod_id) {
   int i,j;
   int CC_id;
   rnti_t rnti;
   PHY_VARS_eNB *eNB_PHY = NULL;
   LTE_eNB_ULSCH_t *ulsch = NULL;
   LTE_eNB_DLSCH_t *dlsch = NULL;
-    for(i = 0; i< release_rntis.number_of_TLVs;i++){
+
+  for(i = 0; i< release_rntis.number_of_TLVs; i++) {
     for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++) {
       eNB_PHY = RC.eNB[mod_id][CC_id];
       rnti = release_rntis.ue_release_request_TLVs_list[i].rnti;
+
       for (j=0; j<NUMBER_OF_UE_MAX; j++) {
         ulsch = eNB_PHY->ulsch[j];
-              if((ulsch != NULL) && (ulsch->rnti == rnti)){
+
+        if((ulsch != NULL) && (ulsch->rnti == rnti)) {
           LOG_I(PHY, "clean_eNb_ulsch ulsch[%d] UE %x\n", j, rnti);
           clean_eNb_ulsch(ulsch);
         }
 
         dlsch = eNB_PHY->dlsch[j][0];
-              if((dlsch != NULL) && (dlsch->rnti == rnti)){
+
+        if((dlsch != NULL) && (dlsch->rnti == rnti)) {
           LOG_I(PHY, "clean_eNb_dlsch dlsch[%d] UE %x \n", j, rnti);
           clean_eNb_dlsch(dlsch);
         }
       }
+
       ulsch = eNB_PHY->ulsch[j];
-          if((ulsch != NULL) && (ulsch->rnti == rnti)){
+
+      if((ulsch != NULL) && (ulsch->rnti == rnti)) {
         LOG_I(PHY, "clean_eNb_ulsch ulsch[%d] UE %x\n", j, rnti);
         clean_eNb_ulsch(ulsch);
       }
+
       for(j=0; j<NUMBER_OF_UCI_VARS_MAX; j++) {
-              if(eNB_PHY->uci_vars[j].rnti == rnti){
+        if(eNB_PHY->uci_vars[j].rnti == rnti) {
           LOG_I(PHY, "clean eNb uci_vars[%d] UE %x \n",j, rnti);
           memset(&eNB_PHY->uci_vars[i],0,sizeof(LTE_eNB_UCI));
         }
-
       }
     }
   }
+
   memset(&release_rntis, 0, sizeof(nfapi_ue_release_request_body_t));
 }