- Force logs level to 7 in pre-ci

- Output logs from ping/oaisim in two distincts files
- Fix some compiler warnings
- Put assertions in some switch default cases
- Create a wrapper for macphy_exit to display FILE and LINE of the caller
- Enabled -Werror=implicit-function-declaration

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4682 818b1a75-f10b-46b9-bf7c-635c3b92a50f

openair2/LAYER2/MAC/rar_tools.c

@@ -43,6 +43,7 @@
 #include "UTIL/LOG/log.h"
 #include "OCG.h"
 #include "OCG_extern.h"
+#include "UTIL/OPT/opt.h"
 
 #define DEBUG_RAR
 
@@ -62,9 +63,9 @@ unsigned short fill_rar(u8 Mod_id,
   RA_HEADER_RAPID *rarh = (RA_HEADER_RAPID *)dlsch_buffer;
   //  RAR_PDU *rar = (RAR_PDU *)(dlsch_buffer+1);
   uint8_t *rar = (uint8_t *)(dlsch_buffer+1);
-  int i,ra_idx;
+  int i,ra_idx = -1;
   uint16_t rballoc;
-  uint8_t mcs,TPC,cqi_req,ULdelay,cqireq;
+  uint8_t mcs,TPC,ULdelay,cqireq;
 
   for (i=0;i<NB_RA_PROC_MAX;i++) {
     if (eNB_mac_inst[Mod_id].RA_template[i].generate_rar == 1) {

openair2/LAYER2/openair2_proc.c

@@ -141,10 +141,10 @@ int dump_eNB_l2_stats(char *buffer, int length){
       }
     }
   }
-  len += sprintf(&buffer[len],"\0");
- 
-  return len;
+
+  return len + 1 /* SR: for trailing \0 */;
 }
+
 #ifdef PROC 
 #ifndef USER_MODE
 static int openair2_stats_read(char *buffer, char **my_buffer, off_t off, int length)

openair2/PHY_INTERFACE/defs.h

@@ -51,8 +51,8 @@
 #define DLSCH 1
 #define ULSCH 2
 
-
-
+#define mac_exit_wrapper(sTRING)	\
+	  mac_xface->macphy_exit(sTRING " in file " __FILE__ ", line ##__LINE__")
 
 /*! \brief MACPHY Interface */
 typedef struct
@@ -60,7 +60,7 @@ typedef struct
     /// Pointer function that initializes L2
     int (*macphy_init)(int eMBMS_active, u8 CBA_active,u8 HO_active);
 
-    /// Pointer function that stops the low-level scheduler due an exit condition        
+    /// Pointer function that stops the low-level scheduler due an exit condition
     void (*macphy_exit)(const char *);
 
     // eNB functions
@@ -71,7 +71,7 @@ typedef struct
     u16 (*fill_rar)(u8 Mod_id,u32 frame,u8 *dlsch_buffer,u16 N_RB_UL, u8 input_buffer_length);
 
     /// Terminate the RA procedure upon reception of l3msg on ulsch
-    void (*terminate_ra_proc)(u8 Mod_id,u32 frame,u16 UE_id, u8 *l3msg,u16 l3msg_len);
+    void (*terminate_ra_proc)(u8 Mod_id,u32 frame,u16 UE_id, u8 *l3msg, u16 l3msg_len);
 
     /// Initiate the RA procedure upon reception (hypothetical) of a valid preamble
     void (*initiate_ra_proc)(u8 Mod_id,u32 frame,u16 preamble,s16 timing_offset,u8 sect_id,u8 subframe,u8 f_id);

openair2/UTIL/OCG/OCG_parse_XML.c

@@ -910,11 +910,11 @@ void characters(void *user_data, const xmlChar *xmlch, int xmllen) { // called o
 					} else if (beam_width_dB_) {
 						oai_emulation.environment_system_config.antenna.eNB_antenna.beam_width_dB = atof(ch);
 					} else if (alpha_rad_1_) {
-					  		oai_emulation.environment_system_config.antenna.eNB_antenna.alpha_rad[1] = atof(ch);
+					  		oai_emulation.environment_system_config.antenna.eNB_antenna.alpha_rad[0] = atof(ch);
 					} else if (alpha_rad_2_) {
-					  		oai_emulation.environment_system_config.antenna.eNB_antenna.alpha_rad[2] = atof(ch);
+					  		oai_emulation.environment_system_config.antenna.eNB_antenna.alpha_rad[1] = atof(ch);
 					} else if (alpha_rad_3_) {
-					  		oai_emulation.environment_system_config.antenna.eNB_antenna.alpha_rad[3] = atof(ch);
+					  		oai_emulation.environment_system_config.antenna.eNB_antenna.alpha_rad[2] = atof(ch);
 					} else if (antenna_gain_dBi_) {
 						oai_emulation.environment_system_config.antenna.eNB_antenna.antenna_gain_dBi = atof(ch);
 					} else if (tx_power_dBm_) {
@@ -922,11 +922,11 @@ void characters(void *user_data, const xmlChar *xmlch, int xmllen) { // called o
 					} else if (rx_noise_level_dB_) {
 						oai_emulation.environment_system_config.antenna.eNB_antenna.rx_noise_level_dB = atof(ch);
 					} else if (antenna_orientation_degree_1_) {
-					  		oai_emulation.environment_system_config.antenna.eNB_antenna.antenna_orientation_degree[1] = atof(ch);
+					  		oai_emulation.environment_system_config.antenna.eNB_antenna.antenna_orientation_degree[0] = atof(ch);
 					} else if (antenna_orientation_degree_2_) {
-					  		oai_emulation.environment_system_config.antenna.eNB_antenna.antenna_orientation_degree[2] = atof(ch);
+					  		oai_emulation.environment_system_config.antenna.eNB_antenna.antenna_orientation_degree[1] = atof(ch);
 					} else if (antenna_orientation_degree_3_) {
-					  		oai_emulation.environment_system_config.antenna.eNB_antenna.antenna_orientation_degree[3] = atof(ch);
+					  		oai_emulation.environment_system_config.antenna.eNB_antenna.antenna_orientation_degree[2] = atof(ch);
 					}
 				} else if (UE_antenna_) {
 					if (antenna_gain_dBi_) {

openair2/UTIL/OTG/otg_rx.c

@@ -43,6 +43,7 @@
 #include "../UTIL/MATH/oml.h"
 #include <math.h>
 #include "otg_form.h"
+#include "otg_kpi.h"
 
 #ifdef ENABLE_DB_STATS
 #include <mysql.h>