From 7ffc20426b684cbfb6bdca5d42c2679153f3be14 Mon Sep 17 00:00:00 2001
From: Cedric Roux <cedric.roux@eurecom.fr>
Date: Mon, 20 Mar 2017 11:00:41 +0100
Subject: [PATCH] integration fix: let simulators compile again
- pucchsim
- prachsim
- pdcchsim
- pbchsim
- mbmssim
Mostly, add and initialize the variable 'cpuf'.
Also, pdcchsim was calling rx_pdcch with wrong
arguments.
---
openair1/SIMULATION/LTE_PHY/mbmssim.c | 3 +++
openair1/SIMULATION/LTE_PHY/pbchsim.c | 4 ++++
openair1/SIMULATION/LTE_PHY/pdcchsim.c | 7 ++++---
openair1/SIMULATION/LTE_PHY/prachsim.c | 4 +++-
openair1/SIMULATION/LTE_PHY/pucchsim.c | 4 +++-
5 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/openair1/SIMULATION/LTE_PHY/mbmssim.c b/openair1/SIMULATION/LTE_PHY/mbmssim.c
index fb2fa506ac..69de4aee9f 100644
--- a/openair1/SIMULATION/LTE_PHY/mbmssim.c
+++ b/openair1/SIMULATION/LTE_PHY/mbmssim.c
@@ -50,6 +50,7 @@
PHY_VARS_eNB *eNB;
PHY_VARS_UE *UE;
+double cpuf;
DCI1E_5MHz_2A_M10PRB_TDD_t DLSCH_alloc_pdu2_1E[2];
#define UL_RB_ALLOC 0x1ff;
@@ -118,6 +119,8 @@ int main(int argc, char **argv)
#endif
*/
+ cpuf = get_cpu_freq_GHz();
+
logInit();
number_of_cards = 1;
diff --git a/openair1/SIMULATION/LTE_PHY/pbchsim.c b/openair1/SIMULATION/LTE_PHY/pbchsim.c
index 806a206a2b..f117879d6b 100644
--- a/openair1/SIMULATION/LTE_PHY/pbchsim.c
+++ b/openair1/SIMULATION/LTE_PHY/pbchsim.c
@@ -50,6 +50,8 @@
PHY_VARS_eNB *eNB,*eNB1,*eNB2;
PHY_VARS_UE *UE;
+double cpuf;
+
#define DLSCH_RB_ALLOC 0x1fbf // igore DC component,RB13
int32_t *dummybuf[4];
@@ -116,6 +118,8 @@ int main(int argc, char **argv)
char title[255];
#endif
+ cpuf = get_cpu_freq_GHz();
+
logInit();
number_of_cards = 1;
diff --git a/openair1/SIMULATION/LTE_PHY/pdcchsim.c b/openair1/SIMULATION/LTE_PHY/pdcchsim.c
index ebc178a55e..4c50aaa5d5 100644
--- a/openair1/SIMULATION/LTE_PHY/pdcchsim.c
+++ b/openair1/SIMULATION/LTE_PHY/pdcchsim.c
@@ -50,6 +50,7 @@ PHY_VARS_UE *UE;
#define CCCH_RB_ALLOC computeRIV(eNB->frame_parms.N_RB_UL,0,2)
#define DLSCH_RB_ALLOC ((uint16_t)0x1fbf) // igore DC component,RB13
+double cpuf;
DCI_PDU DCI_pdu;
@@ -457,6 +458,8 @@ int main(int argc, char **argv)
number_of_cards = 1;
+ cpuf = get_cpu_freq_GHz();
+
logInit();
@@ -1088,9 +1091,7 @@ int main(int argc, char **argv)
UE->pdcch_vars[0][0]->crnti = n_rnti;
// printf("Doing RX : num_pdcch_symbols at TX %d\n",num_pdcch_symbols);
- rx_pdcch(&UE->common_vars,
- UE->pdcch_vars[0],
- &UE->frame_parms,
+ rx_pdcch(UE,
trial,
subframe,
0,
diff --git a/openair1/SIMULATION/LTE_PHY/prachsim.c b/openair1/SIMULATION/LTE_PHY/prachsim.c
index 7acc07528c..52339cdc5d 100644
--- a/openair1/SIMULATION/LTE_PHY/prachsim.c
+++ b/openair1/SIMULATION/LTE_PHY/prachsim.c
@@ -45,7 +45,7 @@ PHY_VARS_UE *UE;
#define DLSCH_RB_ALLOC 0x1fbf // igore DC component,RB13
-
+double cpuf;
extern uint16_t prach_root_sequence_map0_3[838];
@@ -99,6 +99,8 @@ int main(int argc, char **argv)
int NCS_config = 1,rootSequenceIndex=0;
int threequarter_fs = 0;
+ cpuf = get_cpu_freq_GHz();
+
logInit();
number_of_cards = 1;
diff --git a/openair1/SIMULATION/LTE_PHY/pucchsim.c b/openair1/SIMULATION/LTE_PHY/pucchsim.c
index 77bfcb18cf..d1db3c29e1 100644
--- a/openair1/SIMULATION/LTE_PHY/pucchsim.c
+++ b/openair1/SIMULATION/LTE_PHY/pucchsim.c
@@ -47,7 +47,7 @@ PHY_VARS_UE *UE;
#define DLSCH_RB_ALLOC 0x1fbf // igore DC component,RB13
-
+double cpuf;
int main(int argc, char **argv)
{
@@ -101,6 +101,8 @@ int main(int argc, char **argv)
number_of_cards = 1;
+ cpuf = get_cpu_freq_GHz();
+
while ((c = getopt (argc, argv, "har:pf:g:n:s:S:x:y:z:N:F:T:R:")) != -1) {
switch (c) {
case 'a':
--
GitLab