From b4a2c3a5727cf1f113e120109726054d9124e56c Mon Sep 17 00:00:00 2001
From: Lionel Gauthier <lionel.gauthier@eurecom.fr>
Date: Thu, 30 Apr 2015 09:41:01 +0000
Subject: [PATCH] Sebastian Held patches15/0028-fix-compiler-warnings.patch
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7330 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
openair1/SCHED/phy_procedures_lte_eNb.c | 1 -
openair1/SCHED/phy_procedures_lte_ue.c | 1 -
openair2/LAYER2/MAC/eNB_scheduler_RA.c | 2 +-
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c | 3 ++-
openair2/LAYER2/MAC/eNB_scheduler_mch.c | 3 ++-
openair2/LAYER2/MAC/pre_processor.c | 2 --
openair2/LAYER2/MAC/ra_procedures.c | 2 +-
openair2/LAYER2/MAC/rar_tools.c | 2 --
openair2/LAYER2/MAC/ue_procedures.c | 4 ++--
openair2/RRC/LITE/rrc_UE.c | 4 +++-
openair2/RRC/LITE/rrc_eNB.c | 3 ++-
11 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/openair1/SCHED/phy_procedures_lte_eNb.c b/openair1/SCHED/phy_procedures_lte_eNb.c
index f1aa56cec83..cfa5b57d4b1 100755
--- a/openair1/SCHED/phy_procedures_lte_eNb.c
+++ b/openair1/SCHED/phy_procedures_lte_eNb.c
@@ -77,7 +77,6 @@
#define PUCCH1_THRES 15
#define PUCCH1a_THRES 15
-extern inline unsigned int taus(void);
extern int exit_openair;
//extern void do_OFDM_mod(mod_sym_t **txdataF, int32_t **txdata, uint32_t frame, uint16_t next_slot, LTE_DL_FRAME_PARMS *frame_parms);
diff --git a/openair1/SCHED/phy_procedures_lte_ue.c b/openair1/SCHED/phy_procedures_lte_ue.c
index 74e3ae79b93..9e0e77b9b53 100755
--- a/openair1/SCHED/phy_procedures_lte_ue.c
+++ b/openair1/SCHED/phy_procedures_lte_ue.c
@@ -96,7 +96,6 @@ fifo_dump_emos_UE emos_dump_UE;
#define NS_PER_SLOT 500000
-extern inline unsigned int taus(void);
extern int oai_exit;
uint8_t ulsch_input_buffer[2700] __attribute__ ((aligned(16)));
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_RA.c b/openair2/LAYER2/MAC/eNB_scheduler_RA.c
index ff47d72c71e..6971f3ba533 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_RA.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_RA.c
@@ -66,7 +66,7 @@
# include "intertask_interface.h"
#endif
-extern inline unsigned int taus(void);
+#include "SIMULATION/TOOLS/defs.h" // for taus
void schedule_RA(module_id_t module_idP,frame_t frameP, sub_frame_t subframeP,unsigned char Msg3_subframe,unsigned int *nprb,unsigned int *nCCE)
{
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c b/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
index f3f9be377b9..5fcb2c8f80b 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
@@ -59,6 +59,8 @@
//#include "LAYER2/MAC/pre_processor.c"
#include "pdcp.h"
+#include "SIMULATION/TOOLS/defs.h" // for taus
+
#if defined(ENABLE_ITTI)
# include "intertask_interface.h"
#endif
@@ -66,7 +68,6 @@
#define ENABLE_MAC_PAYLOAD_DEBUG
//#define DEBUG_eNB_SCHEDULER 1
-extern inline unsigned int taus(void);
//------------------------------------------------------------------------------
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_mch.c b/openair2/LAYER2/MAC/eNB_scheduler_mch.c
index c84c42f39b4..42ec471b24d 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_mch.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_mch.c
@@ -63,10 +63,11 @@
# include "intertask_interface.h"
#endif
+#include "SIMULATION/TOOLS/defs.h" // for taus
+
#define ENABLE_MAC_PAYLOAD_DEBUG
#define DEBUG_eNB_SCHEDULER 1
-extern inline unsigned int taus(void);
#ifdef Rel10
int8_t get_mbsfn_sf_alloction (module_id_t module_idP, uint8_t CC_id, uint8_t mbsfn_sync_area)
diff --git a/openair2/LAYER2/MAC/pre_processor.c b/openair2/LAYER2/MAC/pre_processor.c
index ea86e4867fd..f0523c2f8b2 100644
--- a/openair2/LAYER2/MAC/pre_processor.c
+++ b/openair2/LAYER2/MAC/pre_processor.c
@@ -68,8 +68,6 @@
#endif
*/
-extern inline unsigned int taus(void);
-
// This function stores the downlink buffer for all the logical channels
void store_dlsch_buffer (module_id_t Mod_id,
diff --git a/openair2/LAYER2/MAC/ra_procedures.c b/openair2/LAYER2/MAC/ra_procedures.c
index 12ec5663e0b..6dae9ae492c 100644
--- a/openair2/LAYER2/MAC/ra_procedures.c
+++ b/openair2/LAYER2/MAC/ra_procedures.c
@@ -55,7 +55,7 @@
#include "SIMULATION/simulation_defs.h"
#endif
-extern inline unsigned int taus(void);
+#include "SIMULATION/TOOLS/defs.h" // for taus
int8_t get_DELTA_PREAMBLE(module_id_t module_idP,int CC_id)
{
diff --git a/openair2/LAYER2/MAC/rar_tools.c b/openair2/LAYER2/MAC/rar_tools.c
index d17f6130916..b8397845458 100644
--- a/openair2/LAYER2/MAC/rar_tools.c
+++ b/openair2/LAYER2/MAC/rar_tools.c
@@ -54,8 +54,6 @@ extern unsigned int distRIV2alloc_LUT25[512];
extern unsigned short RIV2nb_rb_LUT25[512];
extern unsigned short RIV2first_rb_LUT25[512];
-extern inline unsigned int taus(void);
-
//------------------------------------------------------------------------------
unsigned short fill_rar(
const module_id_t module_idP,
diff --git a/openair2/LAYER2/MAC/ue_procedures.c b/openair2/LAYER2/MAC/ue_procedures.c
index 7e09874dc60..c53d5105faf 100644
--- a/openair2/LAYER2/MAC/ue_procedures.c
+++ b/openair2/LAYER2/MAC/ue_procedures.c
@@ -73,6 +73,8 @@
#include "assertions.h"
+#include "SIMULATION/TOOLS/defs.h" // for taus
+
#define DEBUG_HEADER_PARSING 1
#define ENABLE_MAC_PAYLOAD_DEBUG 1
@@ -90,8 +92,6 @@ mapping BSR_names[] = {
{NULL, -1}
};
-extern inline unsigned int taus(void);
-
void ue_init_mac(module_id_t module_idP)
{
diff --git a/openair2/RRC/LITE/rrc_UE.c b/openair2/RRC/LITE/rrc_UE.c
index df551f75056..ebef0a55de2 100644
--- a/openair2/RRC/LITE/rrc_UE.c
+++ b/openair2/RRC/LITE/rrc_UE.c
@@ -91,6 +91,9 @@
# include "intertask_interface.h"
#endif
+#include "SIMULATION/TOOLS/defs.h" // for taus
+
+
#ifdef PHY_EMUL
extern EMULATION_VARS *Emul_vars;
#endif
@@ -102,7 +105,6 @@ extern void *bigphys_malloc(int);
//#define XER_PRINT
-extern inline unsigned int taus(void);
extern int8_t dB_fixed2(uint32_t x,uint32_t y);
void
diff --git a/openair2/RRC/LITE/rrc_eNB.c b/openair2/RRC/LITE/rrc_eNB.c
index f2166ece668..7d40310fb90 100644
--- a/openair2/RRC/LITE/rrc_eNB.c
+++ b/openair2/RRC/LITE/rrc_eNB.c
@@ -97,6 +97,8 @@
# include "rrc_eNB_ral.h"
#endif
+#include "SIMULATION/TOOLS/defs.h" // for taus
+
//#define XER_PRINT
#ifdef PHY_EMUL
@@ -109,7 +111,6 @@ extern void* bigphys_malloc(int);
#endif
extern uint16_t two_tier_hexagonal_cellIds[7];
-extern inline unsigned int taus(void);
/* TS 36.331: RRC-TransactionIdentifier ::= INTEGER (0..3) */
static const uint8_t RRC_TRANSACTION_IDENTIFIER_NUMBER = 4;
--
GitLab