summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJennifer Averett <Jennifer.Averett@OARcorp.com>2005-05-03 14:20:07 +0000
committerJennifer Averett <Jennifer.Averett@OARcorp.com>2005-05-03 14:20:07 +0000
commit9dee983377b9278bfcaa0815470458871a042538 (patch)
treef677372129c7909930504ccda8f297207be92892
parent2005-05-03 Jennifer Averett <jennifer.averett@oarcorp.com> (diff)
downloadrtems-9dee983377b9278bfcaa0815470458871a042538.tar.bz2
2005-05-03 Jennifer Averett <jennifer.averett@oarcorp.com>
* 3c509/3c509.c, ne2000/ne2000.c: Modified parameters to remove warnings. * console/console.c, wd8003/wd8003.c: Added support for addition of parameter in ISRs.
-rw-r--r--c/src/lib/libbsp/i386/pc386/3c509/3c509.c7
-rw-r--r--c/src/lib/libbsp/i386/pc386/ChangeLog7
-rw-r--r--c/src/lib/libbsp/i386/pc386/console/console.c9
-rw-r--r--c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c2
-rw-r--r--c/src/lib/libbsp/i386/pc386/wd8003/wd8003.c4
5 files changed, 23 insertions, 6 deletions
diff --git a/c/src/lib/libbsp/i386/pc386/3c509/3c509.c b/c/src/lib/libbsp/i386/pc386/3c509/3c509.c
index c8c5e9fe5e..8bdfa7c746 100644
--- a/c/src/lib/libbsp/i386/pc386/3c509/3c509.c
+++ b/c/src/lib/libbsp/i386/pc386/3c509/3c509.c
@@ -58,6 +58,11 @@
*
* MODIFICATION/HISTORY:
* $Log$
+ * Revision 1.6 2005/04/26 23:03:51 joel
+ * 2005-04-26 Joel Sherrill <joel@OARcorp.com>
+ *
+ * * 3c509/3c509.c, wd8003/wd8003.c: Eliminate warnings.
+ *
* Revision 1.5 2004/07/25 14:21:43 joel
* 2004-07-25 Joel Sherrill <joel@OARcorp.com>
*
@@ -703,7 +708,7 @@ static void _3c509_stats (struct ep_softc *sc)
* RETURNS:
*
**********************************************************************************/
-static int _3c509_ioctl (struct ifnet *ifp, int command, caddr_t data)
+static int _3c509_ioctl (struct ifnet *ifp, u_long command, caddr_t data)
{
struct ep_softc *sc = ifp->if_softc;
int error = 0;
diff --git a/c/src/lib/libbsp/i386/pc386/ChangeLog b/c/src/lib/libbsp/i386/pc386/ChangeLog
index 12c84e5105..784b054e5a 100644
--- a/c/src/lib/libbsp/i386/pc386/ChangeLog
+++ b/c/src/lib/libbsp/i386/pc386/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-03 Jennifer Averett <jennifer.averett@oarcorp.com>
+
+ * 3c509/3c509.c, ne2000/ne2000.c: Modified parameters to
+ remove warnings.
+ * console/console.c, wd8003/wd8003.c: Added support for
+ addition of parameter in ISRs.
+
2005-04-26 Joel Sherrill <joel@OARcorp.com>
* 3c509/3c509.c, wd8003/wd8003.c: Eliminate warnings.
diff --git a/c/src/lib/libbsp/i386/pc386/console/console.c b/c/src/lib/libbsp/i386/pc386/console/console.c
index 7679cca602..5fc912386d 100644
--- a/c/src/lib/libbsp/i386/pc386/console/console.c
+++ b/c/src/lib/libbsp/i386/pc386/console/console.c
@@ -74,7 +74,8 @@ extern void kbd_init( void );
/*-------------------------------------------------------------------------+
| External Prototypes
+--------------------------------------------------------------------------*/
-extern void keyboard_interrupt(void);
+extern void keyboard_interrupt(void );
+extern void keyboard_interrupt_wrapper(void *);
extern char BSP_wait_polled_input(void);
extern void _IBMPC_initVideo(void);
@@ -86,7 +87,7 @@ static int isr_is_on(const rtems_irq_connect_data *);
extern int rtems_kbpoll( void );
static rtems_irq_connect_data console_isr_data = {BSP_KEYBOARD,
- keyboard_interrupt,
+ keyboard_interrupt_wrapper,
0,
isr_on,
isr_off,
@@ -558,6 +559,10 @@ conSetAttr(int minor, const struct termios *t)
return 0;
}
+void keyboard_interrupt_wrapper(void *unused){
+ keyboard_interrupt();
+}
+
/*
* BSP initialization
*/
diff --git a/c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c b/c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c
index 621ba8fbfa..541f899f84 100644
--- a/c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c
+++ b/c/src/lib/libbsp/i386/pc386/ne2000/ne2000.c
@@ -1073,7 +1073,7 @@ ne_stats (struct ne_softc *sc)
/* NE2000 driver ioctl handler. */
static int
-ne_ioctl (struct ifnet *ifp, int command, caddr_t data)
+ne_ioctl (struct ifnet *ifp, u_long command, caddr_t data)
{
struct ne_softc *sc = ifp->if_softc;
int error = 0;
diff --git a/c/src/lib/libbsp/i386/pc386/wd8003/wd8003.c b/c/src/lib/libbsp/i386/pc386/wd8003/wd8003.c
index acbeb37ff9..aedc70464b 100644
--- a/c/src/lib/libbsp/i386/pc386/wd8003/wd8003.c
+++ b/c/src/lib/libbsp/i386/pc386/wd8003/wd8003.c
@@ -129,7 +129,7 @@ static struct wd_softc wd_softc[NWDDRIVER];
* WD interrupt handler
*/
static void
-wd8003Enet_interrupt_handler (void)
+wd8003Enet_interrupt_handler (void *unused)
{
unsigned int tport;
unsigned char status, status2;
@@ -523,7 +523,7 @@ wd_stats (struct wd_softc *sc)
* Driver ioctl handler
*/
static int
-wd_ioctl (struct ifnet *ifp, int command, caddr_t data)
+wd_ioctl (struct ifnet *ifp, u_long command, caddr_t data)
{
struct wd_softc *sc = ifp->if_softc;
int error = 0;