summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/mips64/include/db_machdep.h8
-rw-r--r--sys/arch/mips64/include/float.h4
-rw-r--r--sys/arch/mips64/include/param.h6
-rw-r--r--sys/arch/mips64/include/rm7000.h14
-rw-r--r--sys/arch/mips64/include/trap.h4
-rw-r--r--sys/arch/mips64/mips64/db_disasm.c8
-rw-r--r--sys/arch/mips64/mips64/interrupt.c4
-rw-r--r--sys/arch/mips64/mips64/mainbus.c20
-rw-r--r--sys/arch/mips64/mips64/process_machdep.c6
-rw-r--r--sys/arch/mips64/mips64/trap.c8
-rw-r--r--sys/arch/mips64/mips64/vm_machdep.c4
-rw-r--r--sys/arch/sgi/dev/lpt_lbus.c6
-rw-r--r--sys/arch/sgi/include/intr.h4
-rw-r--r--sys/arch/sgi/localbus/macebus.c4
-rw-r--r--sys/arch/sgi/pci/macepcibridge.c6
-rw-r--r--sys/arch/sgi/pci/pciide_machdep.c4
16 files changed, 55 insertions, 55 deletions
diff --git a/sys/arch/mips64/include/db_machdep.h b/sys/arch/mips64/include/db_machdep.h
index 1c2885237ce..a0ee99e5b3e 100644
--- a/sys/arch/mips64/include/db_machdep.h
+++ b/sys/arch/mips64/include/db_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_machdep.h,v 1.6 2005/01/04 21:14:35 espie Exp $ */
+/* $OpenBSD: db_machdep.h,v 1.7 2005/01/31 21:35:49 grange Exp $ */
/*
* Copyright (c) 1998-2003 Opsycon AB (www.opsycon.se)
@@ -45,7 +45,7 @@ typedef vaddr_t db_addr_t;
#define SOFTWARE_SSTEP /* Need software single step */
#define SOFTWARE_SSTEP_EMUL /* next_instr_address() emulates 100% */
-db_addr_t next_instr_address __P((db_addr_t, boolean_t));
+db_addr_t next_instr_address(db_addr_t, boolean_t);
#define BKPT_SIZE (4)
#define BKPT_SET(ins) (BREAK_DDB)
#define DB_VALID_BREAKPOINT(addr) (((addr) & 3) == 0)
@@ -72,7 +72,7 @@ db_addr_t next_instr_address __P((db_addr_t, boolean_t));
#define inst_load(i) (db_inst_type(i) == IT_LOAD)
#define inst_store(i) (db_inst_type(i) == IT_STORE)
-int db_inst_type __P((int));
-void db_machine_init __P((void));
+int db_inst_type(int);
+void db_machine_init(void);
#endif /* !_MIPS_DB_MACHDEP_H_ */
diff --git a/sys/arch/mips64/include/float.h b/sys/arch/mips64/include/float.h
index d054887c6ad..dbfef1fdbe4 100644
--- a/sys/arch/mips64/include/float.h
+++ b/sys/arch/mips64/include/float.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: float.h,v 1.1 2004/08/06 20:56:01 pefo Exp $ */
+/* $OpenBSD: float.h,v 1.2 2005/01/31 21:35:49 grange Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -41,7 +41,7 @@
#include <sys/cdefs.h>
__BEGIN_DECLS
-int __flt_rounds __P((void));
+int __flt_rounds(void);
__END_DECLS
#define FLT_RADIX 2 /* b */
diff --git a/sys/arch/mips64/include/param.h b/sys/arch/mips64/include/param.h
index d4be80923e1..7b3ca59fae1 100644
--- a/sys/arch/mips64/include/param.h
+++ b/sys/arch/mips64/include/param.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: param.h,v 1.5 2004/09/17 18:31:51 miod Exp $ */
+/* $OpenBSD: param.h,v 1.6 2005/01/31 21:35:49 grange Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -153,8 +153,8 @@
#ifndef _LOCORE
#define DELAY(n) delay(n)
-void delay __P((int));
-void nanodelay __P((int));
+void delay(int);
+void nanodelay(int);
#endif
#else /* !_KERNEL */
diff --git a/sys/arch/mips64/include/rm7000.h b/sys/arch/mips64/include/rm7000.h
index 86db8feb2d9..0d7eccbb332 100644
--- a/sys/arch/mips64/include/rm7000.h
+++ b/sys/arch/mips64/include/rm7000.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rm7000.h,v 1.1 2005/01/18 15:03:38 grange Exp $ */
+/* $OpenBSD: rm7000.h,v 1.2 2005/01/31 21:35:49 grange Exp $ */
/*
* Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com)
@@ -87,12 +87,12 @@
#ifdef _KERNEL
__BEGIN_DECLS
-int rm7k_perfcntr __P((int, long, long, long));
-void rm7k_perfintr __P((struct trap_frame *));
-int rm7k_watchintr __P((struct trap_frame *));
-void cp0_setperfcount __P((int));
-void cp0_setperfctrl __P((int));
-int cp0_getperfcount __P((void));
+int rm7k_perfcntr(int, long, long, long);
+void rm7k_perfintr(struct trap_frame *);
+int rm7k_watchintr(struct trap_frame *);
+void cp0_setperfcount(int);
+void cp0_setperfctrl(int);
+int cp0_getperfcount(void);
__END_DECLS
#endif /* _KERNEL */
diff --git a/sys/arch/mips64/include/trap.h b/sys/arch/mips64/include/trap.h
index b2a179fd52e..485fd3732e7 100644
--- a/sys/arch/mips64/include/trap.h
+++ b/sys/arch/mips64/include/trap.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.h,v 1.4 2004/10/08 07:13:44 grange Exp $ */
+/* $OpenBSD: trap.h,v 1.5 2005/01/31 21:35:49 grange Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -113,7 +113,7 @@ struct trapdebug { /* trap history buffer for debugging */
#define TRAPSIZE 10 /* Trap log buffer length */
extern struct trapdebug trapdebug[TRAPSIZE], *trp;
-void trapDump __P((char *msg));
+void trapDump(char *msg);
#else
diff --git a/sys/arch/mips64/mips64/db_disasm.c b/sys/arch/mips64/mips64/db_disasm.c
index d0d6808a80f..aa1da19584a 100644
--- a/sys/arch/mips64/mips64/db_disasm.c
+++ b/sys/arch/mips64/mips64/db_disasm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_disasm.c,v 1.3 2004/09/15 16:05:18 pefo Exp $ */
+/* $OpenBSD: db_disasm.c,v 1.4 2005/01/31 21:35:50 grange Exp $ */
/*-
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)kadb.c 8.1 (Berkeley) 6/10/93
- * $Id: db_disasm.c,v 1.3 2004/09/15 16:05:18 pefo Exp $
+ * $Id: db_disasm.c,v 1.4 2005/01/31 21:35:50 grange Exp $
*/
#include <sys/param.h>
@@ -120,9 +120,9 @@ static char *c0_reg[32] = {
"c0r24","c0r25","ecc","cacheerr","taglo","taghi","errepc","c0r31"
};
-int kdbpeek __P((void *));
+int kdbpeek(void *);
-static int md_printins __P((int ins, int mdbdot));
+static int md_printins(int ins, int mdbdot);
db_addr_t
db_disasm(loc, altfmt)
diff --git a/sys/arch/mips64/mips64/interrupt.c b/sys/arch/mips64/mips64/interrupt.c
index 27c43b39ae9..391c6ea26ce 100644
--- a/sys/arch/mips64/mips64/interrupt.c
+++ b/sys/arch/mips64/mips64/interrupt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: interrupt.c,v 1.10 2005/01/18 15:03:38 grange Exp $ */
+/* $OpenBSD: interrupt.c,v 1.11 2005/01/31 21:35:50 grange Exp $ */
/*
* Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com)
@@ -336,7 +336,7 @@ generic_intr_establish(icp, irq, type, level, ih_fun, ih_arg, ih_what)
u_long irq; /* XXX pci_intr_handle_t compatible XXX */
int type;
int level;
- int (*ih_fun) __P((void *));
+ int (*ih_fun)(void *);
void *ih_arg;
char *ih_what;
{
diff --git a/sys/arch/mips64/mips64/mainbus.c b/sys/arch/mips64/mips64/mainbus.c
index 6b7c2838cc3..07ac443e7be 100644
--- a/sys/arch/mips64/mips64/mainbus.c
+++ b/sys/arch/mips64/mips64/mainbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mainbus.c,v 1.3 2004/08/10 20:15:47 deraadt Exp $ */
+/* $OpenBSD: mainbus.c,v 1.4 2005/01/31 21:35:50 grange Exp $ */
/*
* Copyright (c) 2001-2003 Opsycon AB (www.opsycon.se / www.opsycon.com)
@@ -40,9 +40,9 @@ struct mainbus_softc {
};
/* Definition of the mainbus driver. */
-static int mbmatch __P((struct device *, void *, void *));
-static void mbattach __P((struct device *, struct device *, void *));
-static int mbprint __P((void *, const char *));
+static int mbmatch(struct device *, void *, void *);
+static void mbattach(struct device *, struct device *, void *);
+static int mbprint(void *, const char *);
struct cfattach mainbus_ca = {
sizeof(struct mainbus_softc), mbmatch, mbattach
@@ -51,11 +51,11 @@ struct cfdriver mainbus_cd = {
NULL, "mainbus", DV_DULL, NULL, 0
};
-void *mb_intr_establish __P((void *, u_long, int, int, int (*)(void *), void *, char
- *));
-void mb_intr_disestablish __P((void *, void *));
-caddr_t mb_cvtaddr __P((struct confargs *));
-int mb_matchname __P((struct confargs *, char *));
+void *mb_intr_establish(void *, u_long, int, int, int (*)(void *),
+ void *, char *);
+void mb_intr_disestablish(void *, void *);
+caddr_t mb_cvtaddr(struct confargs *);
+int mb_matchname(struct confargs *, char *);
static int
mbmatch(parent, cfdata, aux)
@@ -158,7 +158,7 @@ mb_intr_establish(icp, irq, type, level, ih_fun, ih_arg, ih_what)
u_long irq; /* XXX pci_intr_handle_t compatible XXX */
int type;
int level;
- int (*ih_fun) __P((void *));
+ int (*ih_fun)(void *);
void *ih_arg;
char *ih_what;
{
diff --git a/sys/arch/mips64/mips64/process_machdep.c b/sys/arch/mips64/mips64/process_machdep.c
index a3f9a8787b1..825519680b7 100644
--- a/sys/arch/mips64/mips64/process_machdep.c
+++ b/sys/arch/mips64/mips64/process_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: process_machdep.c,v 1.4 2004/08/10 20:28:13 deraadt Exp $ */
+/* $OpenBSD: process_machdep.c,v 1.5 2005/01/31 21:35:50 grange Exp $ */
/*
* Copyright (c) 1994 Adam Glass
@@ -40,7 +40,7 @@
* From:
* Id: procfs_i386.c,v 4.1 1993/12/17 10:47:45 jsp Rel
*
- * $Id: process_machdep.c,v 1.4 2004/08/10 20:28:13 deraadt Exp $
+ * $Id: process_machdep.c,v 1.5 2005/01/31 21:35:50 grange Exp $
*/
/*
@@ -79,7 +79,7 @@
#define REGSIZE sizeof(struct trap_frame)
-extern void cpu_singlestep __P((struct proc *));
+extern void cpu_singlestep(struct proc *);
int
process_read_regs(p, regs)
struct proc *p;
diff --git a/sys/arch/mips64/mips64/trap.c b/sys/arch/mips64/mips64/trap.c
index 2510cfc246c..4b7fcc698c0 100644
--- a/sys/arch/mips64/mips64/trap.c
+++ b/sys/arch/mips64/mips64/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.21 2005/01/18 15:03:38 grange Exp $ */
+/* $OpenBSD: trap.c,v 1.22 2005/01/31 21:35:50 grange Exp $ */
/* tracked to 1.23 */
/*
@@ -136,7 +136,7 @@ void stacktrace(struct trap_frame *);
void logstacktrace(struct trap_frame *);
int kdbpeek(void *);
/* extern functions printed by name in stack backtraces */
-extern void idle __P((void));
+extern void idle(void);
#endif /* DDB || DEBUG */
#if defined(DDB)
@@ -1125,7 +1125,7 @@ cpu_singlestep(p)
/* forward */
char *fn_name(long addr);
-void stacktrace_subr __P((struct trap_frame *, int (*)(const char*, ...)));
+void stacktrace_subr(struct trap_frame *, int (*)(const char*, ...));
/*
* Print a stack backtrace.
@@ -1147,7 +1147,7 @@ logstacktrace(regs)
void
stacktrace_subr(regs, printfn)
struct trap_frame *regs;
- int (*printfn) __P((const char*, ...));
+ int (*printfn)(const char*, ...);
{
long pc, sp, fp, ra, va, subr;
long a0, a1, a2, a3;
diff --git a/sys/arch/mips64/mips64/vm_machdep.c b/sys/arch/mips64/mips64/vm_machdep.c
index fc3a8ecebbe..283aaba9b31 100644
--- a/sys/arch/mips64/mips64/vm_machdep.c
+++ b/sys/arch/mips64/mips64/vm_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vm_machdep.c,v 1.6 2004/09/20 10:29:57 pefo Exp $ */
+/* $OpenBSD: vm_machdep.c,v 1.7 2005/01/31 21:35:50 grange Exp $ */
/*
* Copyright (c) 1988 University of Utah.
* Copyright (c) 1992, 1993
@@ -57,7 +57,7 @@
#include <machine/cpu.h>
#include <machine/autoconf.h>
-extern void proc_trampoline __P((void));
+extern void proc_trampoline(void);
/*
* Finish a fork operation, with process p2 nearly set up.
*/
diff --git a/sys/arch/sgi/dev/lpt_lbus.c b/sys/arch/sgi/dev/lpt_lbus.c
index 5f195203d7b..d816302c52d 100644
--- a/sys/arch/sgi/dev/lpt_lbus.c
+++ b/sys/arch/sgi/dev/lpt_lbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lpt_lbus.c,v 1.3 2004/08/10 19:16:18 deraadt Exp $ */
+/* $OpenBSD: lpt_lbus.c,v 1.4 2005/01/31 21:35:50 grange Exp $ */
/*
* Copyright (c) 1993, 1994 Charles Hannum.
@@ -64,8 +64,8 @@
#include <dev/ic/lptreg.h>
#include <dev/ic/lptvar.h>
-int lpt_localbus_probe __P((struct device *, void *, void *));
-void lpt_localbus_attach __P((struct device *, struct device *, void *));
+int lpt_localbus_probe(struct device *, void *, void *);
+void lpt_localbus_attach(struct device *, struct device *, void *);
struct cfattach lpt_pica_ca = {
sizeof(struct lpt_softc), lpt_localbus_probe, lpt_localbus_attach
diff --git a/sys/arch/sgi/include/intr.h b/sys/arch/sgi/include/intr.h
index e6532535f59..082114a92c1 100644
--- a/sys/arch/sgi/include/intr.h
+++ b/sys/arch/sgi/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.11 2005/01/02 19:34:15 kettenis Exp $ */
+/* $OpenBSD: intr.h,v 1.12 2005/01/31 21:35:50 grange Exp $ */
/*
* Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com)
@@ -256,7 +256,7 @@ extern void *hwmask_addr;
*/
void *generic_intr_establish(void *, u_long, int, int,
- int (*) __P((void *)), void *, char *);
+ int (*)(void *), void *, char *);
void generic_intr_disestablish(void *, void *);
void generic_intr_makemasks(void);
void generic_do_pending_int(int);
diff --git a/sys/arch/sgi/localbus/macebus.c b/sys/arch/sgi/localbus/macebus.c
index 2510a7eb819..d91bcb58da2 100644
--- a/sys/arch/sgi/localbus/macebus.c
+++ b/sys/arch/sgi/localbus/macebus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: macebus.c,v 1.10 2004/09/27 19:20:49 pefo Exp $ */
+/* $OpenBSD: macebus.c,v 1.11 2005/01/31 21:35:50 grange Exp $ */
/*
* Copyright (c) 2000-2004 Opsycon AB (www.opsycon.se)
@@ -437,7 +437,7 @@ static intrmask_t intrtype[INTMASKSIZE];
static intrmask_t intrmask[INTMASKSIZE];
static intrmask_t intrlevel[INTMASKSIZE];
-static int fakeintr __P((void *));
+static int fakeintr(void *);
static int fakeintr(void *a) {return 0;}
/*
diff --git a/sys/arch/sgi/pci/macepcibridge.c b/sys/arch/sgi/pci/macepcibridge.c
index 16c30e2ee56..528eb5a8177 100644
--- a/sys/arch/sgi/pci/macepcibridge.c
+++ b/sys/arch/sgi/pci/macepcibridge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: macepcibridge.c,v 1.6 2004/10/20 12:49:15 pefo Exp $ */
+/* $OpenBSD: macepcibridge.c,v 1.7 2005/01/31 21:35:50 grange Exp $ */
/*
* Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se)
@@ -156,7 +156,7 @@ struct _perr_map {
};
-static int mace_pcibrprint __P((void *, const char *pnp));
+static int mace_pcibrprint(void *, const char *pnp);
int
@@ -437,7 +437,7 @@ mace_pcibr_intr_establish(lcv, ih, level, func, arg, name)
void *lcv;
pci_intr_handle_t ih;
int level;
- int (*func) __P((void *));
+ int (*func)(void *);
void *arg;
char *name;
{
diff --git a/sys/arch/sgi/pci/pciide_machdep.c b/sys/arch/sgi/pci/pciide_machdep.c
index fb4e90a8b21..5e828bb1979 100644
--- a/sys/arch/sgi/pci/pciide_machdep.c
+++ b/sys/arch/sgi/pci/pciide_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pciide_machdep.c,v 1.2 2004/08/10 19:16:18 deraadt Exp $ */
+/* $OpenBSD: pciide_machdep.c,v 1.3 2005/01/31 21:35:50 grange Exp $ */
/*
* Copyright (c) 2003-2004 Opsycon AB (www.opsycon.se / www.opsycon.com)
@@ -41,7 +41,7 @@ pciide_machdep_compat_intr_establish(dev, pa, chan, func, arg)
struct device *dev;
struct pci_attach_args *pa;
int chan;
- int (*func) __P((void *));
+ int (*func)(void *);
void *arg;
{
void *cookie = (void *)4;