diff options
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/i386/autoconf.c | 16 | ||||
| -rw-r--r-- | sys/i386/i386/conf.c | 3 | ||||
| -rw-r--r-- | sys/i386/i386/cons.c | 4 | ||||
| -rw-r--r-- | sys/i386/i386/machdep.c | 8 | ||||
| -rw-r--r-- | sys/i386/i386/mem.c | 4 | ||||
| -rw-r--r-- | sys/i386/isa/spkr.c | 4 |
6 files changed, 20 insertions, 19 deletions
diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c index 4eb5684..ecf5def 100644 --- a/sys/i386/i386/autoconf.c +++ b/sys/i386/i386/autoconf.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91 - * $Id: autoconf.c,v 1.36 1995/08/30 01:34:20 bde Exp $ + * $Id: autoconf.c,v 1.37 1995/09/03 05:43:00 julian Exp $ */ /* @@ -74,13 +74,13 @@ extern struct vfsops ufs_vfsops; extern struct vfsops lfs_vfsops; #endif #ifdef NFS -int nfs_mountroot __P((void)); +int nfs_mountroot __P((void *)); #endif #ifdef CD9660 -int cd9660_mountroot __P((void)); +int cd9660_mountroot __P((void *)); #endif #ifdef MSDOSFS -int msdosfs_mountroot __P((void)); +int msdosfs_mountroot __P((void *)); #endif #ifdef MFS_ROOT int mfs_initminiroot __P((u_char *)); @@ -118,7 +118,8 @@ static struct { }; int -find_cdrom_root() +find_cdrom_root(dummy) + void *dummy; { int i,j,k; @@ -127,7 +128,7 @@ find_cdrom_root() rootdev = makedev(try_cdrom[k].major,j*8); printf("trying rootdev=0x%lx (%s%d)\n", rootdev, try_cdrom[k].name,j); - i = (*cd9660_mountroot)(); + i = (*cd9660_mountroot)(NULL); if (!i) return i; } return EINVAL; @@ -159,7 +160,8 @@ configure_finish() * Determine i/o configuration for a machine. */ void -configure( caddr_t dummy ) /* arg not used */ +configure(dummy) /* arg not used */ + void *dummy; { configure_start(); diff --git a/sys/i386/i386/conf.c b/sys/i386/i386/conf.c index 94d03eb..4fc699a 100644 --- a/sys/i386/i386/conf.c +++ b/sys/i386/i386/conf.c @@ -42,7 +42,7 @@ * SUCH DAMAGE. * * from: @(#)conf.c 5.8 (Berkeley) 5/12/91 - * $Id: conf.c,v 1.95 1995/09/03 23:55:53 jkh Exp $ + * $Id: conf.c,v 1.96 1995/09/08 03:37:51 julian Exp $ */ #include <sys/param.h> @@ -55,7 +55,6 @@ #include <sys/conf.h> d_rdwr_t rawread, rawwrite; -d_strategy_t swstrategy; /* Lots of bogus defines for shorthand purposes */ #define noopen (d_open_t *)enodev diff --git a/sys/i386/i386/cons.c b/sys/i386/i386/cons.c index af17d13..a47b6ce 100644 --- a/sys/i386/i386/cons.c +++ b/sys/i386/i386/cons.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)cons.c 7.2 (Berkeley) 5/9/91 - * $Id: cons.c,v 1.30 1995/06/26 07:39:49 bde Exp $ + * $Id: cons.c,v 1.31 1995/09/03 05:43:01 julian Exp $ */ #include <sys/param.h> @@ -80,7 +80,7 @@ static struct tty *cn_tp; /* physical console tty struct */ #include <sys/devfsext.h> #include "sys/kernel.h" -void cndev_init(caddr_t data) /* data not used */ +void cndev_init(void *data) /* data not used */ { void * x; /* path name devsw minor type uid gid perm*/ diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index f0f5724..df465fa 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $Id: machdep.c,v 1.139 1995/09/06 16:13:31 wpaul Exp $ + * $Id: machdep.c,v 1.140 1995/09/08 03:19:47 davidg Exp $ */ #include "npx.h" @@ -130,7 +130,7 @@ * System initialization */ -static void cpu_startup __P(( caddr_t)); +static void cpu_startup __P((void *)); SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL) @@ -197,8 +197,8 @@ extern struct linker_set netisr_set; /* ARGSUSED*/ static void -cpu_startup( udata) -caddr_t udata; /* not used*/ +cpu_startup(udata) + void *udata; /* not used*/ { register unsigned i; register caddr_t v; diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c index aac5aa7..a8c1548 100644 --- a/sys/i386/i386/mem.c +++ b/sys/i386/i386/mem.c @@ -38,7 +38,7 @@ * * from: Utah $Hdr: mem.c 1.13 89/10/08$ * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 - * $Id: mem.c,v 1.10 1995/09/03 05:43:04 julian Exp $ + * $Id: mem.c,v 1.11 1995/09/08 11:07:08 bde Exp $ */ /* @@ -67,7 +67,7 @@ #include "sys/kernel.h" int mmopen(); -void memdev_init(caddr_t data) /* data not used */ +void memdev_init(void *data) /* data not used */ { void * x; /* path name devsw minor type uid gid perm*/ diff --git a/sys/i386/isa/spkr.c b/sys/i386/isa/spkr.c index 764d552..82a7021 100644 --- a/sys/i386/isa/spkr.c +++ b/sys/i386/isa/spkr.c @@ -4,7 +4,7 @@ * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993 * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su> * - * $Id: spkr.c,v 1.15 1995/09/03 05:43:31 julian Exp $ + * $Id: spkr.c,v 1.16 1995/09/08 11:07:59 bde Exp $ */ #include "speaker.h" @@ -28,7 +28,7 @@ #include "sys/kernel.h" int spkropen(); -void spkrdev_init(caddr_t data) /* data not used */ +void spkrdev_init(void *data) /* data not used */ { void * x; /* path name devsw minor type uid gid perm*/ |
