2009-05-06 Joel Sherrill <joel.sherrill@oarcorp.com>

	* console/console.c, console/inch.c, ide/ide.c: Fixed warnings.

4 files changed, 10 insertions, 2 deletions

diff --git a/c/src/lib/libbsp/i386/pc386/ChangeLog b/c/src/lib/libbsp/i386/pc386/ChangeLog
index f6121c2c56..8326aba139 100644
--- a/c/src/lib/libbsp/i386/pc386/ChangeLog
+++ b/c/src/lib/libbsp/i386/pc386/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-06	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* console/console.c, console/inch.c, ide/ide.c: Fixed warnings.
+
 2009-04-28	Chris Johns <chrisj@rtems.org>
 
 	* Makefile.am: Add bspcmdline.c.
diff --git a/c/src/lib/libbsp/i386/pc386/console/console.c b/c/src/lib/libbsp/i386/pc386/console/console.c
index 037f56c859..6b05747620 100644
--- a/c/src/lib/libbsp/i386/pc386/console/console.c
+++ b/c/src/lib/libbsp/i386/pc386/console/console.c
@@ -39,6 +39,7 @@
 #include <bsp/irq.h>
 #include <rtems/libio.h>
 #include <termios.h>
+#include <rtems/termiostypes.h>
 #include <uart.h>
 #include <libcpu/cpuModel.h>
 
@@ -78,7 +79,7 @@ extern void kbd_init( void );
 +--------------------------------------------------------------------------*/
 extern void keyboard_interrupt(void );
 extern void keyboard_interrupt_wrapper(void *);
-extern char BSP_wait_polled_input(void);
+extern int BSP_wait_polled_input(void);
 extern void _IBMPC_initVideo(void);
 
 static int  conSetAttr(int minor, const struct termios *);
diff --git a/c/src/lib/libbsp/i386/pc386/console/inch.c b/c/src/lib/libbsp/i386/pc386/console/inch.c
index bc3a56dcff..274d7e2d82 100644
--- a/c/src/lib/libbsp/i386/pc386/console/inch.c
+++ b/c/src/lib/libbsp/i386/pc386/console/inch.c
@@ -245,7 +245,7 @@ _IBMPC_inch(void)
   * Routine that can be used before interrupt management is initialized.
   */
 
-char
+int
 BSP_wait_polled_input(void)
 {
   char c;
diff --git a/c/src/lib/libbsp/i386/pc386/ide/ide.c b/c/src/lib/libbsp/i386/pc386/ide/ide.c
index c14598a452..ee7880da64 100644
--- a/c/src/lib/libbsp/i386/pc386/ide/ide.c
+++ b/c/src/lib/libbsp/i386/pc386/ide/ide.c
@@ -31,6 +31,8 @@
 
 /* #define DEBUG_OUT */
 
+/* Not using this currently */
+#if 0
 static bool pc386_ide_status_busy (uint32_t port,
                                    uint32_t timeout,
                                    uint8_t* status_val)
@@ -51,6 +53,7 @@ static bool pc386_ide_status_busy (uint32_t port,
 
   return false;
 }
+#endif
 
 static bool pc386_ide_status_data_ready (uint32_t port,
                                          uint32_t timeout,