2002-11-04 Joel Sherrill <joel@OARcorp.com>

* console/console.c, network/network.c: Removed warnings.

c/src/lib/libbsp/i386/i386ex/ChangeLog

@@ -1,3 +1,7 @@
+2002-11-04	Joel Sherrill <joel@OARcorp.com>
+
+	* console/console.c, network/network.c: Removed warnings.
+
 2002-11-01	Joel Sherrill <joel@OARcorp.com>
 
 	* startup/bspstart.c: Removed warnings.

c/src/lib/libbsp/i386/i386ex/console/console.c

@@ -43,6 +43,7 @@ void __assert (const char *file, int line, const char *msg);
 #include <bsp.h>
 #include <irq.h>
 #include <rtems/libio.h>
+#include <rtems/error.h>
 #include <termios.h>
 #include <uart.h>
 #include <libcpu/cpuModel.h>
@@ -189,8 +190,6 @@ console_initialize(rtems_device_major_number major,
 } /* console_initialize */
 
 
-static int console_open_count = 0;
-
 static int console_last_close(int major, int minor, void *arg)
 {
   BSP_remove_rtems_irq_handler (&console_isr_data);

c/src/lib/libbsp/i386/i386ex/network/network.c

@@ -1,4 +1,4 @@
-/* uti596.c: An 82596 ethernet driver for rtems-bsd.
+/* uti595.c: An 82596 ethernet driver for rtems-bsd.
  *
  *  $Id$
  */
@@ -60,6 +60,7 @@ int count_rx = 0;
 #include "netexterns.h"
 
 #include <asm.h>
+#include <string.h>
 
 
 /* #include "../misc/utils.h" */
@@ -68,7 +69,6 @@ static struct uti596_softc uti596_softc;
 
 
 static    int scbStatus;
-static    rtems_status_code sc;
 static    struct i596_cmd *pIsrCmd;
 static    struct i596_rfd *pIsrRfd;
 
@@ -169,6 +169,8 @@ void send_packet(struct ifnet *, struct mbuf *);
 
 void 
 uti596_request_reset(void){
+   rtems_status_code sc;
+
    uti596_softc.nic_reset = 0;
    sc = rtems_event_send(uti596_softc.resetDaemonTid, NIC_RESET_EVENT);
    if ( sc != RTEMS_SUCCESSFUL )
@@ -2709,7 +2711,6 @@ void uti596_init(void * arg){
 
   struct uti596_softc  *sc = arg;
   struct ifnet *ifp = &sc->arpcom.ac_if;
-  rtems_status_code status_code;
 
 
   if (sc->txDaemonTid == 0) {

c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog

@@ -1,3 +1,7 @@
+2002-11-04	Joel Sherrill <joel@OARcorp.com>
+
+	* console/console.c, network/network.c: Removed warnings.
+
 2002-11-01	Joel Sherrill <joel@OARcorp.com>
 
 	* clock/p_clock.c, console/console.c, startup/bspstart.c: Removed

c/src/lib/libbsp/powerpc/mbx8xx/console/console.c

@@ -856,12 +856,11 @@ rtems_device_driver console_open(
   void *arg
 )
 {
+#if NVRAM_CONFIGURE == 1
   /* Used to track termios private data for callbacks */
   extern struct rtems_termios_tty *ttyp[];
-  
   rtems_libio_open_close_args_t *args = arg;
-  rtems_status_code sc;
+#endif
-  
   static const rtems_termios_callbacks sccEPPCBugCallbacks = {
     NULL,                       	/* firstOpen */
     NULL,                       	/* lastClose */
@@ -871,6 +870,22 @@ rtems_device_driver console_open(
     NULL,                       	/* startRemoteTx */
     0                           	/* outputUsesInterrupts */
   };
+  static const rtems_termios_callbacks pollCallbacks = {
+    NULL,                       	/* firstOpen */
+    NULL,                       	/* lastClose */
+    m8xx_uart_pollRead,        	        /* pollRead */
+    m8xx_uart_pollWrite,       	        /* write */
+    m8xx_uart_setAttributes,            /* setAttributes */
+    NULL,                       	/* stopRemoteTx */
+    NULL,                       	/* startRemoteTx */
+    0                           	/* outputUsesInterrupts */
+  };
+  rtems_status_code sc;
+  
+   
+#if (NVRAM_CONFIGURE == 1) || \
+    ((NVRAM_CONFIGURE != 1) && (UARTS_USE_TERMIOS == 1) && \
+      (UARTS_IO_MODE == 1))
   
   static const rtems_termios_callbacks intrCallbacks = {
     NULL,                       	/* firstOpen */
@@ -882,17 +897,7 @@ rtems_device_driver console_open(
     NULL,                       	/* startRemoteTx */
     1                           	/* outputUsesInterrupts */
   };
-  
+#endif
-  static const rtems_termios_callbacks pollCallbacks = {
-    NULL,                       	/* firstOpen */
-    NULL,                       	/* lastClose */
-    m8xx_uart_pollRead,        	  /* pollRead */
-    m8xx_uart_pollWrite,       	  /* write */
-    m8xx_uart_setAttributes,      /* setAttributes */
-    NULL,                       	/* stopRemoteTx */
-    NULL,                       	/* startRemoteTx */
-    0                           	/* outputUsesInterrupts */
-  };
   
   if ( minor > NUM_PORTS-1 ) 
     return RTEMS_INVALID_NUMBER;

c/src/lib/libbsp/powerpc/mbx8xx/network/network.c

@@ -136,7 +136,8 @@ static void  m8xx_scc1_ethernet_off(const rtems_irq_connect_data* ptr)
 
 static void  m8xx_scc1_ethernet_isOn(const rtems_irq_connect_data* ptr)
 {
-  return BSP_irq_enabled_at_cpm (ptr->name);
+  int BSP_irq_enabled_at_cpm(const rtems_irq_symbolic_name );
+  BSP_irq_enabled_at_cpm (ptr->name);
 }
 
 /*
@@ -203,8 +204,6 @@ m8xx_enet_initialize (struct m8xx_enet_struct *sc)
 {
   int i;
   unsigned char *hwaddr;
-  rtems_status_code status;
-  rtems_isr_entry old_handler;
   
   /*
    * Configure port A