osaf/libs/core/include/ncssysf_tmr.h | 5 +
osaf/libs/core/leap/include/Makefile.am | 1 -
osaf/libs/core/leap/include/ncs_tasks.h | 139
----------------------------------
osaf/libs/core/leap/include/sysf_exc_scr.h | 6 +-
osaf/libs/core/leap/os_defs.c | 1 -
osaf/libs/core/leap/sysf_tmr.c | 1 -
6 files changed, 10 insertions(+), 143 deletions(-)
diff --git a/osaf/libs/core/include/ncssysf_tmr.h
b/osaf/libs/core/include/ncssysf_tmr.h
--- a/osaf/libs/core/include/ncssysf_tmr.h
+++ b/osaf/libs/core/include/ncssysf_tmr.h
@@ -58,6 +58,11 @@ extern "C" {
extern uint32_t gl_tmr_milliseconds;
+
+#ifndef NCS_TMR_STACKSIZE
+#define NCS_TMR_STACKSIZE NCS_STACKSIZE_HUGE
+#endif
+
/** Target system timer support functions...
**/
diff --git a/osaf/libs/core/leap/include/Makefile.am
b/osaf/libs/core/leap/include/Makefile.am
--- a/osaf/libs/core/leap/include/Makefile.am
+++ b/osaf/libs/core/leap/include/Makefile.am
@@ -22,7 +22,6 @@ noinst_HEADERS = \
ncsdlib.h \
ncs_edu.h \
ncs_hdl.h \
- ncs_tasks.h \
patricia.h \
sysf_def.h \
sysf_exc_scr.h \
diff --git a/osaf/libs/core/leap/include/ncs_tasks.h
b/osaf/libs/core/leap/include/ncs_tasks.h
deleted file mode 100644
--- a/osaf/libs/core/leap/include/ncs_tasks.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/* -*- OpenSAF -*-
- *
- * (C) Copyright 2008 The OpenSAF Foundation
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. This file and program are licensed
- * under the GNU Lesser General Public License Version 2.1, February 1999.
- * The complete license can be accessed from the following location:
- * http://opensource.org/licenses/lgpl-license.php
- * See the Copying file included with the OpenSAF distribution for full
- * licensing terms.
- *
- * Author(s): Emerson Network Power
- *
- */
-
-/*****************************************************************************
-..............................................................................
-
-..............................................................................
-
- D E S C R I P T I O N :
-
- This module contains all task configuration information, including
- priority, stack-size and task-name for all possible NetPlane tasks.
- The idea is that there is one file to visit to both understand and
- adjust any product thread value at compile time.
-
- T A K E N O T E :
-
- This file has been set up in the LEAP 2.6 release. It may not be the
- case that all subsystems have yet adopted the advertised task
- mnemonics called out below. It will take some time for all subsystems
- to make the migration.
-
- O V E R V I E W
-
- WHO AND WHERE ARE TASKS CREATED
-
- For the most part, NetPlane invokes m_NCS_TASK_CREATE outside of its base
- code to create tasks. This is because task creation and destruction is
- considered a 'system' function that takes place in the context of the
- system's initialization and destruction sequence.
-
- As such, NetPlane tasks are generally created in either demo code or
- powercode, which NetPlane classifies as 'editable' (adjustable).
-
- TASK STACK SIZES
-
- The stack sizes used below work for our test environments. Different OS's
- may cause one to adjust these sizes. Relative size mnemonics are set up so
- that if your OS/Compiler needs/uses more or less, you can adjust them all
- at once.
-
- TASK NAMES
-
- Task names are here as much for convenience as for configuration. You
- may wish to change them, but system behavior is not contingent on this
- value in any way.
-
- TASK PRIORITIES
-
- NetPlane software TASKS cover the spectrum of system software:
-
- A - There are low level system services such as LEAP TIMER and
- SYSF_IP services.
-
- D - Management Plane services, such as NetPlane's CLI and MAB
- Services.
-
- Roughly speaking, NetPlane task priorities are arranged highest (get
- CPU if in READY queue) to lowest in that order: A, B, C and D.
-
- Once said, there are exceptions and there is no hard and fast rule,
- as different OSs mixed with different hardware platforms in monolith
- or distributed contexts will behave differently.
-
- As such, you may find reason to tweek the shipped settings, as
- reflected in this file at ship-time.
-
- Note that all possible NetPlane tasks are listed here. This in no way
- implies that these tasks are in fact running. Again, this is a system
- initialization sequence responsibility.
-
-******************************************************************************
-*/
-
-/*
- * Module Inclusion Control...
- */
-#ifndef NCS_TASKS_H
-#define NCS_TASKS_H
-
-/*************************************************************************
-
- A ) S Y S T E M S E R V I C E S
-
-**************************************************************************/
-
-/*************************************************************************
-SYSF TIMER
-
- This thread drives the LEAP Timer Services.
- Function entry: ncslmp_process_events()
-
-NOTE: These mnemonics do not yet mapped to this task's creation properties.
-**************************************************************************/
-
-#ifndef NCS_TMR_STACKSIZE
-#define NCS_TMR_STACKSIZE NCS_STACKSIZE_HUGE
-#endif
-
-#ifndef NCS_TMR_PRIORITY
-#define NCS_TMR_PRIORITY NCS_TASK_PRIORITY_1
-#endif
-
-#ifndef NCS_TMR_TASKNAME
-#define NCS_TMR_TASKNAME "SYSF_TMR"
-#endif
-
-/*************************************************************************
-SYSF EXEC MOD
-
- This thread drives the LEAP Execute Module Services.
- Function entry: ncslmp_process_events()
-
-NOTE: These mnemonics do not yet mapped to this task's creation properties.
-**************************************************************************/
-
-#ifndef NCS_EXEC_MOD_STACKSIZE
-#define NCS_EXEC_MOD_STACKSIZE NCS_STACKSIZE_HUGE
-#endif
-
-#ifndef NCS_EXEC_MOD_TASKNAME
-#define NCS_EXEC_MOD_TASKNAME "EXEC_SCR_MOD"
-#endif
-
-#endif /* NCS_TASKS.H */
diff --git a/osaf/libs/core/leap/include/sysf_exc_scr.h
b/osaf/libs/core/leap/include/sysf_exc_scr.h
--- a/osaf/libs/core/leap/include/sysf_exc_scr.h
+++ b/osaf/libs/core/leap/include/sysf_exc_scr.h
@@ -39,7 +39,6 @@
#include "ncssysf_def.h"
#include "ncspatricia.h"
#include "ncssysf_tmr.h"
-#include "ncs_tasks.h"
#include "signal.h"
#include "ncssysf_tsk.h"
#include "ncssysf_lck.h"
@@ -92,6 +91,11 @@ typedef struct sysf_execute_module_cb {
NCS_SERVICE_ID_COMMON, \
0)
+
+#ifndef NCS_EXEC_MOD_STACKSIZE
+#define NCS_EXEC_MOD_STACKSIZE NCS_STACKSIZE_HUGE
+#endif
+
extern SYSF_EXECUTE_MODULE_CB module_cb;
extern void ncs_exc_mdl_start_timer(SYSF_PID_LIST *exec_pid);
diff --git a/osaf/libs/core/leap/os_defs.c b/osaf/libs/core/leap/os_defs.c
--- a/osaf/libs/core/leap/os_defs.c
+++ b/osaf/libs/core/leap/os_defs.c
@@ -48,7 +48,6 @@
#include <sysf_exc_scr.h>
#include <ncssysf_tsk.h>
-#include "ncs_tasks.h"
#include "ncssysf_lck.h"
#include "ncssysf_def.h"
#include "osaf_utility.h"
diff --git a/osaf/libs/core/leap/sysf_tmr.c b/osaf/libs/core/leap/sysf_tmr.c
--- a/osaf/libs/core/leap/sysf_tmr.c
+++ b/osaf/libs/core/leap/sysf_tmr.c
@@ -31,7 +31,6 @@
#include <ncsgl_defs.h>
#include "ncs_osprm.h"
-#include "ncs_tasks.h"
#include "ncs_tmr.h"
#include "sysf_def.h"
#include "ncssysf_def.h"
------------------------------------------------------------------------------
Sponsored by Intel(R) XDK
Develop, test and display web and hybrid apps with a single code base.
Download it for free now!
http://pubads.g.doubleclick.net/gampad/clk?id=111408631&iu=/4140/ostg.clktrk
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
