Module: xenomai-forge
Branch: next
Commit: 45edc07f63d82e5acb35f8a16dd6880412c825ac
URL:
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=45edc07f63d82e5acb35f8a16dd6880412c825ac
Author: Philippe Gerum <r...@xenomai.org>
Date: Thu Aug 1 16:19:30 2013 +0200
cobalt/assert: group default debug levels in one place
---
include/cobalt/kernel/assert.h | 22 +++++++++++++++++++++-
include/cobalt/kernel/lock.h | 4 ----
include/cobalt/kernel/synch.h | 4 ----
include/rtdm/rtdm_driver.h | 4 ----
kernel/cobalt/posix/internal.h | 4 ----
kernel/cobalt/rtdm/internal.h | 4 ----
6 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/include/cobalt/kernel/assert.h b/include/cobalt/kernel/assert.h
index cad72d0..dbca076 100644
--- a/include/cobalt/kernel/assert.h
+++ b/include/cobalt/kernel/assert.h
@@ -45,7 +45,27 @@
#ifndef CONFIG_XENO_OPT_DEBUG_NUCLEUS
#define CONFIG_XENO_OPT_DEBUG_NUCLEUS 0
-#endif /* CONFIG_XENO_OPT_DEBUG_NUCLEUS */
+#endif
+
+#ifndef CONFIG_XENO_OPT_DEBUG_XNLOCK
+#define CONFIG_XENO_OPT_DEBUG_XNLOCK 0
+#endif
+
+#ifndef CONFIG_XENO_OPT_DEBUG_SYNCH_RELAX
+#define CONFIG_XENO_OPT_DEBUG_SYNCH_RELAX 0
+#endif
+
+#ifndef CONFIG_XENO_OPT_DEBUG_RTDM
+#define CONFIG_XENO_OPT_DEBUG_RTDM 0
+#endif
+
+#ifndef CONFIG_XENO_OPT_DEBUG_RTDM_APPL
+#define CONFIG_XENO_OPT_DEBUG_RTDM_APPL 0
+#endif
+
+#ifndef CONFIG_XENO_OPT_DEBUG_COBALT
+#define CONFIG_XENO_OPT_DEBUG_COBALT 0
+#endif
void __xnsys_assert_failed(const char *file, int line, const char *msg);
diff --git a/include/cobalt/kernel/lock.h b/include/cobalt/kernel/lock.h
index 21f0047..ea7cfed 100644
--- a/include/cobalt/kernel/lock.h
+++ b/include/cobalt/kernel/lock.h
@@ -41,10 +41,6 @@ typedef unsigned long spl_t;
#define splnone() ipipe_unstall_head()
#define spltest() ipipe_test_head()
-#ifndef CONFIG_XENO_OPT_DEBUG_XNLOCK
-#define CONFIG_XENO_OPT_DEBUG_XNLOCK 0
-#endif
-
#if XENO_DEBUG(XNLOCK)
struct xnlock {
diff --git a/include/cobalt/kernel/synch.h b/include/cobalt/kernel/synch.h
index a596ae3..ea93129 100644
--- a/include/cobalt/kernel/synch.h
+++ b/include/cobalt/kernel/synch.h
@@ -26,10 +26,6 @@
#include <cobalt/kernel/assert.h>
#include <cobalt/kernel/timer.h>
-#ifndef CONFIG_XENO_OPT_DEBUG_SYNCH_RELAX
-#define CONFIG_XENO_OPT_DEBUG_SYNCH_RELAX 0
-#endif /* CONFIG_XENO_OPT_DEBUG_SYNCH_RELAX */
-
#define XNSYNCH_CLAIMED 0x10 /* Claimed by other thread(s) w/ PIP */
#define XNSYNCH_FLCLAIM XN_HANDLE_SPARE3 /* Corresponding bit in fast lock */
diff --git a/include/rtdm/rtdm_driver.h b/include/rtdm/rtdm_driver.h
index f8acc9c..ae986ff 100644
--- a/include/rtdm/rtdm_driver.h
+++ b/include/rtdm/rtdm_driver.h
@@ -52,10 +52,6 @@
#include <asm-generic/xenomai/pci_ids.h>
#endif /* CONFIG_PCI */
-#ifndef CONFIG_XENO_OPT_DEBUG_RTDM
-#define CONFIG_XENO_OPT_DEBUG_RTDM 0
-#endif
-
struct rtdm_dev_context;
typedef struct xnselector rtdm_selector_t;
enum rtdm_selecttype;
diff --git a/kernel/cobalt/posix/internal.h b/kernel/cobalt/posix/internal.h
index 45a8815..fbf6505 100644
--- a/kernel/cobalt/posix/internal.h
+++ b/kernel/cobalt/posix/internal.h
@@ -28,10 +28,6 @@
#include "process.h"
#include "extension.h"
-#ifndef CONFIG_XENO_OPT_DEBUG_COBALT
-#define CONFIG_XENO_OPT_DEBUG_COBALT 0
-#endif
-
#define COBALT_MAGIC(n) (0x8686##n##n)
#define COBALT_ANY_MAGIC COBALT_MAGIC(00)
#define COBALT_THREAD_MAGIC COBALT_MAGIC(01)
diff --git a/kernel/cobalt/rtdm/internal.h b/kernel/cobalt/rtdm/internal.h
index 35703f8..f953c55 100644
--- a/kernel/cobalt/rtdm/internal.h
+++ b/kernel/cobalt/rtdm/internal.h
@@ -27,10 +27,6 @@
#include <linux/list.h>
#include <linux/sem.h>
-#ifndef CONFIG_XENO_OPT_DEBUG_RTDM_APPL
-#define CONFIG_XENO_OPT_DEBUG_RTDM_APPL 0
-#endif
-
#define RTDM_FD_MAX CONFIG_XENO_OPT_RTDM_FILDES
#define DEF_DEVNAME_HASHTAB_SIZE 256 /* entries in name hash table */
_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git
