cosmetic changes

openair1/PHY/MODULATION/beamforming.c

@@ -72,15 +72,15 @@ int beam_precoding(int32_t **txdataF,
           ((int16_t*)&txdataF_BF[aa][re])[1] = (int16_t)((((int16_t*)&txdataF[p][slot_offset_F+symbol*frame_parms->ofdm_symbol_size+re])[0]*((int16_t*)&beam_weights[p][aa][re])[1])>>15);
           ((int16_t*)&txdataF_BF[aa][re])[1] += (int16_t)((((int16_t*)&txdataF[p][slot_offset_F+symbol*frame_parms->ofdm_symbol_size+re])[1]*((int16_t*)&beam_weights[0][aa][re])[0])>>15);
 
-          //printf("beamforming.c:txdata[%d][%d]=%d+j%d, beam_weights[%d][%d][%d]=%d+j%d,txdata_BF[%d][%d]=%d+j%d\n",
-          //       p,slot_offset_F+symbol*frame_parms->ofdm_symbol_size+re,
-          //       ((int16_t*)&txdataF[p][slot_offset_F+symbol*frame_parms->ofdm_symbol_size+re])[0],
-          //       ((int16_t*)&txdataF[p][slot_offset_F+symbol*frame_parms->ofdm_symbol_size+re])[1],
-          //       p,aa,re,
-          //       ((int16_t*)&beam_weights[p][aa][re])[0],((int16_t*)&beam_weights[p][aa][re])[1],
-          //       aa,re,
-          //       ((int16_t*)&txdataF_BF[aa][re])[0],
-          //       ((int16_t*)&txdataF_BF[aa][re])[1]);
+          /*printf("beamforming.c:txdata[%d][%d]=%d+j%d, beam_weights[%d][%d][%d]=%d+j%d,txdata_BF[%d][%d]=%d+j%d\n",
+                 p,slot_offset_F+symbol*frame_parms->ofdm_symbol_size+re,
+                 ((int16_t*)&txdataF[p][slot_offset_F+symbol*frame_parms->ofdm_symbol_size+re])[0],
+                 ((int16_t*)&txdataF[p][slot_offset_F+symbol*frame_parms->ofdm_symbol_size+re])[1],
+                 p,aa,re,
+                 ((int16_t*)&beam_weights[p][aa][re])[0],((int16_t*)&beam_weights[p][aa][re])[1],
+                 aa,re,
+                 ((int16_t*)&txdataF_BF[aa][re])[0],
+                 ((int16_t*)&txdataF_BF[aa][re])[1]); */
         }
       
       } 
@@ -90,9 +90,9 @@ int beam_precoding(int32_t **txdataF,
         ((int16_t*)&txdataF_BF[aa][re])[0] = (int16_t)((((int16_t*)&txdataF[5][slot_offset_F+symbol*frame_parms->ofdm_symbol_size+re])[0]*((int16_t*)&beam_weights[5][aa][re])[0])>>15);
         ((int16_t*)&txdataF_BF[aa][re])[0] -= (int16_t)((((int16_t*)&txdataF[5][slot_offset_F+symbol*frame_parms->ofdm_symbol_size+re])[1]*((int16_t*)&beam_weights[5][aa][re])[1])>>15);
         ((int16_t*)&txdataF_BF[aa][re])[1] = (int16_t)((((int16_t*)&txdataF[5][slot_offset_F+symbol*frame_parms->ofdm_symbol_size+re])[0]*((int16_t*)&beam_weights[5][aa][re])[1])>>15);
-        ((int16_t*)&txdataF_BF[aa][re])[1] += (int16_t)((((int16_t*)&txdataF[5][slot_offset_F+symbol*frame_parms->ofdm_symbol_size+re])[1]*((int16_t*)&beam_weights[5][aa][re])[0])>>15);
-/*
-        printf("beamforming.c:txdata[5][%d]=%d+j%d, beam_weights[5][%d][%d]=%d+j%d,txdata_BF[%d][%d]=%d+j%d\n",
+        ((int16_t*)&txdataF_BF[aa][re])[1] += (int16_t)((((int16_t*)&txdataF[5][slot_offset_F+symbol*frame_parms->ofdm_symbol_size+re])[1]*((int16_t*)&beam_weights[5][aa][re])[0])>>15);      
+        
+       /* printf("beamforming.c:txdata[5][%d]=%d+j%d, beam_weights[5][%d][%d]=%d+j%d,txdata_BF[%d][%d]=%d+j%d\n",
                slot_offset_F+symbol*frame_parms->ofdm_symbol_size+re,
                ((int16_t*)&txdataF[5][slot_offset_F+symbol*frame_parms->ofdm_symbol_size+re])[0],
                ((int16_t*)&txdataF[5][slot_offset_F+symbol*frame_parms->ofdm_symbol_size+re])[1],
@@ -101,8 +101,8 @@ int beam_precoding(int32_t **txdataF,
                ((int16_t*)&beam_weights[5][aa][re])[1],
                aa,re,
                ((int16_t*)&txdataF_BF[aa][re])[0],
-               ((int16_t*)&txdataF_BF[aa][re])[1]);
-*/
+               ((int16_t*)&txdataF_BF[aa][re])[1]); */
+       
       }
     }
 
@@ -119,4 +119,7 @@ int beam_precoding(int32_t **txdataF,
       }
     }  
   }
+
+return 0;
+
 }

targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm7.exmimo2.conf

@@ -34,8 +34,8 @@ eNBs =
         N_RB_DL                 			      = 25;
         Nid_cell_mbsfn          			      = 0;
         nb_antenna_ports          			      = 1;
-        nb_antennas_tx          			      = 1;
-        nb_antennas_rx          			      = 1;
+        nb_antennas_tx          			      = 3;
+        nb_antennas_rx          			      = 3;
         tx_gain                                            = 10; //25;
         rx_gain                                            = 10; //20;
         prach_root              			      = 0;

targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm7.exmimo2.conf

@@ -34,8 +34,8 @@ eNBs =
         N_RB_DL                 			      = 25;
         Nid_cell_mbsfn          			      = 0;
         nb_antenna_ports          			      = 1;
-        nb_antennas_tx          			      = 1;
-        nb_antennas_rx          			      = 1;
+        nb_antennas_tx          			      = 2;
+        nb_antennas_rx          			      = 2;
         tx_gain                                            = 25;
         rx_gain                                            = 20;
         prach_root              			      = 0;
@@ -153,7 +153,7 @@ eNBs =
 
     log_config :
     {
-      global_log_level                      ="debug";
+      global_log_level                      ="info";
       global_log_verbosity                  ="medium";
       hw_log_level                          ="info";
       hw_log_verbosity                      ="medium";