Merge remote-tracking branch 'origin/dci_handling_br' into develop_integration_w08

openair1/PHY/LTE_TRANSPORT/dci.h

@@ -2969,3 +2969,53 @@ struct DCI0A_20_MHz {
 #define sizeof_DCI0A_20MHz 17
 
 #define MAX_DCI_SIZE_BITS 45
+
+struct DCI_INFO_EXTRACTED {
+    /// type = 0 => DCI Format 0, type = 1 => DCI Format 1A
+    uint8_t type;
+    /// Resource Allocation Header
+    uint8_t rah;
+    /// HARQ Process
+    uint8_t harq_pid;
+    /// CQI Request
+    uint8_t cqi_req;
+    /// SRS Request
+    uint8_t srs_req;
+    /// Power Control
+    uint8_t TPC;
+    /// Localized/Distributed VRB
+    uint8_t vrb_type;
+    /// RB Assignment (ceil(log2(N_RB_DL/P)) bits)
+    uint32_t rballoc;
+    // Applicable only when vrb_type = 1
+    uint8_t Ngap;
+    /// Cyclic shift
+    uint8_t cshift;
+    /// Hopping flag
+    uint8_t hopping;
+    /// Downlink Assignment Index
+    uint8_t dai;
+    /// DAI (TDD)
+    uint8_t ulindex;
+
+    /// TB swap
+    uint8_t tb_swap;
+    /// TPMI information for precoding
+    uint8_t tpmi;
+    /// Redundancy version 2
+    uint8_t rv2;
+    /// New Data Indicator 2
+    uint8_t ndi2;
+    /// Modulation and Coding Scheme and Redundancy Version 2
+    uint8_t mcs2;
+    /// Redundancy version 1
+    uint8_t rv1;
+    /// New Data Indicator 1
+    uint8_t ndi1;
+    /// Modulation and Coding Scheme and Redundancy Version 1
+    uint8_t mcs1;
+
+    /// Scrambling ID
+    uint64_t ap_si_nl_id:3;
+};
+typedef struct DCI_INFO_EXTRACTED DCI_INFO_EXTRACTED_t;

openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c

@@ -2090,7 +2090,6 @@ void dlsch_channel_compensation_TM34(LTE_DL_FRAME_PARMS *frame_parms,
   unsigned char aarx=0,symbol_mod,pilots=0;
   int precoded_signal_strength0=0,precoded_signal_strength1=0;
   int rx_power_correction;
-  int output_shift;
 
   int **rxdataF_ext           = pdsch_vars->rxdataF_ext;
   int **dl_ch_estimates_ext   = pdsch_vars->dl_ch_estimates_ext;
@@ -3153,7 +3152,6 @@ void dlsch_detection_mrc_TM34(LTE_DL_FRAME_PARMS *frame_parms,
                               unsigned short nb_rb,
                               unsigned char dual_stream_UE) {
 
-  unsigned char aatx;
   int i;
   __m128i *rxdataF_comp128_0,*rxdataF_comp128_1,*rxdataF_comp128_i0,*rxdataF_comp128_i1,*dl_ch_mag128_0,*dl_ch_mag128_1,*dl_ch_mag128_0b,*dl_ch_mag128_1b,*rho128_0,*rho128_1,*rho128_i0,*rho128_i1,*dl_ch_mag128_i0,*dl_ch_mag128_i1,*dl_ch_mag128_i0b,*dl_ch_mag128_i1b;
 

openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c

@@ -697,7 +697,6 @@ int32_t dlsch_qpsk_llr_SIC(LTE_DL_FRAME_PARMS *frame_parms,
 
   int16_t rho_amp_x0[2*frame_parms->N_RB_DL*12];
   int16_t rho_rho_amp_x0[2*frame_parms->N_RB_DL*12];
-  int16_t clean_x1[2*frame_parms->N_RB_DL*12];
   uint16_t amp_tmp;
   uint16_t *llr16=(uint16_t*)dlsch_llr;
   int i, len,  nsymb;
@@ -953,7 +952,6 @@ void dlsch_16qam_llr_SIC (LTE_DL_FRAME_PARMS *frame_parms,
 {
   int16_t rho_amp_x0[2*frame_parms->N_RB_DL*12];
   int16_t rho_rho_amp_x0[2*frame_parms->N_RB_DL*12];
-  int16_t clean_x1[2*frame_parms->N_RB_DL*12];
   uint16_t amp_tmp;
   uint32_t *llr32=(uint32_t*)dlsch_llr;
   int i, len,  nsymb;
@@ -1222,7 +1220,6 @@ void dlsch_64qam_llr_SIC(LTE_DL_FRAME_PARMS *frame_parms,
 {
   int16_t rho_amp_x0[2*frame_parms->N_RB_DL*12];
   int16_t rho_rho_amp_x0[2*frame_parms->N_RB_DL*12];
-  int16_t clean_x1[2*frame_parms->N_RB_DL*12];
   uint16_t amp_tmp;
   uint16_t *llr32=(uint16_t*)dlsch_llr;
   int i, len,  nsymb, len2;

openair1/PHY/LTE_TRANSPORT/phich.c

@@ -1395,7 +1395,7 @@ void rx_phich(PHY_VARS_UE *ue,
             subframe,
             HI16,
             nseq_PHICH,
-            ngroup_PHICH,ulsch->harq_processes[harq_pid]->round+1,
+            ngroup_PHICH,
             ulsch->Mlimit);
       //#endif
 

openair1/PHY/LTE_TRANSPORT/prach.c

@@ -1133,7 +1133,6 @@ void rx_prach(PHY_VARS_eNB *eNB,
   int fft_size,log2_ifft_size;
   uint8_t nb_ant_rx = 1; //eNB->frame_parms.nb_antennas_rx;
 
-  int en;
 
   for (aa=0; aa<nb_ant_rx; aa++) {
     prach[aa] = (int16_t*)&eNB->common_vars.rxdata[0][aa][subframe*eNB->frame_parms.samples_per_tti-eNB->N_TA_offset];