From 6416c6d4ea88db5ee13ea8b8a958e2f6587c52c6 Mon Sep 17 00:00:00 2001
From: Raymond Knopp <raymond.knopp@eurecom.fr>
Date: Mon, 4 Jun 2018 22:31:43 -0700
Subject: [PATCH] minor changes to remove global variable in dci handling
---
openair1/PHY/LTE_TRANSPORT/dci.c | 8 +++++---
openair2/RRC/LTE/rrc_eNB.c | 4 +++-
targets/RT/USER/lte-uesoftmodem.c | 3 ---
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/openair1/PHY/LTE_TRANSPORT/dci.c b/openair1/PHY/LTE_TRANSPORT/dci.c
index d8a13bbbfd..83ebaaaa37 100755
--- a/openair1/PHY/LTE_TRANSPORT/dci.c
+++ b/openair1/PHY/LTE_TRANSPORT/dci.c
@@ -57,8 +57,8 @@
-static uint8_t d[3*(MAX_DCI_SIZE_BITS + 16) + 96];
-static uint8_t w[3*3*(MAX_DCI_SIZE_BITS+16)];
+//static uint8_t d[3*(MAX_DCI_SIZE_BITS + 16) + 96];
+//static uint8_t w[3*3*(MAX_DCI_SIZE_BITS+16)];
void dci_encoding(uint8_t *a,
uint8_t A,
@@ -70,6 +70,8 @@ void dci_encoding(uint8_t *a,
uint8_t D = (A + 16);
uint32_t RCC;
+ uint8_t d[3*(MAX_DCI_SIZE_BITS + 16) + 96];
+ uint8_t w[3*3*(MAX_DCI_SIZE_BITS+16)];
#ifdef DEBUG_DCI_ENCODING
int32_t i;
@@ -169,7 +171,7 @@ uint8_t *generate_dci0(uint8_t *dci,
return(e+coded_bits);
}
-uint32_t Y;
+//uint32_t Y;
diff --git a/openair2/RRC/LTE/rrc_eNB.c b/openair2/RRC/LTE/rrc_eNB.c
index e3e6018445..4dd664b072 100644
--- a/openair2/RRC/LTE/rrc_eNB.c
+++ b/openair2/RRC/LTE/rrc_eNB.c
@@ -29,7 +29,9 @@
*/
#define RRC_ENB
#define RRC_ENB_C
-
+#include <asn_application.h>
+#include <asn_internal.h> /* for _ASN_DEFAULT_STACK_MAX */
+#include <per_encoder.h>
#include "rrc_defs.h"
#include "rrc_extern.h"
#include "assertions.h"
diff --git a/targets/RT/USER/lte-uesoftmodem.c b/targets/RT/USER/lte-uesoftmodem.c
index 4007542918..ddaff6b2f2 100644
--- a/targets/RT/USER/lte-uesoftmodem.c
+++ b/targets/RT/USER/lte-uesoftmodem.c
@@ -1098,9 +1098,6 @@ int main( int argc, char **argv )
printf("ITTI tasks created\n");
#endif
- // init UE_PF_PO and mutex lock
- pthread_mutex_init(&ue_pf_po_mutex, NULL);
- memset (&UE_PF_PO[0][0], 0, sizeof(UE_PF_PO_t)*NUMBER_OF_UE_MAX*MAX_NUM_CCs);
mlockall(MCL_CURRENT | MCL_FUTURE);
--
GitLab