summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2002-11-01 21:54:20 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2002-11-01 21:54:20 +0000
commitbbb71a15739387160103b55a05804be7192ca856 (patch)
treec71ef64f69d5af1338a92518441f656d7d830d31
parent52a2cd9139b462ea4276453284fe901c387b3e3f (diff)
downloadrtems-bbb71a15739387160103b55a05804be7192ca856.tar.bz2
2002-11-01 Joel Sherrill <joel@OARcorp.com>
* canbus/canbus.c, clock/p_clock.c, console/console.c, network/network.c, startup/bspstart.c: Removed warnings.
-rw-r--r--c/src/lib/libbsp/powerpc/eth_comm/ChangeLog5
-rw-r--r--c/src/lib/libbsp/powerpc/eth_comm/canbus/canbus.c4
-rw-r--r--c/src/lib/libbsp/powerpc/eth_comm/clock/p_clock.c1
-rw-r--r--c/src/lib/libbsp/powerpc/eth_comm/console/console.c4
-rw-r--r--c/src/lib/libbsp/powerpc/eth_comm/network/network.c17
-rw-r--r--c/src/lib/libbsp/powerpc/eth_comm/startup/bspstart.c1
6 files changed, 20 insertions, 12 deletions
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog b/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog
index ff2a280f25..7b9332de69 100644
--- a/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-01 Joel Sherrill <joel@OARcorp.com>
+
+ * canbus/canbus.c, clock/p_clock.c, console/console.c,
+ network/network.c, startup/bspstart.c: Removed warnings.
+
2002-10-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* .cvsignore: Reformat.
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/canbus/canbus.c b/c/src/lib/libbsp/powerpc/eth_comm/canbus/canbus.c
index 08bd4628b2..9554817936 100644
--- a/c/src/lib/libbsp/powerpc/eth_comm/canbus/canbus.c
+++ b/c/src/lib/libbsp/powerpc/eth_comm/canbus/canbus.c
@@ -109,10 +109,12 @@ rtems_device_driver canbus_initialize(
)
{
int i,j;
+#if 0
char dev_str[16]; /* This allows us to have a device name up to */
/* 15 chars long. If we only use names like */
/* /dev/can0 (9 chars) we will be fine up to */
/* /dev/can9999999 */
+#endif
rtems_status_code status;
rtems_isr_entry old_handler;
@@ -311,7 +313,7 @@ rtems_device_driver canbus_open(
case 0: m8xx.simask |= M8xx_SIMASK_IRM3; break;
case 1: m8xx.simask |= M8xx_SIMASK_IRM4; break;
case 2: m8xx.simask |= M8xx_SIMASK_IRM2; break;
- default: return;
+ default: return 0xffffffff;
}
return RTEMS_SUCCESSFUL;
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/clock/p_clock.c b/c/src/lib/libbsp/powerpc/eth_comm/clock/p_clock.c
index 85b56dd942..fe7f422d01 100644
--- a/c/src/lib/libbsp/powerpc/eth_comm/clock/p_clock.c
+++ b/c/src/lib/libbsp/powerpc/eth_comm/clock/p_clock.c
@@ -16,6 +16,7 @@
#include <bsp.h>
#include <bsp/irq.h>
+#include <rtems/bspIo.h>
extern void clockOn(void*);
extern void clockOff (void*);
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/console/console.c b/c/src/lib/libbsp/powerpc/eth_comm/console/console.c
index e9cf1a2101..fdbcacf8cc 100644
--- a/c/src/lib/libbsp/powerpc/eth_comm/console/console.c
+++ b/c/src/lib/libbsp/powerpc/eth_comm/console/console.c
@@ -32,6 +32,8 @@
#include <termios.h>
#include <rtems/bspIo.h>
+extern void rtems_panic(char *,int);
+
static void _BSP_null_char( char c ) {return;}
BSP_output_char_function_type BSP_output_char = _BSP_null_char;
@@ -124,7 +126,7 @@ rtems_device_driver console_open(rtems_device_major_number major,
sccregs = &m8xx.scc4;
break;
default:
- rtems_panic ("CONSOLE: bad minor number");
+ rtems_panic ("CONSOLE: bad minor number", 0);
}
if (sccregs)
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/network/network.c b/c/src/lib/libbsp/powerpc/eth_comm/network/network.c
index c6c89441d2..c3f96d32d3 100644
--- a/c/src/lib/libbsp/powerpc/eth_comm/network/network.c
+++ b/c/src/lib/libbsp/powerpc/eth_comm/network/network.c
@@ -32,6 +32,8 @@
#include <netinet/if_ether.h>
#include <bsp/irq.h>
+extern void rtems_panic(char *,int);
+
/*
* Number of interfaces supported by this driver
*/
@@ -127,7 +129,7 @@ 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);
+ BSP_irq_enabled_at_cpm (ptr->name);
}
/*
@@ -201,8 +203,6 @@ m860_scc_initialize_hardware (struct m860_enet_struct *sc)
{
int i;
unsigned char *hwaddr;
- rtems_status_code status;
- rtems_isr_entry old_handler;
/*
* Configure port A CLK1, CLK2, TXD1 and RXD1 pins
@@ -241,7 +241,7 @@ m860_scc_initialize_hardware (struct m860_enet_struct *sc)
sc->txMbuf = malloc (sc->txBdCount * sizeof *sc->txMbuf,
M_MBUF, M_NOWAIT);
if (!sc->rxMbuf || !sc->txMbuf)
- rtems_panic ("No memory for mbuf pointers");
+ rtems_panic ("No memory for mbuf pointers",0);
/*
* Set receiver and transmitter buffer descriptor bases
@@ -361,7 +361,7 @@ m860_scc_initialize_hardware (struct m860_enet_struct *sc)
* Set up interrupts
*/
if (!BSP_install_rtems_irq_handler (&ethernetSCC1IrqData)) {
- rtems_panic ("Can't attach M8xx SCC1 interrupt handler\n");
+ rtems_panic ("Can't attach M8xx SCC1 interrupt handler\n",0);
}
m8xx.scc1.sccm = 0; /* No interrupts unmasked till necessary */
@@ -428,7 +428,6 @@ m860_fec_initialize_hardware (struct m860_enet_struct *sc)
int i;
unsigned char *hwaddr;
rtems_status_code status;
- rtems_isr_entry old_handler;
/*
* Issue reset to FEC
@@ -494,7 +493,7 @@ m860_fec_initialize_hardware (struct m860_enet_struct *sc)
sc->txMbuf = malloc (sc->txBdCount * sizeof *sc->txMbuf,
M_MBUF, M_NOWAIT);
if (!sc->rxMbuf || !sc->txMbuf)
- rtems_panic ("No memory for mbuf pointers");
+ rtems_panic ("No memory for mbuf pointers",0);
/*
* Set receiver and transmitter buffer descriptor bases
@@ -571,7 +570,7 @@ m860_fec_initialize_hardware (struct m860_enet_struct *sc)
* Set up interrupts
*/
if (!BSP_install_rtems_irq_handler (&ethernetFECIrqData))
- rtems_panic ("Can't attach M860 FEC interrupt handler\n");
+ rtems_panic ("Can't attach M860 FEC interrupt handler\n", 0);
}
@@ -1620,8 +1619,6 @@ rtems_fec_driver_attach (struct rtems_bsdnet_ifconfig *config)
int
rtems_enet_driver_attach (struct rtems_bsdnet_ifconfig *config)
{
- int i;
-
if ((m8xx.fec.mii_data & 0xffff) == 0x2000) {
/* rtems_scc1_driver_attach(config);*/
return rtems_fec_driver_attach(config);
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/startup/bspstart.c b/c/src/lib/libbsp/powerpc/eth_comm/startup/bspstart.c
index 6b832e1877..5832ee1307 100644
--- a/c/src/lib/libbsp/powerpc/eth_comm/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/eth_comm/startup/bspstart.c
@@ -118,6 +118,7 @@ void bsp_start(void)
ppc_cpu_revision_t myCpuRevision;
register unsigned char* intrStack;
register unsigned int intrNestingLevel = 0;
+ extern void cpu_init(void);
/*
* Get CPU identification dynamically. Note that the get_ppc_cpu_type() function