Fix indentation, merge miss and remove unnecessary comment.

common/utils/asn1_conversions.h

@@ -33,11 +33,7 @@
  *\return the extracted value.
  */
 static inline uint8_t BIT_STRING_to_uint8(BIT_STRING_t *asn) {
-  //DevCheck ((asn->size == 1), asn->size, 0, 0);
-  if(!(asn->size == 1)) {
-    printf("BIT_STRING_to_uint8 size %ld\n", asn->size);
-    return 0;
-  }
+  DevCheck ((asn->size == 1), asn->size, 0, 0);
 
   return asn->buf[0] >> asn->bits_unused;
 }
@@ -51,11 +47,7 @@ static inline uint16_t BIT_STRING_to_uint16(BIT_STRING_t *asn) {
   uint16_t result = 0;
   int index = 0;
 
-  //DevCheck ((asn->size > 0) && (asn->size <= 2), asn->size, 0, 0);
-  if(!((asn->size > 0) && (asn->size <= 2))) {
-    printf("BIT_STRING_to_uint16 size %ld\n", asn->size);
-    return 0;
-  }
+  DevCheck ((asn->size > 0) && (asn->size <= 2), asn->size, 0, 0);
 
   switch (asn->size) {
     case 2:
@@ -82,11 +74,7 @@ static inline uint32_t BIT_STRING_to_uint32(BIT_STRING_t *asn) {
   int index;
   int shift;
 
-  //DevCheck ((asn->size > 0) && (asn->size <= 4), asn->size, 0, 0);
-  if(!((asn->size > 0) && (asn->size <= 4))) {
-    printf("BIT_STRING_to_uint32 size %ld\n", asn->size);
-    return 0;
-  }
+  DevCheck ((asn->size > 0) && (asn->size <= 4), asn->size, 0, 0);
 
   shift = ((asn->size - 1) * 8) - asn->bits_unused;
   for (index = 0; index < (asn->size - 1); index++) {
@@ -109,11 +97,7 @@ static inline uint64_t BIT_STRING_to_uint64(BIT_STRING_t *asn) {
   int index;
   int shift;
 
-  //DevCheck ((asn->size > 0) && (asn->size <= 8), asn->size, 0, 0);
-  if(!((asn->size > 0) && (asn->size <= 8))) {
-    printf("BIT_STRING_to_uint64 size %ld\n", asn->size);
-    return 0;
-  }
+  DevCheck ((asn->size > 0) && (asn->size <= 8), asn->size, 0, 0);
 
   shift = ((asn->size - 1) * 8) - asn->bits_unused;
   for (index = 0; index < (asn->size - 1); index++) {

openair1/PHY/TOOLS/signal_energy.c

@@ -68,52 +68,6 @@ int32_t subcarrier_energy(int32_t *input,uint32_t length, int32_t *subcarrier_en
 }
 #endif
 
-//int32_t signal_energy(int32_t *input,uint32_t length)
-//{
-//
-//  int32_t i;
-//  int32_t temp,temp2;
-//  register __m64 mm0,mm1,mm2,mm3;
-//  __m64 *in = (__m64 *)input;
-//
-//
-//  mm0 = _mm_setzero_si64();//pxor(mm0,mm0);
-//  mm3 = _mm_setzero_si64();//pxor(mm3,mm3);
-//
-//  for (i=0; i<length>>1; i++) {
-//
-//    mm1 = in[i];
-//    mm2 = mm1;
-//    mm1 = _m_pmaddwd(mm1,mm1);
-//    mm1 = _m_psradi(mm1,shift);// shift any 32 bits blocs of the word by the value shift
-//    mm0 = _m_paddd(mm0,mm1);// add the two 64 bits words 4 bytes by 4 bytes
-//    //    mm2 = _m_psrawi(mm2,shift_DC);
-//    mm3 = _m_paddw(mm3,mm2);// add the two 64 bits words 2 bytes by 2 bytes
-//  }
-//
-//  mm1 = mm0;
-//  mm0 = _m_psrlqi(mm0,32);
-//  mm0 = _m_paddd(mm0,mm1);
-//  temp = _m_to_int(mm0);
-//  temp/=length;
-//  temp<<=shift;   // this is the average of x^2
-//
-//  // now remove the DC component
-//
-//
-//  mm2 = _m_psrlqi(mm3,32);
-//  mm2 = _m_paddw(mm2,mm3);
-//  mm2 = _m_pmaddwd(mm2,mm2);
-//  temp2 = _m_to_int(mm2);
-//  temp2/=(length*length);
-//  //  temp2<<=(2*shift_DC);
-//  temp -= temp2;
-//
-//  _mm_empty();
-//  _m_empty();
-//
-//  return((temp>0)?temp:1);
-
 //-----------------------------------------------------------------
 // Average Power calculation with DC removing
 //-----------------------------------------------------------------
@@ -147,7 +101,6 @@ int32_t signal_energy(int32_t *input,uint32_t length)
   temp = _mm_cvtsi128_si32(_mm_cvttps_epi32(_mm_sub_ps(num2, num3)));
 
   return temp;
-
 }
 
 int32_t signal_energy_amp_shift(int32_t *input,uint32_t length)
@@ -198,64 +151,6 @@ int32_t signal_energy_amp_shift(int32_t *input,uint32_t length)
 
 int32_t signal_energy_nodc(int32_t *input,uint32_t length)
 {
-
-//  int32_t i;
-//  int32_t temp;
-//  register __m64 mm0,mm1;//,mm2,mm3;
-//  __m64 *in = (__m64 *)input;
-//
-//#ifdef MAIN
-//  int16_t *printb;
-//#endif
-//
-//  mm0 = _mm_setzero_si64();//_pxor(mm0,mm0);
-//  //  mm3 = _mm_setzero_si64();//pxor(mm3,mm3);
-//
-//  for (i=0; i<length>>1; i++) {
-//
-//    mm1 = in[i];
-//    mm1 = _m_pmaddwd(mm1,mm1);// SIMD complex multiplication
-//    mm1 = _m_psradi(mm1,shift);
-//    mm0 = _m_paddd(mm0,mm1);
-//    //    temp2 = mm0;
-//    //    printf("%d %d\n",((int *)&in[i])[0],((int *)&in[i])[1]);
-//
-//
-//    //    printb = (int16_t *)&mm2;
-//    //    printf("mm2 %d : %d %d %d %d\n",i,printb[0],printb[1],printb[2],printb[3]);
-//
-//
-//  }
-//
-//  /*
-//  #ifdef MAIN
-//  printb = (int16_t *)&mm3;
-//  printf("%d %d %d %d\n",printb[0],printb[1],printb[2],printb[3]);
-//  #endif
-//  */
-//  mm1 = mm0;
-//
-//  mm0 = _m_psrlqi(mm0,32);
-//
-//  mm0 = _m_paddd(mm0,mm1);
-//
-//  temp = _m_to_int(mm0);
-//
-//  temp/=length;
-//  temp<<=shift;   // this is the average of x^2
-//
-//#ifdef MAIN
-//  printf("E x^2 = %d\n",temp);
-//#endif
-//  _mm_empty();
-//  _m_empty();
-//
-//
-//
-//  return((temp>0)?temp:1);
-
-
-
   int32_t i;
   int32_t temp;
 
@@ -277,8 +172,6 @@ int32_t signal_energy_nodc(int32_t *input,uint32_t length)
                  ((float*)&mm0)[3])/(float)length);
 
   return temp;
-
-
 }
 
 #elif defined(__arm__)

openair1/SCHED/fapi_l1.c

@@ -1009,7 +1009,6 @@ void schedule_response(Sched_Rsp_t *Sched_INFO, L1_rxtx_proc_t *proc) {
         number_ul_pdu=0;
       }else if (RC.mac[Mod_id]->scheduler_mode == SCHED_MODE_FAIR_RR) {
         if(ulsch_pdu_num <= RC.rrc[Mod_id]->configuration.radioresourceconfig[CC_id].ue_multiple_max){
-      //LOG_D(PHY, "UL_CONFIG to send to PNF\n");
           UL_req->sfn_sf = frame << 4 | subframe;
           oai_nfapi_ul_config_req(UL_req);
           UL_req->ul_config_request_body.number_of_pdus=0;

openair2/LAYER2/MAC/eNB_scheduler_RA.c

@@ -212,13 +212,6 @@ add_msg3(module_id_t module_idP, int CC_id, RA_t *ra, frame_t frameP,
       hi_dci0_req->sfn_sf                                     = sfnsf_add_subframe(frameP, subframeP, sf_ahead_dl);
       hi_dci0_req->header.message_id                          = NFAPI_HI_DCI0_REQUEST;
 
-      //if (NFAPI_MODE != NFAPI_MONOLITHIC) {
-      //  oai_nfapi_hi_dci0_req(hi_dci0_req);
-      //  hi_dci0_req_body->number_of_hi=0;
-      //}
-
-      //LOG_D(MAC, "MSG3: HI_DCI0 SFN/SF:%d number_of_dci:%d number_of_hi:%d\n", NFAPI_SFNSF2DEC(hi_dci0_req->sfn_sf), hi_dci0_req_body->number_of_dci, hi_dci0_req_body->number_of_hi);
-
       // save UL scheduling information for preprocessor
       for (j = 0; j < ra->msg3_nb_rb; j++)
         cc->vrb_map_UL[ra->msg3_first_rb + j] = 1;

openair2/LAYER2/MAC/eNB_scheduler_ulsch.c

@@ -202,7 +202,7 @@ rx_sdu(const module_id_t enb_mod_idP,
       }
     } else {  // sduP == NULL => error
       UE_scheduling_control->pusch_rx_error_num[CC_idP]++;
-      LOG_D(MAC, "[eNB %d][PUSCH %d] CC_id %d %d.%d ULSCH in error in round %d, ul_cqi %d, UE_id %d, RNTI %x (len %d)\n",
+      LOG_W(MAC, "[eNB %d][PUSCH %d] CC_id %d %d.%d ULSCH in error in round %d, ul_cqi %d, UE_id %d, RNTI %x (len %d)\n",
             enb_mod_idP,
             harq_pid,
             CC_idP,
@@ -1656,11 +1656,9 @@ schedule_ulsch_rnti(module_id_t   module_idP,
       UE_template_ptr->cshift[harq_pid] = cshift;
       /* Setting DCI0 NFAPI struct */
       hi_dci0_pdu = &hi_dci0_req_body->hi_dci0_pdu_list[dci_ul_pdu_idx];
-      //memset((void *) hi_dci0_pdu, 0,sizeof(nfapi_hi_dci0_request_pdu_t));
       hi_dci0_pdu->pdu_type = NFAPI_HI_DCI0_DCI_PDU_TYPE;
       hi_dci0_pdu->pdu_size = 2 + sizeof(nfapi_hi_dci0_dci_pdu);
       hi_dci0_pdu->dci_pdu.dci_pdu_rel8.dci_format = NFAPI_UL_DCI_FORMAT_0;
-      //hi_dci0_pdu->dci_pdu.dci_pdu_rel8.aggregation_level = aggregation;
       hi_dci0_pdu->dci_pdu.dci_pdu_rel8.rnti = rnti;
       hi_dci0_pdu->dci_pdu.dci_pdu_rel8.transmission_power = 6000;
       hi_dci0_pdu->dci_pdu.dci_pdu_rel8.resource_block_start = UE_template_ptr->pre_first_nb_rb_ul;

openair2/RRC/LTE/rrc_eNB.c

@@ -6711,24 +6711,6 @@ rrc_eNB_process_RRCConnectionReconfigurationComplete(
                                   );
           }
         } else {        // remove LCHAN from MAC/PHY
-#if 0
-          if (ue_context_pP->ue_context.DRB_active[drb_id] == 1) {
-            // DRB has just been removed so remove RLC + PDCP for DRB
-            /*      rrc_pdcp_config_req (ctxt_pP->module_id, frameP, 1, CONFIG_ACTION_REMOVE,
-               (ue_mod_idP * NB_RB_MAX) + DRB2LCHAN[i],UNDEF_SECURITY_MODE);
-             */
-            if (!NODE_IS_CU(RC.rrc[ctxt_pP->module_id]->node_type)) {
-              rrc_rlc_config_req(ctxt_pP,
-                                 SRB_FLAG_NO,
-                                 MBMS_FLAG_NO,
-                                 CONFIG_ACTION_REMOVE,
-                                 DRB2LCHAN[i],
-                                 Rlc_info_um);
-            }
-          }
-
-          ue_context_pP->ue_context.DRB_active[drb_id] = 0;
-#endif
           if (DRB_configList->list.array[i]->logicalChannelIdentity) {
             DRB2LCHAN[i] = (uint8_t) * DRB_configList->list.array[i]->logicalChannelIdentity;
           }