summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp
diff options
context:
space:
mode:
authorJoel Sherrill <joel@rtems.org>2016-03-29 13:10:50 -0500
committerJoel Sherrill <joel@rtems.org>2016-03-29 13:10:50 -0500
commit578d839413a6cb3c7f3c5d35ebaebb35119fb34e (patch)
treee16c13a93f9c16e874d859bb13ab43b81c9efd26 /c/src/lib/libbsp
parentepiphany/epiphany_sim: Remove include of <rtems/console.h> from <bsp.h> and f... (diff)
downloadrtems-578d839413a6cb3c7f3c5d35ebaebb35119fb34e.tar.bz2
i386/pc386: Remove include of <rtems/console.h> from <bsp.h> and fix warnings
Diffstat (limited to '')
-rw-r--r--c/src/lib/libbsp/i386/pc386/console/console_control.c3
-rw-r--r--c/src/lib/libbsp/i386/pc386/console/console_select.c10
-rw-r--r--c/src/lib/libbsp/i386/pc386/include/bsp.h1
3 files changed, 8 insertions, 6 deletions
diff --git a/c/src/lib/libbsp/i386/pc386/console/console_control.c b/c/src/lib/libbsp/i386/pc386/console/console_control.c
index e0201de570..a0b9220bba 100644
--- a/c/src/lib/libbsp/i386/pc386/console/console_control.c
+++ b/c/src/lib/libbsp/i386/pc386/console/console_control.c
@@ -16,10 +16,11 @@
*/
#include <bsp.h>
-#include <rtems/libio.h>
#include <stdlib.h>
#include <assert.h>
#include <termios.h>
+#include <rtems/libio.h>
+#include <rtems/console.h>
#include <bsp/irq.h>
diff --git a/c/src/lib/libbsp/i386/pc386/console/console_select.c b/c/src/lib/libbsp/i386/pc386/console/console_select.c
index 1d938a1ebd..3fb31ecb3c 100644
--- a/c/src/lib/libbsp/i386/pc386/console/console_select.c
+++ b/c/src/lib/libbsp/i386/pc386/console/console_select.c
@@ -18,14 +18,16 @@
* http://www.rtems.org/license/LICENSE.
*/
-#include <bsp.h>
-#include <rtems/libio.h>
#include <stdlib.h>
-#include <assert.h>
#include <termios.h>
-#include <rtems/termiostypes.h>
+#include <bsp.h>
#include <libchip/serial.h>
+#include <rtems/libio.h>
+#include <rtems/console.h>
+#include <rtems/termiostypes.h>
+#include <bsp/bspimpl.h>
+
#include "../../../shared/console_private.h"
#ifdef RTEMS_RUNTIME_CONSOLE_SELECT
#include <crt.h>
diff --git a/c/src/lib/libbsp/i386/pc386/include/bsp.h b/c/src/lib/libbsp/i386/pc386/include/bsp.h
index fd67501d85..c26a78c64e 100644
--- a/c/src/lib/libbsp/i386/pc386/include/bsp.h
+++ b/c/src/lib/libbsp/i386/pc386/include/bsp.h
@@ -55,7 +55,6 @@
#include <rtems.h>
#include <rtems/iosupp.h>
-#include <rtems/console.h>
#include <rtems/score/cpu.h>
#include <rtems/bspIo.h>