summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2016-06-23 14:06:21 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2016-06-23 14:08:02 +0200
commit32fd70213848aafedb754b947e9fd6eaf819b1d3 (patch)
treeace42ffacc0f2b430cb8b1143a91713b49aa70ae
parentUpdate rtems_waf to pick up the long command line fix. (diff)
downloadrtems-libbsd-32fd70213848aafedb754b947e9fd6eaf819b1d3.tar.bz2
Update due to RTEMS printer API changes
-rw-r--r--freebsd/sys/kern/kern_intr.c2
-rw-r--r--rtemsbsd/include/machine/stdarg.h2
-rw-r--r--rtemsbsd/rtems/rtems-kernel-panic.c2
-rw-r--r--rtemsbsd/rtems/rtems-kernel-program.c1
-rw-r--r--testsuite/include/rtems/bsd/test/default-init.h1
-rw-r--r--testsuite/include/rtems/bsd/test/default-network-init.h1
6 files changed, 7 insertions, 2 deletions
diff --git a/freebsd/sys/kern/kern_intr.c b/freebsd/sys/kern/kern_intr.c
index e602cd83..87b7241d 100644
--- a/freebsd/sys/kern/kern_intr.c
+++ b/freebsd/sys/kern/kern_intr.c
@@ -59,7 +59,6 @@ __FBSDID("$FreeBSD$");
#include <machine/cpu.h>
#ifndef __rtems__
#include <machine/md_var.h>
-#include <machine/stdarg.h>
#else /* __rtems__ */
#ifdef INTR_FILTER
#error INTR_FILTER is currently not suppported with RTEMS
@@ -67,6 +66,7 @@ __FBSDID("$FreeBSD$");
#include <machine/rtems-bsd-thread.h>
#define RTEMSBSD_SWI_WAKEUP_EVENT RTEMS_EVENT_31
#endif /* __rtems__ */
+#include <machine/stdarg.h>
#ifdef DDB
#include <ddb/ddb.h>
#include <ddb/db_sym.h>
diff --git a/rtemsbsd/include/machine/stdarg.h b/rtemsbsd/include/machine/stdarg.h
index 936ffd88..38ade6d9 100644
--- a/rtemsbsd/include/machine/stdarg.h
+++ b/rtemsbsd/include/machine/stdarg.h
@@ -1 +1 @@
-/* EMPTY */
+#include <stdarg.h>
diff --git a/rtemsbsd/rtems/rtems-kernel-panic.c b/rtemsbsd/rtems/rtems-kernel-panic.c
index 9b787db6..2de4f931 100644
--- a/rtemsbsd/rtems/rtems-kernel-panic.c
+++ b/rtemsbsd/rtems/rtems-kernel-panic.c
@@ -44,6 +44,8 @@
#include <sys/types.h>
#include <sys/systm.h>
+#include <stdarg.h>
+
void
panic(const char *fmt, ...)
{
diff --git a/rtemsbsd/rtems/rtems-kernel-program.c b/rtemsbsd/rtems/rtems-kernel-program.c
index 5ade72db..a71d5496 100644
--- a/rtemsbsd/rtems/rtems-kernel-program.c
+++ b/rtemsbsd/rtems/rtems-kernel-program.c
@@ -50,6 +50,7 @@
#include <sys/mutex.h>
#include <setjmp.h>
+#include <stdarg.h>
#include <stdlib.h>
#undef printf
diff --git a/testsuite/include/rtems/bsd/test/default-init.h b/testsuite/include/rtems/bsd/test/default-init.h
index 1398170f..2f73442e 100644
--- a/testsuite/include/rtems/bsd/test/default-init.h
+++ b/testsuite/include/rtems/bsd/test/default-init.h
@@ -9,6 +9,7 @@
#include <assert.h>
#include <stdlib.h>
#include <stdio.h>
+#include <rtems/printer.h>
#include <rtems/stackchk.h>
#include <rtems/bsd/bsd.h>
diff --git a/testsuite/include/rtems/bsd/test/default-network-init.h b/testsuite/include/rtems/bsd/test/default-network-init.h
index d4683924..1d69fd1a 100644
--- a/testsuite/include/rtems/bsd/test/default-network-init.h
+++ b/testsuite/include/rtems/bsd/test/default-network-init.h
@@ -44,6 +44,7 @@
#include <machine/rtems-bsd-commands.h>
#include <rtems.h>
+#include <rtems/printer.h>
#include <rtems/stackchk.h>
#include <rtems/bsd/bsd.h>