Move content to new <machine/rtems-bsd-support.h>

13 files changed, 83 insertions, 26 deletions

diff --git a/freebsd/sys/kern/kern_module.c b/freebsd/sys/kern/kern_module.c
index 8351c626..9ff8a78f 100644
--- a/freebsd/sys/kern/kern_module.c
+++ b/freebsd/sys/kern/kern_module.c
@@ -196,7 +196,7 @@ module_register(const moduledata_t *data, linker_file_t container)
 		TAILQ_INSERT_TAIL(&container->modules, newmod, flink);
 	newmod->file = container;
 #else /* __rtems__ */
-		BSD_PANIC("not supported");
+		BSD_ASSERT(0);
 #endif /* __rtems__ */
 	MOD_XUNLOCK;
 	return (0);
diff --git a/rtemsbsd/include/machine/rtems-bsd-config.h.in b/rtemsbsd/include/machine/rtems-bsd-config.h.in
index 1eff742a..220e750c 100644
--- a/rtemsbsd/include/machine/rtems-bsd-config.h.in
+++ b/rtemsbsd/include/machine/rtems-bsd-config.h.in
@@ -96,24 +96,16 @@
 
 #include <machine/rtems-bsd-symbols.h>
 
-/* Debug */
+/* Assert */
 
 void rtems_bsd_assert_func(const char *file, int line, const char *func, const char *expr);
 
-#define BSD_PRINTF(fmt, ...) printf("%s: " fmt, __func__, ##__VA_ARGS__)
-
-#define BSD_PANIC(fmt, ...) panic("%s: " fmt "\n",  __func__, ##__VA_ARGS__)
-
-#ifdef NDEBUG
+#ifdef RTEMS_BSD_NO_ASSERT
 # define BSD_ASSERT(expr) ((void) 0)
 #else
 # define BSD_ASSERT(expr) ((expr) ? (void) 0 : rtems_bsd_assert_func(__FILE__, __LINE__, __func__, #expr))
 #endif
 
-#define BSD_ASSERT_SC(sc) BSD_ASSERT((sc) == RTEMS_SUCCESSFUL)
-
-#define BSD_ASSERT_RV(rv) BSD_ASSERT((rv) == 0)
-
 /* General definitions */
 
 #define M_RTEMS_HEAP 0
@@ -128,16 +120,4 @@ void rtems_bsd_assert_func(const char *file, int line, const char *func, const c
 
 #define BSD_DEFAULT_PRISON (&prison0)
 
-extern rtems_chain_control rtems_bsd_lock_chain;
-
-extern rtems_chain_control rtems_bsd_mtx_chain;
-
-extern rtems_chain_control rtems_bsd_sx_chain;
-
-extern rtems_chain_control rtems_bsd_condvar_chain;
-
-extern rtems_chain_control rtems_bsd_callout_chain;
-
-extern rtems_chain_control rtems_bsd_malloc_chain;
-
 #endif /* _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_ */
diff --git a/rtemsbsd/include/machine/rtems-bsd-support.h b/rtemsbsd/include/machine/rtems-bsd-support.h
new file mode 100644
index 00000000..de148921
--- /dev/null
+++ b/rtemsbsd/include/machine/rtems-bsd-support.h
@@ -0,0 +1,69 @@
+/**
+ * @file
+ *
+ * @ingroup rtems_bsd_machine
+ *
+ * @brief TODO.
+ */
+
+/*
+ * Copyright (c) 2009-2013 embedded brains GmbH.  All rights reserved.
+ *
+ *  embedded brains GmbH
+ *  Dornierstr. 4
+ *  82178 Puchheim
+ *  Germany
+ *  <rtems@embedded-brains.de>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_SUPPORT_H_
+#define _RTEMS_BSD_MACHINE_RTEMS_BSD_SUPPORT_H_
+
+#include <stdio.h>
+
+#include <rtems/chain.h>
+
+/* Debug */
+
+#define BSD_PRINTF(fmt, ...) printf("%s: " fmt, __func__, ##__VA_ARGS__)
+
+#define BSD_PANIC(fmt, ...) panic("%s: " fmt "\n",  __func__, ##__VA_ARGS__)
+
+#define BSD_ASSERT_SC(sc) BSD_ASSERT((sc) == RTEMS_SUCCESSFUL)
+
+#define BSD_ASSERT_RV(rv) BSD_ASSERT((rv) == 0)
+
+extern rtems_chain_control rtems_bsd_lock_chain;
+
+extern rtems_chain_control rtems_bsd_mtx_chain;
+
+extern rtems_chain_control rtems_bsd_sx_chain;
+
+extern rtems_chain_control rtems_bsd_condvar_chain;
+
+extern rtems_chain_control rtems_bsd_callout_chain;
+
+extern rtems_chain_control rtems_bsd_malloc_chain;
+
+#endif /* _RTEMS_BSD_MACHINE_RTEMS_BSD_SUPPORT_H_ */
diff --git a/rtemsbsd/rtems/rtems-bsd-cam.c b/rtemsbsd/rtems/rtems-bsd-cam.c
index baad15f2..e401d24e 100644
--- a/rtemsbsd/rtems/rtems-bsd-cam.c
+++ b/rtemsbsd/rtems/rtems-bsd-cam.c
@@ -39,6 +39,7 @@
  */
 
 #include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-support.h>
 
 #include <rtems/bsd/sys/param.h>
 #include <sys/systm.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-condvar.c b/rtemsbsd/rtems/rtems-bsd-condvar.c
index f5022191..af02a469 100644
--- a/rtemsbsd/rtems/rtems-bsd-condvar.c
+++ b/rtemsbsd/rtems/rtems-bsd-condvar.c
@@ -38,6 +38,7 @@
  */
 
 #include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-support.h>
 
 #include <rtems/score/objectimpl.h>
 #include <rtems/score/threaddispatch.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-delay.c b/rtemsbsd/rtems/rtems-bsd-delay.c
index 9eb34c40..b8e0eb33 100644
--- a/rtemsbsd/rtems/rtems-bsd-delay.c
+++ b/rtemsbsd/rtems/rtems-bsd-delay.c
@@ -59,5 +59,5 @@ DELAY(int usec)
 	}
 
 	sc = rtems_task_wake_after(ticks);
-	BSD_ASSERT_SC(sc);
+	BSD_ASSERT(sc == RTEMS_SUCCESSFUL);
 }
diff --git a/rtemsbsd/rtems/rtems-bsd-malloc.c b/rtemsbsd/rtems/rtems-bsd-malloc.c
index f5484712..a21fb942 100644
--- a/rtemsbsd/rtems/rtems-bsd-malloc.c
+++ b/rtemsbsd/rtems/rtems-bsd-malloc.c
@@ -38,6 +38,7 @@
  */
 
 #include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-support.h>
 
 #include <rtems/bsd/sys/param.h>
 #include <rtems/bsd/sys/types.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-mutex.c b/rtemsbsd/rtems/rtems-bsd-mutex.c
index 1c79bd28..6f7bd064 100644
--- a/rtemsbsd/rtems/rtems-bsd-mutex.c
+++ b/rtemsbsd/rtems/rtems-bsd-mutex.c
@@ -39,6 +39,7 @@
 
 #include <machine/rtems-bsd-config.h>
 #include <machine/rtems-bsd-thread.h>
+#include <machine/rtems-bsd-support.h>
 
 #include <rtems/score/objectimpl.h>
 #include <rtems/rtems/attrimpl.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-rwlock.c b/rtemsbsd/rtems/rtems-bsd-rwlock.c
index 50e39997..31814623 100644
--- a/rtemsbsd/rtems/rtems-bsd-rwlock.c
+++ b/rtemsbsd/rtems/rtems-bsd-rwlock.c
@@ -38,6 +38,7 @@
  */
 
 #include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-support.h>
 
 #include <rtems/score/objectimpl.h>
 #include <rtems/posix/rwlockimpl.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-shell.c b/rtemsbsd/rtems/rtems-bsd-shell.c
index 9e110e28..014f825c 100644
--- a/rtemsbsd/rtems/rtems-bsd-shell.c
+++ b/rtemsbsd/rtems/rtems-bsd-shell.c
@@ -39,6 +39,7 @@
 
 #include <machine/rtems-bsd-config.h>
 #include <machine/rtems-bsd-thread.h>
+#include <machine/rtems-bsd-support.h>
 
 #include <rtems/bsd/sys/param.h>
 #include <rtems/bsd/sys/types.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-signal.c b/rtemsbsd/rtems/rtems-bsd-signal.c
index 0c024487..7bb211e9 100644
--- a/rtemsbsd/rtems/rtems-bsd-signal.c
+++ b/rtemsbsd/rtems/rtems-bsd-signal.c
@@ -46,11 +46,11 @@
 void
 psignal(struct proc *p, int sig)
 {
-	BSD_PANIC("not implemented");
+	BSD_ASSERT(0);
 }
 
 void pgsigio(struct sigio **sigiop, int sig, int checkctty)
 {
  
-	BSD_PANIC("not implemented");
+	BSD_ASSERT(0);
 }
diff --git a/rtemsbsd/rtems/rtems-bsd-sx.c b/rtemsbsd/rtems/rtems-bsd-sx.c
index 5b2bc4da..f847cfb8 100644
--- a/rtemsbsd/rtems/rtems-bsd-sx.c
+++ b/rtemsbsd/rtems/rtems-bsd-sx.c
@@ -38,6 +38,7 @@
  */
 
 #include <machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-support.h>
 
 #include <rtems/score/objectimpl.h>
 #include <rtems/rtems/attrimpl.h>
diff --git a/rtemsbsd/rtems/rtems-bsd-thread.c b/rtemsbsd/rtems/rtems-bsd-thread.c
index b3bdb842..0d893a32 100644
--- a/rtemsbsd/rtems/rtems-bsd-thread.c
+++ b/rtemsbsd/rtems/rtems-bsd-thread.c
@@ -39,6 +39,7 @@
 
 #include <machine/rtems-bsd-config.h>
 #include <machine/rtems-bsd-thread.h>
+#include <machine/rtems-bsd-support.h>
 
 #include <rtems/bsd/sys/param.h>
 #include <rtems/bsd/sys/types.h>