[rtems commit] i386/pc386: Remove include of <rtems/console.h> from <bsp.h > and fix warnings

[Joel Sherrill]

Module:    rtems
Branch:    master
Commit:    578d839413a6cb3c7f3c5d35ebaebb35119fb34e
Changeset: http://git.rtems.org/rtems/commit/?id=578d839413a6cb3c7f3c5d35ebaebb35119fb34e

Author:    Joel Sherrill <joel at rtems.org>
Date:      Tue Mar 29 13:10:50 2016 -0500

i386/pc386: Remove include of <rtems/console.h> from <bsp.h> and fix warnings

---

 c/src/lib/libbsp/i386/pc386/console/console_control.c |  3 ++-
 c/src/lib/libbsp/i386/pc386/console/console_select.c  | 10 ++++++----
 c/src/lib/libbsp/i386/pc386/include/bsp.h             |  1 -
 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 e0201de..a0b9220 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 1d938a1..3fb31ec 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 fd67501..c26a78c 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>