From 7799ef6933649eecce18645fcb92dd710fcef549 Mon Sep 17 00:00:00 2001
From: Lionel Gauthier <lionel.gauthier@eurecom.fr>
Date: Thu, 9 Apr 2015 09:18:31 +0000
Subject: [PATCH] patches13/0016-fix-compiler-warnings.patch
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7062 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
openair1/PHY/LTE_TRANSPORT/pucch.c | 10 ----------
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp | 2 ++
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/openair1/PHY/LTE_TRANSPORT/pucch.c b/openair1/PHY/LTE_TRANSPORT/pucch.c
index 9783181fc4..bac836b689 100644
--- a/openair1/PHY/LTE_TRANSPORT/pucch.c
+++ b/openair1/PHY/LTE_TRANSPORT/pucch.c
@@ -149,11 +149,6 @@ void generate_pucch(mod_sym_t **txdataF,
return;
}
- if (NRB2 > 2047) {
- msg("[PHY] generate_pucch: Illegal NRB2 %d (should be 0...2047)\n",NRB2);
- return;
- }
-
if (Ncs1_div_deltaPUCCH_Shift > 7) {
msg("[PHY] generate_pucch: Illegal Ncs1_div_deltaPUCCH_Shift %d (should be 0...7)\n",Ncs1_div_deltaPUCCH_Shift);
return;
@@ -476,11 +471,6 @@ int32_t rx_pucch(PHY_VARS_eNB *phy_vars_eNB,
return(-1);
}
- if (NRB2 > 2047) {
- LOG_E(PHY,"[eNB] rx_pucch: Illegal NRB2 %d (should be 0...2047)\n",NRB2);
- return(-1);
- }
-
if (Ncs1_div_deltaPUCCH_Shift > 7) {
LOG_E(PHY,"[eNB] rx_pucch: Illegal Ncs1_div_deltaPUCCH_Shift %d (should be 0...7)\n",Ncs1_div_deltaPUCCH_Shift);
return(-1);
diff --git a/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp b/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
index 55d2c10c7a..a250c3d58b 100644
--- a/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
+++ b/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
@@ -112,6 +112,8 @@ static int trx_usrp_start(openair0_device *device)
s->rx_count = 0;
s->tx_count = 0;
s->rx_timestamp = 0;
+
+ return 0;
}
static void trx_usrp_end(openair0_device *device)
--
GitLab