Warning removal patch from Philip A. Prindeville <philipp@zembu.com>.

5 files changed, 21 insertions, 18 deletions

diff --git a/c/src/lib/libbsp/i386/pc386/3c509/3c509.c b/c/src/lib/libbsp/i386/pc386/3c509/3c509.c
index e4c27d894f..07feea0255 100644
--- a/c/src/lib/libbsp/i386/pc386/3c509/3c509.c
+++ b/c/src/lib/libbsp/i386/pc386/3c509/3c509.c
@@ -58,6 +58,9 @@
  *
  * MODIFICATION/HISTORY:
  * $Log$
+ * Revision 1.1  1999/05/14 16:23:42  joel
+ * Added 3COM 3C509 driver from Rosimildo DaSilva <rdasilva@connecttel.com>.
+ *
  *
  **********************************************************************************/
 
@@ -384,7 +387,7 @@ void __inline outb( unsigned short io_addr, unsigned char out_data )
  **********************************************************************************/
 static __inline unsigned char inb( unsigned short io_addr )
 {
-  unsigned short in_data;
+  unsigned char in_data;
   inport_byte( io_addr, in_data );
   return in_data;
 }
diff --git a/c/src/lib/libbsp/i386/pc386/console/console.c b/c/src/lib/libbsp/i386/pc386/console/console.c
index dc3584111a..a16188c464 100644
--- a/c/src/lib/libbsp/i386/pc386/console/console.c
+++ b/c/src/lib/libbsp/i386/pc386/console/console.c
@@ -68,7 +68,7 @@ extern BSP_polling_getchar_function_type BSP_poll_char;
 /*-------------------------------------------------------------------------+
 | External Prototypes
 +--------------------------------------------------------------------------*/
-extern void _IBMPC_keyboard_isr(void);
+extern void _IBMPC_keyboard_isr(rtems_vector_number);
 extern rtems_boolean _IBMPC_scankey(char *);  /* defined in 'inch.c' */
 extern char BSP_wait_polled_input(void);
 extern void _IBMPC_initVideo(void);
diff --git a/c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c b/c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c
index 666653f421..b0f1938802 100644
--- a/c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c
+++ b/c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c
@@ -186,6 +186,11 @@ struct ne_softc {
 
 static struct ne_softc ne_softc[NNEDRIVER];
 
+/* Forward declarations to avoid warnings */
+
+static void ne_stop (struct ne_softc *sc);
+static void ne_init (void *arg);
+
 /* Find the NE2000 device which is attached at a particular interrupt
    vector.  */
 
diff --git a/c/src/lib/libbsp/i386/shared/comm/i386-stub-glue.c b/c/src/lib/libbsp/i386/shared/comm/i386-stub-glue.c
index 997237c1c2..60f2204356 100644
--- a/c/src/lib/libbsp/i386/shared/comm/i386-stub-glue.c
+++ b/c/src/lib/libbsp/i386/shared/comm/i386-stub-glue.c
@@ -21,6 +21,7 @@ int  getDebugChar(void);       /* read and return a single char */
 /* assign an exception handler */
 void exceptionHandler(int, void (*handler)(void));   
 
+void BSP_loop(int uart);
 
 /* Current uart used by gdb stub */
 static int uart_current = 0;
diff --git a/c/src/lib/libbsp/i386/shared/comm/uart.c b/c/src/lib/libbsp/i386/shared/comm/uart.c
index b3e3174b69..db87d08682 100644
--- a/c/src/lib/libbsp/i386/shared/comm/uart.c
+++ b/c/src/lib/libbsp/i386/shared/comm/uart.c
@@ -35,14 +35,11 @@ uread(int uart, unsigned int reg)
 {
   register unsigned char val;
 
-  if(uart == 0)
-    {
-      i386_inport_byte(COM1_BASE_IO+reg, val);
-    }
-  else
-    {
-      i386_inport_byte(COM2_BASE_IO+reg, val);
-    }
+  if (uart == 0) {
+    inport_byte(COM1_BASE_IO+reg, val);
+  } else {
+    inport_byte(COM2_BASE_IO+reg, val);
+  }
 
   return val;
 }
@@ -50,14 +47,11 @@ uread(int uart, unsigned int reg)
 static inline void      
 uwrite(int uart, int reg, unsigned int val)
 {
-  if(uart == 0)
-    {
-      i386_outport_byte(COM1_BASE_IO+reg, val);
-    } 
-  else
-    {
-      i386_outport_byte(COM2_BASE_IO+reg, val);
-    }
+  if (uart == 0) {
+    outport_byte(COM1_BASE_IO+reg, val);
+  } else {
+    outport_byte(COM2_BASE_IO+reg, val);
+  }
 }
 
 #ifdef UARTDEBUG