From 11b1a9c0da2ca535419cf3b17cedd19a056e0f55 Mon Sep 17 00:00:00 2001
From: winckel <winckel@eurecom.fr>
Date: Tue, 22 Oct 2013 07:40:37 +0000
Subject: [PATCH] Moved ITTI configuration values into a separate file.
Included "mme_config.h" explicitely in files because it must be removed from
"intertask_interface.h" to make ITTI more generic. Removed some useless timer
definitions.
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4247 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
common/utils/itti/timer.c | 3 ---
common/utils/itti/timer.h | 2 --
openair-cn/NAS/nas_main.c | 1 +
openair-cn/UTILS/mme_config.c | 1 +
openair-cn/UTILS/mme_default_values.h | 12 ------------
5 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/common/utils/itti/timer.c b/common/utils/itti/timer.c
index b1314696b3..c34719011a 100644
--- a/common/utils/itti/timer.c
+++ b/common/utils/itti/timer.c
@@ -243,9 +243,6 @@ int timer_init(void)
STAILQ_INIT(&timer_desc.timer_queue);
pthread_mutex_init(&timer_desc.timer_list_mutex, NULL);
- timer_desc.timeout.tv_sec = MME_TIMER_TIMEOUT_S;
- timer_desc.timeout.tv_nsec = MME_TIMER_TIMEOUT_NS;
-
TMR_DEBUG("Initializing TIMER task interface: DONE\n");
return 0;
}
diff --git a/common/utils/itti/timer.h b/common/utils/itti/timer.h
index 4acff6b809..c4504a8a71 100644
--- a/common/utils/itti/timer.h
+++ b/common/utils/itti/timer.h
@@ -28,8 +28,6 @@
*******************************************************************************/
-#include "mme_config.h"
-
#ifndef TIMER_H_
#define TIMER_H_
diff --git a/openair-cn/NAS/nas_main.c b/openair-cn/NAS/nas_main.c
index 5f70a7608f..1ea624d937 100644
--- a/openair-cn/NAS/nas_main.c
+++ b/openair-cn/NAS/nas_main.c
@@ -5,6 +5,7 @@
#include <string.h>
#include "intertask_interface.h"
+#include "mme_config.h"
#include "nas_defs.h"
diff --git a/openair-cn/UTILS/mme_config.c b/openair-cn/UTILS/mme_config.c
index 5c96d83236..5529a2e731 100644
--- a/openair-cn/UTILS/mme_config.c
+++ b/openair-cn/UTILS/mme_config.c
@@ -42,6 +42,7 @@
#include <arpa/inet.h> /* To provide inet_addr */
#include "mme_config.h"
+#include "intertask_interface_conf.h"
mme_config_t mme_config;
diff --git a/openair-cn/UTILS/mme_default_values.h b/openair-cn/UTILS/mme_default_values.h
index 30e827e2c5..0be05d1683 100644
--- a/openair-cn/UTILS/mme_default_values.h
+++ b/openair-cn/UTILS/mme_default_values.h
@@ -34,8 +34,6 @@
/*******************************************************************************
* Timer Constants
******************************************************************************/
-#define MME_TIMER_TIMEOUT_NS (1000)
-#define MME_TIMER_TIMEOUT_S (0)
#define MME_STATISTIC_TIMER_S (60)
/*******************************************************************************
@@ -82,16 +80,6 @@
#define RELATIVE_CAPACITY (15)
-/*******************************************************************************
- * Intertask Interface Constants
- ******************************************************************************/
-
-#define ITTI_QUEUE_SIZE_PER_TASK (5 * 1024 * 1024) /* Limit the queue size to 5M */
-#define ITTI_PORT (10007)
-/* This is the queue size for signal dumper */
-#define ITTI_QUEUE_SIZE_MAX (1 * 1024 * 1024) /* 1 MBytes */
-#define ITTI_DUMP_MAX_CON (5) /* Max connections in parallel */
-
/*******************************************************************************
* IPv4 Constants
******************************************************************************/
--
GitLab