summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2002-11-04 14:28:09 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2002-11-04 14:28:09 +0000
commit37a25cf35d1b6a90dcfe232e165f9bcd3df0a77e (patch)
tree44ddf3d75748a2c1fcbcf431ea807541ec7c3d4e
parent844de9915c5a6568d9f83dba66ccd46777b7b50a (diff)
downloadrtems-37a25cf35d1b6a90dcfe232e165f9bcd3df0a77e.tar.bz2
2002-11-04 Joel Sherrill <joel@OARcorp.com>
* console/console.c, irq/irq.c, network/if_hdlcsubr.c, network/if_hdlcsubr.h, network/network.c, vectors/vectors_init.c: Removed warnings.
-rw-r--r--c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog6
-rw-r--r--c/src/lib/libbsp/powerpc/mpc8260ads/console/console.c12
-rw-r--r--c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.c1
-rw-r--r--c/src/lib/libbsp/powerpc/mpc8260ads/network/if_hdlcsubr.c4
-rw-r--r--c/src/lib/libbsp/powerpc/mpc8260ads/network/if_hdlcsubr.h3
-rw-r--r--c/src/lib/libbsp/powerpc/mpc8260ads/network/network.c4
-rw-r--r--c/src/lib/libbsp/powerpc/mpc8260ads/vectors/vectors_init.c1
7 files changed, 24 insertions, 7 deletions
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog
index ea3673b435..89ef8ae334 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-04 Joel Sherrill <joel@OARcorp.com>
+
+ * console/console.c, irq/irq.c, network/if_hdlcsubr.c,
+ network/if_hdlcsubr.h, network/network.c, vectors/vectors_init.c:
+ Removed warnings.
+
2002-11-01 Joel Sherrill <joel@OARcorp.com>
* irq/irq.c, irq/irq_asm.S, startup/bspstart.c: Fixed typos and
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/console/console.c b/c/src/lib/libbsp/powerpc/mpc8260ads/console/console.c
index eb89ff7071..6d9cbbb15d 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/console/console.c
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/console/console.c
@@ -323,12 +323,10 @@ rtems_device_driver console_open(
void *arg
)
{
+#if UARTS_IO_MODE == 1 /* RTEMS interrupt-driven I/O with termios */
/* 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;
-
static const rtems_termios_callbacks intrCallbacks = {
NULL, /* firstOpen */
@@ -340,7 +338,8 @@ rtems_device_driver console_open(
NULL, /* startRemoteTx */
1 /* outputUsesInterrupts */
};
-
+#else
+#if (UARTS_USE_TERMIOS == 1) && (UARTS_IO_MODE != 1)
static const rtems_termios_callbacks pollCallbacks = {
NULL, /* firstOpen */
NULL, /* lastClose */
@@ -351,7 +350,12 @@ rtems_device_driver console_open(
NULL, /* startRemoteTx */
0 /* outputUsesInterrupts */
};
+#endif
+#endif
+
+ rtems_status_code sc;
+
if ( minor > NUM_PORTS-1 )
return RTEMS_INVALID_NUMBER;
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.c b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.c
index de3ccec242..72d77c7d04 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.c
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.c
@@ -20,6 +20,7 @@
#include <bsp.h>
#include <bsp/irq.h>
#include <rtems.h>
+#include <rtems/apiext.h>
#include <rtems/bspIo.h>
#include <libcpu/raw_exception.h>
#include <bsp/vectors.h>
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/network/if_hdlcsubr.c b/c/src/lib/libbsp/powerpc/mpc8260ads/network/if_hdlcsubr.c
index d630a32a43..43d80567c4 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/network/if_hdlcsubr.c
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/network/if_hdlcsubr.c
@@ -73,6 +73,8 @@
#include <netinet/in_var.h>
#include <netinet/if_ether.h>
+#include <stdio.h>
+
#include "if_hdlcsubr.h"
@@ -94,7 +96,9 @@ hdlc_output(ifp, m0, dst, rt0)
{
short type;
int s, error = 0;
+#if 0
u_char edst[6];
+#endif
register struct mbuf *m = m0;
register struct rtentry *rt;
struct mbuf *mcopy = (struct mbuf *)0;
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/network/if_hdlcsubr.h b/c/src/lib/libbsp/powerpc/mpc8260ads/network/if_hdlcsubr.h
index 48faf5a9d3..3944a1a6d1 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/network/if_hdlcsubr.h
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/network/if_hdlcsubr.h
@@ -37,4 +37,5 @@ int hdlc_output __P((struct ifnet *,
struct mbuf *, struct sockaddr *, struct rtentry *));
int hdlc_ioctl __P((struct ifnet *, int , caddr_t ));
-#endif \ No newline at end of file
+#endif
+
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/network/network.c b/c/src/lib/libbsp/powerpc/mpc8260ads/network/network.c
index b3c85377cb..1b453444c5 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/network/network.c
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/network/network.c
@@ -536,7 +536,7 @@ scc_rxDaemon (void *arg)
* Invalidate the buffer for this descriptor
*/
- rtems_cache_invalidate_multiple_data_lines(rxBd->buffer, rxBd->length);
+ rtems_cache_invalidate_multiple_data_lines((void *)rxBd->buffer, rxBd->length);
m = sc->rxMbuf[rxBdIndex];
@@ -687,7 +687,7 @@ scc_sendpacket (struct ifnet *ifp, struct mbuf *m)
* Flush the buffer for this descriptor
*/
- rtems_cache_flush_multiple_data_lines(txBd->buffer, txBd->length);
+ rtems_cache_flush_multiple_data_lines((void *)txBd->buffer, txBd->length);
/* throw off the header for Ethernet Emulation mode */
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/vectors_init.c b/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/vectors_init.c
index 1c17a6513f..cc49023705 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/vectors_init.c
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/vectors/vectors_init.c
@@ -15,6 +15,7 @@
#include <bsp/vectors.h>
#include <libcpu/raw_exception.h>
#include <bsp.h>
+#include <rtems/bspIo.h>
static rtems_raw_except_global_settings exception_config;
static rtems_raw_except_connect_data exception_table[LAST_VALID_EXC + 1];