Module: xenomai-forge
Branch: master
Commit: 959c9c93edf1ef76b4d81921d308d9c370bdb6ff
URL:
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=959c9c93edf1ef76b4d81921d308d9c370bdb6ff
Author: Philippe Gerum <r...@xenomai.org>
Date: Sun Jan 1 16:54:01 2012 +0100
nucleus: remove sysheap_size module parameter
Nobody ever heard of this parameter, and the preferred way has always
been to set CONFIG_XENO_OPT_SYS_HEAPSZ for defining the system heap
size instead. This value is not something one would change for a quick
check on the fly anyway.
This way, we can always introduce build time computations based on
this value.
---
include/cobalt/nucleus/Makefile.am | 1 -
include/cobalt/nucleus/Makefile.in | 1 -
include/cobalt/nucleus/module.h | 28 ----------------------------
include/cobalt/nucleus/xenomai.h | 2 +-
kernel/cobalt/nucleus/clock.c | 2 +-
kernel/cobalt/nucleus/module.c | 10 +---------
kernel/cobalt/nucleus/pod.c | 6 +++---
kernel/cobalt/nucleus/shadow.c | 2 +-
kernel/cobalt/nucleus/synch.c | 2 +-
kernel/cobalt/nucleus/thread.c | 2 +-
10 files changed, 9 insertions(+), 47 deletions(-)
diff --git a/include/cobalt/nucleus/Makefile.am
b/include/cobalt/nucleus/Makefile.am
index 4b0f561..9c2342f 100644
--- a/include/cobalt/nucleus/Makefile.am
+++ b/include/cobalt/nucleus/Makefile.am
@@ -10,7 +10,6 @@ includesub_HEADERS = \
hostrt.h \
intr.h \
map.h \
- module.h \
pipe.h \
pod.h \
ppd.h \
diff --git a/include/cobalt/nucleus/Makefile.in
b/include/cobalt/nucleus/Makefile.in
index a12cfc1..3677fe3 100644
--- a/include/cobalt/nucleus/Makefile.in
+++ b/include/cobalt/nucleus/Makefile.in
@@ -251,7 +251,6 @@ includesub_HEADERS = \
hostrt.h \
intr.h \
map.h \
- module.h \
pipe.h \
pod.h \
ppd.h \
diff --git a/include/cobalt/nucleus/module.h b/include/cobalt/nucleus/module.h
deleted file mode 100644
index e0167b5..0000000
--- a/include/cobalt/nucleus/module.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2001,2002,2003 Philippe Gerum <r...@xenomai.org>.
- *
- * Xenomai is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * Xenomai 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. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Xenomai; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#ifndef _XENO_NUCLEUS_MODULE_H
-#define _XENO_NUCLEUS_MODULE_H
-
-#include <nucleus/queue.h>
-#include <nucleus/clock.h>
-
-extern u_long xnmod_sysheap_size;
-
-#endif /* !_XENO_NUCLEUS_MODULE_H */
diff --git a/include/cobalt/nucleus/xenomai.h b/include/cobalt/nucleus/xenomai.h
index 2865c22..3e7ef6e 100644
--- a/include/cobalt/nucleus/xenomai.h
+++ b/include/cobalt/nucleus/xenomai.h
@@ -24,7 +24,7 @@
#include <nucleus/synch.h>
#include <nucleus/heap.h>
#include <nucleus/intr.h>
-#include <nucleus/module.h>
+#include <nucleus/clock.h>
#include <nucleus/version.h>
#endif /* !_XENO_NUCLEUS_XENOMAI_H */
diff --git a/kernel/cobalt/nucleus/clock.c b/kernel/cobalt/nucleus/clock.c
index 1da8bc3..676e52c 100644
--- a/kernel/cobalt/nucleus/clock.c
+++ b/kernel/cobalt/nucleus/clock.c
@@ -28,7 +28,7 @@
#include <nucleus/pod.h>
#include <nucleus/timer.h>
-#include <nucleus/module.h>
+#include <nucleus/clock.h>
/*!
* \fn void xnclock_adjust(xnsticks_t delta)
diff --git a/kernel/cobalt/nucleus/module.c b/kernel/cobalt/nucleus/module.c
index 4b58810..3ecd37a 100644
--- a/kernel/cobalt/nucleus/module.c
+++ b/kernel/cobalt/nucleus/module.c
@@ -21,8 +21,8 @@
* An abstract RTOS core.
*/
#include <linux/init.h>
-#include <nucleus/module.h>
#include <nucleus/pod.h>
+#include <nucleus/clock.h>
#include <nucleus/timer.h>
#include <nucleus/heap.h>
#include <nucleus/intr.h>
@@ -40,12 +40,6 @@ MODULE_DESCRIPTION("Xenomai nucleus");
MODULE_AUTHOR("r...@xenomai.org");
MODULE_LICENSE("GPL");
-u_long sysheap_size_arg = CONFIG_XENO_OPT_SYS_HEAPSZ;
-module_param_named(sysheap_size, sysheap_size_arg, ulong, 0444);
-MODULE_PARM_DESC(sysheap_size, "System heap size (Kb)");
-
-u_long xnmod_sysheap_size;
-
int xeno_nucleus_status = -EINVAL;
struct xnsys_ppd __xnsys_global_ppd;
@@ -61,8 +55,6 @@ int __init xenomai_init(void)
{
int ret;
- xnmod_sysheap_size = module_param_value(sysheap_size_arg) * 1024;
-
ret = rthal_init();
if (ret)
goto fail;
diff --git a/kernel/cobalt/nucleus/pod.c b/kernel/cobalt/nucleus/pod.c
index 12a72af..d226b4b 100644
--- a/kernel/cobalt/nucleus/pod.c
+++ b/kernel/cobalt/nucleus/pod.c
@@ -40,7 +40,7 @@
#include <nucleus/heap.h>
#include <nucleus/intr.h>
#include <nucleus/registry.h>
-#include <nucleus/module.h>
+#include <nucleus/clock.h>
#include <nucleus/stat.h>
#include <nucleus/assert.h>
#include <nucleus/select.h>
@@ -337,9 +337,9 @@ int xnpod_init(void)
xnlock_put_irqrestore(&nklock, s);
- heapaddr = xnarch_alloc_pages(xnmod_sysheap_size);
+ heapaddr = xnarch_alloc_pages(CONFIG_XENO_OPT_SYS_HEAPSZ * 1024);
if (heapaddr == NULL ||
- xnheap_init(&kheap, heapaddr, xnmod_sysheap_size,
+ xnheap_init(&kheap, heapaddr, CONFIG_XENO_OPT_SYS_HEAPSZ * 1024,
XNHEAP_PAGE_SIZE) != 0) {
return -ENOMEM;
}
diff --git a/kernel/cobalt/nucleus/shadow.c b/kernel/cobalt/nucleus/shadow.c
index 82f9e92..ec6dc4d 100644
--- a/kernel/cobalt/nucleus/shadow.c
+++ b/kernel/cobalt/nucleus/shadow.c
@@ -48,7 +48,7 @@
#include <nucleus/pod.h>
#include <nucleus/heap.h>
#include <nucleus/synch.h>
-#include <nucleus/module.h>
+#include <nucleus/clock.h>
#include <nucleus/shadow.h>
#include <nucleus/ppd.h>
#include <nucleus/trace.h>
diff --git a/kernel/cobalt/nucleus/synch.c b/kernel/cobalt/nucleus/synch.c
index 49038a3..0497481 100644
--- a/kernel/cobalt/nucleus/synch.c
+++ b/kernel/cobalt/nucleus/synch.c
@@ -34,7 +34,7 @@
#include <nucleus/pod.h>
#include <nucleus/synch.h>
#include <nucleus/thread.h>
-#include <nucleus/module.h>
+#include <nucleus/clock.h>
#define w_bprio(t) xnsched_weighted_bprio(t)
#define w_cprio(t) xnsched_weighted_cprio(t)
diff --git a/kernel/cobalt/nucleus/thread.c b/kernel/cobalt/nucleus/thread.c
index adc2a67..5ad78d9 100644
--- a/kernel/cobalt/nucleus/thread.c
+++ b/kernel/cobalt/nucleus/thread.c
@@ -22,7 +22,7 @@
#include <nucleus/heap.h>
#include <nucleus/thread.h>
#include <nucleus/sched.h>
-#include <nucleus/module.h>
+#include <nucleus/clock.h>
#include <asm/xenomai/bits/thread.h>
static unsigned idtags;
_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git
