summaryrefslogtreecommitdiffstats
path: root/c
diff options
context:
space:
mode:
authorTill Straumann <strauman@slac.stanford.edu>2009-10-20 17:12:06 +0000
committerTill Straumann <strauman@slac.stanford.edu>2009-10-20 17:12:06 +0000
commite33c621ed0f9b9df7f0dd49e7aac9c162587c260 (patch)
treee1d8478a28346b2941d2f9d786cb1d8f9f8c7ea4 /c
parentRegenerate. (diff)
downloadrtems-e33c621ed0f9b9df7f0dd49e7aac9c162587c260.tar.bz2
2009-10-20 Till Straumann <strauman@slac.stanford.edu>
* network/tsec.c: fixed compiler warnings.
Diffstat (limited to 'c')
-rw-r--r--c/src/lib/libbsp/powerpc/mvme3100/ChangeLog4
-rw-r--r--c/src/lib/libbsp/powerpc/mvme3100/network/tsec.c15
2 files changed, 11 insertions, 8 deletions
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog b/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog
index 8c61305aa7..b104282f32 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-20 Till Straumann <strauman@slac.stanford.edu>
+
+ * network/tsec.c: fixed compiler warnings.
+
2009-10-20 Ralf Corsépius <ralf.corsepius@rtems.org>
* configure.ac: Don't add -ansi -fasm to CFLAGS.
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/network/tsec.c b/c/src/lib/libbsp/powerpc/mvme3100/network/tsec.c
index 8efdcc6919..1b54688128 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/network/tsec.c
+++ b/c/src/lib/libbsp/powerpc/mvme3100/network/tsec.c
@@ -1065,7 +1065,7 @@ static struct tsec_private *
tsec_setup_internal(
int unit,
rtems_id driver_tid,
- void (*isr)(void *, uint32_t),
+ void (*isr)(void *),
void * isr_arg,
void (*cleanup_txbuf)(void *user_buf, void *cleanup_txbuf_arg, int error_on_tx_occurred),
void * cleanup_txbuf_arg,
@@ -1337,11 +1337,10 @@ int media = IFM_MAKEWORD(0, 0, 0, 0);
void
BSP_tsec_init_hw(struct tsec_private *mp, int promisc, unsigned char *enaddr)
{
-FEC_Enet_Base b = mp->base;
-unsigned i;
-uint32_t v;
-int sz;
-rtems_interrupt_level l;
+FEC_Enet_Base b = mp->base;
+unsigned i;
+uint32_t v;
+int sz;
BSP_tsec_stop_hw(mp);
@@ -1489,7 +1488,7 @@ rtems_interrupt_level l;
BSP_tsec_enable_irq_mask( mp, mp->irq_mask );
}
-static uint8_t
+static void
hash_prog(struct tsec_private *mp, uint32_t tble, const uint8_t *enaddr, int accept)
{
uint8_t s;
@@ -1539,7 +1538,7 @@ int i;
static void
mcast_filter_prog(struct tsec_private *mp, uint8_t *enaddr, int accept)
{
-static const uint8_t bcst={0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+static const uint8_t bcst[6]={0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
if ( ! (enaddr[0] & 0x01) ) {
/* not a multicast address; ignore */
return;