summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--c/src/lib/libbsp/mips/csb350/timer/timer.c4
-rw-r--r--c/src/libchip/ide/ata.c4
-rw-r--r--c/src/libchip/network/elnk.c91
-rw-r--r--cpukit/libnetworking/netinet/in_cksum.c6
-rw-r--r--cpukit/librpc/src/rpc/clnt_tcp.c14
-rw-r--r--cpukit/librpc/src/rpc/svc_tcp.c14
6 files changed, 66 insertions, 67 deletions
diff --git a/c/src/lib/libbsp/mips/csb350/timer/timer.c b/c/src/lib/libbsp/mips/csb350/timer/timer.c
index 652f2b7580..c743311cbb 100644
--- a/c/src/lib/libbsp/mips/csb350/timer/timer.c
+++ b/c/src/lib/libbsp/mips/csb350/timer/timer.c
@@ -19,7 +19,7 @@
rtems_boolean Timer_driver_Find_average_overhead;
uint32_t tstart;
-void Timer_initialize()
+void Timer_initialize(void)
{
asm volatile ("mfc0 %0, $9\n" : "=r" (tstart));
/* tick time in picooseconds */
@@ -30,7 +30,7 @@ void Timer_initialize()
#define LEAST_VALID 1 /* Don't trust a value lower than this */
/* tx39 simulator can count instructions. :) */
-int Read_timer()
+int Read_timer(void)
{
uint32_t total;
uint32_t cnt;
diff --git a/c/src/libchip/ide/ata.c b/c/src/libchip/ide/ata.c
index b459b5a2ca..47272b2f7c 100644
--- a/c/src/libchip/ide/ata.c
+++ b/c/src/libchip/ide/ata.c
@@ -63,7 +63,7 @@ int ata_irq_chain_cnt = 0;
#ifdef SAFE_MUTEX
static rtems_id ata_lock;
static void
-rtems_ata_lock ()
+rtems_ata_lock (void)
{
rtems_status_code sc = rtems_semaphore_obtain (ata_lock,
RTEMS_WAIT,
@@ -73,7 +73,7 @@ rtems_ata_lock ()
}
static void
-rtems_ata_unlock ()
+rtems_ata_unlock (void)
{
rtems_status_code sc = rtems_semaphore_release (ata_lock);
if (sc != RTEMS_SUCCESSFUL)
diff --git a/c/src/libchip/network/elnk.c b/c/src/libchip/network/elnk.c
index 2ea362db98..57c81473ab 100644
--- a/c/src/libchip/network/elnk.c
+++ b/c/src/libchip/network/elnk.c
@@ -1026,8 +1026,7 @@ inline unsigned char CSR_READ_1( struct elnk_softc *sc, int reg)
* to make it a function.
*/
static void
-xl_wait(sc)
- struct elnk_softc *sc;
+xl_wait(struct elnk_softc *sc)
{
register int i;
@@ -1068,8 +1067,8 @@ xl_wait(sc)
* Sync the PHYs by setting data bit and strobing the clock 32 times.
*/
static void
-xl_mii_sync(sc)
- struct elnk_softc *sc;
+xl_mii_sync(
+ struct elnk_softc *sc)
{
register int i;
@@ -1090,10 +1089,10 @@ xl_mii_sync(sc)
* Clock a series of bits through the MII.
*/
static void
-xl_mii_send(sc, bits, cnt)
- struct elnk_softc *sc;
- u_int32_t bits;
- int cnt;
+xl_mii_send(
+ struct elnk_softc *sc,
+ u_int32_t bits,
+ int cnt )
{
int i;
@@ -1115,10 +1114,9 @@ xl_mii_send(sc, bits, cnt)
* Read an PHY register through the MII.
*/
static int
-xl_mii_readreg(sc, frame)
- struct elnk_softc *sc;
- struct xl_mii_frame *frame;
-
+xl_mii_readreg(
+ struct elnk_softc *sc,
+ struct xl_mii_frame *frame )
{
int i, ack;
@@ -1199,10 +1197,9 @@ xl_mii_readreg(sc, frame)
* Write to a PHY register through the MII.
*/
static int
-xl_mii_writereg(sc, frame)
- struct elnk_softc *sc;
- struct xl_mii_frame *frame;
-
+xl_mii_writereg(
+ struct elnk_softc *sc,
+ struct xl_mii_frame *frame )
{
/*
* Set up frame for TX.
@@ -1244,9 +1241,10 @@ xl_mii_writereg(sc, frame)
}
static int
-xl_miibus_readreg(sc, phy, reg)
- struct elnk_softc *sc;
- int phy, reg;
+xl_miibus_readreg(
+ struct elnk_softc *sc,
+ int phy,
+ int reg )
{
struct xl_mii_frame frame;
@@ -1273,9 +1271,11 @@ xl_miibus_readreg(sc, phy, reg)
}
static int
-xl_miibus_writereg(sc, phy, reg, data)
- struct elnk_softc *sc;
- int phy, reg, data;
+xl_miibus_writereg(
+ struct elnk_softc *sc,
+ int phy,
+ int reg,
+ int data )
{
struct xl_mii_frame frame;
@@ -1309,8 +1309,7 @@ xl_miibus_writereg(sc, phy, reg, data)
* it a command.
*/
static int
-xl_eeprom_wait(sc)
- struct elnk_softc *sc;
+xl_eeprom_wait(struct elnk_softc *sc)
{
int i;
@@ -1334,12 +1333,12 @@ xl_eeprom_wait(sc)
* data is stored in the EEPROM in network byte order.
*/
static int
-xl_read_eeprom(sc, dest, off, cnt, swap)
- struct elnk_softc *sc;
- caddr_t dest;
- int off;
- int cnt;
- int swap;
+xl_read_eeprom(
+ struct elnk_softc *sc,
+ caddr_t dest,
+ int off,
+ int cnt,
+ int swap)
{
int err = 0, i;
u_int16_t word = 0, *ptr;
@@ -1382,9 +1381,9 @@ xl_read_eeprom(sc, dest, off, cnt, swap)
static void
-xl_stats_update(timerid,xsc)
- rtems_id timerid;
- void *xsc;
+xl_stats_update(
+ rtems_id timerid,
+ void *xsc)
{
struct elnk_softc *sc = (struct elnk_softc *)xsc;
struct ifnet *ifp = &sc->arpcom.ac_if;
@@ -1468,8 +1467,7 @@ xl_stats_update(timerid,xsc)
static void
-xl_reset(sc)
- struct elnk_softc *sc;
+xl_reset(struct elnk_softc *sc)
{
register int i;
@@ -1520,8 +1518,7 @@ xl_reset(sc)
static void
-xl_stop(sc)
- struct elnk_softc *sc;
+xl_stop(struct elnk_softc *sc)
{
struct ifnet *ifp;
@@ -1561,8 +1558,7 @@ xl_stop(sc)
static void
-xl_setcfg(sc)
- struct elnk_softc *sc;
+xl_setcfg(struct elnk_softc *sc)
{
u_int32_t icfg;
@@ -1587,9 +1583,9 @@ xl_setcfg(sc)
static void
-xl_setmode(sc, media)
- struct elnk_softc *sc;
- int media;
+xl_setmode(
+ struct elnk_softc *sc,
+ int media)
{
u_int32_t icfg;
u_int16_t mediastat;
@@ -1690,9 +1686,9 @@ xl_setmode(sc, media)
static void
-xl_choose_xcvr(sc, verbose)
- struct elnk_softc *sc;
- int verbose;
+xl_choose_xcvr(
+ struct elnk_softc *sc,
+ int verbose)
{
u_int16_t devid;
@@ -1802,8 +1798,7 @@ xl_choose_xcvr(sc, verbose)
* possible manufacturing defect with his adapter/system/whatever.
*/
static void
-xl_mediacheck(sc)
- struct elnk_softc *sc;
+xl_mediacheck(struct elnk_softc *sc)
{
xl_choose_xcvr(sc, 1);
@@ -2053,7 +2048,7 @@ elnk_interrupt_handler ( struct elnk_softc *sc )
static rtems_isr
-elnk_interrupt_handler_entry()
+elnk_interrupt_handler_entry(void)
{
int i;
diff --git a/cpukit/libnetworking/netinet/in_cksum.c b/cpukit/libnetworking/netinet/in_cksum.c
index dd01e6241d..f8707e8b30 100644
--- a/cpukit/libnetworking/netinet/in_cksum.c
+++ b/cpukit/libnetworking/netinet/in_cksum.c
@@ -74,9 +74,9 @@
{l_util.l = sum; sum = l_util.s[0] + l_util.s[1]; ADDCARRY(sum);}
int
-in_cksum(m, len)
- register struct mbuf *m;
- register uint32_t len;
+in_cksum(
+ struct mbuf *m,
+ uint32_t len )
{
register u_short *w;
register int32_t sum = 0;
diff --git a/cpukit/librpc/src/rpc/clnt_tcp.c b/cpukit/librpc/src/rpc/clnt_tcp.c
index f1c316fc8f..c3e2312914 100644
--- a/cpukit/librpc/src/rpc/clnt_tcp.c
+++ b/cpukit/librpc/src/rpc/clnt_tcp.c
@@ -65,8 +65,8 @@ static char *rcsid = "$FreeBSD: src/lib/libc/rpc/clnt_tcp.c,v 1.14 2000/01/27 23
#define MCALL_MSG_SIZE 24
-static int readtcp();
-static int writetcp();
+static int readtcp(char *, char*, int);
+static int writetcp(char *, char*, int);
static enum clnt_stat clnttcp_call(CLIENT *, u_long, xdrproc_t, caddr_t, xdrproc_t, caddr_t, struct timeval);
static void clnttcp_abort(void);
@@ -489,10 +489,11 @@ clnttcp_destroy(
*/
static int
readtcp(
- struct ct_data *ct,
- caddr_t buf,
+ char *_ct,
+ char *buf,
int len)
{
+ struct ct_data *ct = (struct ct_data*) _ct;
fd_set *fds, readfds;
struct timeval start, after, duration, delta, tmp, tv;
int r, save_errno;
@@ -564,10 +565,11 @@ readtcp(
static int
writetcp(
- struct ct_data *ct,
- caddr_t buf,
+ char *_ct,
+ char *buf,
int len)
{
+ struct ct_data *ct = (struct ct_data *) _ct;
register int i, cnt;
for (cnt = len; cnt > 0; cnt -= i, buf += i) {
diff --git a/cpukit/librpc/src/rpc/svc_tcp.c b/cpukit/librpc/src/rpc/svc_tcp.c
index 6fbe2d6c45..f2bf383e8b 100644
--- a/cpukit/librpc/src/rpc/svc_tcp.c
+++ b/cpukit/librpc/src/rpc/svc_tcp.c
@@ -87,8 +87,8 @@ static struct xp_ops svctcp_rendezvous_op = {
svctcp_destroy
};
-static int readtcp(), writetcp();
-static SVCXPRT *makefd_xprt();
+static int readtcp(char *, char*, int), writetcp(char *, char*, int);
+static SVCXPRT *makefd_xprt( int fd, u_int sendsize, u_int recvsize);
struct tcp_rendezvous { /* kept in xprt->xp_p1 */
u_int sendsize;
@@ -325,10 +325,11 @@ static struct timeval wait_per_try = { 35, 0 };
*/
static int
readtcp(
- SVCXPRT *xprt,
- caddr_t buf,
+ char *_xprt,
+ char *buf,
int len)
{
+ SVCXPRT *xprt = (SVCXPRT*) _xprt;
register int sock = xprt->xp_sock;
struct timeval start, delta, tv;
struct timeval tmp1, tmp2;
@@ -393,10 +394,11 @@ fatal_err:
*/
static int
writetcp(
- SVCXPRT *xprt,
- caddr_t buf,
+ char *_xprt,
+ char *buf,
int len)
{
+ SVCXPRT *xprt = (SVCXPRT *) _xprt;
register int i, cnt;
for (cnt = len; cnt > 0; cnt -= i, buf += i) {