diff options
Diffstat (limited to 'sys/arch/i386/stand')
| -rw-r--r-- | sys/arch/i386/stand/boot/crt0.c | 12 | ||||
| -rw-r--r-- | sys/arch/i386/stand/installboot/installboot.c | 13 | ||||
| -rw-r--r-- | sys/arch/i386/stand/libsa/biosdev.c | 6 | ||||
| -rw-r--r-- | sys/arch/i386/stand/libsa/biosdev.h | 42 | ||||
| -rw-r--r-- | sys/arch/i386/stand/libsa/cmd_i386.c | 12 | ||||
| -rw-r--r-- | sys/arch/i386/stand/libsa/debug.c | 4 | ||||
| -rw-r--r-- | sys/arch/i386/stand/libsa/debug.h | 8 | ||||
| -rw-r--r-- | sys/arch/i386/stand/libsa/disk.h | 4 | ||||
| -rw-r--r-- | sys/arch/i386/stand/libsa/diskprobe.c | 4 | ||||
| -rw-r--r-- | sys/arch/i386/stand/libsa/libsa.h | 28 |
10 files changed, 66 insertions, 67 deletions
diff --git a/sys/arch/i386/stand/boot/crt0.c b/sys/arch/i386/stand/boot/crt0.c index 6b9e243aa64..e5af727fde2 100644 --- a/sys/arch/i386/stand/boot/crt0.c +++ b/sys/arch/i386/stand/boot/crt0.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crt0.c,v 1.3 1998/05/25 19:20:49 mickey Exp $ */ +/* $OpenBSD: crt0.c,v 1.4 2002/03/14 01:26:34 millert Exp $ */ /* * Copyright (c) 1997-1998 Michael Shalayeff @@ -41,11 +41,11 @@ #include "libsa.h" #include <lib/libsa/unixdev.h> -void start __P((void)) asm("start"); -void _rtt __P((void)); -extern int boot __P((dev_t)); -static void domap __P((void)); -static void seterm __P((void)); +void start(void) asm("start"); +void _rtt(void); +extern int boot(dev_t); +static void domap(void); +static void seterm(void); void start() diff --git a/sys/arch/i386/stand/installboot/installboot.c b/sys/arch/i386/stand/installboot/installboot.c index 2add3ed9762..1122c9fd72f 100644 --- a/sys/arch/i386/stand/installboot/installboot.c +++ b/sys/arch/i386/stand/installboot/installboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: installboot.c,v 1.35 2001/11/06 19:53:14 miod Exp $ */ +/* $OpenBSD: installboot.c,v 1.36 2002/03/14 01:26:34 millert Exp $ */ /* $NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */ /* @@ -77,12 +77,11 @@ int maxblocknum; /* size of this array */ int biosdev; -char *loadprotoblocks __P((char *, long *)); -int loadblocknums __P((char *, int, struct disklabel *)); -static void devread __P((int, void *, daddr_t, size_t, char *)); -static void usage __P((void)); -static int record_block - __P((u_int8_t *, daddr_t, u_int, struct disklabel *)); +char *loadprotoblocks(char *, long *); +int loadblocknums(char *, int, struct disklabel *); +static void devread(int, void *, daddr_t, size_t, char *); +static void usage(void); +static int record_block(u_int8_t *, daddr_t, u_int, struct disklabel *); static void usage() diff --git a/sys/arch/i386/stand/libsa/biosdev.c b/sys/arch/i386/stand/libsa/biosdev.c index 84bbf84a81c..db3090fb752 100644 --- a/sys/arch/i386/stand/libsa/biosdev.c +++ b/sys/arch/i386/stand/libsa/biosdev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: biosdev.c,v 1.52 1998/06/11 02:30:57 mickey Exp $ */ +/* $OpenBSD: biosdev.c,v 1.53 2002/03/14 01:26:34 millert Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff @@ -43,8 +43,8 @@ #include "libsa.h" #include "biosdev.h" -static const char *biosdisk_err __P((u_int)); -static int biosdisk_errno __P((u_int)); +static const char *biosdisk_err(u_int); +static int biosdisk_errno(u_int); extern int debug; diff --git a/sys/arch/i386/stand/libsa/biosdev.h b/sys/arch/i386/stand/libsa/biosdev.h index ad523bf686b..675d17c11cc 100644 --- a/sys/arch/i386/stand/libsa/biosdev.h +++ b/sys/arch/i386/stand/libsa/biosdev.h @@ -1,4 +1,4 @@ -/* $OpenBSD: biosdev.h,v 1.25 2000/06/08 01:51:33 mickey Exp $ */ +/* $OpenBSD: biosdev.h,v 1.26 2002/03/14 01:26:34 millert Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff @@ -37,27 +37,27 @@ struct open_file; /* biosdev.c */ extern const char *biosdevs[]; -int biosstrategy __P((void *, int, daddr_t, size_t, void *, size_t *)); -int biosopen __P((struct open_file *, ...)); -int biosclose __P((struct open_file *)); -int biosioctl __P((struct open_file *, u_long, void *)); -int bios_getdiskinfo __P((int, bios_diskinfo_t *)); -int biosd_io __P((int, int, int, int, int, int, void*)); -const char * bios_getdisklabel __P((bios_diskinfo_t *, struct disklabel *)); +int biosstrategy(void *, int, daddr_t, size_t, void *, size_t *); +int biosopen(struct open_file *, ...); +int biosclose(struct open_file *); +int biosioctl(struct open_file *, u_long, void *); +int bios_getdiskinfo(int, bios_diskinfo_t *); +int biosd_io(int, int, int, int, int, int, void*); +const char * bios_getdisklabel(bios_diskinfo_t *, struct disklabel *); /* diskprobe.c */ -struct diskinfo *dklookup __P((int)); -bios_diskinfo_t *bios_dklookup __P((int)); +struct diskinfo *dklookup(int); +bios_diskinfo_t *bios_dklookup(int); /* bioscons.c */ -void pc_probe __P((struct consdev *)); -void pc_init __P((struct consdev *)); -int pc_getc __P((dev_t)); -void pc_putc __P((dev_t, int)); -void pc_pollc __P((dev_t, int)); -void com_probe __P((struct consdev *)); -void com_init __P((struct consdev *)); -int comspeed __P((dev_t, int)); -int com_getc __P((dev_t)); -void com_putc __P((dev_t, int)); -void com_pollc __P((dev_t, int)); +void pc_probe(struct consdev *); +void pc_init(struct consdev *); +int pc_getc(dev_t); +void pc_putc(dev_t, int); +void pc_pollc(dev_t, int); +void com_probe(struct consdev *); +void com_init(struct consdev *); +int comspeed(dev_t, int); +int com_getc(dev_t); +void com_putc(dev_t, int); +void com_pollc(dev_t, int); diff --git a/sys/arch/i386/stand/libsa/cmd_i386.c b/sys/arch/i386/stand/libsa/cmd_i386.c index 69927bd91f4..70c7bb1774e 100644 --- a/sys/arch/i386/stand/libsa/cmd_i386.c +++ b/sys/arch/i386/stand/libsa/cmd_i386.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd_i386.c,v 1.22 1999/08/25 00:54:19 mickey Exp $ */ +/* $OpenBSD: cmd_i386.c,v 1.23 2002/03/14 01:26:34 millert Exp $ */ /* * Copyright (c) 1997-1999 Michael Shalayeff @@ -46,13 +46,13 @@ extern const char version[]; -int Xboot __P((void)); -int Xdiskinfo __P((void)); -int Xmemory __P((void)); -int Xregs __P((void)); +int Xboot(void); +int Xdiskinfo(void); +int Xmemory(void); +int Xregs(void); /* From gidt.S */ -int bootbuf __P((void*, int)); +int bootbuf(void*, int); const struct cmd_table cmd_machine[] = { { "boot", CMDT_CMD, Xboot }, diff --git a/sys/arch/i386/stand/libsa/debug.c b/sys/arch/i386/stand/libsa/debug.c index cad1f1d4525..d2374fea76a 100644 --- a/sys/arch/i386/stand/libsa/debug.c +++ b/sys/arch/i386/stand/libsa/debug.c @@ -1,4 +1,4 @@ -/* $OpenBSD: debug.c,v 1.7 1998/06/09 13:45:07 mickey Exp $ */ +/* $OpenBSD: debug.c,v 1.8 2002/03/14 01:26:34 millert Exp $ */ /* * Copyright (c) 1997 Michael Shalayeff @@ -44,7 +44,7 @@ struct reg reg; u_int32_t *const reg_values[] = { REG_VALUES(reg) }; char *const trap_names[] = { TRAP_NAMES }; -void d_putc __P((dev_t, int)); +void d_putc(dev_t, int); #ifdef DEBUG_DEBUG #define CKPT(c) (*(u_short volatile *)(VBASE+160) = (0x1700 | (c))) diff --git a/sys/arch/i386/stand/libsa/debug.h b/sys/arch/i386/stand/libsa/debug.h index 67fc9addb71..d3bbfb7e821 100644 --- a/sys/arch/i386/stand/libsa/debug.h +++ b/sys/arch/i386/stand/libsa/debug.h @@ -1,4 +1,4 @@ -/* $OpenBSD: debug.h,v 1.4 1998/04/18 07:39:45 deraadt Exp $ */ +/* $OpenBSD: debug.h,v 1.5 2002/03/14 01:26:34 millert Exp $ */ /* * Copyright (c) 1997 Michael Shalayeff @@ -38,6 +38,6 @@ extern char *const reg_names[]; extern const size_t nregs; -int debug_init __P((void)); -void dump_regs __P((u_int, u_int)); -void dump_mem __P((char *, void *, size_t)); +int debug_init(void); +void dump_regs(u_int, u_int); +void dump_mem(char *, void *, size_t); diff --git a/sys/arch/i386/stand/libsa/disk.h b/sys/arch/i386/stand/libsa/disk.h index 0b60ed730d2..35a684c5d51 100644 --- a/sys/arch/i386/stand/libsa/disk.h +++ b/sys/arch/i386/stand/libsa/disk.h @@ -1,4 +1,4 @@ -/* $OpenBSD: disk.h,v 1.1 1997/11/30 21:59:50 mickey Exp $ */ +/* $OpenBSD: disk.h,v 1.2 2002/03/14 01:26:34 millert Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -51,7 +51,7 @@ TAILQ_HEAD(disklist_lh, diskinfo); /* Head of this list */ extern struct diskinfo *bootdev_dip; -void dump_diskinfo __P((void)); +void dump_diskinfo(void); #endif /* _DISKPROBE_H */ diff --git a/sys/arch/i386/stand/libsa/diskprobe.c b/sys/arch/i386/stand/libsa/diskprobe.c index f01a096083d..1b19b2ec1c5 100644 --- a/sys/arch/i386/stand/libsa/diskprobe.c +++ b/sys/arch/i386/stand/libsa/diskprobe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diskprobe.c,v 1.17 1999/10/03 20:37:25 ho Exp $ */ +/* $OpenBSD: diskprobe.c,v 1.18 2002/03/14 01:26:34 millert Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -49,7 +49,7 @@ #define MAX_CKSUMLEN MAXBSIZE / DEV_BSIZE /* Max # of blks to cksum */ /* Local Prototypes */ -static int disksum __P((int)); +static int disksum(int); /* List of disk devices we found/probed */ struct disklist_lh disklist; diff --git a/sys/arch/i386/stand/libsa/libsa.h b/sys/arch/i386/stand/libsa/libsa.h index 7520b896174..298aba48ab6 100644 --- a/sys/arch/i386/stand/libsa/libsa.h +++ b/sys/arch/i386/stand/libsa/libsa.h @@ -1,4 +1,4 @@ -/* $OpenBSD: libsa.h,v 1.33 2001/08/18 15:34:17 mickey Exp $ */ +/* $OpenBSD: libsa.h,v 1.34 2002/03/14 01:26:34 millert Exp $ */ /* * Copyright (c) 1996-1999 Michael Shalayeff @@ -38,21 +38,21 @@ #define DEFAULT_KERNEL_ADDRESS 0x100000 -void gateA20 __P((int)); +void gateA20(int); -void smpprobe __P((void)); -void pciprobe __P((void)); -void memprobe __P((void)); -void diskprobe __P((void)); -void apmprobe __P((void)); -void apmcheck __P((void)); -void dump_biosmem __P((bios_memmap_t *)); -int mem_add __P((long, long)); -int mem_delete __P((long, long)); -void mem_pass __P((void)); +void smpprobe(void); +void pciprobe(void); +void memprobe(void); +void diskprobe(void); +void apmprobe(void); +void apmcheck(void); +void dump_biosmem(bios_memmap_t *); +int mem_add(long, long); +int mem_delete(long, long); +void mem_pass(void); -void devboot __P((dev_t, char *)); -void machdep __P((void)); +void devboot(dev_t, char *); +void machdep(void); extern const char bdevs[][4]; extern const int nbdevs; |